phpwiki-checkins Mailing List for PhpWiki

Revision: 9577
 http://sourceforge.net/p/phpwiki/code/9577
Author: vargenau
Date: 2015年02月28日 17:02:28 +0000 (2015年2月28日)
Log Message:
-----------
Remove unused function
Modified Paths:
--------------
 trunk/lib/IniConfig.php
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2015年02月28日 16:57:34 UTC (rev 9576)
+++ trunk/lib/IniConfig.php	2015年02月28日 17:02:28 UTC (rev 9577)
@@ -550,17 +550,6 @@
 fixup_dynamic_configs(); // [100ms]
 }
 
-function _ignore_unknown_charset_warning(&$error)
-{
- if (preg_match('/^htmlspecialchars\(\): charset \`.+\' not supported, assuming iso-8859-1/',
- $error->errstr)
- ) {
- $error->errno = 0;
- return true; // Ignore error
- }
- return false;
-}
-
 // moved from lib/config.php [1ms]
 function fixup_static_configs($file)
 {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9576
 http://sourceforge.net/p/phpwiki/code/9576
Author: vargenau
Date: 2015年02月28日 16:57:34 +0000 (2015年2月28日)
Log Message:
-----------
PDO is part of language now
Modified Paths:
--------------
 trunk/lib/IniConfig.php
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2015年02月27日 18:16:08 UTC (rev 9575)
+++ trunk/lib/IniConfig.php	2015年02月28日 16:57:34 UTC (rev 9576)
@@ -324,15 +324,7 @@
 DATABASE_TYPE, join(",", $valid_database_types)),
 E_USER_ERROR);
 unset($valid_database_types);
- if (DATABASE_TYPE == 'PDO') {
- // try to load it dynamically (unix only)
- if (!loadPhpExtension("pdo")) {
- echo $GLOBALS['php_errormsg'], "<br>\n";
- trigger_error(sprintf("dl() problem: Required extension "%s" could not be loaded!",
- "pdo"),
- E_USER_ERROR);
- }
- }
+
 // Detect readonly database, e.g. system mounted read-only for maintenance
 // via dbh->readonly later. Unfortunately not possible as constant.
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9575
 http://sourceforge.net/p/phpwiki/code/9575
Author: vargenau
Date: 2015年02月27日 18:16:08 +0000 (2015年2月27日)
Log Message:
-----------
Remove unused variables
Modified Paths:
--------------
 trunk/lib/WikiDB/backend/ADODB.php
 trunk/lib/WikiDB/backend/ADODB_mysql.php
 trunk/lib/WikiDB/backend/ADODB_oci8po.php
 trunk/lib/WikiDB/backend/ADODB_sqlite.php
 trunk/lib/WikiDB/backend/PDO.php
 trunk/lib/WikiDB/backend/PearDB_oci8.php
Modified: trunk/lib/WikiDB/backend/ADODB.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB.php	2015年02月27日 17:54:34 UTC (rev 9574)
+++ trunk/lib/WikiDB/backend/ADODB.php	2015年02月27日 18:16:08 UTC (rev 9575)
@@ -466,7 +466,6 @@
 $dbh->BeginTrans();
 $dbh->CommitLock($version_tbl);
 $id = $this->_get_pageid($pagename, true);
- $backend_type = $this->backendType();
 $dbh->Execute(sprintf("DELETE FROM $version_tbl"
 . " WHERE id=%d AND version=%d",
 $id, $version));
@@ -1312,7 +1311,7 @@
 $field_list = array();
 $old_db = $this->database();
 if ($database != $old_db) {
- $conn = $this->_dbh->Connect($this->_parsedDSN['hostspec'],
+ $this->_dbh->Connect($this->_parsedDSN['hostspec'],
 DBADMIN_USER ? DBADMIN_USER : $this->_parsedDSN['username'],
 DBADMIN_PASSWD ? DBADMIN_PASSWD : $this->_parsedDSN['password'],
 $database);
@@ -1322,7 +1321,7 @@
 }
 if ($database != $old_db) {
 $this->_dbh->close();
- $conn = $this->_dbh->Connect($this->_parsedDSN['hostspec'],
+ $this->_dbh->Connect($this->_parsedDSN['hostspec'],
 $this->_parsedDSN['username'],
 $this->_parsedDSN['password'],
 $old_db);
Modified: trunk/lib/WikiDB/backend/ADODB_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_mysql.php	2015年02月27日 17:54:34 UTC (rev 9574)
+++ trunk/lib/WikiDB/backend/ADODB_mysql.php	2015年02月27日 18:16:08 UTC (rev 9575)
@@ -125,7 +125,7 @@
 }
 if (DO_APP_LOCK) {
 $lock = join('-', $tables);
- $result = $this->_dbh->Execute("SELECT RELEASE_LOCK('$lock')");
+ $this->_dbh->Execute("SELECT RELEASE_LOCK('$lock')");
 }
 if (DO_FULL_LOCK) {
 // if this is not enough:
@@ -175,7 +175,7 @@
 $row = $dbh->GetRow($query);
 if (!$row) {
 // have auto-incrementing, atomic version
- $rs = $dbh->Execute(sprintf("INSERT INTO $page_tbl"
+ $dbh->Execute(sprintf("INSERT INTO $page_tbl"
 . " (id,pagename)"
 . " VALUES(NULL,%s)",
 $dbh->qstr($pagename)));
@@ -210,7 +210,6 @@
 $dbh->BeginTrans();
 $dbh->CommitLock($version_tbl);
 $id = $this->_get_pageid($pagename, true);
- $backend_type = $this->backendType();
 // optimize: mysql can do this with one REPLACE INTO.
 $rs = $dbh->Execute(sprintf("REPLACE INTO $version_tbl"
 . " (id,version,mtime,minor_edit,content,versiondata)"
Modified: trunk/lib/WikiDB/backend/ADODB_oci8po.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_oci8po.php	2015年02月27日 17:54:34 UTC (rev 9574)
+++ trunk/lib/WikiDB/backend/ADODB_oci8po.php	2015年02月27日 18:16:08 UTC (rev 9575)
@@ -124,7 +124,6 @@
 
 function write_accesslog(&$entry)
 {
- global $request;
 $dbh = &$this->_dbh;
 $log_tbl = $entry->_accesslog->logtable;
 $dbh->query("INSERT INTO $log_tbl"
Modified: trunk/lib/WikiDB/backend/ADODB_sqlite.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_sqlite.php	2015年02月27日 17:54:34 UTC (rev 9574)
+++ trunk/lib/WikiDB/backend/ADODB_sqlite.php	2015年02月27日 18:16:08 UTC (rev 9575)
@@ -42,7 +42,7 @@
 // atomic version
 // TODO: we have auto-increment since sqlite-2.3.4
 // http://www.sqlite.org/faq.html#q1
- $rs = $dbh->Execute(sprintf("INSERT INTO $page_tbl"
+ $dbh->Execute(sprintf("INSERT INTO $page_tbl"
 . " (id,pagename)"
 . " VALUES((SELECT max(id) FROM $page_tbl)+1, %s)",
 $dbh->qstr($pagename)));
Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2015年02月27日 17:54:34 UTC (rev 9574)
+++ trunk/lib/WikiDB/backend/PDO.php	2015年02月27日 18:16:08 UTC (rev 9575)
@@ -32,11 +32,6 @@
 
 function __construct($dbparams)
 {
- /**
- * @var WikiRequest $request
- */
- global $request;
-
 $this->_dbparams = $dbparams;
 if (strstr($dbparams['dsn'], "://")) { // pear DB syntax
 $parsed = parseDSN($dbparams['dsn']);
Modified: trunk/lib/WikiDB/backend/PearDB_oci8.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_oci8.php	2015年02月27日 17:54:34 UTC (rev 9574)
+++ trunk/lib/WikiDB/backend/PearDB_oci8.php	2015年02月27日 18:16:08 UTC (rev 9575)
@@ -75,7 +75,6 @@
 
 function write_accesslog(&$entry)
 {
- global $request;
 $dbh = &$this->_dbh;
 $log_tbl = $entry->_accesslog->logtable;
 // duration problem: sprintf "%f" might use comma e.g. "100,201" in european locales
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9574
 http://sourceforge.net/p/phpwiki/code/9574
Author: vargenau
Date: 2015年02月27日 17:54:34 +0000 (2015年2月27日)
Log Message:
-----------
Remove CVS backend
Modified Paths:
--------------
 trunk/config/config-dist.ini
 trunk/configurator.php
 trunk/lib/IniConfig.php
 trunk/lib/TextSearchQuery.php
 trunk/lib/WikiDB.php
 trunk/lib/WikiTheme.php
 trunk/lib/WikiUser/Db.php
 trunk/lib/interwiki.map
 trunk/lib/plugin/PageDump.php
 trunk/lib/plugin/SystemInfo.php
 trunk/lib/stdlib.php
 trunk/locale/Makefile
 trunk/locale/README.de.txt
 trunk/locale/de/LC_MESSAGES/phpwiki.mo
 trunk/locale/es/LC_MESSAGES/phpwiki.mo
 trunk/locale/fr/LC_MESSAGES/phpwiki.mo
 trunk/locale/fr/pgsrc/Aide%2FPluginRessourcesRss
 trunk/locale/it/LC_MESSAGES/phpwiki.mo
 trunk/locale/ja/LC_MESSAGES/phpwiki.mo
 trunk/locale/nl/LC_MESSAGES/phpwiki.mo
 trunk/locale/po/de.po
 trunk/locale/po/es.po
 trunk/locale/po/fr.po
 trunk/locale/po/it.po
 trunk/locale/po/ja.po
 trunk/locale/po/nl.po
 trunk/locale/po/phpwiki.pot
 trunk/locale/po/sv.po
 trunk/locale/po/zh.po
 trunk/locale/sv/LC_MESSAGES/phpwiki.mo
 trunk/locale/zh/LC_MESSAGES/phpwiki.mo
 trunk/pgsrc/Help%2FPageDumpPlugin
 trunk/pgsrc/ReleaseNotes
 trunk/themes/Sidebar/themeinfo.php
 trunk/themes/fusionforge/interwiki.map
 trunk/themes/fusionforge/wikilens.js
 trunk/themes/wikilens/wikilens.js
Removed Paths:
-------------
 trunk/lib/WikiDB/backend/cvs.php
 trunk/lib/WikiDB/cvs.php
 trunk/tests/unit_test_backend_cvs.php
Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2015年02月27日 17:18:07 UTC (rev 9573)
+++ trunk/config/config-dist.ini	2015年02月27日 17:54:34 UTC (rev 9574)
@@ -400,7 +400,6 @@
 ; dba: use one of the standard UNIX dbm libraries. Use BerkeleyDB (db3,4) (fastest)
 ; file: use a serialized file database. (easiest)
 ; flatfile: use a flat file database. (experimental, readable, slow)
-; cvs: use a CVS server to store everything. (experimental, slowest, not recommended)
 DATABASE_TYPE = dba
 
 ; Prefix for filenames or table names
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2015年02月27日 17:18:07 UTC (rev 9573)
+++ trunk/configurator.php	2015年02月27日 17:54:34 UTC (rev 9574)
@@ -638,14 +638,12 @@
 'SQL' => "SQL PEAR",
 'ADODB' => "SQL ADODB",
 'PDO' => "PDO (php5 only)",
- 'file' => "flatfile",
- 'cvs' => "CVS File handler")/*, "
+ 'file' => "flatfile")/*, "
 Select the database backend type:
 Choose dba (default) to use one of the standard UNIX dba libraries. This is the fastest.
 Choose ADODB or SQL to use an SQL database with ADODB or PEAR.
 Choose PDO on php5 to use an SQL database. (experimental, no paging yet)
 flatfile is simple and slow.
-CVS is highly experimental and slow.
 Recommended is dba or SQL: PEAR or ADODB."*/);
 
 $properties["SQL DSN Setup"] =
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2015年02月27日 17:18:07 UTC (rev 9573)
+++ trunk/lib/IniConfig.php	2015年02月27日 17:54:34 UTC (rev 9574)
@@ -318,7 +318,7 @@
 unset($rsdef[$item]);
 }
 }
- $valid_database_types = array('SQL', 'ADODB', 'PDO', 'dba', 'file', 'flatfile', 'cvs', 'cvsclient');
+ $valid_database_types = array('SQL', 'ADODB', 'PDO', 'dba', 'file', 'flatfile');
 if (!in_array(DATABASE_TYPE, $valid_database_types))
 trigger_error(sprintf("Invalid DATABASE_TYPE=%s. Choose one of %s",
 DATABASE_TYPE, join(",", $valid_database_types)),
Modified: trunk/lib/TextSearchQuery.php
===================================================================
--- trunk/lib/TextSearchQuery.php	2015年02月27日 17:18:07 UTC (rev 9573)
+++ trunk/lib/TextSearchQuery.php	2015年02月27日 17:54:34 UTC (rev 9574)
@@ -403,7 +403,6 @@
 * Check the symbolic definition query against unwanted functions and characters.
 * "population < 20000 and area > 1000000" vs
 * "area > 1000000 and mail($me,file("/etc/passwd"),...)"
- * http://localhost/wikicvs/SemanticSearch?attribute=*&attr_op=<0 and find(1)>&s=-0.01&start_debug=1
 */
 function check_query($query)
 {
Deleted: trunk/lib/WikiDB/backend/cvs.php
===================================================================
--- trunk/lib/WikiDB/backend/cvs.php	2015年02月27日 17:18:07 UTC (rev 9573)
+++ trunk/lib/WikiDB/backend/cvs.php	2015年02月27日 17:54:34 UTC (rev 9574)
@@ -1,1031 +0,0 @@
-<?php
-
-/**
- * Backend for handling CVS repository.
- *
- * ASSUMES: that the shell commands 'cvs', 'grep', 'rm', are all located
- * ASSUMES: in the path of the server calling this script.
- *
- * Author: Gerrit Riessen, ger...@op...
- */
-
-require_once 'lib/WikiDB/backend.php';
-require_once 'lib/ErrorManager.php';
-
-/**
- * Constants used by the CVS backend
- **/
-// these are the parameters defined in db_params
-define('CVS_DOC_DIR', 'doc_dir');
-define('CVS_REPOSITORY', 'repository');
-define('CVS_CHECK_FOR_REPOSITORY', 'check_for_repository');
-define('CVS_DEBUG_FILE', 'debug_file');
-define('CVS_PAGE_SOURCE', 'pgsrc');
-define('CVS_MODULE_NAME', 'module_name');
-
-// these are the things that are defined in the page hash
-// CMD == Cvs Meta Data
-define('CMD_LAST_MODIFIED', 'lastmodified');
-define('CMD_CONTENT', '%content');
-define('CMD_CREATED', 'created');
-define('CMD_VERSION', 'version');
-define('CMD_AUTHOR', 'author');
-define('CMD_LINK_ATT', '_links_');
-
-// file names used to store specific information
-define('CVS_MP_FILE', '.most_popular');
-define('CVS_MR_FILE', '.most_recent');
-
-class WikiDB_backend_cvs
- extends WikiDB_backend
-{
- public $_docDir;
- public $_repository;
- public $_module_name;
- public $_debug_file;
-
- /**
- * In the following parameters should be defined in dbparam:
- * . wiki ==> directory where the pages should be stored
- * this is not the CVS repository location
- * . repository ==> local directory where the repository should be
- * created. This can also be a :pserver: but then
- * set check_for_repository to false and checkout
- * the documents beforehand. (This is basically CVSROOT)
- * . check_for_repository ==> boolean flag to indicate whether the
- * repository should be created, this only
- * applies to local directories, for pserver
- * set this to false and check out the
- * document base beforehand
- * . debug_file ==> file name where debug information should be sent.
- * If file doesn't exist then it's created, if this
- * is empty, then debugging is turned off.
- * . pgsrc ==> directory name where the default wiki pages are stored.
- * This is only required if the backend is to create a
- * new CVS repository.
- *
- * The class also adds a parameter 'module_name' to indicate the name
- * of the cvs module that is being used to version the documents. The
- * module_name is assumed to be the base name of directory given in
- * wiki, e.g. if wiki == '/some/path/to/documents' then module_name
- * becomes 'documents' and this module will be created in the CVS
- * repository or assumed to exist. If on the other hand the parameter
- * already exists, then it is not overwritten.
- */
- function __construct($dbparam)
- {
- // setup all the instance values.
- $this->_docDir = $dbparam{CVS_DOC_DIR};
- $this->_repository = $dbparam{CVS_REPOSITORY};
- if (!$dbparam{CVS_MODULE_NAME}) {
- $this->_module_name = basename($this->_docDir);
- $dbparam{CVS_MODULE_NAME} = $this->_module_name;
- } else {
- $this->_module_name = $dbparam{CVS_MODULE_NAME};
- }
- $this->_debug_file = $dbparam{CVS_DEBUG_FILE};
-
- if ($dbparam{CVS_CHECK_FOR_REPOSITORY}
- && !(is_dir($this->_repository)
- && is_dir($this->_repository . "/CVSROOT")
- && is_dir($this->_repository . "/" . $this->_module_name))
- ) {
-
- $this->_cvsDebug(sprintf("Creating new repository [%s]", $this->_repository));
-
- // doesn't exist, need to create it and the replace the wiki
- // document directory.
- $this->_mkdir($this->_repository, 0775);
-
- // assume that the repository is a local directory, prefix :local:
- if (!ereg("^:local:", $this->_repository)) {
- $this->_repository = ":local:" . $this->_repository;
- }
-
- $cmdLine = sprintf("cvs -d \"%s\" init", $this->_repository);
- $this->_execCommand($cmdLine, $cmdOutput, true);
-
- $this->_mkdir($this->_docDir, 0775);
- $cmdLine = sprintf("cd %s; cvs -d \"%s\" import -m no_message "
- . "%s V R", $this->_docDir, $this->_repository,
- $this->_module_name);
- $this->_execCommand($cmdLine, $cmdOutput, true);
-
- // remove the wiki directory and check it out from the
- // CVS repository
- $cmdLine = sprintf("rm -fr %s; cd %s; cvs -d \"%s\" co %s",
- $this->_docDir, dirname($this->_docDir),
- $this->_repository, $this->_module_name);
- $this->_execCommand($cmdLine, $cmdOutput, true);
-
- // add the default pages using the update_pagedata
- $metaData = array();
- $metaData[$AUTHOR] = "PhpWiki -- CVS Backend";
-
- if (is_dir($dbparam[CVS_PAGE_SOURCE])) {
- $d = opendir($dbparam[CVS_PAGE_SOURCE]);
- while ($entry = readdir($d)) {
- $filename = $dbparam[CVS_PAGE_SOURCE] . "/" . $entry;
- $this->_cvsDebug(sprintf("Found [%s] in [%s]", $entry, $dbparam[CVS_PAGE_SOURCE]));
-
- if (is_file($filename)) {
- $metaData[CMD_CONTENT] = join('', file($filename));
- $this->update_pagedata($entry, $metaData);
- }
- }
- closedir($d);
- }
-
- // ensure that the results of the is_dir are cleared
- clearstatcache();
- }
- }
-
- /**
- * Return: metadata about page
- */
- function get_pagedata($pagename)
- {
- // the metadata information about a page is stored in the
- // CVS directory of the document root in serialized form. The
- // file always has the name, i.e. '_$pagename'.
- $metaFile = $this->_docDir . "/CVS/_" . $pagename;
-
- if (file_exists($metaFile)) {
-
- $megaHash =
- unserialize(join('', $this->_readFileWithPath($metaFile)));
-
- $filename = $this->_docDir . "/" . $pagename;
- if (file_exists($filename)) {
- $megaHash[CMD_CONTENT] = $this->_readFileWithPath($filename);
- } else {
- $megaHash[CMD_CONTENT] = "";
- }
-
- $this->_updateMostRecent($pagename);
- $this->_updateMostPopular($pagename);
-
- return $megaHash;
- } else {
- return false;
- }
- }
-
- /**
- * This will create a new page if page being requested does not
- * exist.
- */
- function update_pagedata($pagename, $newdata = array())
- {
- // check argument
- if (!is_array($newdata)) {
- trigger_error("update_pagedata: Argument 'newdata' was not array",
- E_USER_WARNING);
- }
-
- // retrieve the meta data
- $metaData = $this->get_pagedata($pagename);
-
- if (!$metaData) {
- $this->_cvsDebug("update_pagedata: no meta data found");
- // this means that the page does not exist, we need to create
- // it.
- $metaData = array();
-
- $metaData[CMD_CREATED] = time();
- $metaData[CMD_VERSION] = "1";
-
- if (!isset($newdata[CMD_CONTENT])) {
- $metaData[CMD_CONTENT] = "";
- } else {
- $metaData[CMD_CONTENT] = $newdata[CMD_CONTENT];
- }
-
- // create an empty page ...
- $this->_writePage($pagename, $metaData[CMD_CONTENT]);
- $this->_addPage($pagename);
-
- // make sure that the page is written and committed a second time
- unset($newdata[CMD_CONTENT]);
- unset($metaData[CMD_CONTENT]);
- }
-
- // change any meta data information
- foreach ($newdata as $key => $value) {
- if ($value == false || empty($value)) {
- unset($metaData[$key]);
- } else {
- $metaData[$key] = $value;
- }
- }
-
- // update the page data, if required. Use newdata because it could
- // be empty and thus unset($metaData[CMD_CONTENT]).
- if (isset($newdata[CMD_CONTENT])) {
- $this->_writePage($pagename, $newdata[CMD_CONTENT]);
- }
-
- // remove any content from the meta data before storing it
- unset($metaData[CMD_CONTENT]);
- $metaData[CMD_LAST_MODIFIED] = time();
-
- $metaData[CMD_VERSION] = $this->_commitPage($pagename, $metaData);
- $this->_writeMetaInfo($pagename, $metaData);
- }
-
- function get_latest_version($pagename)
- {
- $metaData = $this->get_pagedata($pagename);
- if ($metaData) {
- // the version number is everything after the '1.'
- return $metaData[CMD_VERSION];
- } else {
- $this->_cvsDebug(sprintf("get_latest_versioned FAILED for [%s]", $pagename));
- return 0;
- }
- }
-
- function get_previous_version($pagename, $version)
- {
- // cvs increments the version numbers, so this is real easy ;-)
- return ($version > 0 ? $version - 1 : 0);
- }
-
- /**
- * the version parameter is assumed to be everything after the '1.'
- * in the CVS versioning system.
- */
- function get_versiondata($pagename, $version, $want_content = false)
- {
- $this->_cvsDebug("get_versiondata: [$pagename] [$version] [$want_content]");
-
- $filedata = "";
- if ($want_content) {
- // retrieve the version from the repository
- $cmdLine = sprintf("cvs -d \"%s\" co -p -r 1.%d %s/%s 2>&1",
- $this->_repository, $version,
- $this->_module_name, $pagename);
- $this->_execCommand($cmdLine, $filedata, true);
-
- // TODO: DEBUG: 5 is a magic number here, depending on the
- // TODO: DEBUG: version of cvs used here, 5 might have to
- // TODO: DEBUG: change. Basically find a more reliable way of
- // TODO: DEBUG: doing this.
- // the first 5 lines contain various bits of
- // administrative information that can be ignored.
- for ($i = 0; $i < 5; $i++) {
- array_shift($filedata);
- }
- }
-
- /**
- * Now obtain the rest of the pagehash information, this is contained
- * in the log message for the revision in serialized form.
- */
- $cmdLine = sprintf("cd %s; cvs log -r1.%d %s", $this->_docDir,
- $version, $pagename);
- $this->_execCommand($cmdLine, $logdata, true);
-
- // shift log data until we get to the 'revision X.X' line
- // FIXME: ensure that we don't enter an endless loop here
- while (!ereg("^revision 1.([0-9]+)$", $logdata[0], $revInfo)) {
- array_shift($logdata);
- }
-
- // serialized hash information now stored in position 2
- $rVal = unserialize(_unescape($logdata[2]));
-
- // version information is incorrect
- $rVal[CMD_VERSION] = $revInfo[1];
- $rVal[CMD_CONTENT] = $filedata;
-
- foreach ($rVal as $key => $value) {
- $this->_cvsDebug("$key == [$value]");
- }
-
- return $rVal;
- }
-
- /**
- * See ADODB for a better delete_page(), which can be undone and is seen in RecentChanges.
- * See backend.php
- */
- //function delete_page($pagename) { $this->purge_page($pagename); }
-
- /**
- * This returns false if page was not deleted or could not be deleted
- * else return true.
- */
- function purge_page($pagename)
- {
- $this->_cvsDebug("delete_page [$pagename]");
- $filename = $this->_docDir . "/" . $pagename;
- $metaFile = $this->_docDir . "/CVS/_" . $pagename;
-
- // obtain a write block before deleting the file
- if ($this->_deleteFile($filename) == false) {
- return false;
- }
-
- $this->_deleteFile($metaFile);
-
- $this->_removePage($pagename);
-
- return true;
- }
-
- /**
- * For now delete and create a new one.
- *
- * This returns false if page was not renamed,
- * else return true.
- */
- function rename_page($pagename, $to)
- {
- $this->_cvsDebug("rename_page [$pagename,$to]");
- $data = get_pagedata($pagename);
- if (isset($data['pagename']))
- $data['pagename'] = $to;
- //$version = $this->get_latest_version($pagename);
- //$vdata = get_versiondata($pagename, $version, 1);
- //$data[CMD_CONTENT] = $vdata[CMD_CONTENT];
- $this->delete_page($pagename);
- $this->update_pagedata($to, $data);
- return true;
- }
-
- function delete_versiondata($pagename, $version)
- {
- // TODO: Not Implemented.
- // TODO: This is, for CVS, difficult because it implies removing a
- // TODO: revision somewhere in the middle of a revision tree, and
- // TODO: this is basically not possible!
- trigger_error("delete_versiondata: Not Implemented", E_USER_WARNING);
- }
-
- function set_versiondata($pagename, $version, $data)
- {
- // TODO: Not Implemented.
- // TODO: requires changing the log(commit) message for a particular
- // TODO: version and this can't be done??? (You can edit the repository
- // TODO: file directly but i don't know of a way of doing it via
- // TODO: the cvs tools).
- trigger_error("set_versiondata: Not Implemented", E_USER_WARNING);
- }
-
- function update_versiondata($pagename, $version, $newdata)
- {
- // TODO: same problem as set_versiondata
- trigger_error("set_versiondata: Not Implemented", E_USER_WARNING);
- }
-
- function set_links($pagename, $links)
- {
- // TODO: needs to be tested ....
- $megaHash = get_pagedata($pagename);
- $megaHash[CMD_LINK_ATT] = $links;
- $this->_writeMetaInfo($pagename, $megaHash);
- }
-
- function get_links($pagename, $reversed = true, $include_empty = false,
- $sortby = '', $limit = '', $exclude = '')
- {
- // TODO: ignores the $reversed argument and returns
- // TODO: the value of _links_ attribute of the meta information
- // TODO: to implement a reversed version, i guess, we going to
- // TODO: need to do a grep on all files for the pagename in
- // TODO: in question and return all those page names that contained
- // TODO: the required pagename!
- $megaHash = get_pagedata($pagename);
- return $megaHash[CMD_LINK_ATT];
- }
-
- /* function get_all_revisions($pagename) {
- // TODO: should replace this with something more efficient
- include_once 'lib/WikiDB/backend/dumb/AllRevisionsIter.php';
- return new WikiDB_backend_dumb_AllRevisionsIter($this, $pagename);
- } */
-
- public function get_all_pages($include_empty = false,
- $sortby = '', $limit = '', $exclude = '')
- {
- // FIXME: this ignores the parameters.
- return new Cvs_Backend_Array_Iterator(
- $this->_getAllFileNamesInDir($this->_docDir));
- }
-
- public function text_search($search, $fulltext = false,
- $sortby = '', $limit = '', $exclude = '')
- {
- if ($fulltext) {
- $iter = new Cvs_Backend_Full_Search_Iterator(
- $this->_getAllFileNamesInDir($this->_docDir),
- $search,
- $this->_docDir);
- $iter->stoplisted =& $search->stoplisted;
- return $iter;
- } else {
- return new Cvs_Backend_Title_Search_Iterator(
- $this->_getAllFileNamesInDir($this->_docDir),
- $search);
- }
- }
-
- public function most_popular($limit = 20, $sortby = '')
- {
- // TODO: needs to be tested ...
- $mp = $this->_getMostPopular();
- if ($limit < 0) {
- asort($mp, SORT_NUMERIC);
- $limit = -$limit;
- } else {
- arsort($mp, SORT_NUMERIC);
- }
- $returnVal = array();
-
- while ((list($key, $val) = each($a)) && $limit > 0) {
- $returnVal[] = $key;
- $limit--;
- }
- return $returnVal;
- }
-
- /**
- * This only accepts the 'since' and 'limit' attributes, everything
- * else is ignored.
- */
- public function most_recent($params)
- {
- // TODO: needs to be tested ...
- // most recent are those pages with the highest time value ...
- $mr = $this->_getMostRecent();
- $rev = false;
- $returnVal = array();
- if (isset($params['limit'])) {
- $limit = $params['limit'];
- $rev = $limit < 0;
- }
- if ($rev) {
- arsort($mr, SORT_NUMERIC);
- } else {
- asort($mr, SORT_NUMERIC);
- }
- if (isset($limit)) {
- while ((list($key, $val) = each($a)) && $limit > 0) {
- $returnVal[] = $key;
- $limit--;
- }
- } elseif (isset($params['since'])) {
- while ((list($key, $val) = each($a))) {
-
- if ($val > $params['since']) {
- $returnVal[] = $key;
- }
- }
- }
-
- return new Cvs_Backend_Array_Iterator($returnVal);
- }
-
- function lock($tables = array(), $write_lock = true)
- {
- // TODO: to be implemented
- trigger_error("lock: Not Implemented", E_USER_WARNING);
- }
-
- function unlock($tables = array(), $force = false)
- {
- // TODO: to be implemented
- trigger_error("unlock: Not Implemented", E_USER_WARNING);
- }
-
- function close()
- {
- }
-
- function sync()
- {
- }
-
- function optimize()
- {
- return true;
- }
-
- /**
- * What we do here is take a listing of the documents directory and
- * check that each page has metadata file. If not, then a metadata
- * file is created for the page.
- *
- * This can happen if rebuild() was called and someone has added
- * files to the CVS repository not via PhpWiki. These files are
- * added to the document directory but without any metadata files.
- */
- function check()
- {
- // TODO:
- // TODO: test this .... i.e. add test to unit test file.
- // TODO:
- $page_names = $this->_getAllFileNamesInDir($this->_docDir);
- $meta_names = $this->_getAllFileNamesInDir($this->_docDir . "/CVS");
-
- array_walk($meta_names, '_strip_leading_underscore');
- reset($meta_names);
- $no_meta_files = array_diff($page_names, $meta_names);
-
- array_walk($no_meta_files, '_create_meta_file', $this);
-
- return true;
- }
-
- /**
- * Do an update of the CVS repository
- */
- function rebuild()
- {
- // TODO:
- // TODO: test this .... i.e. add test to unit test file.
- // TODO:
- $cmdLine = sprintf("cd %s; cvs update -d 2>&1", $this->_docDir);
- $this->_execCommand($cmdLine, $cmdOutput, true);
- return true;
- }
-
- //
- // ..-.-..-.-..-.-.. .--..-......-.--. --.-....----.....
- // The rest are all internal methods, not to be used
- // directly.
- // ..-.-..-.-..-.-.. .--..-......-.--. --.-....----.....
- //
- function _create_meta_file($page_name, $key, &$backend)
- {
- // this is used as part of an array walk and therefore takes
- // the backend argument
- $backend->_cvsDebug(sprintf("Creating meta file for [%s]", $page_name));
- $backend->update_pagedata($page_name, array());
- }
-
- function _strip_leading_underscore(&$item)
- {
- $item = ereg_replace("^_", "", $item);
- }
-
- /**
- * update the most popular information by incrementing the count
- * for the following page. If the page was not defined, it is entered
- * with a value of 1.
- */
- function _updateMostPopular($pagename)
- {
- $mp = $this->_getMostPopular();
- if (isset($mp[$pagename])) {
- $mp[$pagename]++;
- } else {
- $mp[$pagename] = 1;
- }
- $this->_writeFileWithPath($this->_docDir . "/CVS/" . CVS_MP_FILE,
- serialize($mp));
- }
-
- /**
- * Returns an array containing the most popular information. This
- * creates the most popular file if it does not exist.
- */
- function _getMostPopular()
- {
- $mostPopular = $this->_docDir . "/CVS/" . CVS_MP_FILE;
- if (!file_exists($mostPopular)) {
- $this->_writeFileWithPath($mostPopular, serialize(array()));
- }
- return unserialize(join('', $this->_readFileWithPath($mostPopular)));
- }
-
- function _getMostRecent()
- {
- $mostRecent = $this->_docDir . "/CVS/" . CVS_MR_FILE;
- if (!file_exists($mostRecent)) {
- $this->_writeFileWithPath($mostRecent, serialize(array()));
- }
- return unserialize(join('', $this->_readFileWithPath($mostRecent)));
- }
-
- function _updateMostRecent($pagename)
- {
- $mr = $this->_getMostRecent();
- $mr[$pagename] = time();
- $this->_writeFileWithPath($this->_docDir . "/CVS/" . CVS_MR_FILE,
- serialize($mr));
- }
-
- function _writeMetaInfo($pagename, $hashInfo)
- {
- $this->_writeFileWithPath($this->_docDir . "/CVS/_" . $pagename,
- serialize($hashInfo));
- }
-
- function _writePage($pagename, $content)
- {
- $this->_writeFileWithPath($this->_docDir . "/" . $pagename, $content);
- }
-
- function _removePage($pagename)
- {
- $cmdLine = sprintf("cd %s; cvs remove %s 2>&1; cvs commit -m '%s' "
- . "%s 2>&1", $this->_docDir, $pagename,
- "remove page", $pagename);
-
- $this->_execCommand($cmdLine, $cmdRemoveOutput, true);
- }
-
- /**
- * this returns the new version number of the file.
- */
- function _commitPage($pagename, &$meta_data)
- {
- $cmdLine = sprintf("cd %s; cvs commit -m \"%s\" %s 2>&1",
- $this->_docDir,
- escapeshellcmd(serialize($meta_data)),
- $pagename);
- $this->_execCommand($cmdLine, $cmdOutput, true);
-
- $cmdOutput = implode("\n", $cmdOutput);
- $revInfo = array();
- ereg("\nnew revision: 1[.]([0-9]+); previous revision: ", $cmdOutput,
- $revInfo);
-
- $this->_cvsDebug("CP: revInfo 0: $revInfo[0]");
- $this->_cvsDebug("CP: $cmdOutput");
- if (isset($revInfo[1])) {
- $this->_cvsDebug("CP: got revision information");
- return $revInfo[1];
- } else {
- ereg("\ninitial revision: 1[.]([0-9]+)", $cmdOutput, $revInfo);
- if (isset($revInfo[1])) {
- $this->_cvsDebug("CP: is initial release");
- return 1;
- }
- $this->_cvsDebug("CP: returning old version");
- return $meta_data[CMD_VERSION];
- }
- }
-
- function _addPage($pagename)
- {
- // TODO: need to add a check for the mimetype so that binary
- // TODO: files are added as binary files
- $cmdLine = sprintf("cd %s; cvs add %s 2>&1", $this->_docDir,
- $pagename);
- $this->_execCommand($cmdLine, $cmdAddOutput, true);
- }
-
- /**
- * Returns an array containing all the names of files contained
- * in a particular directory. The list is sorted according the
- * string representation of the filenames.
- */
- function _getAllFileNamesInDir($dirName)
- {
- $namelist = array();
- $d = opendir($dirName);
- while ($entry = readdir($d)) {
- $namelist[] = $entry;
- }
- closedir($d);
- sort($namelist, SORT_STRING);
- return $namelist;
- }
-
- /**
- * Recursively create all directories.
- */
- function _mkdir($path, $mode)
- {
- $directoryName = dirname($path);
- if ($directoryName != "/" && $directoryName != "\\"
- && !is_dir($directoryName) && $directoryName != ""
- ) {
- $rVal = $this->_mkdir($directoryName, $mode);
- } else {
- $rVal = true;
- }
-
- return ($rVal && @mkdir($path, $mode));
- }
-
- /**
- * Recursively create all directories and then the file.
- */
- function _createFile($path, $mode)
- {
- $this->_mkdir(dirname($path), $mode);
- touch($path);
- chmod($path, $mode);
- }
-
- /**
- * The lord giveth, and the lord taketh.
- */
- function _deleteFile($filename)
- {
- if ($fd = fopen($filename, 'a')) {
-
- $locked = flock($fd, 2); // Exclusive blocking lock
-
- if (!$locked) {
- $this->_cvsError("Unable to delete file, lock was not obtained.",
- __LINE__, $filename, EM_NOTICE_ERRORS);
- }
-
- if (($rVal = unlink($filename)) != 0) {
- $this->_cvsDebug("[$filename] --> Unlink returned [$rVal]");
- }
-
- return $rVal;
- } else {
- $this->_cvsError("deleteFile: Unable to open file",
- __LINE__, $filename, EM_NOTICE_ERRORS);
- return false;
- }
- }
-
- /**
- * Called when something happened that causes the CVS backend to
- * fail.
- */
- function _cvsError($msg = "no message",
- $errline = 0,
- $errfile = "lib/WikiDB/backend/cvs.php",
- $errno = EM_FATAL_ERRORS)
- {
- $err = new PhpError($errno, "[CVS(be)]: " . $msg, $errfile, $errline);
- // send error to the debug routine
- $this->_cvsDebug($err->asXML());
- // send the error to the error manager
- $GLOBALS['ErrorManager']->handleError($err);
- }
-
- /**
- * Debug function specifically for the CVS database functions.
- * Can be deactived by setting the WikiDB['debug_file'] to ""
- */
- function _cvsDebug($msg)
- {
- if ($this->_debug_file == "") {
- return;
- }
-
- if (!file_exists($this->_debug_file)) {
- $this->_createFile($this->_debug_file, 0755);
- }
-
- if ($fdlock = @fopen($this->_debug_file, 'a')) {
- $locked = flock($fdlock, 2);
- if (!$locked) {
- fclose($fdlock);
- return;
- }
-
- $fdappend = @fopen($this->_debug_file, 'a');
- fwrite($fdappend, ($msg . "\n"));
- fclose($fdappend);
- fclose($fdlock);
- } else {
- // TODO: this should be replaced ...
- printf("unable to locate/open [%s], turning debug off\n", $filename);
- $this->_debug_file = "";
- }
- }
-
- /**
- * Execute a command and potentially exit if the flag exitOnNonZero is
- * set to true and the return value was nonZero
- */
- function _execCommand($cmdLine, &$cmdOutput, $exitOnNonZero)
- {
- $this->_cvsDebug(sprintf("Preparing to execute [%s]", $cmdLine));
- exec($cmdLine, $cmdOutput, $cmdReturnVal);
- if ($exitOnNonZero && ($cmdReturnVal != 0)) {
- $this->_cvsDebug(sprintf("Command failed [%s], Output: ", $cmdLine) . "[" .
- join("\n", $cmdOutput) . "]");
- $this->_cvsError(sprintf("Command failed [%s], Return value: %s", $cmdLine, $cmdReturnVal),
- __LINE__);
- }
- $this->_cvsDebug("Done execution [" . join("\n", $cmdOutput) . "]");
-
- return $cmdReturnVal;
- }
-
- /**
- * Read locks a file, reads it, and returns it contents
- */
- function _readFileWithPath($filename)
- {
- if ($fd = @fopen($filename, "r")) {
- $locked = flock($fd, 1); // read lock
- if (!$locked) {
- fclose($fd);
- $this->_cvsError("Unable to obtain read lock.", __LINE__);
- }
-
- $content = file($filename);
- fclose($fd);
- return $content;
- } else {
- $this->_cvsError(sprintf("Unable to open file '%s' for reading", $filename),
- __LINE__);
- return false;
- }
- }
-
- /**
- * Either replace the contents of an existing file or create a
- * new file in the particular store using the page name as the
- * file name.
- *
- * Nothing is returned, might be useful to return something ;-)
- */
- function _writeFileWithPath($filename, $contents)
- {
- // TODO: $contents should probably be a reference parameter ...
- if ($fd = fopen($filename, 'a')) {
- $locked = flock($fd, 2); // Exclusive blocking lock
- if (!$locked) {
- $this->_cvsError("Timeout while obtaining lock.", __LINE__);
- }
-
- // Second filehandle -- we use this to write the contents
- $fdsafe = fopen($filename, 'w');
- fwrite($fdsafe, $contents);
- fclose($fdsafe);
- fclose($fd);
- } else {
- $this->_cvsError(sprintf("Could not open file '%s' for writing", $filename),
- __LINE__);
- }
- }
-
- /**
- * Copy the contents of the source directory to the destination directory.
- */
- function _copyFilesFromDirectory($src, $dest)
- {
- $this->_cvsDebug(sprintf("Copying from [%s] to [%s]", $src, $dest));
-
- if (is_dir($src) && is_dir($dest)) {
- $this->_cvsDebug("Copying ");
- $d = opendir($src);
- while ($entry = readdir($d)) {
- if (is_file($src . "/" . $entry)
- && copy($src . "/" . $entry, $dest . "/" . $entry)
- ) {
- $this->_cvsDebug(sprintf("Copied to [%s]", "$dest/$entry"));
- } else {
- $this->_cvsDebug(sprintf("Failed to copy [%s]", "$src/$entry"));
- }
- }
- closedir($d);
- return true;
- } else {
- $this->_cvsDebug("Not copying");
- return false;
- }
- }
-
- /**
- * Unescape a string value. Normally this comes from doing an
- * escapeshellcmd. This converts the following:
- * \{ --> {
- * \} --> }
- * \; --> ;
- * \" --> "
- */
- function _unescape($val)
- {
- $val = str_replace("\\{", "{", $val);
- $val = str_replace("\\}", "}", $val);
- $val = str_replace("\\;", ";", $val);
- $val = str_replace("\\\"", "\"", $val);
-
- return $val;
- }
-
- /**
- * Function for removing the newlines from the ends of the
- * file data returned from file(..). This is used in retrievePage
- */
- function _strip_newlines(&$item, $key)
- {
- $item = ereg_replace("\n$", "", $item);
- }
-
-} /* End of WikiDB_backend_cvs class */
-
-/**
- * Generic iterator for stepping through an array of values.
- */
-class Cvs_Backend_Array_Iterator
- extends WikiDB_backend_iterator
-{
- public $_array;
-
- function Cvs_Backend_Iterator($arrayValue = Array())
- {
- $this->_array = $arrayValue;
- }
-
- function next()
- {
- while (($rVal = array_pop($this->_array)) != NULL) {
- return $rVal;
- }
- return false;
- }
-
- function count()
- {
- return count($this->_array);
- }
-
- function free()
- {
- unset($this->_array);
- }
-}
-
-class Cvs_Backend_Full_Search_Iterator
- extends Cvs_Backend_Array_Iterator
-{
- public $_searchString = '';
- public $_docDir = "";
-
- function __construct($arrayValue = array(),
- $searchString = "",
- $documentDir = ".")
- {
- $this->Cvs_Backend_Array_Iterator($arrayValue);
- $this->_searchString = $searchString;
- $this->_docDir = $documentDir;
- }
-
- function next()
- {
- do {
- $pageName = Cvs_Backend_Array_Iterator::next();
- } while (!$this->_searchFile($this->_searchString,
- $this->_docDir . "/" . $pageName));
-
- return $pageName;
- }
-
- /**
- * Does nothing more than a grep and search the entire contents
- * of the given file. Returns TRUE of the searchstring was found,
- * false if the search string wasn't find or the file was a directory
- * or could not be read.
- */
- function _searchFile($searchString, $fileName)
- {
- // TODO: using grep here, it might make more sense to use
- // TODO: some sort of inbuilt/language specific method for
- // TODO: searching files.
- $cmdLine = sprintf("grep -E -i '%s' %s > /dev/null 2>&1",
- $searchString, $fileName);
-
- return (WikiDB_backend_cvs::_execCommand($cmdLine, $cmdOutput,
- false) == 0);
- }
-}
-
-/**
- * Iterator used for doing a title search.
- */
-class Cvs_Backend_Title_Search_Iterator
- extends Cvs_Backend_Array_Iterator
-{
- public $_searchString = '';
-
- function __construct($arrayValue = array(),
- $searchString = "")
- {
- parent::__construct($arrayValue);
- $this->_searchString = $searchString;
- }
-
- function next()
- {
- do {
- $pageName = Cvs_Backend_Array_Iterator::next();
- } while (!eregi($this->_searchString, $pageName));
-
- return $pageName;
- }
-}
-
-// Local Variables:
-// mode: php
-// tab-width: 8
-// c-basic-offset: 4
-// c-hanging-comment-ender-p: nil
-// indent-tabs-mode: nil
-// End:
Deleted: trunk/lib/WikiDB/cvs.php
===================================================================
--- trunk/lib/WikiDB/cvs.php	2015年02月27日 17:18:07 UTC (rev 9573)
+++ trunk/lib/WikiDB/cvs.php	2015年02月27日 17:54:34 UTC (rev 9574)
@@ -1,27 +0,0 @@
-<?php
-
-require_once 'lib/WikiDB.php';
-require_once 'lib/WikiDB/backend/cvs.php';
-
-/**
- * Wrapper class for the cvs backend.
- *
- * @Author: Gerrit Riessen, ger...@op...
- *
- * Use the new cvsclient PECL extension, if available
- * http://pecl.php.net/package/cvsclient
- *
- */
-class WikiDB_cvs
- extends WikiDB
-{
- public $_backend;
-
- function __construct($dbparams)
- {
- if (loadPhpExtension('cvsclient'))
- $this->_backend = new WikiDB_backend_cvsclient($dbparams);
- else
- $this->_backend = new WikiDB_backend_cvs($dbparams);
- }
-}
Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2015年02月27日 17:18:07 UTC (rev 9573)
+++ trunk/lib/WikiDB.php	2015年02月27日 17:54:34 UTC (rev 9574)
@@ -95,8 +95,6 @@
 * <dd> Another generic SQL backend. (More current features are tested here. Much faster)
 * <dt> dba
 * <dd> Dba based backend. The default and by far the fastest.
- * <dt> cvs
- * <dd>
 * <dt> file
 * <dd> flat files
 * </dl>
@@ -1929,7 +1927,7 @@
 }
 
 // There's always hits, but we cache only if more
- // (well not with file, cvs and dba)
+ // (well not with file and dba)
 if (isset($next['pagedata']) and count($next['pagedata']) > 1) {
 $this->_wikidb->_cache->cache_data($next);
 // cache existing page id's since we iterate over all links in GleanDescription
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2015年02月27日 17:18:07 UTC (rev 9573)
+++ trunk/lib/WikiTheme.php	2015年02月27日 17:54:34 UTC (rev 9574)
@@ -926,8 +926,6 @@
 while (($subdir = $dir->read()) !== false) {
 if ($subdir[0] == '.')
 continue;
- if ($subdir == 'CVS')
- continue;
 if (is_dir("$path_dir/$subdir"))
 $path[] = "$button_dir/$subdir";
 }
@@ -939,8 +937,6 @@
 while (($subdir = $dir->read()) !== false) {
 if ($subdir[0] == '.')
 continue;
- if ($subdir == 'CVS')
- continue;
 if (is_dir("$path_dir/$subdir"))
 $path[] = "themes/default/buttons/$subdir";
 }
Modified: trunk/lib/WikiUser/Db.php
===================================================================
--- trunk/lib/WikiUser/Db.php	2015年02月27日 17:18:07 UTC (rev 9573)
+++ trunk/lib/WikiUser/Db.php	2015年02月27日 17:54:34 UTC (rev 9574)
@@ -29,7 +29,7 @@
 * libnss-mysql.
 *
 * We support only the SQL and ADODB backends.
- * The other WikiDB backends (flat, cvs, dba, ...) should be used for pages,
+ * The other WikiDB backends (flat, dba, ...) should be used for pages,
 * not for auth stuff. If one would like to use e.g. dba for auth, he should
 * use PearDB (SQL) with the right $DBAuthParam['auth_dsn'].
 * (Not supported yet, since we require SQL. SQLite would make since when
Modified: trunk/lib/interwiki.map
===================================================================
--- trunk/lib/interwiki.map	2015年02月27日 17:18:07 UTC (rev 9573)
+++ trunk/lib/interwiki.map	2015年02月27日 17:54:34 UTC (rev 9574)
@@ -89,7 +89,6 @@
 php-function http://www.php.net/%s
 php-lookup http://www.php.net/manual-lookup.php?pattern=
 PhpWiki http://phpwiki.fr/
-PhpWikiCvs https://sourceforge.net/p/phpwiki/code/HEAD/tree/trunk/
 PhpWikiSvn https://sourceforge.net/p/phpwiki/code/HEAD/tree/trunk/
 Pikie http://pikie.darktech.org/cgi/pikie?
 PlWikiPedia http://pl.wikipedia.org/wiki/
Modified: trunk/lib/plugin/PageDump.php
===================================================================
--- trunk/lib/plugin/PageDump.php	2015年02月27日 17:18:07 UTC (rev 9573)
+++ trunk/lib/plugin/PageDump.php	2015年02月27日 17:54:34 UTC (rev 9574)
@@ -63,7 +63,7 @@
 return array('s' => false,
 'page' => '[pagename]',
 //'encoding' => 'binary', // 'binary', 'quoted-printable'
- 'format' => false, // 'normal', 'forsvn', 'forcvs', 'backup'
+ 'format' => false, // 'normal', 'forsvn', 'backup'
 // display within WikiPage or give a downloadable
 // raw pgsrc?
 'download' => false);
@@ -98,14 +98,10 @@
 //
 // Normal: add unique Message-Id, don't
 // strip any fields from Content-Type.
- //
- // ForCVS: strip attributes from
- // Content-Type field: "author", "version", "lastmodified",
- // "author_id", "hits".
 
 $this->pagename = $page;
 $this->generateMessageId($mailified);
- if (($format == 'forsvn') || ($format == 'forcvs'))
+ if ($format == 'forsvn')
 $this->fixup_headers_forsvn($mailified);
 else // backup or normal
 $this->fixup_headers($mailified);
Modified: trunk/lib/plugin/SystemInfo.php
===================================================================
--- trunk/lib/plugin/SystemInfo.php	2015年02月27日 17:18:07 UTC (rev 9573)
+++ trunk/lib/plugin/SystemInfo.php	2015年02月27日 17:54:34 UTC (rev 9574)
@@ -125,10 +125,6 @@
 $s .= "DATABASE_DBA_HANDLER: " . DATABASE_DBA_HANDLER . ", ";
 $s .= "DATABASE_DIRECTORY: \"" . DATABASE_DIRECTORY . "\", ";
 break;
- case 'cvs':
- $s .= "DATABASE_DIRECTORY: \"" . DATABASE_DIRECTORY . "\", ";
- // $s .= "cvs stuff: , ";
- break;
 case 'flatfile':
 $s .= "DATABASE_DIRECTORY: " . DATABASE_DIRECTORY . ", ";
 break;
@@ -391,7 +387,7 @@
 return $content;
 }
 
- // Size of databases/files/cvs are possible plus the known size of the app.
+ // Size of databases/files are possible plus the known size of the app.
 // Cache this costly operation.
 // Even if the whole plugin call is stored internally, we cache this
 // separately with a separate key.
@@ -420,7 +416,7 @@
 $pagesize = filesize($DBParams['directory']
 . "/wiki_pagedb.db3") / 1024;
 // if issubdirof($dbdir, $dir) $appsize -= $pagesize;
- } else { // flatfile, cvs
+ } else { // flatfile
 $dbdir = $DBParams['directory'];
 $pagesize = `du -s $dbdir`;
 // if issubdirof($dbdir, $dir) $appsize -= $pagesize;
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2015年02月27日 17:18:07 UTC (rev 9573)
+++ trunk/lib/stdlib.php	2015年02月27日 17:54:34 UTC (rev 9574)
@@ -928,7 +928,7 @@
 $this->_warnings[] = _("White space converted to single space");
 
 // Delete any control characters.
- if (DATABASE_TYPE == 'cvs' or DATABASE_TYPE == 'file' or DATABASE_TYPE == 'flatfile') {
+ if (DATABASE_TYPE == 'file' or DATABASE_TYPE == 'flatfile') {
 $pagename = preg_replace('/[\x00-\x1f\x7f\x80-\x9f]/', '', $orig = $pagename);
 if ($pagename != $orig)
 $this->_errors[] = _("Control characters not allowed");
@@ -949,9 +949,8 @@
 $this->_errors[] = _("Page name too long");
 }
 
- // disallow some chars only on file and cvs
- if ((DATABASE_TYPE == 'cvs'
- or DATABASE_TYPE == 'file'
+ // disallow some chars only on file
+ if ((DATABASE_TYPE == 'file'
 or DATABASE_TYPE == 'flatfile')
 and preg_match('/(:|\.\.)/', $pagename, $m)
 ) {
@@ -1869,7 +1868,7 @@
 }
 
 /**
- * Useful for PECL overrides: cvsclient, ldap, soap, xmlrpc, pdo, pdo_<driver>
+ * Useful for PECL overrides: ldap, soap, xmlrpc, pdo, pdo_<driver>
 */
 function loadPhpExtension($extension)
 {
Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile	2015年02月27日 17:18:07 UTC (rev 9573)
+++ trunk/locale/Makefile	2015年02月27日 17:54:34 UTC (rev 9574)
@@ -322,7 +322,6 @@
 ${POT_FILE}: .././lib/WikiDB/backend/ADODB.php
 ${POT_FILE}: .././lib/WikiDB/backend/ADODB_postgres7.php
 ${POT_FILE}: .././lib/WikiDB/backend/ADODB_sqlite.php
-${POT_FILE}: .././lib/WikiDB/backend/cvs.php
 ${POT_FILE}: .././lib/WikiDB/backend/dbaBase.php
 ${POT_FILE}: .././lib/WikiDB/backend/dba.php
 ${POT_FILE}: .././lib/WikiDB/backend/dumb/AllRevisionsIter.php
@@ -345,7 +344,6 @@
 ${POT_FILE}: .././lib/WikiDB/backend/PearDB.php
 ${POT_FILE}: .././lib/WikiDB/backend/PearDB_sqlite.php
 ${POT_FILE}: .././lib/WikiDB/backend.php
-${POT_FILE}: .././lib/WikiDB/cvs.php
 ${POT_FILE}: .././lib/WikiDB/dba.php
 ${POT_FILE}: .././lib/WikiDB/file.php
 ${POT_FILE}: .././lib/WikiDB/flatfile.php
Modified: trunk/locale/README.de.txt
===================================================================
--- trunk/locale/README.de.txt	2015年02月27日 17:18:07 UTC (rev 9573)
+++ trunk/locale/README.de.txt	2015年02月27日 17:54:34 UTC (rev 9574)
@@ -11,7 +11,7 @@
 sachdienliche Vorschläge: Bitte laden Sie sich zunächst die neueste
 PhpWiki-Version auf Ihren Rechner von:
 
-Nightly CVS snapshot:
+Nightly snapshot:
 http://phpwiki.sf.net/nightly/phpwiki.nightly.tar.gz
 
 Achten Sie auch darauf, diese Datei mit UTF-8 abzuspeichern (nicht mit ISO-8859-1,
@@ -34,7 +34,7 @@
 
 Alle Ihre Korrekturen werden dann von einem der Entwickler, sobald ein
 entsprechender Umfang erreicht ist, bei geeigneter Gelegenheit in
-ihrer Gesamtheit ins PhpWiki-CVS (auf Sourceforge) eingesetzt und
+ihrer Gesamtheit ins PhpWiki (auf Sourceforge) eingesetzt und
 damit dann für alle PhpWiki-Benutzer zugänglich und wirksam.
 
 -- CarstenKlapp <car...@us...>
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/pgsrc/Aide%2FPluginRessourcesRss
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FPluginRessourcesRss	2015年02月27日 17:18:07 UTC (rev 9573)
+++ trunk/locale/fr/pgsrc/Aide%2FPluginRessourcesRss	2015年02月27日 17:54:34 UTC (rev 9574)
@@ -1,4 +1,4 @@
-Date: 2014年11月20日 14:25:52 +0000
+Date: 2015年2月27日 18:41:28 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
 Content-Type: application/x-phpwiki;
 pagename=Aide%2FPluginRessourcesRss;
@@ -43,10 +43,6 @@
 0|
 nombre maximum d'entrées (0 = illimitée)
 
-=== Code source (depuis v1.3.8):
-* [PhpWikiCvs:lib/plugin/RssFeed.php]
-* [PhpWikiCvs:lib/RssParser.php] _révisé pour allow_url_fopen=Off_
-
 === Exemples
 
 * sources ~PhpWikiRss
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2015年02月27日 17:18:07 UTC (rev 9573)
+++ trunk/locale/po/de.po	2015年02月27日 17:54:34 UTC (rev 9574)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年02月27日 17:55+0100\n"
+"POT-Creation-Date: 2015年02月27日 18:53+0100\n"
 "PO-Revision-Date: 2000年10月31日 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2015年02月27日 17:18:07 UTC (rev 9573)
+++ trunk/locale/po/es.po	2015年02月27日 17:54:34 UTC (rev 9574)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年02月27日 17:55+0100\n"
+"POT-Creation-Date: 2015年02月27日 18:53+0100\n"
 "PO-Revision-Date: 2000年02月01日 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2015年02月27日 17:18:07 UTC (rev 9573)
+++ trunk/locale/po/fr.po	2015年02月27日 17:54:34 UTC (rev 9574)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年02月27日 17:55+0100\n"
+"POT-Creation-Date: 2015年02月27日 18:53+0100\n"
 "PO-Revision-Date: 2004年06月22日 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2015年02月27日 17:18:07 UTC (rev 9573)
+++ trunk/locale/po/it.po	2015年02月27日 17:54:34 UTC (rev 9574)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年02月27日 17:55+0100\n"
+"POT-Creation-Date: 2015年02月27日 18:53+0100\n"
 "PO-Revision-Date: 2005年02月12日 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2015年02月27日 17:18:07 UTC (rev 9573)
+++ trunk/locale/po/ja.po	2015年02月27日 17:54:34 UTC (rev 9574)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年02月27日 17:55+0100\n"
+"POT-Creation-Date: 2015年02月27日 18:53+0100\n"
 "PO-Revision-Date: 2003年06月07日 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2015年02月27日 17:18:07 UTC (rev 9573)
+++ trunk/locale/po/nl.po	2015年02月27日 17:54:34 UTC (rev 9574)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年02月27日 17:55+0100\n"
+"POT-Creation-Date: 2015年02月27日 18:53+0100\n"
 "PO-Revision-Date: 2000年09月30日 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2015年02月27日 17:18:07 UTC (rev 9573)
+++ trunk/locale/po/phpwiki.pot	2015年02月27日 17:54:34 UTC (rev 9574)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年02月27日 17:55+0100\n"
+"POT-Creation-Date: 2015年02月27日 18:53+0100\n"
 "PO-Revision-Date: 2002年12月14日 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2015年02月27日 17:18:07 UTC (rev 9573)
+++ trunk/locale/po/sv.po	2015年02月27日 17:54:34 UTC (rev 9574)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年02月27日 17:55+0100\n"
+"POT-Creation-Date: 2015年02月27日 18:53+0100\n"
 "PO-Revision-Date: 2001年01月27日 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2015年02月27日 17:18:07 UTC (rev 9573)
+++ trunk/locale/po/zh.po	2015年02月27日 17:54:34 UTC (rev 9574)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年02月27日 17:55+0100\n"
+"POT-Creation-Date: 2015年02月27日 18:53+0100\n"
 "PO-Revision-Date: 2004年04月21日 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -2042,9 +2042,8 @@
 msgid "View a single page dump online."
 msgstr ""
 
-#, fuzzy
 msgid "Download for Subversion"
-msgstr "給 CVS 的下載"
+msgstr ""
 
 msgid "Download for backup"
 msgstr "給備份用的下載"
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/pgsrc/Help%2FPageDumpPlugin
===================================================================
--- trunk/pgsrc/Help%2FPageDumpPlugin	2015年02月27日 17:18:07 UTC (rev 9573)
+++ trunk/pgsrc/Help%2FPageDumpPlugin	2015年02月27日 17:54:34 UTC (rev 9574)
@@ -1,4 +1,4 @@
-Date: Tue, 7 Oct 2014 19:05:57 +0000
+Date: 2015年2月27日 18:40:24 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
 Content-Type: application/x-phpwiki;
 pagename=Help%2FPageDumpPlugin;
@@ -26,7 +26,7 @@
 | pagename
 |-
 | **format**
-| 'normal', 'forsvn', 'forcvs', 'backup'
+| 'normal', 'forsvn', 'backup'
 | none
 |-
 | **download**
@@ -34,8 +34,6 @@
 | false
 |}
 
-Note: 'forsvn' and 'forcvs' are the same.
-
 == Example ==
 
 {{{
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2015年02月27日 17:18:07 UTC (rev 9573)
+++ trunk/pgsrc/ReleaseNotes	2015年02月27日 17:54:34 UTC (rev 9574)
@@ -1,4 +1,4 @@
-Date: 2015年2月27日 17:55:50 +0000
+Date: 2015年2月27日 18:40:24 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
 Content-Type: application/x-phpwiki;
 pagename=ReleaseNotes;
@@ -24,6 +24,7 @@
 * SUBPAGE_SEPARATOR removed, it must be '/'
 * RateIt plugin for Fusionforge
 * remove acdropdown and livesearch
+* remove CVS backend
 
 == 1.5.2 2014年10月10日 Marc-Etienne Vargenau ==
 
Deleted: trunk/tests/unit_test_backend_cvs.php
===================================================================
--- trunk/tests/unit_test_backend_cvs.php	2015年02月27日 17:18:07 UTC (rev 9573)
+++ trunk/tests/unit_test_backend_cvs.php	2015年02月27日 17:54:34 UTC (rev 9574)
@@ -1,115 +0,0 @@
-<?php
-/**
- * Unit tests the 'lib/WikiDB/backend/cvs.php' file and with it
- * the class WikiDB_backend_cvs. This isn't based on the PhpUnit, and
- * is designed to be run directly using the php4 command.
- *
- * Author: Gerrit Riessen, ger...@op...
- */
-
-// assume that the we've cd'ed to the tests directory
-ini_set('include_path', '..' );
-
-if ( $USER == "root" ) {
- // root user can't check in to a CVS repository
- print( "can not be run as root\n" );
- exit();
-}
-
-// set to false if something went wrong
-$REMOVE_DEBUG = true;
-
-require_once 'lib/WikiDB/backend/cvs.php';
-
-$db_params = array();
-/**
- * These are the parameters required by the backend.
- */
-$db_params[CVS_PAGE_SOURCE] = "../pgsrc";
-$db_params[CVS_CHECK_FOR_REPOSITORY] = true;
-// the following three are removed if the test succeeds.
-$db_params[CVS_DOC_DIR] = "/tmp/wiki_docs";
-$db_params[CVS_REPOSITORY] = "/tmp/wiki_repository";
-$db_params[CVS_DEBUG_FILE] = "/tmp/php_cvs.log";
-
-//
-// Check the creation of a new CVS repository and the importing of
-// the default pages.
-//
-$cvsdb = new WikiDB_backend_cvs( $db_params );
-// check that all files contained in page source where checked in.
-$allPageNames = array();
-$d = opendir( $db_params[CVS_PAGE_SOURCE] );
-while ( $entry = readdir( $d ) ) {
- exec( "grep 'Checking in $entry' " . $db_params[CVS_DEBUG_FILE],
- $cmdOutput, $cmdRetval );
-
- if ( !is_dir( $db_params[CVS_PAGE_SOURCE] . "/" . $entry )) {
- $allPageNames[] = $entry;
-
- if ( $cmdRetval ) {
- print "*** Error: [$entry] was not checked in -- view "
- . $db_params[CVS_DEBUG_FILE] . " for details\n";
- $REMOVE_DEBUG = false;
- }
- }
-}
-closedir( $d );
-
-//
-// Check that the meta data files were created
-//
-function get_pagedata( $page_name, $key, &$cvsdb )
-{
- global $REMOVE_DEBUG;
- $pageHash = $cvsdb->get_pagedata( $page_name );
- if ( $pageHash[CMD_VERSION] != "1" ) {
- print ( "*** Error: [$page_name] version wrong 1 != "
- . $pageHash[CMD_VERSION] ."\n" );
- $REMOVE_DEBUG = false;
- }
-
- $new_data = array();
- $new_data[CMD_CONTENT] = "";
- $cvsdb->update_pagedata( $page_name, $new_data );
-
- $pageHash = $cvsdb->get_pagedata( $page_name );
- if ( $pageHash[CMD_VERSION] != "2" ) {
- print ( "*** Error: [$page_name] version wrong 2 != "
- . $pageHa...
 
[truncated message content]

Revision: 9573
 http://sourceforge.net/p/phpwiki/code/9573
Author: vargenau
Date: 2015年02月27日 17:18:07 +0000 (2015年2月27日)
Log Message:
-----------
Remove commented code
Modified Paths:
--------------
 trunk/themes/default/templates/navbar.tmpl
Modified: trunk/themes/default/templates/navbar.tmpl
===================================================================
--- trunk/themes/default/templates/navbar.tmpl	2015年02月27日 17:17:22 UTC (rev 9572)
+++ trunk/themes/default/templates/navbar.tmpl	2015年02月27日 17:18:07 UTC (rev 9573)
@@ -13,15 +13,14 @@
 <?php echo WikiLink(_("RecentChanges"), "button") ?>
 <?php echo $SEP?><?php echo Template('search',
 array('SEARCH_BEFORE' => HTML::button(_("FindPage"))))
-?><?php if (!empty($revision)) { ?>
-<?php echo $SEP?><?php echo $WikiTheme->makeLinkButton($revision,_("LikePages"),_("LikePages"))
-?><?php echo $SEP?><?php echo $WikiTheme->makeLinkButton($revision,_("BackLinks"),_("BackLinks"))
-?><?php /* RelatedChanges disabled
- $links = $page->getPageLinks();
- if ($links->count() > 1) { ?><?php echo $SEP?><?php echo $WikiTheme->makeLinkButton($revision,_("RelatedChanges"),_("RelatedChanges")) ?><?php } */ ?>
+?>
+<?php if (!empty($revision)) { ?>
+<?php echo $SEP?><?php echo $WikiTheme->makeLinkButton($revision,_("LikePages"), _("LikePages")) ?>
+<?php echo $SEP?><?php echo $WikiTheme->makeLinkButton($revision,_("BackLinks"), _("BackLinks")) ?>
 <?php } ?>
 <?php if (!empty($user) && $user->isSignedIn()) { ?>
-<?php echo $SEP?><?php echo WikiLink(_("UserPreferences"), 'button',_("Preferences")) ?>
+<?php echo $SEP?>
+<?php echo WikiLink(_("UserPreferences"), 'button', _("Preferences")) ?>
 <?php } ?>
 <?php if (!empty($user)) { ?>
 <?php
@@ -31,8 +30,9 @@
 if ($dbi->isWikiPage($UserCalPageTitle)) {
 $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time());
 //$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
- ?>
-<?php echo $SEP?><?php echo WikiLink($UserCalPageTodayTitle, "button", _("Today")) ?>
+?>
+<?php echo $SEP?>
+<?php echo WikiLink($UserCalPageTodayTitle, "button", _("Today")) ?>
 <?php } ?>
 <?php } ?>
 <?php if (!empty($user) && $user->isAdmin()) { ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9572
 http://sourceforge.net/p/phpwiki/code/9572
Author: vargenau
Date: 2015年02月27日 17:17:22 +0000 (2015年2月27日)
Log Message:
-----------
White space
Modified Paths:
--------------
 trunk/themes/Crao/templates/navbar.tmpl
Modified: trunk/themes/Crao/templates/navbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/navbar.tmpl	2015年02月27日 17:05:46 UTC (rev 9571)
+++ trunk/themes/Crao/templates/navbar.tmpl	2015年02月27日 17:17:22 UTC (rev 9572)
@@ -18,18 +18,20 @@
 <td class="align-right; width:150px">
 <div id="search">
 <?php if (!empty($user) && $user->isSignedIn()) { ?>
- <?php echo WikiLink(_("UserPreferences"),'button',_("Preferences")) ?><?php echo $SEP?>
+ <?php echo WikiLink(_("UserPreferences"), 'button', _("Preferences")) ?>
+ <?php echo $SEP?>
 <?php } ?>
 <?php if (!empty($user)) { ?>
 <?php
- /* Today's calendar page for the user, if the Calender subpage is defined. */
- $UserCalPageTitle = $user->getId() . '/' . _("Calendar");
- $dbi = $request->getDbh();
- if ($dbi->isWikiPage($UserCalPageTitle)) {
+ /* Today's calendar page for the user, if the Calender subpage is defined. */
+ $UserCalPageTitle = $user->getId() . '/' . _("Calendar");
+ $dbi = $request->getDbh();
+ if ($dbi->isWikiPage($UserCalPageTitle)) {
 $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time());
 //$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
 ?>
-<?php echo WikiLink($UserCalPageTodayTitle, "button", _("Today")) ?><?php echo $SEP?>
+<?php echo WikiLink($UserCalPageTodayTitle, "button", _("Today")) ?>
+<?php echo $SEP?>
 <?php } ?>
 <?php if (!empty($user) && $user->isAdmin()) { ?>
 <?php echo WikiLink(_("PhpWikiAdministration"), "button", _("Admin")) ?><?php echo $SEP?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9571
 http://sourceforge.net/p/phpwiki/code/9571
Author: vargenau
Date: 2015年02月27日 17:05:46 +0000 (2015年2月27日)
Log Message:
-----------
Remove acdropdown and livesearch
Modified Paths:
--------------
 trunk/config/config-default.ini
 trunk/config/config-dist.ini
 trunk/configurator.php
 trunk/g
 trunk/lib/EditToolbar.php
 trunk/lib/IniConfig.php
 trunk/lib/WikiTheme.php
 trunk/lib/WysiwygEdit/spaw.php
 trunk/lib/plugin/LinkSearch.php
 trunk/lib/plugin/SemanticSearch.php
 trunk/lib/plugin/SemanticSearchAdvanced.php
 trunk/lib/plugin/WikiFormRich.php
 trunk/locale/de/LC_MESSAGES/phpwiki.mo
 trunk/locale/es/LC_MESSAGES/phpwiki.mo
 trunk/locale/fr/LC_MESSAGES/phpwiki.mo
 trunk/locale/it/LC_MESSAGES/phpwiki.mo
 trunk/locale/ja/LC_MESSAGES/phpwiki.mo
 trunk/locale/nl/LC_MESSAGES/phpwiki.mo
 trunk/locale/po/de.po
 trunk/locale/po/es.po
 trunk/locale/po/fr.po
 trunk/locale/po/it.po
 trunk/locale/po/ja.po
 trunk/locale/po/nl.po
 trunk/locale/po/phpwiki.pot
 trunk/locale/po/sv.po
 trunk/locale/po/zh.po
 trunk/locale/sv/LC_MESSAGES/phpwiki.mo
 trunk/locale/zh/LC_MESSAGES/phpwiki.mo
 trunk/pgsrc/ReleaseNotes
 trunk/themes/Crao/templates/navbar.tmpl
 trunk/themes/Sidebar/templates/search.tmpl
 trunk/themes/blog/themeinfo.php
 trunk/themes/default/templates/search.tmpl
 trunk/themes/default/toolbar.js
Removed Paths:
-------------
 trunk/themes/default/moacdropdown/
 trunk/themes/default/moacdropdown.js
Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2015年02月27日 16:12:26 UTC (rev 9570)
+++ trunk/config/config-default.ini	2015年02月27日 17:05:46 UTC (rev 9571)
@@ -22,10 +22,7 @@
 ENABLE_CAPTCHA = false
 ENABLE_MAILNOTIFY = true
 USE_CAPTCHA_RANDOM_WORD = false
-ENABLE_ACDROPDOWN = true
 DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS = false
-; deprecated, because non-free
-ENABLE_LIVESEARCH = false
 ENABLE_WYSIWYG = false
 WYSIWYG_BACKEND = Wikiwyg
 WYSIWYG_DEFAULT_PAGETYPE_HTML = false
Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2015年02月27日 16:12:26 UTC (rev 9570)
+++ trunk/config/config-dist.ini	2015年02月27日 17:05:46 UTC (rev 9571)
@@ -117,25 +117,10 @@
 ; All internal action links do contain ref=nofollow
 ;GOOGLE_LINKS_NOFOLLOW = false
 
-; LiveSearch enables immediate title search results via XMLHttpRequest.
-; Displays the results in a dropdown under the titlesearch inputbox
-; while typing. (experimental, only with certain themes)
-; You'll have to copy livesearch.js from http://blog.bitflux.ch/wiki/LiveSearch
-; to themes/default/ and define ENABLE_LIVESEARCH in config.ini to true. 
-; See themes/blog/themeinfo.php.
-; We used the bitflux.ch library temporarily, but we changed to 
-; the better moacdropdown. 
-;ENABLE_LIVESEARCH = true
-
-; ENABLE_ACDROPDOWN replaces now ENABLE_LIVESEARCH
-; http://momche.net/publish/article.php?page=acdropdown
-;ENABLE_ACDROPDOWN = false
-
 ; Aysnchronous ajax callbacks to dynamically display pages 
 ; (as format=xml) on demand.
 ; Experimental feature for plugin DynamicIncludePage, which might fail on 
 ; some strictly non-conformant entities.
-; Note: TitleSearch ajax calls are enabled by ENABLE_ACDROPDOWN (xmlrpc, not xml)
 ;ENABLE_AJAX = false
 
 ; Experimental WikiPedia feature: Force Discussion/Article link at the topnavbar.
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2015年02月27日 16:12:26 UTC (rev 9570)
+++ trunk/configurator.php	2015年02月27日 17:05:46 UTC (rev 9571)
@@ -454,12 +454,6 @@
 $properties["GOOGLE_LINKS_NOFOLLOW"] =
 new boolean_define_commented_optional('GOOGLE_LINKS_NOFOLLOW');
 
-$properties["ENABLE_LIVESEARCH"] =
- new boolean_define_commented_optional('ENABLE_LIVESEARCH');
-
-$properties["ENABLE_ACDROPDOWN"] =
- new boolean_define_commented_optional('ENABLE_ACDROPDOWN');
-
 $properties["ENABLE_DISCUSSION_LINK"] =
 new boolean_define_commented_optional('ENABLE_DISCUSSION_LINK');
 
Modified: trunk/g
===================================================================
--- trunk/g	2015年02月27日 16:12:26 UTC (rev 9570)
+++ trunk/g	2015年02月27日 17:05:46 UTC (rev 9571)
@@ -170,8 +170,6 @@
 // Allow <div> and <span> in wiki code
 define('ENABLE_MARKUP_DIVSPAN', true);
 
- // Disable ENABLE_ACDROPDOWN, it creates a <style> in the <body> (illegal)
- define('ENABLE_ACDROPDOWN', false);
 define('ENABLE_AJAX', false);
 
 define('TOOLBAR_PAGELINK_PULLDOWN', false);
Modified: trunk/lib/EditToolbar.php
===================================================================
--- trunk/lib/EditToolbar.php	2015年02月27日 16:12:26 UTC (rev 9570)
+++ trunk/lib/EditToolbar.php	2015年02月27日 17:05:46 UTC (rev 9571)
@@ -27,7 +27,7 @@
 * Features:
 * - save-preview and formatting buttons from mediawiki
 * - Search&Replace from walterzorn.de
- * - pageinsert popup by Reini Urban (TODO: should be a pulldown, use acdropdown)
+ * - pageinsert popup by Reini Urban (TODO: should be a pulldown)
 */
 
 class EditToolbar
@@ -274,8 +274,7 @@
 $sr_html = '';
 }
 
- //TODO: Delegate this to run-time with showing an hidden input at the right, and do
- // a separate moacdropdown and xmlrpc:titleSearch.
+ //TODO: Delegate this to run-time with showing an hidden input at the right
 
 // Button to generate categories, display in extra window as popup and insert
 $sr_html = HTML($sr_html, $this->categoriesPulldown());
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2015年02月27日 16:12:26 UTC (rev 9570)
+++ trunk/lib/IniConfig.php	2015年02月27日 17:05:46 UTC (rev 9571)
@@ -187,7 +187,7 @@
 // List of all valid config options to be define()d which take booleans.
 $_IC_VALID_BOOL = array
 ('ENABLE_PAGEPERM', 'ENABLE_EDIT_TOOLBAR', 'JS_SEARCHREPLACE',
- 'ENABLE_XHTML_XML', 'ENABLE_DOUBLECLICKEDIT', 'ENABLE_LIVESEARCH', 'ENABLE_ACDROPDOWN',
+ 'ENABLE_XHTML_XML', 'ENABLE_DOUBLECLICKEDIT',
 'USECACHE', 'WIKIDB_NOCACHE_MARKUP',
 'ENABLE_REVERSE_DNS', 'ENCRYPTED_PASSWD', 'ZIPDUMP_AUTH',
 'ENABLE_RAW_HTML', 'ENABLE_RAW_HTML_LOCKEDONLY', 'ENABLE_RAW_HTML_SAFE',
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2015年02月27日 16:12:26 UTC (rev 9570)
+++ trunk/lib/WikiTheme.php	2015年02月27日 17:05:46 UTC (rev 9571)
@@ -268,18 +268,6 @@
 or ENABLE_DOUBLECLICKEDIT
 )
 $this->initDoubleClickEdit();
-
- // will be replaced by acDropDown
- if (ENABLE_LIVESEARCH) { // by bitflux.ch
- $this->initLiveSearch();
- }
- // replaces external LiveSearch
- // enable ENABLE_AJAX for DynamicIncludePage
- if (ENABLE_ACDROPDOWN or ENABLE_AJAX) {
- $this->initMoAcDropDown();
- if (ENABLE_AJAX and DEBUG) // minified all together
- $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("ajax.js"))));
- }
 }
 
 function file($file)
@@ -1616,41 +1604,6 @@
 $this->addMoreAttr('body', 'DoubleClickEdit', HTML::raw(" ondblclick=\"url = document.URL; url2 = url; if (url.indexOf('?') != -1) url2 = url.slice(0, url.indexOf('?')); if ((url.indexOf('action') == -1) || (url.indexOf('action=browse') != -1)) document.location = url2 + '?action=edit';\""));
 }
 
- // Immediate title search results via XMLHTML(HttpRequest)
- // by Bitflux GmbH, bitflux.ch. You need to install the livesearch.js separately.
- // Google's or acdropdown is better.
- private function initLiveSearch()
- {
- //subclasses of Sidebar will init this twice
- static $already = 0;
- if (!$this->HTML_DUMP_SUFFIX and !$already) {
- $this->addMoreAttr('body', 'LiveSearch',
- HTML::raw(" onload=\"liveSearchInit()"));
- $this->addMoreHeaders(JavaScript('var liveSearchURI="'
- . WikiURL(_("TitleSearch"), array(), true) . '";'));
- $this->addMoreHeaders(JavaScript('', array
- ('src' => $this->_findData('livesearch.js'))));
- $already = 1;
- }
- }
-
- // Immediate title search results via XMLHttpRequest
- // using the shipped moacdropdown js-lib
- private function initMoAcDropDown()
- {
- //subclasses of Sidebar will init this twice
- static $already = 0;
- if (!$this->HTML_DUMP_SUFFIX and !$already) {
- $dir = $this->_findData('moacdropdown');
- if (!DEBUG and ($css = $this->_findFile('moacdropdown/css/dropdown.css'))) {
- $this->addMoreHeaders($this->_CSSlink(0, $css, 'all'));
- } else {
- $this->addMoreHeaders(HTML::style(array('type' => 'text/css'), " @import url( $dir/css/dropdown.css );\n"));
- }
- $already = 1;
- }
- }
-
 function calendarLink($date = false)
 {
 return $this->calendarBase() . '/' .
Modified: trunk/lib/WysiwygEdit/spaw.php
===================================================================
--- trunk/lib/WysiwygEdit/spaw.php	2015年02月27日 16:12:26 UTC (rev 9570)
+++ trunk/lib/WysiwygEdit/spaw.php	2015年02月27日 17:05:46 UTC (rev 9571)
@@ -38,7 +38,6 @@
 $width='100%', // width
 $height='300px', // height
 $css_stylesheet='', // css stylesheet file for content
- $dropdown_data='' // data for dropdowns (style, font, etc.)
 */
 $this->SPAW = new SPAW_Wysiwyg($id, $textarea->_content);
 $textarea->SetAttr('id', $name);
Modified: trunk/lib/plugin/LinkSearch.php
===================================================================
--- trunk/lib/plugin/LinkSearch.php	2015年02月27日 16:12:26 UTC (rev 9570)
+++ trunk/lib/plugin/LinkSearch.php	2015年02月27日 17:05:46 UTC (rev 9571)
@@ -63,7 +63,6 @@
 'value' => $args['page'],
 'title' => _("Search only in these pages. With autocompletion."),
 'class' => 'dropdown',
- 'acdropdown' => 'true',
 'autocomplete_complete' => 'true',
 'autocomplete_matchsubstring' => 'false',
 'autocomplete_list' => 'xmlrpc:wiki.titleSearch ^[S] 4'
@@ -72,7 +71,6 @@
 'value' => $args['s'],
 'title' => _("Filter by this link. These are pagenames. With autocompletion."),
 'class' => 'dropdown',
- 'acdropdown' => 'true',
 'autocomplete_complete' => 'true',
 'autocomplete_matchsubstring' => 'true',
 'autocomplete_list' => 'xmlrpc:wiki.titleSearch ^[S] 4'
Modified: trunk/lib/plugin/SemanticSearch.php
===================================================================
--- trunk/lib/plugin/SemanticSearch.php	2015年02月27日 16:12:26 UTC (rev 9570)
+++ trunk/lib/plugin/SemanticSearch.php	2015年02月27日 17:05:46 UTC (rev 9571)
@@ -97,7 +97,6 @@
 'value' => $args['page'],
 'title' => _("Search only in these pages. With autocompletion."),
 'class' => 'dropdown',
- 'acdropdown' => 'true',
 'autocomplete_complete' => 'true',
 'autocomplete_matchsubstring' => 'false',
 'autocomplete_list' => 'xmlrpc:wiki.titleSearch ^[S] 4'
@@ -110,7 +109,6 @@
 'title' => _("Filter by this relation. With autocompletion."),
 'class' => 'dropdown',
 'style' => 'width:10em',
- 'acdropdown' => 'true',
 'autocomplete_assoc' => 'false',
 'autocomplete_complete' => 'true',
 'autocomplete_matchsubstring' => 'true',
@@ -120,7 +118,6 @@
 'value' => $args['s'],
 'title' => _("Filter by this link. These are pagenames. With autocompletion."),
 'class' => 'dropdown',
- 'acdropdown' => 'true',
 'autocomplete_complete' => 'true',
 'autocomplete_matchsubstring' => 'true',
 'autocomplete_list' => 'xmlrpc:wiki.titleSearch ^[S] 4'
@@ -180,7 +177,6 @@
 'title' => _("Filter by this attribute name. With autocompletion."),
 'class' => 'dropdown',
 'style' => 'width:10em',
- 'acdropdown' => 'true',
 'autocomplete_complete' => 'true',
 'autocomplete_matchsubstring' => 'true',
 'autocomplete_assoc' => 'false',
@@ -192,7 +188,6 @@
 'title' => _("Comparison operator. With autocompletion."),
 'class' => 'dropdown',
 'style' => 'width:2em',
- 'acdropdown' => 'true',
 'autocomplete_complete' => 'true',
 'autocomplete_matchsubstring' => 'true',
 'autocomplete_assoc' => 'false',
@@ -202,7 +197,6 @@
 'value' => $args['s'],
 'title' => _("Filter by this numeric attribute value. With autocompletion."), //?
 'class' => 'dropdown',
- 'acdropdown' => 'false',
 'autocomplete_complete' => 'true',
 'autocomplete_matchsubstring' => 'false',
 'autocomplete_assoc' => 'false',
Modified: trunk/lib/plugin/SemanticSearchAdvanced.php
===================================================================
--- trunk/lib/plugin/SemanticSearchAdvanced.php	2015年02月27日 16:12:26 UTC (rev 9570)
+++ trunk/lib/plugin/SemanticSearchAdvanced.php	2015年02月27日 17:05:46 UTC (rev 9571)
@@ -89,7 +89,6 @@
 'value' => $args['page'],
 'title' => _("Search only in these pages. With autocompletion."),
 'class' => 'dropdown',
- 'acdropdown' => 'true',
 'autocomplete_complete' => 'true',
 'autocomplete_matchsubstring' => 'false',
 'autocomplete_list' => 'xmlrpc:wiki.titleSearch ^[S] 4'
@@ -100,7 +99,6 @@
 $querybox = HTML::textarea(array('name' => 's',
 'title' => _("Enter a valid query expression"),
 'rows' => 4,
- 'acdropdown' => 'true',
 'autocomplete_complete' => 'true',
 'autocomplete_assoc' => 'false',
 'autocomplete_matchsubstring' => 'true',
Modified: trunk/lib/plugin/WikiFormRich.php
===================================================================
--- trunk/lib/plugin/WikiFormRich.php	2015年02月27日 16:12:26 UTC (rev 9570)
+++ trunk/lib/plugin/WikiFormRich.php	2015年02月27日 17:05:46 UTC (rev 9571)
@@ -331,8 +331,6 @@
 {
 global $request;
 $input['class'] = "dropdown";
- $input['acdropdown'] = "true";
- //$input['autocomplete'] = "OFF";
 $input['autocomplete_complete'] = "true";
 // only match begin: autocomplete_matchbegin, or
 $input['autocomplete_matchsubstring'] = "true";
@@ -348,7 +346,6 @@
 static $tmpArray = 'tmpArray00';
 // deferred remote xmlrpc call
 if (string_starts_with($input['method'], "dynxmlrpc:")) {
- // how is server + method + args encoding parsed by acdropdown?
 $input['autocomplete_list'] = substr($input['method'], 3);
 if ($input['args'])
 $input['autocomplete_list'] .= (" " . $input['args']);
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2015年02月27日 16:12:26 UTC (rev 9570)
+++ trunk/locale/po/de.po	2015年02月27日 17:05:46 UTC (rev 9571)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年02月18日 15:00+0100\n"
+"POT-Creation-Date: 2015年02月27日 17:55+0100\n"
 "PO-Revision-Date: 2000年10月31日 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -5355,9 +5355,6 @@
 msgid "Today"
 msgstr "Heute"
 
-msgid "LiveSearch"
-msgstr "LiveSuche"
-
 #, php-format
 msgid "You are signed in as %s"
 msgstr "Sie sind angemeldet als %s"
@@ -6125,6 +6122,9 @@
 msgid "Y-m-d H:i"
 msgstr ""
 
+#~ msgid "LiveSearch"
+#~ msgstr "LiveSuche"
+
 #~ msgid "Can't open ZIP file "%s" for reading"
 #~ msgstr "Konnte ZIP-Datei »%s« nicht zum Lesen öffnen"
 
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2015年02月27日 16:12:26 UTC (rev 9570)
+++ trunk/locale/po/es.po	2015年02月27日 17:05:46 UTC (rev 9571)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年02月18日 15:00+0100\n"
+"POT-Creation-Date: 2015年02月27日 17:55+0100\n"
 "PO-Revision-Date: 2000年02月01日 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -5230,9 +5230,6 @@
 msgid "Today"
 msgstr "Hoy"
 
-msgid "LiveSearch"
-msgstr ""
-
 #, php-format
 msgid "You are signed in as %s"
 msgstr ""
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2015年02月27日 16:12:26 UTC (rev 9570)
+++ trunk/locale/po/fr.po	2015年02月27日 17:05:46 UTC (rev 9571)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年02月18日 15:00+0100\n"
+"POT-Creation-Date: 2015年02月27日 17:55+0100\n"
 "PO-Revision-Date: 2004年06月22日 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -5289,9 +5289,6 @@
 msgid "Today"
 msgstr "Aujourd'hui"
 
-msgid "LiveSearch"
-msgstr "RechercheLive"
-
 #, php-format
 msgid "You are signed in as %s"
 msgstr "Vous êtes connecté comme %s"
@@ -6027,6 +6024,9 @@
 msgid "Y-m-d H:i"
 msgstr ""
 
+#~ msgid "LiveSearch"
+#~ msgstr "RechercheLive"
+
 #~ msgid "Can't open ZIP file "%s" for reading"
 #~ msgstr "Impossible d'ouvrir le fichier ZIP « %s » en lecture"
 
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2015年02月27日 16:12:26 UTC (rev 9570)
+++ trunk/locale/po/it.po	2015年02月27日 17:05:46 UTC (rev 9571)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年02月18日 15:00+0100\n"
+"POT-Creation-Date: 2015年02月27日 17:55+0100\n"
 "PO-Revision-Date: 2005年02月12日 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -5175,9 +5175,6 @@
 msgid "Today"
 msgstr "Oggi"
 
-msgid "LiveSearch"
-msgstr "RicercaLive"
-
 #, php-format
 msgid "You are signed in as %s"
 msgstr "Utente corrente: %s"
@@ -5890,6 +5887,9 @@
 msgid "Y-m-d H:i"
 msgstr ""
 
+#~ msgid "LiveSearch"
+#~ msgstr "RicercaLive"
+
 #~ msgid "reverse"
 #~ msgstr "ritorni"
 
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2015年02月27日 16:12:26 UTC (rev 9570)
+++ trunk/locale/po/ja.po	2015年02月27日 17:05:46 UTC (rev 9571)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年02月18日 15:00+0100\n"
+"POT-Creation-Date: 2015年02月27日 17:55+0100\n"
 "PO-Revision-Date: 2003年06月07日 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -5333,10 +5333,6 @@
 msgid "Today"
 msgstr "今日"
 
-#, fuzzy
-msgid "LiveSearch"
-msgstr "タイトル検索"
-
 #, fuzzy, php-format
 msgid "You are signed in as %s"
 msgstr "%s としてサインインしました"
@@ -6088,6 +6084,10 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "LiveSearch"
+#~ msgstr "タイトル検索"
+
+#, fuzzy
 #~ msgid "sent to %s"
 #~ msgstr "%s に戻る"
 
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2015年02月27日 16:12:26 UTC (rev 9570)
+++ trunk/locale/po/nl.po	2015年02月27日 17:05:46 UTC (rev 9571)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年02月18日 15:00+0100\n"
+"POT-Creation-Date: 2015年02月27日 17:55+0100\n"
 "PO-Revision-Date: 2000年09月30日 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -5167,9 +5167,6 @@
 msgid "Today"
 msgstr ""
 
-msgid "LiveSearch"
-msgstr "LiveZoek"
-
 #, php-format
 msgid "You are signed in as %s"
 msgstr ""
@@ -5880,6 +5877,9 @@
 msgid "Y-m-d H:i"
 msgstr ""
 
+#~ msgid "LiveSearch"
+#~ msgstr "LiveZoek"
+
 #~ msgid ""
 #~ "Your home page has not been created yet so your preferences cannot not be "
 #~ "saved."
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2015年02月27日 16:12:26 UTC (rev 9570)
+++ trunk/locale/po/phpwiki.pot	2015年02月27日 17:05:46 UTC (rev 9571)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年02月18日 15:00+0100\n"
+"POT-Creation-Date: 2015年02月27日 17:55+0100\n"
 "PO-Revision-Date: 2002年12月14日 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -5159,9 +5159,6 @@
 msgid "Today"
 msgstr ""
 
-msgid "LiveSearch"
-msgstr ""
-
 #, php-format
 msgid "You are signed in as %s"
 msgstr ""
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2015年02月27日 16:12:26 UTC (rev 9570)
+++ trunk/locale/po/sv.po	2015年02月27日 17:05:46 UTC (rev 9571)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年02月18日 15:00+0100\n"
+"POT-Creation-Date: 2015年02月27日 17:55+0100\n"
 "PO-Revision-Date: 2001年01月27日 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -5160,9 +5160,6 @@
 msgid "Today"
 msgstr ""
 
-msgid "LiveSearch"
-msgstr ""
-
 #, php-format
 msgid "You are signed in as %s"
 msgstr ""
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2015年02月27日 16:12:26 UTC (rev 9570)
+++ trunk/locale/po/zh.po	2015年02月27日 17:05:46 UTC (rev 9571)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年02月18日 15:00+0100\n"
+"POT-Creation-Date: 2015年02月27日 17:55+0100\n"
 "PO-Revision-Date: 2004年04月21日 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -5426,10 +5426,6 @@
 msgid "Today"
 msgstr "今天"
 
-#, fuzzy
-msgid "LiveSearch"
-msgstr "標題搜索"
-
 #, fuzzy, php-format
 msgid "You are signed in as %s"
 msgstr "你必須簽入才能 %s."
@@ -6193,6 +6189,10 @@
 msgid "Y-m-d H:i"
 msgstr ""
 
+#, fuzzy
+#~ msgid "LiveSearch"
+#~ msgstr "標題搜索"
+
 #~ msgid "Can't open ZIP file "%s" for reading"
 #~ msgstr "無法開啟 ZIP 檔案 "%s" 進行讀取"
 
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2015年02月27日 16:12:26 UTC (rev 9570)
+++ trunk/pgsrc/ReleaseNotes	2015年02月27日 17:05:46 UTC (rev 9571)
@@ -1,4 +1,4 @@
-Date: 2015年2月20日 17:50:57 +0000
+Date: 2015年2月27日 17:55:50 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
 Content-Type: application/x-phpwiki;
 pagename=ReleaseNotes;
@@ -23,6 +23,7 @@
 * load theme pgsrc, if it exists
 * SUBPAGE_SEPARATOR removed, it must be '/'
 * RateIt plugin for Fusionforge
+* remove acdropdown and livesearch
 
 == 1.5.2 2014年10月10日 Marc-Etienne Vargenau ==
 
Modified: trunk/themes/Crao/templates/navbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/navbar.tmpl	2015年02月27日 16:12:26 UTC (rev 9570)
+++ trunk/themes/Crao/templates/navbar.tmpl	2015年02月27日 17:05:46 UTC (rev 9571)
@@ -40,15 +40,7 @@
 onfocus="if (this.value == '<?php echo _("Search")?>') {this.value = '';}"
 onmouseout="window.status=''; return true;"
 onmouseover="window.status='<?php echo _("Search")?>'; return true;"
-<?php if (ENABLE_LIVESEARCH) { ?>
- title="<?php echo _("LiveSearch")?>"
- onKeypress="liveSearchStart()"
- onblur="setTimeout('closeResults()',2000); if (this.value == '') {this.value = '<?php echo _("Search")?>';}" />
- </div><br /><div class="align-left" id="LSResult"></div>
-<?php } else { ?>
 title="<?php echo _("TitleSearch")?>" />
 </div>
-<?php } ?>
 </td></tr></table></div>
 </form>
-
Modified: trunk/themes/Sidebar/templates/search.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/search.tmpl	2015年02月27日 16:12:26 UTC (rev 9570)
+++ trunk/themes/Sidebar/templates/search.tmpl	2015年02月27日 17:05:46 UTC (rev 9571)
@@ -15,21 +15,8 @@
 onmouseout="window.status=''; return true;"
 onmouseover="window.status='<?php echo _("Quick Search")?>'; return true;"
 accesskey="f"
-<?php if (0 and ENABLE_ACDROPDOWN) { ?>
- class="dropdown" id="searchInput" title="<?php echo _("LiveSearch") . " [$p-f]"?>"
- style="width:115px;"
- acdropdown="true" autocomplete_complete="false" autocomplete_matchsubstring="false"
- autocomplete_list="xmlrpc:wiki.titleSearch [S] 4" />
-<?php } elseif (ENABLE_LIVESEARCH) { ?>
- type="text" id="livesearch" title="<?php echo _("LiveSearch") . " [$p-f]"?>"
- onKeypress="liveSearchStart()"
- onblur="setTimeout('closeResults()',2000); if (this.value == '') {this.value = '<?php echo _("Search")?>';}" />
- <br/>
- <div id="LSResult">
- </div>
-<?php } else { ?>
 type="text" id="search"
 title="<?php echo _("Search term(s)") . " [$p-f]"?>" />
-<?php } ?> <?php echo $SEARCH_AFTER ?>
+<?php echo $SEARCH_AFTER ?>
 </form>
 </div>
Modified: trunk/themes/blog/themeinfo.php
===================================================================
--- trunk/themes/blog/themeinfo.php	2015年02月27日 16:12:26 UTC (rev 9570)
+++ trunk/themes/blog/themeinfo.php	2015年02月27日 17:05:46 UTC (rev 9571)
@@ -29,15 +29,6 @@
 * PageTrail: > .. > ..
 * Right sidebar boxes: Archives, Syndication, Links, GoogleAds
 *
- * For the livesearch feature (autodropdown of the results while you tip)
- * you'll have to copy livesearch.js from http://blog.bitflux.ch/wiki/LiveSearch
- * to themes/default/, change the liveSearchReq.open line to:
-liveSearchReq.open("GET", liveSearchURI + "?format=livesearch&paging=none&limit=25&s=" + document.forms.searchform.s.value);
- * and define ENABLE_LIVESEARCH in config.ini to true.
- *
- * Better autodropdown's are in consideration:
- * http://momche.net/publish/article.php?page=acdropdown)
- *
 * Happy blogging.
 */
 
Deleted: trunk/themes/default/moacdropdown.js
===================================================================
--- trunk/themes/default/moacdropdown.js	2015年02月27日 16:12:26 UTC (rev 9570)
+++ trunk/themes/default/moacdropdown.js	2015年02月27日 17:05:46 UTC (rev 9571)
@@ -1,1354 +0,0 @@
-
-function cBrowser(){var userAgent=navigator.userAgent.toLowerCase()
-this.version=parseInt(navigator.appVersion)
-this.subVersion=parseFloat(navigator.appVersion)
-this.ns=((userAgent.indexOf('mozilla')!=-1)&&((userAgent.indexOf('spoofer')==-1)&&(userAgent.indexOf('compatible')==-1)))
-this.ns2=(this.ns&&(this.version==2))
-this.ns3=(this.ns&&(this.version==3))
-this.ns4b=(this.ns&&(this.subVersion<4.04))
-this.ns4=(this.ns&&(this.version==4))
-this.ns5=(this.ns&&(this.version==5))
-this.ie=(userAgent.indexOf('msie')!=-1)
-this.ie3=(this.ie&&(this.version==2))
-this.ie4=(this.ie&&(this.version==4)&&(userAgent.indexOf('msie 4.')!=-1))
-this.ie5=(this.ie&&(this.version==4)&&(userAgent.indexOf('msie 5.0')!=-1))
-this.ie55=(this.ie&&(this.version==4)&&(userAgent.indexOf('msie 5.5')!=-1))
-this.ie6=(this.ie&&(this.version==4)&&(userAgent.indexOf('msie 6.0')!=-1))
-this.op3=(userAgent.indexOf('opera')!=-1)
-this.win=(userAgent.indexOf('win')!=-1)
-this.mac=(userAgent.indexOf('mac')!=-1)
-this.unix=(userAgent.indexOf('x11')!=-1)
-this.name=navigator.appName
-this.dom=this.ns5||this.ie5||this.ie55||this.ie6}
-var bw=new cBrowser()
-cDomEvent={e:null,type:'',button:0,key:0,x:0,y:0,pagex:0,pagey:0,target:null,from:null,to:null}
-cDomEvent.init=function(e)
-{if(window.event)e=window.event
-this.e=e
-this.type=e.type
-this.button=(e.which)?e.which:e.button
-this.key=(e.which)?e.which:e.keyCode
-this.target=(e.srcElement)?e.srcElement:e.originalTarget
-this.currentTarget=(e.currentTarget)?e.currentTarget:e.srcElement
-this.from=(e.originalTarget)?e.originalTarget:(e.fromElement)?e.fromElement:null
-this.to=(e.currentTarget)?e.currentTarget:(e.toElement)?e.toElement:null
-this.x=(e.layerX)?e.layerX:(e.offsetX)?e.offsetX:null
-this.y=(e.layerY)?e.layerY:(e.offsetY)?e.offsetY:null
-this.screenX=e.screenX
-this.screenY=e.screenY
-this.pageX=(e.pageX)?e.pageX:e.x+document.body.scrollLeft
-this.pageY=(e.pageY)?e.pageY:e.y+document.body.scrollTop}
-cDomEvent.getEvent=function(e)
-{if(window.event)e=window.event
-return{e:e,type:e.type,button:(e.which)?e.which:e.button,key:(e.which)?e.which:e.keyCode,target:(e.srcElement)?e.srcElement:e.originalTarget,currentTarget:(e.currentTarget)?e.currentTarget:e.srcElement,from:(e.originalTarget)?e.originalTarget:(e.fromElement)?e.fromElement:null,to:(e.currentTarget)?e.currentTarget:(e.toElement)?e.toElement:null,x:(e.layerX)?e.layerX:(e.offsetX)?e.offsetX:null,y:(e.layerY)?e.layerY:(e.offsetY)?e.offsetY:null,screenX:e.screenX,screenY:e.screenY,pageX:(e.pageX)?e.pageX:(e.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)),pageY:(e.pageY)?e.pageY:(e.clientY+(document.documentElement.scrollTop||document.body.scrollTop))}}
-cDomEvent.cancelEvent=function(e)
-{if(e.preventDefault)
-{e.preventDefault()}
-e.returnValue=false
-e.cancelBubble=true
-return false}
-cDomEvent.addEvent=function(hElement,sEvent,handler,bCapture)
-{if(hElement.addEventListener)
-{hElement.addEventListener(sEvent,handler,bCapture)
-return true}
-else if(hElement.attachEvent)
-{return hElement.attachEvent('on'+sEvent,handler)}
-else if(document.all||hElement.captureEvents)
-{if(hElement.captureEvents)eval('hElement.captureEvents( Event.'+sEvent.toUpperCase()+' )')
-eval('hElement.on'+sEvent+' = '+handler)}
-else
-{alert('Not implemented yet!')}}
-cDomEvent.encapsulateEvent=function(hHandler)
-{return function(hEvent)
-{hEvent=cDomEvent.getEvent(hEvent)
-hHandler.call(hEvent.target,hEvent.e)}}
-cDomEvent.addEvent2=function(hElement,sEvent,handler,bCapture)
-{if(hElement)
-{if(hElement.addEventListener)
-{hElement.addEventListener(sEvent,cDomEvent.encapsulateEvent(handler),bCapture)
-return true}
-else if(hElement.attachEvent)
-{return hElement.attachEvent('on'+sEvent,cDomEvent.encapsulateEvent(handler))}
-else
-{alert('Not implemented yet!')}}
-else
-{}}
-cDomEvent.addCustomEvent2=function(hElement,sEvent,handler)
-{if(hElement)
-{hElement[sEvent]=handler}
-else
-{}}
-cDomEvent.removeEvent=function(hElement,sEvent,handler,bCapture)
-{if(hElement.addEventListener)
-{hElement.removeEventListener(sEvent,handler,bCapture)
-return true}
-else if(hElement.attachEvent)
-{return hElement.detachEvent('on'+sEvent,handler)}
-else if(document.all||hElement.captureEvents)
-{eval('hElement.on'+sEvent+' = null')}
-else
-{alert('Not implemented yet!')}}
-function MouseButton()
-{if(document.layers)
-{this.left=1
-this.middle=2
-this.right=3}
-else if(document.all)
-{this.left=1
-this.middle=4
-this.right=2}
-else
-{this.left=0
-this.middle=1
-this.right=2}}
-var MB=new MouseButton()
-if(document.ELEMENT_NODE==null)
-{document.ELEMENT_NODE=1
-document.TEXT_NODE=3}
-function getSubNodeByName(hNode,sNodeName)
-{if(hNode!=null)
-{var nNc=0
-var nC=0
-var hNodeChildren=hNode.childNodes
-var hCNode=null
-while(nC<hNodeChildren.length)
-{hCNode=hNodeChildren.item(nC++)
-if((hCNode.nodeType==1)&&(hCNode.nodeName.toLowerCase()==sNodeName))
-{return hCNode}}}
-return null}
-function getPrevNodeSibling(hNode)
-{if(hNode!=null)
-{do{hNode=hNode.previousSibling}while(hNode!=null&&hNode.nodeType!=1)
-return hNode}}
-function getNextNodeSibling(hNode)
-{if(hNode!=null)
-{do{hNode=hNode.nextSibling}while(hNode!=null&&hNode.nodeType!=1)
-return hNode}}
-function getLastSubNodeByName(hNode,sNodeName)
-{if(hNode!=null)
-{var nNc=0
-var nC=0
-var hNodeChildren=hNode.childNodes
-var hCNode=null
-var nLength=hNodeChildren.length-1
-while(nLength>=0)
-{hCNode=hNodeChildren.item(nLength)
-if((hCNode.nodeType==1)&&(hCNode.nodeName.toLowerCase()==sNodeName))
-{return hCNode}
-nLength--}}
-return null}
-function getSubNodeByProperty(hNode,sProperty,sPropValue)
-{if(hNode!=null)
-{var nNc=0
-var nC=0
-var hNodeChildren=hNode.childNodes
-var hCNode=null
-var sAttribute
-var hProp
-sPropValue=sPropValue.toLowerCase()
-while(nC<hNodeChildren.length)
-{hCNode=hNodeChildren.item(nC++)
-if(hCNode.nodeType==document.ELEMENT_NODE)
-{hProp=eval('hCNode.'+sProperty)
-if(typeof(sPropValue)!='undefined')
-{if(hProp.toLowerCase()==sPropValue)
-{return hCNode}}
-else
-{return hCNode}}
-nNc++}}
-return null}
-function findAttribute(hNode,sAtt)
-{sAtt=sAtt.toLowerCase()
-for(var nI=0;nI<hNode.attributes.length;nI++)
-{if(hNode.attributes.item(nI).nodeName.toLowerCase()==sAtt)
-{return hNode.attributes.item(nI).nodeValue}}
-return null}
-function getSubNodeByAttribute(hNode,sAtt,sAttValue)
-{if(hNode!=null)
-{var nNc=0
-var nC=0
-var hNodeChildren=hNode.childNodes
-var hCNode=null
-var sAttribute
-sAttValue=sAttValue.toLowerCase()
-while(nC<hNodeChildren.length)
-{hCNode=hNodeChildren.item(nC++)
-if(hCNode.nodeType==document.ELEMENT_NODE)
-{sAttribute=hCNode.getAttribute(sAtt)
-if(sAttribute&&sAttribute.toLowerCase()==sAttValue)
-return hCNode}
-nNc++}}
-return null}
-function getLastSubNodeByAttribute(hNode,sAtt,sAttValue)
-{if(hNode!=null)
-{var nNc=0
-var nC=0
-var hNodeChildren=hNode.childNodes
-var hCNode=null
-var nLength=hNodeChildren.length-1
-while(nLength>=0)
-{hCNode=hNodeChildren.item(nLength)
-if(hCNode.nodeType==document.ELEMENT_NODE)
-{sAttribute=hCNode.getAttribute(sAtt)
-if(sAttribute&&sAttribute.toLowerCase()==sAttValue)
-return hCNode}
-nLength--}}
-return null}
-function getParentByTagName(hNode,sParentTagName)
-{while((hNode.tagName)&&!(/(body|html)/i.test(hNode.tagName)))
-{if(hNode.tagName==sParentTagName)
-{return hNode}
-hNode=hNode.parentNode}
-return null}
-function getParentByAttribute(hNode,sAtt,sAttValue)
-{while((hNode.tagName)&&!(/(body|html)/i.test(hNode.tagName)))
-{var sAttr=hNode.getAttribute(sAtt)
-if(sAttr!=null&&sAttr.toString().length>0)
-{if(sAttValue!==null)
-{if(sAttr==sAttValue)
-{return hNode}}
-else
-{return hNode}}
-hNode=hNode.parentNode}
-return null}
-function getParentByProperty(hNode,sProperty,sPropValue)
-{while((hNode.tagName)&&!(/(body|html)/i.test(hNode.tagName)))
-{var hProp=eval('hNode.'+sProperty)
-if(hProp!=null&&hProp.toString().length>0)
-{if(sPropValue!==null)
-{if(hProp==sPropValue)
-{return hNode}}
-else
-{return hNode}}
-hNode=hNode.parentNode}
-return null}
-function getNodeText(hNode)
-{if(hNode==null)
-{return''}
-var sRes
-if(hNode.hasChildNodes())
-{sRes=hNode.childNodes.item(0).nodeValue}
-else
-{sRes=hNode.text}
-return sRes}
-function cDomExtension(hParent,aSelectors,hInitFunction)
-{this.hParent=hParent
-this.aSelectors=aSelectors
-this.hInitFunction=hInitFunction}
-cDomExtensionManager={aExtensions:new Array()}
-cDomExtensionManager.register=function(hDomExtension)
-{cDomExtensionManager.aExtensions.push(hDomExtension)}
-cDomExtensionManager.initSelector=function(hParent,sSelector,hInitFunction)
-{var hSelectorRegEx
-var hAttributeRegEx
-var aSelectorData
-var aAttributeData
-var sAttribute
-hSelectorRegEx=/([a-z0-9_]*)\[?([^\]]*)\]?/i
-hAttributeRegEx=/([a-z0-9_]*)([\*\^\$]?)(=?)(([a-z0-9_=]*))/i
-if(hSelectorRegEx.test(sSelector)&&!/[@#\.]/.test(sSelector))
-{aSelectorData=hSelectorRegEx.exec(sSelector)
-if(aSelectorData[1]!='')
-{hGroup=hParent.getElementsByTagName(aSelectorData[1].toLowerCase())
-for(nI=0;nI<hGroup.length;nI++)
-{hGroup[nI].markExt=true}
-for(nI=0;nI<hGroup.length;nI++)
-{if(!hGroup[nI].markExt)
-{continue}
-else
-{hGroup[nI].markExt=false}
-if(aSelectorData[2]=='')
-{if(hGroup[nI].tagName.toLowerCase()==aSelectorData[1].toLowerCase())
-{hInitFunction(hGroup[nI])}}
-else
-{aAttributeData=hAttributeRegEx.exec(aSelectorData[2])
-if(aAttributeData[1]=='class')
-{sAttribute=hGroup[nI].className}
-else
-{sAttribute=hGroup[nI].getAttribute(aAttributeData[1])}
-if(sAttribute!=null&&sAttribute.length>0)
-{if(aAttributeData[3]=='=')
-{if(aAttributeData[2]=='')
-{if(sAttribute==aAttributeData[4])
-{hInitFunction(hGroup[nI])}}
-else
-{switch(aAttributeData[2])
-{case'^':if(sAttribute.indexOf(aAttributeData[4])==0)
-{hInitFunction(hGroup[nI])}
-break
-case'$':if(sAttribute.lastIndexOf(aAttributeData[4])==sAttribute.length-aAttributeData[4].length)
-{hInitFunction(hGroup[nI])}
-break
-case'*':if(sAttribute.indexOf(aAttributeData[4])>=0)
-{hInitFunction(hGroup[nI])}
-break}}}
-else
-{hInitFunction(hGroup[nI])}}}}
-return}}
-hSelectorRegEx=/([a-z0-9_]*)([\.#@]?)([a-z0-9_=~]*)/i
-hAttributeRegEx=/([a-z0-9_]*)([=~])?([a-z0-9_]*)/i
-aSelectorData=hSelectorRegEx.exec(sSelector)
-if(aSelectorData[1]!='')
-{var hGroup=hParent.getElementsByTagName(aSelectorData[1])
-for(nI=0;nI<hGroup.length;nI++)
-{hGroup[nI].markExt=true}
-for(nI=0;nI<hGroup.length;nI++)
-{if(!hGroup[nI].markExt)
-{continue}
-else
-{hGroup[nI].markExt=false}
-if(aSelectorData[2]!='')
-{switch(aSelectorData[2])
-{case'.':if(hGroup[nI].className==aSelectorData[3])
-{hInitFunction(hGroup[nI])}
-break
-case'#':if(hGroup[nI].id==aSelectorData[3])
-{hInitFunction(hGroup[nI])}
-break
-case'@':aAttributeData=hAttributeRegEx.exec(aSelectorData[3])
-sAttribute=hGroup[nI].getAttribute(aAttributeData[1])
-if(sAttribute!=null&&sAttribute.length>0)
-{if(aAttributeData[3]!='')
-{if(aAttributeData[2]=='=')
-{if(sAttribute==aAttributeData[3])
-{hInitFunction(hGroup[nI])}}
-else
-{if(sAttribute.indexOf(aAttributeData[3])>=0)
-{hInitFunction(hGroup[nI])}}}
-else
-{hInitFunction(hGroup[nI])}}
-break}}}}}
-cDomExtensionManager.initialize=function()
-{var hDomExtension=null
-var aSelectors
-for(var nKey in cDomExtensionManager.aExtensions)
-{aSelectors=cDomExtensionManager.aExtensions[nKey].aSelectors
-for(var nKey2 in aSelectors)
-{cDomExtensionManager.initSelector(cDomExtensionManager.aExtensions[nKey].hParent,aSelectors[nKey2],cDomExtensionManager.aExtensions[nKey].hInitFunction)}}}
-if(window.addEventListener)
-{window.addEventListener('load',cDomExtensionManager.initialize,false)}
-else if(window.attachEvent)
-{window.attachEvent('onload',cDomExtensionManager.initialize)}
-function cDomObject(sId)
-{if(bw.dom||bw.ie)
-{this.hElement=document.getElementById(sId)
-this.hStyle=this.hElement.style}}
-cDomObject.prototype.getWidth=function()
-{return cDomObject.getWidth(this.hElement)}
-cDomObject.getWidth=function(hElement)
-{if(hElement.currentStyle)
-{var nWidth=parseInt(hElement.currentStyle.width)
-if(isNaN(nWidth))
-{return parseInt(hElement.offsetWidth)}
-else
-{return nWidth}}
-else
-{return parseInt(hElement.offsetWidth)}}
-cDomObject.prototype.getHeight=function()
-{return cDomObject.getHeight(this.hElement)}
-cDomObject.getHeight=function(hElement)
-{if(hElement.currentStyle)
-{var nHeight=parseInt(hElement.currentStyle.height)
-if(isNaN(nHeight))
-{return parseInt(hElement.offsetHeight)}
-else
-{return nHeight}}
-else
-{return parseInt(hElement.offsetHeight)}}
-cDomObject.prototype.getLeft=function()
-{return cDomObject.getLeft(this.hElement)}
-cDomObject.getLeft=function(hElement)
-{return parseInt(hElement.offsetLeft)}
-cDomObject.prototype.getTop=function()
-{return cDomObject.getTop(this.hElement)}
-cDomObject.getTop=function(hElement)
-{return parseInt(hElement.offsetTop)}
-cDomObject.getOffsetParam=function(hElement,sParam,hLimitParent)
-{var nRes=0
-if(hLimitParent==null)
-{hLimitParent=document.body.parentElement}
-while(hElement!=hLimitParent)
-{nRes+=eval('hElement.'+sParam)
-if(!hElement.offsetParent){break}
-hElement=hElement.offsetParent}
-return nRes}
-cDomObject.getScrollOffset=function(hElement,sParam,hLimitParent)
-{nRes=0
-if(hLimitParent==null)
-{hLimitParent=document.body.parentElement}
-while(hElement!=hLimitParent)
-{nRes+=eval('hElement.scroll'+sParam)
-if(!hElement.offsetParent){break}
-hElement=hElement.parentNode}
-return nRes}
-function getDomDocumentPrefix(){if(getDomDocumentPrefix.prefix)
-return getDomDocumentPrefix.prefix;var prefixes=["MSXML2","Microsoft","MSXML","MSXML3"];var o;for(var i=0;i<prefixes.length;i++){try{o=new ActiveXObject(prefixes[i]+".DomDocument");return getDomDocumentPrefix.prefix=prefixes[i];}
-catch(ex){};}
-throw new Error("Could not find an installed XML parser");}
-function getXmlHttpPrefix(){if(getXmlHttpPrefix.prefix)
-return getXmlHttpPrefix.prefix;var prefixes=["MSXML2","Microsoft","MSXML","MSXML3"];var o;for(var i=0;i<prefixes.length;i++){try{o=new ActiveXObject(prefixes[i]+".XmlHttp");return getXmlHttpPrefix.prefix=prefixes[i];}
-catch(ex){};}
-throw new Error("Could not find an installed XML parser");}
-function XmlHttp(){}
-XmlHttp.create=function(){try{if(window.XMLHttpRequest){var req=new XMLHttpRequest();if(req.readyState==null){req.readyState=1;req.addEventListener("load",function(){req.readyState=4;if(typeof req.onreadystatechange=="function")
-req.onreadystatechange();},false);}
-return req;}
-if(window.ActiveXObject){return new ActiveXObject(getXmlHttpPrefix()+".XmlHttp");}}
-catch(ex){}
-throw new Error("Your browser does not support XmlHttp objects");};function XmlDocument(){}
-XmlDocument.create=function(){try{if(document.implementation&&document.implementation.createDocument){var doc=document.implementation.createDocument("","",null);if(doc.readyState==null){doc.readyState=1;doc.addEventListener("load",function(){doc.readyState=4;if(typeof doc.onreadystatechange=="function")
-doc.onreadystatechange();},false);}
-return doc;}
-if(window.ActiveXObject)
-return new ActiveXObject(getDomDocumentPrefix()+".DomDocument");}
-catch(ex){}
-throw new Error("Your browser does not support XmlDocument objects");};if(window.DOMParser&&window.XMLSerializer&&window.Node&&Node.prototype&&Node.prototype.__defineGetter__){Document.prototype.loadXML=function(s){var doc2=(new DOMParser()).parseFromString(s,"text/xml");while(this.hasChildNodes())
-this.removeChild(this.lastChild);for(var i=0;i<doc2.childNodes.length;i++){this.appendChild(this.importNode(doc2.childNodes[i],true));}};Document.prototype.__defineGetter__("xml",function(){return(new XMLSerializer()).serializeToString(this);});}
-function cAutocomplete(sInputId)
-{this.init(sInputId)}
-var xmlrpc_url;cAutocomplete.CS_NAME='Autocomplete component'
-cAutocomplete.CS_OBJ_NAME='AC_COMPONENT'
-cAutocomplete.CS_LIST_PREFIX='ACL_'
-cAutocomplete.CS_BUTTON_PREFIX='ACB_'
-cAutocomplete.CS_INPUT_PREFIX='AC_'
-cAutocomplete.CS_HIDDEN_INPUT_PREFIX='ACH_'
-cAutocomplete.CS_INPUT_CLASSNAME='dropdown'
-cAutocomplete.CB_AUTOINIT=true
-cAutocomplete.CB_AUTOCOMPLETE=false
-cAutocomplete.CB_FORCECORRECT=false
-cAutocomplete.CB_MATCHSUBSTRING=false
-cAutocomplete.CS_SEPARATOR=','
-cAutocomplete.CS_ARRAY_SEPARATOR=','
-cAutocomplete.CB_MATCHSTRINGBEGIN=true
-cAutocomplete.CN_OFFSET_TOP=2
-cAutocomplete.CN_OFFSET_LEFT=-1
-cAutocomplete.CN_LINE_HEIGHT=19
-cAutocomplete.CN_NUMBER_OF_LINES=10
-cAutocomplete.CN_HEIGHT_FIX=2
-cAutocomplete.CN_CLEAR_TIMEOUT=300
-cAutocomplete.CN_SHOW_TIMEOUT=400
-cAutocomplete.CN_REMOTE_SHOW_TIMEOUT=1000
-cAutocomplete.CN_MARK_TIMEOUT=400
-cAutocomplete.hListDisplayed=null
-cAutocomplete.nCount=0
-cAutocomplete.autoInit=function()
-{var nI=0
-var hACE=null
-var sLangAtt
-var nInputsLength=document.getElementsByTagName('INPUT').length
-for(nI=0;nI<nInputsLength;nI++)
-{if(document.getElementsByTagName('INPUT')[nI].type.toLowerCase()=='text')
-{sLangAtt=document.getElementsByTagName('INPUT')[nI].getAttribute('acdropdown')
-if(sLangAtt!=null&&sLangAtt.length>0)
-{if(document.getElementsByTagName('INPUT')[nI].id==null||document.getElementsByTagName('INPUT')[nI].id.length==0)
-{document.getElementsByTagName('INPUT')[nI].id=cAutocomplete.CS_OBJ_NAME+cAutocomplete.nCount}
-hACE=new cAutocomplete(document.getElementsByTagName('INPUT')[nI].id)}}}
-var nTALength=document.getElementsByTagName('TEXTAREA').length
-for(nI=0;nI<nTALength;nI++)
-{sLangAtt=document.getElementsByTagName('TEXTAREA')[nI].getAttribute('acdropdown')
-if(sLangAtt!=null&&sLangAtt.length>0)
-{if(document.getElementsByTagName('TEXTAREA')[nI].id==null||document.getElementsByTagName('TEXTAREA')[nI].id.length==0)
-{document.getElementsByTagName('TEXTAREA')[nI].id=cAutocomplete.CS_OBJ_NAME+cAutocomplete.nCount}
-hACE=new cAutocomplete(document.getElementsByTagName('TEXTAREA')[nI].id)}}
-var nSelectsLength=document.getElementsByTagName('SELECT').length
-var aSelect=null
-for(nI=0;nI<nSelectsLength;nI++)
-{aSelect=document.getElementsByTagName('SELECT')[nI]
-sLangAtt=aSelect.getAttribute('acdropdown')
-if(sLangAtt!=null&&sLangAtt.length>0)
-{if(aSelect.id==null||aSelect.id.length==0)
-{aSelect.id=cAutocomplete.CS_OBJ_NAME+cAutocomplete.nCount}
-hACE=new cAutocomplete(aSelect.id)
-nSelectsLength--
-nI--}}}
-if(cAutocomplete.CB_AUTOINIT)
-{if(window.attachEvent)
-{window.attachEvent('onload',cAutocomplete.autoInit)}
-else if(window.addEventListener)
-{window.addEventListener('load',cAutocomplete.autoInit,false)}}
-cAutocomplete.prototype.init=function(sInputId)
-{this.bDebug=false
-this.sInputId=sInputId
-this.sListId=cAutocomplete.CS_LIST_PREFIX+sInputId
-this.sObjName=cAutocomplete.CS_OBJ_NAME+'_obj_'+(cAutocomplete.nCount++)
-this.hObj=this.sObjName
-this.hActiveSelection=null
-this.nSelectedItemIdx=-1
-this.sLastActiveValue=''
-this.sActiveValue=''
-this.bListDisplayed=false
-this.nItemsDisplayed=0
-this.bAssociative=true
-this.sHiddenInputId=null
-this.bHasButton=false
-this.aData=null
-this.aSearchData=new Array()
-this.bSorted=false
-this.nLastMatchLength=0
-this.bForceCorrect=cAutocomplete.CB_FORCECORRECT
-var sForceCorrect=document.getElementById(this.sInputId).getAttribute('autocomplete_forcecorrect')
-if(sForceCorrect!=null&&sForceCorrect.length>0)
-{this.bForceCorrect=eval(sForceCorrect)}
-this.bMatchBegin=cAutocomplete.CB_MATCHSTRINGBEGIN
-var sMatchBegin=document.getElementById(this.sInputId).getAttribute('autocomplete_matchbegin')
-if(sMatchBegin!=null&&sMatchBegin.length>0)
-{this.bMatchBegin=eval(sMatchBegin)}
-this.bMatchSubstring=cAutocomplete.CB_MATCHSUBSTRING
-var sMatchSubstring=document.getElementById(this.sInputId).getAttribute('autocomplete_matchsubstring')
-if(sMatchSubstring!=null&&sMatchSubstring.length>0)
-{this.bMatchSubstring=eval(sMatchSubstring)}
-this.bAutoComplete=cAutocomplete.CB_AUTOCOMPLETE
-this.bAutocompleted=false
-var sAutoComplete=document.getElementById(this.sInputId).getAttribute('autocomplete_complete')
-if(sAutoComplete!=null&&sAutoComplete.length>0)
-{this.bAutoComplete=eval(sAutoComplete)}
-this.formatOptions=null
-var sFormatFunction=document.getElementById(this.sInputId).getAttribute('autocomplete_format')
-if(sFormatFunction!=null&&sFormatFunction.length>0)
-{this.formatOptions=eval(sFormatFunction)}
-this.onSelect=null
-var sOnSelectFunction=document.getElementById(this.sInputId).getAttribute('autocomplete_onselect')
-if(sOnSelectFunction!=null&&sOnSelectFunction.length>0)
-{this.onSelect=eval(sOnSelectFunction)}
-if(this.getListArrayType()=='url'||this.getListArrayType()=='xmlrpc')
-{this.bAssociative=false
-this.bRemoteList=true
-this.sListURL=this.getListURL()
-this.hXMLHttp=XmlHttp.create()
-this.bXMLRPC=(this.getListArrayType()=='xmlrpc')}
-else
-{this.bRemoteList=false}
-var sAssociative=document.getElementById(this.sInputId).getAttribute('autocomplete_assoc')
-if(sAssociative!=null&&sAssociative.length>0)
-{this.bAssociative=eval(sAssociative)}
-this.initListArray()
-this.initListContainer()
-this.initInput()
-eval(this.hObj+'= this')}
-cAutocomplete.prototype.initInput=function()
-{var hInput=document.getElementById(this.sInputId)
-hInput.hAutocomplete=this
-var hContainer=document.getElementById(this.sListId)
-hContainer.hAutocomplete=this
-var nWidth=hInput.offsetWidth
-if(!nWidth||nWidth==0)
-{var hOWInput=hInput.cloneNode(true)
-hOWInput.style.position='absolute'
-hOWInput.style.top='-1000px'
-document.body.appendChild(hOWInput)
-var nWidth=hOWInput.offsetWidth
-document.body.removeChild(hOWInput)}
-var sInputName=hInput.name
-var hForm=hInput.form
-var bHasButton=false
-var sHiddenValue=hInput.value
-var sValue=hInput.type.toLowerCase()=='text'?hInput.value:''
-var sHasButton=hInput.getAttribute('autocomplete_button')
-if(sHasButton!=null&&sHasButton.length>0)
-{bHasButton=true}
-if(hInput.type.toLowerCase()=='select-one')
-{bHasButton=true
-if(hInput.selectedIndex>=0)
-{sHiddenValue=hInput.options[hInput.selectedIndex].value
-sValue=hInput.options[hInput.selectedIndex].text}}
-if(hForm)
-{var hHiddenInput=document.createElement('INPUT')
-hHiddenInput.id=cAutocomplete.CS_HIDDEN_INPUT_PREFIX+this.sInputId
-hHiddenInput.type='hidden'
-hForm.appendChild(hHiddenInput)
-if(this.bAssociative)
-{hHiddenInput.name=sInputName
-hInput.name=cAutocomplete.CS_INPUT_PREFIX+sInputName}
-else
-{hHiddenInput.name=cAutocomplete.CS_INPUT_PREFIX+sInputName}
-hHiddenInput.value=sHiddenValue
-this.sHiddenInputId=hHiddenInput.id}
-if(bHasButton)
-{this.bHasButton=true
-var hInputContainer=document.createElement('DIV')
-hInputContainer.className='acinputContainer'
-hInputContainer.style.width=nWidth
-var hInputButton=document.createElement('INPUT')
-hInputButton.id=cAutocomplete.CS_BUTTON_PREFIX+this.sInputId
-hInputButton.type='button'
-hInputButton.className='button'
-hInputButton.tabIndex=hInput.tabIndex+1
-hInputButton.hAutocomplete=this
-var hNewInput=document.createElement('INPUT')
-if(this.bAssociative)
-{hNewInput.name=cAutocomplete.CS_INPUT_PREFIX+sInputName}
-else
-{hNewInput.name=sInputName}
-hNewInput.type='text'
-hNewInput.value=sValue
-hNewInput.style.width=nWidth-22
-hNewInput.className=cAutocomplete.CS_INPUT_CLASSNAME
-hNewInput.tabIndex=hInput.tabIndex
-hNewInput.hAutocomplete=this
-hInputContainer.appendChild(hNewInput)
-hInputContainer.appendChild(hInputButton)
-hInput.parentNode.replaceChild(hInputContainer,hInput)
-hNewInput.id=this.sInputId
-hInput=hNewInput}
-if(hInput.attachEvent)
-{hInput.attachEvent('onkeyup',cAutocomplete.onInputKeyUp)
-hInput.attachEvent('onkeyup',cAutocomplete.saveCaretPosition)
-hInput.attachEvent('onkeydown',cAutocomplete.onInputKeyDown)
-hInput.attachEvent('onblur',cAutocomplete.onInputBlur)
-hInput.attachEvent('onfocus',cAutocomplete.onInputFocus)
-if(hInputButton)
-{hInputButton.attachEvent('onclick',cAutocomplete.onButtonClick)}}
-else if(hInput.addEventListener)
-{hInput.addEventListener('keyup',cAutocomplete.onInputKeyUp,false)
-hInput.addEventListener('keyup',cAutocomplete.saveCaretPosition,false)
-hInput.addEventListener('keydown',cAutocomplete.onInputKeyDown,false)
-hInput.addEventListener('keypress',cAutocomplete.onInputKeyPress,false)
-hInput.addEventListener('blur',cAutocomplete.onInputBlur,false)
-hInput.addEventListener('focus',cAutocomplete.onInputFocus,false)
-if(hInputButton)
-{hInputButton.addEventListener('click',cAutocomplete.onButtonClick,false)}}
-hInput.setAttribute('autocomplete','OFF')
-if(hForm)
-{if(hForm.attachEvent)
-{hForm.attachEvent('onsubmit',cAutocomplete.onFormSubmit)
-if(this.bDebug){this.debug("attachEvent added")}}
-else if(hForm.addEventListener)
-{hForm.addEventListener('submit',cAutocomplete.onFormSubmit,false)
-if(this.bDebug){this.debug("addEventListener")}}}}
-cAutocomplete.prototype.initListContainer=function()
-{var hInput=document.getElementById(this.sInputId)
-var hContainer=document.createElement('DIV')
-hContainer.className='autocomplete_holder'
-hContainer.id=this.sListId
-hContainer.style.zIndex=10000+cAutocomplete.nCount
-hContainer.hAutocomplete=this
-var hFirstBorder=document.createElement('DIV')
-hFirstBorder.className='autocomplete_firstborder'
-var hSecondBorder=document.createElement('DIV')
-hSecondBorder.className='autocomplete_secondborder'
-var hList=document.createElement('UL')
-hList.className='autocomplete'
-hSecondBorder.appendChild(hList)
-hFirstBorder.appendChild(hSecondBorder)
-hContainer.appendChild(hFirstBorder)
-document.body.appendChild(hContainer)
-if(hContainer.attachEvent)
-{hContainer.attachEvent('onblur',cAutocomplete.onListBlur)
-hContainer.attachEvent('onfocus',cAutocomplete.onListFocus)}
-else if(hInput.addEventListener)
-{hContainer.addEventListener('blur',cAutocomplete.onListBlur,false)
-hContainer.addEventListener('focus',cAutocomplete.onListFocus,false)}
-if(hContainer.attachEvent)
-{hContainer.attachEvent('onclick',cAutocomplete.onItemClick)}
-else if(hContainer.addEventListener)
-{hContainer.addEventListener('click',cAutocomplete.onItemClick,false)}}
-cAutocomplete.prototype.createList=function()
-{var hInput=document.getElementById(this.sInputId)
-var hContainer=document.getElementById(this.sListId)
-var hList=hContainer.getElementsByTagName('UL')[0]
-if(hList)
-{hList=hList.parentNode.removeChild(hList)
-while(hList.hasChildNodes())
-{hList.removeChild(hList.childNodes[0])}}
-var hListItem=null
-var hListItemLink=null
-var hArrKey=null
-var sArrEl=null
-var hArr=this.aData
-var nI=0
-var sRealText
-for(hArrKey in hArr)
-{sArrEl=hArr[hArrKey]
-hListItem=document.createElement('LI')
-hListItemLink=document.createElement('A')
-hListItemLink.setAttribute('itemvalue',hArrKey)
-var sArrData=sArrEl.split(cAutocomplete.CS_ARRAY_SEPARATOR)
-if(sArrData.length>1)
-{this.aData[hArrKey]=sArrData[0]
-hListItemLink.setAttribute('itemdata',sArrEl.substring(sArrEl.indexOf(cAutocomplete.CS_ARRAY_SEPARATOR)+1))
-sRealText=sArrData[0]}
-else
-{sRealText=sArrEl}
-hListItemLink.href='#'
-hListItemLink.appendChild(document.createTextNode(sRealText))
-hListItemLink.realText=sRealText
-if(nI==this.nSelectedItemIdx)
-{this.hActiveSelection=hListItemLink
-this.hActiveSelection.className='selected'}
-hListItem.appendChild(hListItemLink)
-hList.appendChild(hListItem)
-this.aSearchData[nI++]=sRealText.toLowerCase()}
-var hSecondBorder=hContainer.firstChild.firstChild
-hSecondBorder.appendChild(hList)
-this.bListUpdated=false}
-cAutocomplete.prototype.initListArray=function()
-{var hInput=document.getElementById(this.sInputId)
-var hArr=null
-if(hInput.type.toLowerCase()=='select-one')
-{hArr=new Object()
-for(var nI=0;nI<hInput.options.length;nI++)
-{hArrKey=hInput.options.item(nI).value
-sArrEl=hInput.options.item(nI).text
-hArr[hArrKey]=sArrEl
-if(hInput.options.item(nI).selected)
-{this.nSelectedItemIdx=nI}}}
-else
-{var sAA=hInput.getAttribute('autocomplete_list')
-var sAAS=hInput.getAttribute('autocomplete_list_sort')
-var sArrayType=this.getListArrayType()
-switch(sArrayType)
-{case'array':hArr=eval(sAA.substring(6))
-break
-case'list':hArr=new Array()
-var hTmpArray=sAA.substring(5).split('|')
-var aValueArr
-for(hKey in hTmpArray)
-{aValueArr=hTmpArray[hKey].split(cAutocomplete.CS_ARRAY_SEPARATOR)
-if(aValueArr.length==1)
-{hArr[hKey]=hTmpArray[hKey]
-this.bAssociative=false}
-else
-{hArr[aValueArr[0]]=aValueArr[1]}}
-break}
-if(sAAS!=null&&eval(sAAS))
-{this.bSorted=true
-this.aData=hArr.sort()
-hArr=hArr.sort()}}
-this.setArray(hArr)}
-cAutocomplete.prototype.setArray=function(sArray)
-{if(typeof sArray=='string')
-{this.aData=eval(sArray)}
-else
-{this.aData=sArray}
-this.bListUpdated=true}
-cAutocomplete.prototype.setListArray=function(sArray)
-{this.setArray(sArray)
-this.updateAndShowList()}
-cAutocomplete.prototype.getListArrayType=function()
-{var hInput=document.getElementById(this.sInputId)
-var sAA=hInput.getAttribute('autocomplete_list')
-if(sAA!=null&&sAA.length>0)
-{if(sAA.indexOf('array:')>=0)
-{return'array'}
-else if(sAA.indexOf('list:')>=0)
-{return'list'}
-else if(sAA.indexOf('url:')>=0)
-{return'url'}
-else if(sAA.indexOf('xmlrpc:')>=0)
-{return'xmlrpc'}}}
-cAutocomplete.prototype.getListURL=function()
-{var hInput=document.getElementById(this.sInputId)
-var sAA=hInput.getAttribute('autocomplete_list')
-if(sAA!=null&&sAA.length>0)
-{if(sAA.indexOf('url:')>=0)
-{return sAA.substring(4)}
-if(sAA.indexOf('xmlrpc:')>=0)
-{return sAA.substring(7)}}}
-cAutocomplete.prototype.setListURL=function(sURL)
-{this.sListURL=sURL;}
-cAutocomplete.prototype.onXmlHttpLoad=function()
-{if(this.hXMLHttp.readyState==4)
-{var hError=this.hXMLHttp.parseError
-if(hError&&hError.errorCode!=0)
-{alert(hError.reason)}
-else
-{this.afterRemoteLoad()}}}
-cAutocomplete.prototype.onXMLRPCHttpLoad=function()
-{if(this.hXMLHttp.readyState==4)
-{var hError=this.hXMLHttp.parseError
-if(hError&&hError.errorCode!=0)
-{alert(hError.reason)}
-else
-{this.afterRemoteLoadXMLRPC()}}}
-cAutocomplete.prototype.loadXMLRPCListArray=function()
-{var sURL=this.sListURL
-var xmlrpc_url=data_path+'/RPC2.php'
-var aMethodArgs=sURL.split(' ')
-var sMethodName=aMethodArgs[0]
-var sStartWith=this.getStringForAutocompletion(this.sActiveValue,this.nInsertPoint)
-sStartWith=sStartWith.replace(/^\s/,'')
-sStartWith=sStartWith.replace(/\s$/,'')
-if(sMethodName.indexOf('?')>0)
-{sMethodName=sMethodName.replace('/^.+\?/','')
-sURL=sURL.replace('/\?.+$/','')}
-else
-{sURL=xmlrpc_url}
-if(sMethodName.length<1)
-{var hInput=document.getElementById(this.sInputId)
-hInput.value=this.sActiveValue
-return}
-var sRequest='<?xml version=\'1.0\' encoding="utf-8" ?>\n'
-sRequest+='<methodCall><methodName>'+sMethodName+'</methodName>\n'
-if(aMethodArgs.length<=1)
-{sRequest+='<params/>\n'}
-else
-{sRequest+='<params>\n'
-for(var nI=1;nI<aMethodArgs.length;nI++)
-{var sArg=aMethodArgs[nI];if(sArg.indexOf('[S]')>=0)
-{sArg=sArg.replace('[S]',sStartWith)}
-sRequest+='<param><value><string>'
-sRequest+=sArg
-sRequest+='</string></value></param>\n'}
-sRequest+='</params>\n'}
-sRequest+='</methodCall>'
-if(this.bDebug){this.debug('url: "'+sURL+'" sRequest: "'+sRequest.substring(20)+'"')}
-this.hXMLHttp.open('POST',sURL,true)
-var hAC=this
-this.hXMLHttp.onreadystatechange=function(){hAC.onXMLRPCHttpLoad()}
-this.hXMLHttp.send(sRequest)}
-cAutocomplete.prototype.loadListArray=function()
-{var sURL=this.sListURL
-var sStartWith=this.getStringForAutocompletion(this.sActiveValue,this.nInsertPoint)
-sStartWith=sStartWith.replace(/^\s/,'')
-sStartWith=sStartWith.replace(/\s$/,'')
-if(sURL.indexOf('[S]')>=0)
-{sURL=sURL.replace('[S]',sStartWith)}
-else
-{sURL+=this.sActiveValue}
-this.hXMLHttp.open('GET',sURL,true)
-var hAC=this
-this.hXMLHttp.onreadystatechange=function(){hAC.onXmlHttpLoad()}
-this.hXMLHttp.send(null)}
-cAutocomplete.prototype.afterRemoteLoad=function()
-{var hInput=document.getElementById(this.sInputId)
-var hArr=new Array()
-var hTmpArray=this.hXMLHttp.responseText.split('|')
-var aValueArr
-for(hKey in hTmpArray)
-{aValueArr=hTmpArray[hKey].split(cAutocomplete.CS_ARRAY_SEPARATOR)
-if(aValueArr.length==1)
-{hArr[hKey]=hTmpArray[hKey]}
-else
-{hArr[aValueArr[0]]=hTmpArray[hKey].substr(hTmpArray[hKey].indexOf(cAutocomplete.CS_ARRAY_SEPARATOR)+1)}}
-hInput.className=''
-hInput.readonly=false
-hInput.value=this.sActiveValue
-this.setListArray(hArr)}
-cAutocomplete.prototype.afterRemoteLoadXMLRPC=function()
-{var hInput=document.getElementById(this.sInputId)
-var hArr=new Array()
-sResult=this.hXMLHttp.responseText
-if(this.bDebug){this.debug("respons...
 
[truncated message content]

Revision: 9570
 http://sourceforge.net/p/phpwiki/code/9570
Author: vargenau
Date: 2015年02月27日 16:12:26 +0000 (2015年2月27日)
Log Message:
-----------
PHP Doc
Modified Paths:
--------------
 trunk/lib/WikiDB/backend/PDO.php
 trunk/lib/WikiDB/backend/PearDB.php
 trunk/lib/WikiDB/backend/file.php
 trunk/lib/WikiUser/PdoDb.php
Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2015年02月27日 15:50:45 UTC (rev 9569)
+++ trunk/lib/WikiDB/backend/PDO.php	2015年02月27日 16:12:26 UTC (rev 9570)
@@ -455,7 +455,7 @@
 *
 * @param $version int Which version to get.
 *
- * @return hash The version data, or false if specified version does not
+ * @return array hash The version data, or false if specified version does not
 * exist.
 */
 function get_versiondata($pagename, $version, $want_content = false)
Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2015年02月27日 15:50:45 UTC (rev 9569)
+++ trunk/lib/WikiDB/backend/PearDB.php	2015年02月27日 16:12:26 UTC (rev 9570)
@@ -341,7 +341,7 @@
 *
 * @param $version int Which version to get.
 *
- * @return hash The version data, or false if specified version does not
+ * @return array hash The version data, or false if specified version does not
 * exist.
 */
 function get_versiondata($pagename, $version, $want_content = false)
Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php	2015年02月27日 15:50:45 UTC (rev 9569)
+++ trunk/lib/WikiDB/backend/file.php	2015年02月27日 16:12:26 UTC (rev 9570)
@@ -272,8 +272,8 @@
 /**
 * Get page meta-data from database.
 *
- * @param $pagename string Page name.
- * @return hash
+ * @param string $pagename Page name.
+ * @return array hash
 * Returns a hash containing the page meta-data.
 * Returns an empty array if there is no meta-data for the requested page.
 * Keys which might be present in the hash are:
@@ -309,8 +309,8 @@
 * $backend->update_pagedata($pagename, array('locked' => false));
 * </pre>
 *
- * @param $pagename string Page name.
- * @param $newdata hash New meta-data.
+ * @param string $pagename Page name.
+ * @param array $newdata hash New meta-data.
 */
 /**
 * This will create a new page if page being requested does not
@@ -376,7 +376,7 @@
 * the content, the backend might still want to set the value of
 * '%content' to the empty string if it knows there's no content.
 *
- * @return hash The version data, or false if specified version does not
+ * @return array hash The version data, or false if specified version does not
 * exist.
 *
 * Some keys which might be present in the $versiondata hash are:
@@ -478,9 +478,9 @@
 * If the given ($pagename,$version) is already in the database,
 * this method completely overwrites any stored data for that version.
 *
- * @param $pagename string Page name.
- * @param $version int New revisions content.
- * @param $data hash New revision metadata.
+ * @param string $pagename Page name.
+ * @param int $version New revisions content.
+ * @param array $data hash New revision metadata.
 *
 * @see get_versiondata
 */
@@ -494,11 +494,11 @@
 *
 * If the given ($pagename,$version) is already in the database,
 * this method only changes those meta-data values whose keys are
- * explicity listed in $newdata.
+ * explicitly listed in $newdata.
 *
- * @param $pagename string Page name.
- * @param $version int New revisions content.
- * @param $newdata hash New revision metadata.
+ * @param string $pagename Page name.
+ * @param int $version New revisions content.
+ * @param array $newdata hash New revision metadata.
 * @see set_versiondata, get_versiondata
 */
 function update_versiondata($pagename, $version, $newdata)
Modified: trunk/lib/WikiUser/PdoDb.php
===================================================================
--- trunk/lib/WikiUser/PdoDb.php	2015年02月27日 15:50:45 UTC (rev 9569)
+++ trunk/lib/WikiUser/PdoDb.php	2015年02月27日 16:12:26 UTC (rev 9570)
@@ -27,7 +27,7 @@
 /**
 * PDO DB methods (PHP5)
 * prepare, bind, execute.
- * We use numrical FETCH_MODE_ROW, so we don't need aliases in the auth_* SQL statements.
+ * We use numerical FETCH_MODE_ROW, so we don't need aliases in the auth_* SQL statements.
 *
 * @tables: user
 * @tables: pref
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9569
 http://sourceforge.net/p/phpwiki/code/9569
Author: vargenau
Date: 2015年02月27日 15:50:45 +0000 (2015年2月27日)
Log Message:
-----------
PAGE_PREFIX becomes a variable (Fusionforge only)
Modified Paths:
--------------
 trunk/g
 trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
 trunk/lib/WikiUser.php
 trunk/lib/wikilens/RatingsUser.php
Modified: trunk/g
===================================================================
--- trunk/g	2015年02月27日 10:37:56 UTC (rev 9568)
+++ trunk/g	2015年02月27日 15:50:45 UTC (rev 9569)
@@ -47,7 +47,11 @@
 // Disable compression, seems needed to get all the messages.
 $no_gz_buffer=true;
 
-require_once('../../../common/include/env.inc.php');
+if (defined('WIKI_SOAP')) {
+ require_once 'include/env.inc.php';
+} else {
+ require_once '../../../common/include/env.inc.php';
+}
 require_once $gfcommon.'include/pre.php';
 require_once $gfplugins.'wiki/common/wikiconfig.class.php';
 
@@ -60,6 +64,10 @@
 define('ENABLE_EDIT_TOOLBAR', false);
 }
 
+if (defined('WIKI_SOAP')) {
+ $group_id = 6;
+}
+
 if (isset($group_id) && $group_id) {
 if (! isset($project) || ! $project) {
 $project = group_get_object($group_id);
@@ -89,7 +97,8 @@
 $wc = new WikiConfig($group_id);
 
 define('VIRTUAL_PATH', '/wiki/g/'.$group_name);
- define('PAGE_PREFIX', '_g'.$group_id.'_');
+ global $page_prefix;
+ $page_prefix = '_g'.$group_id.'_';
 
 // We have to use a smaller value than Phpwiki due to page prefix
 define('MAX_PAGENAME_LENGTH', 92);
Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2015年02月27日 10:37:56 UTC (rev 9568)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2015年02月27日 15:50:45 UTC (rev 9569)
@@ -54,7 +54,8 @@
 $dbparams['dsn'] = str_replace('ffpgsql:', 'pgsql:', $dbparams['dsn']);
 parent::__construct($dbparams);
 
- $p = strlen(PAGE_PREFIX) + 1;
+ global $page_prefix;
+ $p = strlen($page_prefix) + 1;
 $page_tbl = $this->_table_names['page_tbl'];
 $this->page_tbl_fields = "$page_tbl.id AS id, substring($page_tbl.pagename from $p) AS pagename, $page_tbl.hits AS hits";
 
@@ -65,7 +66,8 @@
 {
 $dbh = &$this->_dbh;
 extract($this->_table_names);
- $pat = PAGE_PREFIX;
+ global $page_prefix;
+ $pat = $page_prefix;
 $p = strlen($pat) + 1;
 return $dbh->getCol("SELECT substring(pagename from $p)"
 . " FROM $nonempty_tbl, $page_tbl"
@@ -77,7 +79,8 @@
 {
 $dbh = &$this->_dbh;
 extract($this->_table_names);
- $pat = PAGE_PREFIX;
+ global $page_prefix;
+ $pat = $page_prefix;
 $p = strlen($pat) + 1;
 return $dbh->getOne("SELECT count(*)"
 . " FROM $nonempty_tbl, $page_tbl"
@@ -87,7 +90,8 @@
 
 function get_pagedata($pagename)
 {
- return parent::get_pagedata(PAGE_PREFIX . $pagename);
+ global $page_prefix;
+ return parent::get_pagedata($page_prefix . $pagename);
 }
 
 function update_pagedata($pagename, $newdata)
@@ -100,7 +104,8 @@
 // Note that this will fail silently if the page does not
 // have a record in the page table. Since it's just the
 // hit count, who cares?
- $pagename = PAGE_PREFIX . $pagename;
+ global $page_prefix;
+ $pagename = $page_prefix . $pagename;
 $dbh->query(sprintf("UPDATE $page_tbl SET hits=%d WHERE pagename='%s'",
 $newdata['hits'], $dbh->escapeSimple($pagename)));
 return;
@@ -139,7 +144,8 @@
 $dbh->escapeSimple($this->_serialize($data)),
 $dbh->escapeSimple($pagename)));
 */
- $pagename = PAGE_PREFIX . $pagename;
+ global $page_prefix;
+ $pagename = $page_prefix . $pagename;
 $dbh->query("UPDATE $page_tbl"
 . " SET hits=?, pagedata=?"
 . " WHERE pagename=?",
@@ -149,12 +155,14 @@
 
 function get_latest_version($pagename)
 {
- return parent::get_latest_version(PAGE_PREFIX . $pagename);
+ global $page_prefix;
+ return parent::get_latest_version($page_prefix . $pagename);
 }
 
 function get_previous_version($pagename, $version)
 {
- return parent::get_previous_version(PAGE_PREFIX . $pagename, $version);
+ global $page_prefix;
+ return parent::get_previous_version($page_prefix . $pagename, $version);
 }
 
 function get_versiondata($pagename, $version, $want_content = false)
@@ -178,7 +186,8 @@
 . "$iscontent AS have_content";
 }
 
- $pagename = PAGE_PREFIX . $pagename;
+ global $page_prefix;
+ $pagename = $page_prefix . $pagename;
 $result = $dbh->getRow(sprintf("SELECT $fields"
 . " FROM $page_tbl, $version_tbl"
 . " WHERE $page_tbl.id=$version_tbl.id"
@@ -192,12 +201,14 @@
 
 function get_cached_html($pagename)
 {
- return parent::get_cached_html(PAGE_PREFIX . $pagename);
+ global $page_prefix;
+ return parent::get_cached_html($page_prefix . $pagename);
 }
 
 function set_cached_html($pagename, $data)
 {
- parent::set_cached_html(PAGE_PREFIX . $pagename, $data);
+ global $page_prefix;
+ parent::set_cached_html($page_prefix . $pagename, $data);
 }
 
 function _get_pageid($pagename, $create_if_missing = false)
@@ -217,7 +228,8 @@
 
 $dbh = &$this->_dbh;
 $page_tbl = $this->_table_names['page_tbl'];
- $pagename = PAGE_PREFIX . $pagename;
+ global $page_prefix;
+ $pagename = $page_prefix . $pagename;
 
 $query = sprintf("SELECT id FROM $page_tbl WHERE pagename='%s'",
 $dbh->escapeSimple($pagename));
@@ -287,7 +299,8 @@
 else
 $exclude = '';
 
- $pat = PAGE_PREFIX;
+ global $page_prefix;
+ $pat = $page_prefix;
 $p = strlen($pat) + 1;
 
 $qpagename = $dbh->escapeSimple($pagename);
@@ -323,7 +336,8 @@
 $dbh = &$this->_dbh;
 extract($this->_table_names);
 
- $pat = PAGE_PREFIX;
+ global $page_prefix;
+ $pat = $page_prefix;
 $p = strlen($pat) + 1;
 
 $orderby = $this->sortby($sortby, 'db');
@@ -389,7 +403,8 @@
 {
 $dbh = &$this->_dbh;
 extract($this->_table_names);
- $pat = PAGE_PREFIX;
+ global $page_prefix;
+ $pat = $page_prefix;
 $p = strlen($pat) + 1;
 if ($limit < 0) {
 $order = "hits ASC";
@@ -479,7 +494,8 @@
 if ($pick)
 $where_clause .= " AND " . join(" AND ", $pick);
 
- $pat = PAGE_PREFIX;
+ global $page_prefix;
+ $pat = $page_prefix;
 $p = strlen($pat) + 1;
 
 // FIXME: use SQL_BUFFER_RESULT for mysql?
@@ -502,7 +518,8 @@
 {
 $dbh = &$this->_dbh;
 extract($this->_table_names);
- $pat = PAGE_PREFIX;
+ global $page_prefix;
+ $pat = $page_prefix;
 $p = strlen($pat) + 1;
 if ($orderby = $this->sortby($sortby, 'db', array('pagename', 'wantedfrom')))
 $orderby = 'ORDER BY ' . $orderby;
@@ -512,7 +529,7 @@
 if ($exclude) // array of pagenames
 $exclude = " AND p.pagename NOT IN " . $this->_sql_set($exclude);
 
- $p = strlen(PAGE_PREFIX) + 1;
+ $p = strlen($page_prefix) + 1;
 $sql = "SELECT substring(p.pagename from $p) AS wantedfrom, substring(pp.pagename from $p) AS pagename"
 . " FROM $page_tbl p, $link_tbl linked"
 . " LEFT JOIN $page_tbl pp ON linked.linkto = pp.id"
@@ -553,8 +570,9 @@
 $dbh->query("UPDATE $link_tbl SET linkto=$id WHERE linkto=$new");
 $dbh->query("DELETE FROM $page_tbl WHERE id=$new");
 }
+ global $page_prefix;
 $dbh->query(sprintf("UPDATE $page_tbl SET pagename='%s' WHERE id=$id",
- $dbh->escapeSimple(PAGE_PREFIX . $to)));
+ $dbh->escapeSimple($page_prefix . $to)));
 }
 $this->unlock();
 return $id;
@@ -562,12 +580,14 @@
 
 function is_wiki_page($pagename)
 {
- return parent::is_wiki_page(PAGE_PREFIX . $pagename);
+ global $page_prefix;
+ return parent::is_wiki_page($page_prefix . $pagename);
 }
 
 function increaseHitCount($pagename)
 {
- parent::increaseHitCount(PAGE_PREFIX . $pagename);
+ global $page_prefix;
+ parent::increaseHitCount($page_prefix . $pagename);
 }
 
 function _serialize($data)
@@ -592,7 +612,8 @@
 {
 $dbh = &$this->_dbh;
 extract($this->_table_names);
- $pat = PAGE_PREFIX;
+ global $page_prefix;
+ $pat = $page_prefix;
 $len = strlen($pat) + 1;
 $orderby = $this->sortby($sortby, 'db');
 if ($sortby and $orderby) $orderby = ' ORDER BY ' . $orderby;
@@ -675,7 +696,8 @@
 $word = $node->sql();
 // @alu: use _quote maybe instead of direct pg_escape_string
 $word = pg_escape_string($word);
- $len = strlen(PAGE_PREFIX) + 1;
+ global $page_prefix;
+ $len = strlen($page_prefix) + 1;
 if ($node->op == 'REGEX') { // posix regex extensions
 return ($this->_case_exact
 ? "substring(pagename from $len) ~* '$word'"
Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2015年02月27日 10:37:56 UTC (rev 9568)
+++ trunk/lib/WikiUser.php	2015年02月27日 15:50:45 UTC (rev 9569)
@@ -2199,7 +2199,8 @@
 // notifyPages are pages to notify in the current project
 // while $notifyPagesAll is used to store all the monitored pages.
 if (isset($prefs['notifyPages'])) {
- $this->notifyPagesAll[PAGE_PREFIX] = $prefs['notifyPages'];
+ global $page_prefix;
+ $this->notifyPagesAll[$page_prefix] = $prefs['notifyPages'];
 $prefs['notifyPages'] = @serialize($this->notifyPagesAll);
 }
 }
@@ -2250,8 +2251,9 @@
 // while $notifyPagesAll is used to store all the monitored pages.
 if (isset($prefs['notifyPages'])) {
 $this->notifyPagesAll = $prefs['notifyPages'];
- if (isset($this->notifyPagesAll[PAGE_PREFIX])) {
- $prefs['notifyPages'] = $this->notifyPagesAll[PAGE_PREFIX];
+ global $page_prefix;
+ if (isset($this->notifyPagesAll[$page_prefix])) {
+ $prefs['notifyPages'] = $this->notifyPagesAll[$page_prefix];
 } else {
 $prefs['notifyPages'] = '';
 }
Modified: trunk/lib/wikilens/RatingsUser.php
===================================================================
--- trunk/lib/wikilens/RatingsUser.php	2015年02月27日 10:37:56 UTC (rev 9568)
+++ trunk/lib/wikilens/RatingsUser.php	2015年02月27日 15:50:45 UTC (rev 9569)
@@ -341,7 +341,8 @@
 
 while ($rating = $rating_iter->next()) {
 if (defined('FUSIONFORGE') && FUSIONFORGE) {
- $rating['pagename'] = preg_replace('/^' . PAGE_PREFIX . '/', '', $rating['pagename']);
+ global $page_prefix;
+ $rating['pagename'] = preg_replace('/^' . $page_prefix . '/', '', $rating['pagename']);
 }
 $this->_num_ratings++;
 $this->_ratings[$rating['pagename']][$rating['dimension']]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9568
 http://sourceforge.net/p/phpwiki/code/9568
Author: vargenau
Date: 2015年02月27日 10:37:56 +0000 (2015年2月27日)
Log Message:
-----------
Add private/protected
Modified Paths:
--------------
 trunk/lib/WikiTheme.php
 trunk/themes/blog/themeinfo.php
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2015年02月26日 13:58:41 UTC (rev 9567)
+++ trunk/lib/WikiTheme.php	2015年02月27日 10:37:56 UTC (rev 9568)
@@ -538,7 +538,7 @@
 return fmt("Last edited on %s", $date);
 }
 
- function _relativeDay($time_t)
+ private function _relativeDay($time_t)
 {
 /**
 * @var WikiRequest $request
@@ -914,7 +914,7 @@
 
 private $button_path;
 
- function _findButton($button_file)
+ private function _findButton($button_file)
 {
 if (empty($this->button_path))
 $this->button_path = $this->_getButtonPath();
@@ -926,7 +926,7 @@
 return false;
 }
 
- function _getButtonPath()
+ private function _getButtonPath()
 {
 $button_dir = $this->_findFile("buttons");
 $path_dir = $this->_path . $button_dir;
@@ -1116,7 +1116,7 @@
 WikiURL($pagename, $args), 'wiki');
 }
 
- function _get_name_and_rev($page_or_rev)
+ protected function _get_name_and_rev($page_or_rev)
 {
 $version = false;
 
@@ -1142,7 +1142,7 @@
 return compact('pagename', 'version');
 }
 
- function _labelForAction($action)
+ protected function _labelForAction($action)
 {
 switch ($action) {
 case 'edit':
@@ -1173,7 +1173,7 @@
 }
 
 //----------------------------------------------------------------
- private $_buttonSeparator = "\n | ";
+ private $buttonSeparator = "\n | ";
 
 function setButtonSeparator($separator)
 {
@@ -1226,7 +1226,7 @@
 //
 ////////////////////////////////////////////////////////////////
 
- function _CSSlink($title, $css_file, $media, $is_alt = false)
+ protected function _CSSlink($title, $css_file, $media, $is_alt = false)
 {
 // Don't set title on default style. This makes it clear to
 // the user which is the default (i.e. most supported) style.
@@ -1269,7 +1269,7 @@
 * between media types and CSS file names. Use a key of '' (the empty string)
 * to set the default CSS for non-specified media. (See above for an example.)
 */
- function setDefaultCSS($title, $css_files)
+ protected function setDefaultCSS($title, $css_files)
 {
 if (!is_array($css_files))
 $css_files = array('' => $css_files);
@@ -1283,7 +1283,7 @@
 * @param string $title Name of style.
 * @param string $css_files Name of CSS file.
 */
- function addAlternateCSS($title, $css_files)
+ protected function addAlternateCSS($title, $css_files)
 {
 if (!is_array($css_files))
 $css_files = array('' => $css_files);
@@ -1610,7 +1610,7 @@
 // Works only on action=browse. Patch #970004 by pixels
 // Usage: call $WikiTheme->initDoubleClickEdit() from theme init or
 // define ENABLE_DOUBLECLICKEDIT
- function initDoubleClickEdit()
+ private function initDoubleClickEdit()
 {
 if (!$this->HTML_DUMP_SUFFIX)
 $this->addMoreAttr('body', 'DoubleClickEdit', HTML::raw(" ondblclick=\"url = document.URL; url2 = url; if (url.indexOf('?') != -1) url2 = url.slice(0, url.indexOf('?')); if ((url.indexOf('action') == -1) || (url.indexOf('action=browse') != -1)) document.location = url2 + '?action=edit';\""));
@@ -1619,7 +1619,7 @@
 // Immediate title search results via XMLHTML(HttpRequest)
 // by Bitflux GmbH, bitflux.ch. You need to install the livesearch.js separately.
 // Google's or acdropdown is better.
- function initLiveSearch()
+ private function initLiveSearch()
 {
 //subclasses of Sidebar will init this twice
 static $already = 0;
@@ -1636,7 +1636,7 @@
 
 // Immediate title search results via XMLHttpRequest
 // using the shipped moacdropdown js-lib
- function initMoAcDropDown()
+ private function initMoAcDropDown()
 {
 //subclasses of Sidebar will init this twice
 static $already = 0;
Modified: trunk/themes/blog/themeinfo.php
===================================================================
--- trunk/themes/blog/themeinfo.php	2015年02月26日 13:58:41 UTC (rev 9567)
+++ trunk/themes/blog/themeinfo.php	2015年02月27日 10:37:56 UTC (rev 9568)
@@ -81,7 +81,7 @@
 'title' => _("Click to hide/show")));
 }
 
- function _labelForAction($action)
+ protected function _labelForAction($action)
 {
 switch ($action) {
 case 'edit':
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9567
 http://sourceforge.net/p/phpwiki/code/9567
Author: vargenau
Date: 2015年02月26日 13:58:41 +0000 (2015年2月26日)
Log Message:
-----------
Add function getAutosplitWikiWords
Modified Paths:
--------------
 trunk/lib/WikiTheme.php
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2015年02月26日 13:45:20 UTC (rev 9566)
+++ trunk/lib/WikiTheme.php	2015年02月26日 13:58:41 UTC (rev 9567)
@@ -116,11 +116,11 @@
 foreach ($parts as $part) {
 $path[] = $part;
 $parent = join('/', $path);
- if ($WikiTheme->autosplitWikiWords)
+ if ($WikiTheme->getAutosplitWikiWords())
 $part = " " . $part;
 if ($part)
 $link->pushContent($WikiTheme->linkExistingWikiWord($parent, $sep . $part));
- $sep = $WikiTheme->autosplitWikiWords
+ $sep = $WikiTheme->getAutosplitWikiWords()
 ? ' ' . '/' : '/';
 }
 if ($exists)
@@ -651,6 +651,11 @@
 $this->autosplitWikiWords = $autosplit ? true : false;
 }
 
+ function getAutosplitWikiWords()
+ {
+ return $this->autosplitWikiWords;
+ }
+
 function maybeSplitWikiWord($wikiword)
 {
 if ($this->autosplitWikiWords)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9566
 http://sourceforge.net/p/phpwiki/code/9566
Author: vargenau
Date: 2015年02月26日 13:45:20 +0000 (2015年2月26日)
Log Message:
-----------
Make some class variables private
Modified Paths:
--------------
 trunk/lib/WikiTheme.php
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2015年02月26日 13:44:03 UTC (rev 9565)
+++ trunk/lib/WikiTheme.php	2015年02月26日 13:45:20 UTC (rev 9566)
@@ -116,11 +116,11 @@
 foreach ($parts as $part) {
 $path[] = $part;
 $parent = join('/', $path);
- if ($WikiTheme->_autosplitWikiWords)
+ if ($WikiTheme->autosplitWikiWords)
 $part = " " . $part;
 if ($part)
 $link->pushContent($WikiTheme->linkExistingWikiWord($parent, $sep . $part));
- $sep = $WikiTheme->_autosplitWikiWords
+ $sep = $WikiTheme->autosplitWikiWords
 ? ' ' . '/' : '/';
 }
 if ($exists)
@@ -360,11 +360,10 @@
 // http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_crt_strftime.2c_.wcsftime.asp
 // As a result, we have to use %d, and strip out leading zeros ourselves.
 
- public $_dateFormat = "%B %d, %Y";
- public $_timeFormat = "%I:%M %p";
+ private $dateFormat = "%B %d, %Y";
+ private $timeFormat = "%I:%M %p";
+ private $showModTime = true;
 
- public $_showModTime = true;
-
 /**
 * Set format string used for dates.
 *
@@ -376,8 +375,8 @@
 */
 function setDateFormat($fs, $show_mod_time = true)
 {
- $this->_dateFormat = $fs;
- $this->_showModTime = $show_mod_time;
+ $this->dateFormat = $fs;
+ $this->showModTime = $show_mod_time;
 }
 
 /**
@@ -387,7 +386,7 @@
 */
 function setTimeFormat($fs)
 {
- $this->_timeFormat = $fs;
+ $this->timeFormat = $fs;
 }
 
 /**
@@ -411,7 +410,7 @@
 // strip leading zeros from date elements (ie space followed by zero
 // or leading 0 as in French "09 mai 2009")
 return preg_replace('/ 0/', ' ', preg_replace('/^0/', ' ',
- strftime($this->_dateFormat, $offset_time)));
+ strftime($this->dateFormat, $offset_time)));
 }
 
 /**
@@ -435,7 +434,7 @@
 
 $offset_time = $time_t + 3600 * $request->getPref('timeOffset');
 return preg_replace('/^0/', ' ',
- strtolower(strftime($this->_timeFormat, $offset_time)));
+ strtolower(strftime($this->timeFormat, $offset_time)));
 }
 
 /**
@@ -518,7 +517,7 @@
 $show_version = !$revision->isCurrent();
 
 if ($request->getPref('relativeDates') && ($date = $this->_relativeDay($mtime))) {
- if ($this->_showModTime)
+ if ($this->showModTime)
 $date = sprintf(_("%s at %s"),
 $date, $this->formatTime($mtime));
 
@@ -528,7 +527,7 @@
 return fmt("Last edited on %s", $date);
 }
 
- if ($this->_showModTime)
+ if ($this->showModTime)
 $date = $this->formatDateTime($mtime);
 else
 $date = $this->formatDate($mtime);
@@ -645,26 +644,26 @@
 //
 ////////////////////////////////////////////////////////////////
 
- public $_autosplitWikiWords = false;
+ private $autosplitWikiWords = false;
 
 function setAutosplitWikiWords($autosplit = true)
 {
- $this->_autosplitWikiWords = $autosplit ? true : false;
+ $this->autosplitWikiWords = $autosplit ? true : false;
 }
 
 function maybeSplitWikiWord($wikiword)
 {
- if ($this->_autosplitWikiWords)
+ if ($this->autosplitWikiWords)
 return SplitPagename($wikiword);
 else
 return $wikiword;
 }
 
- public $_anonEditUnknownLinks = true;
+ private $anonEditUnknownLinks = true;
 
 function setAnonEditUnknownLinks($anonedit = true)
 {
- $this->_anonEditUnknownLinks = $anonedit ? true : false;
+ $this->anonEditUnknownLinks = $anonedit ? true : false;
 }
 
 function linkExistingWikiWord($wikiword, $linktext = '', $version = false)
@@ -720,7 +719,7 @@
 return $link;
 } else {
 // if AnonEditUnknownLinks show "?" only users which are allowed to edit this page
- if (!$this->_anonEditUnknownLinks and
+ if (!$this->anonEditUnknownLinks and
 (!$request->_user->isSignedIn()
 or !mayAccessPage('edit', $request->getArg('pagename')))
 ) {
@@ -782,7 +781,7 @@
 // Images and Icons
 //
 ////////////////////////////////////////////////////////////////
- public $_imageAliases = array();
+ private $imageAliases = array();
 
 /*
 *
@@ -791,16 +790,16 @@
 function addImageAlias($alias, $image_name)
 {
 // fall back to the PhpWiki-supplied image if not found
- if ((empty($this->_imageAliases[$alias])
+ if ((empty($this->imageAliases[$alias])
 and $this->_findFile("images/$image_name", true))
 or $image_name === false
 )
- $this->_imageAliases[$alias] = $image_name;
+ $this->imageAliases[$alias] = $image_name;
 }
 
 function getImageURL($image)
 {
- $aliases = &$this->_imageAliases;
+ $aliases = &$this->imageAliases;
 
 if (isset($aliases[$image])) {
 $image = $aliases[$image];
@@ -829,19 +828,19 @@
 return $path;
 }
 
- public $_linkIcons;
+ private $linkIcons;
 
 function setLinkIcon($proto, $image = false)
 {
 if (!$image)
 $image = $proto;
 
- $this->_linkIcons[$proto] = $image;
+ $this->linkIcons[$proto] = $image;
 }
 
 function getLinkIconURL($proto)
 {
- $icons = &$this->_linkIcons;
+ $icons = &$this->linkIcons;
 if (!empty($icons[$proto]))
 return $this->getImageURL($icons[$proto]);
 elseif (!empty($icons['*']))
@@ -849,25 +848,25 @@
 return false;
 }
 
- public $_linkIcon = 'front'; // or 'after' or 'no'.
+ private $linkIcon = 'front'; // or 'after' or 'no'.
 // maybe also 'spanall': there is a scheme currently in effect with front, which
 // spans the icon only to the first, to let the next words wrap on line breaks
 // see stdlib.php:PossiblyGlueIconToText()
 function getLinkIconAttr()
 {
- return $this->_linkIcon;
+ return $this->linkIcon;
 }
 
 function setLinkIconAttr($where)
 {
- $this->_linkIcon = $where;
+ $this->linkIcon = $where;
 }
 
- public $_buttonAliases;
+ private $buttonAliases;
 
 function addButtonAlias($text, $alias = false)
 {
- $aliases = &$this->_buttonAliases;
+ $aliases = &$this->buttonAliases;
 
 if (is_array($text))
 $aliases = array_merge($aliases, $text);
@@ -880,7 +879,7 @@
 
 function getButtonURL($text)
 {
- $aliases = &$this->_buttonAliases;
+ $aliases = &$this->buttonAliases;
 if (isset($aliases[$text]))
 $text = $aliases[$text];
 
@@ -908,14 +907,14 @@
 return $url;
 }
 
- public $_button_path;
+ private $button_path;
 
 function _findButton($button_file)
 {
- if (empty($this->_button_path))
- $this->_button_path = $this->_getButtonPath();
+ if (empty($this->button_path))
+ $this->button_path = $this->_getButtonPath();
 
- foreach ($this->_button_path as $dir) {
+ foreach ($this->button_path as $dir) {
 if ($path = $this->_findData("$dir/$button_file", 1))
 return $path;
 }
@@ -1169,16 +1168,16 @@
 }
 
 //----------------------------------------------------------------
- public $_buttonSeparator = "\n | ";
+ private $_buttonSeparator = "\n | ";
 
 function setButtonSeparator($separator)
 {
- $this->_buttonSeparator = $separator;
+ $this->buttonSeparator = $separator;
 }
 
 function getButtonSeparator()
 {
- return $this->_buttonSeparator;
+ return $this->buttonSeparator;
 }
 
 ////////////////////////////////////////////////////////////////
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9565
 http://sourceforge.net/p/phpwiki/code/9565
Author: vargenau
Date: 2015年02月26日 13:44:03 +0000 (2015年2月26日)
Log Message:
-----------
Add spacing between links
Modified Paths:
--------------
 trunk/themes/default/templates/wikiblog.tmpl
Modified: trunk/themes/default/templates/wikiblog.tmpl
===================================================================
--- trunk/themes/default/templates/wikiblog.tmpl	2015年02月26日 10:03:19 UTC (rev 9564)
+++ trunk/themes/default/templates/wikiblog.tmpl	2015年02月26日 13:44:03 UTC (rev 9565)
@@ -1,6 +1,7 @@
 <?php
 $CDATE = $WikiTheme->formatDateTime($BLOG_CTIME);
 $buttons = $modified = '';
+if (empty($SEP)) $SEP = ' - ';
 
 if ($user->isAdmin() or $user->getId() == $BLOG_CREATOR) {
 $buttons = HTML::small(array('class' => 'floatleft'),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9564
 http://sourceforge.net/p/phpwiki/code/9564
Author: vargenau
Date: 2015年02月26日 10:03:19 +0000 (2015年2月26日)
Log Message:
-----------
Update Help/CreateBibPlugin
Modified Paths:
--------------
 trunk/pgsrc/Help%2FCreateBibPlugin
Removed Paths:
-------------
 trunk/pgsrc/Mathematics
 trunk/pgsrc/MyBib
 trunk/pgsrc/Others
Modified: trunk/pgsrc/Help%2FCreateBibPlugin
===================================================================
--- trunk/pgsrc/Help%2FCreateBibPlugin	2015年02月26日 09:19:57 UTC (rev 9563)
+++ trunk/pgsrc/Help%2FCreateBibPlugin	2015年02月26日 10:03:19 UTC (rev 9564)
@@ -1,4 +1,4 @@
-Date: Thu, 5 Feb 2015 18:09:30 +0000
+Date: 2015年2月26日 11:01:49 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
 Content-Type: application/x-phpwiki;
 pagename=Help%2FCreateBibPlugin;
@@ -35,8 +35,6 @@
 <<CreateBib pagename="MyBib">>
 }}}
 
-<<CreateBib pagename="MyBib">>
-
 == Author ==
 * Lea Viljanen
 
Deleted: trunk/pgsrc/Mathematics
===================================================================
--- trunk/pgsrc/Mathematics	2015年02月26日 09:19:57 UTC (rev 9563)
+++ trunk/pgsrc/Mathematics	2015年02月26日 10:03:19 UTC (rev 9564)
@@ -1,23 +0,0 @@
-Date: Thu, 5 Feb 2015 18:09:30 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
-Content-Type: application/x-phpwiki;
- pagename=Mathematics
- flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
-== Mathematics ==
-
-Bla bla bla...
-
-<pre>
-@Book{abramowitz+stegun,
- author = "Milton {Abramowitz} and Irene A. {Stegun}",
- title = "Handbook of Mathematical Functions with
- Formulas, Graphs, and Mathematical Tables",
- publisher = "Dover",
- year = 1964,
- address = "New York",
- edition = "ninth Dover printing, tenth GPO printing"
-}
-</pre>
Deleted: trunk/pgsrc/MyBib
===================================================================
--- trunk/pgsrc/MyBib	2015年02月26日 09:19:57 UTC (rev 9563)
+++ trunk/pgsrc/MyBib	2015年02月26日 10:03:19 UTC (rev 9564)
@@ -1,11 +0,0 @@
-Date: Thu, 5 Feb 2015 18:09:30 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
-Content-Type: application/x-phpwiki;
- pagename=MyBib
- flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
-List of books
-* [[Mathematics]]
-* [[Others]]
Deleted: trunk/pgsrc/Others
===================================================================
--- trunk/pgsrc/Others	2015年02月26日 09:19:57 UTC (rev 9563)
+++ trunk/pgsrc/Others	2015年02月26日 10:03:19 UTC (rev 9564)
@@ -1,32 +0,0 @@
-Date: Thu, 5 Feb 2015 18:09:30 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
-Content-Type: application/x-phpwiki;
- pagename=Others
- flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
-== Others ==
-
-Bla bla bla...
-
-<pre>
-@Book{hicks2001,
- author = "von Hicks, III, Michael",
- title = "Design of a Carbon Fiber Composite Grid Structure for the GLAST
- Spacecraft Using a Novel Manufacturing Technique",
- publisher = "Stanford Press",
- year = 2001,
- address = "Palo Alto",
- edition = "1st",
- isbn = "0-69-697269-4"
-}
-
-@Book{Torre2008,
- author = "Joe Torre and Tom Verducci",
- publisher = "Doubleday",
- title = "The Yankee Years",
- year = 2008,
- isbn = "0385527403"
-}
-</pre>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9563
 http://sourceforge.net/p/phpwiki/code/9563
Author: vargenau
Date: 2015年02月26日 09:19:57 +0000 (2015年2月26日)
Log Message:
-----------
listRelations: remove duplicates
Modified Paths:
--------------
 trunk/SOAP.php
Modified: trunk/SOAP.php
===================================================================
--- trunk/SOAP.php	2015年02月25日 17:29:17 UTC (rev 9562)
+++ trunk/SOAP.php	2015年02月26日 09:19:57 UTC (rev 9563)
@@ -326,9 +326,10 @@
 $also_attributes = $option & 2;
 $only_attributes = $option & 2 and !($option & 1);
 $sorted = !($option & 4);
- return $dbi->listRelations($also_attributes,
+ $relations = $dbi->listRelations($also_attributes,
 $only_attributes,
 $sorted);
+ return array_keys(array_flip($relations)); // Remove duplicates
 }
 
 // some basic semantic search
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9562
 http://sourceforge.net/p/phpwiki/code/9562
Author: vargenau
Date: 2015年02月25日 17:29:17 +0000 (2015年2月25日)
Log Message:
-----------
Fix WSDL for metadata: hits, date, locked
Modified Paths:
--------------
 trunk/PhpWiki.wsdl
Modified: trunk/PhpWiki.wsdl
===================================================================
--- trunk/PhpWiki.wsdl	2015年02月25日 15:07:06 UTC (rev 9561)
+++ trunk/PhpWiki.wsdl	2015年02月25日 17:29:17 UTC (rev 9562)
@@ -135,11 +135,9 @@
 </xsd:complexType>
 <xsd:complexType name="PageMetadata">
 <xsd:all>
- <xsd:element name="createdby" type="xsd:string"/>
- <xsd:element name="lastauthor" type="xsd:string"/>
- <xsd:element name="ctime" type="xsd:int"/>
- <xsd:element name="mtime" type="xsd:int"/>
- <xsd:element name="atime" type="xsd:int"/>
+ <xsd:element name="hits" type="xsd:int"/>
+ <xsd:element name="date" type="xsd:int"/>
+ <xsd:element name="locked" type="xsd:string"/>
 </xsd:all>
 </xsd:complexType>
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9561
 http://sourceforge.net/p/phpwiki/code/9561
Author: vargenau
Date: 2015年02月25日 15:07:06 +0000 (2015年2月25日)
Log Message:
-----------
Add BlogArchives, BlogJournal, WikiBlog for Fusionforge
Modified Paths:
--------------
 trunk/lib/IniConfig.php
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2015年02月25日 15:06:23 UTC (rev 9560)
+++ trunk/lib/IniConfig.php	2015年02月25日 15:07:06 UTC (rev 9561)
@@ -583,7 +583,7 @@
 // All pages containing plugins of the same name as the filename
 $ActionPages = explode(':',
 'AllPages:AllUsers:AppendText:AuthorHistory:'
- . 'BackLinks:'
+ . 'BackLinks:BlogArchives:BlogJournal:'
 . 'CreatePage:'
 . 'FullTextSearch:FuzzyPages:'
 . 'LikePages:LinkDatabase:LinkSearch:ListRelations:'
@@ -597,15 +597,13 @@
 . 'TitleSearch:'
 . 'UpLoad:UserPreferences:'
 . 'UserRatings:' // UserRatings works only in wikilens derived themes
- . 'WantedPages:WatchPage:WhoIsOnline:WikiAdminSelect');
+ . 'WantedPages:WatchPage:WikiBlog:WhoIsOnline:WikiAdminSelect');
 
 // The FUSIONFORGE theme omits them
 if (!(defined('FUSIONFORGE') && FUSIONFORGE)) {
 // Add some some action pages
 $ActionPages[] = 'DebugInfo';
 $ActionPages[] = 'SpellCheck'; // SpellCheck does not work
- $ActionPages[] = 'BlogArchives';
- $ActionPages[] = 'BlogJournal';
 $ActionPages[] = 'EditMetaData';
 $ActionPages[] = 'InterWikiSearch';
 $ActionPages[] = 'LdapSearch';
@@ -613,7 +611,6 @@
 $ActionPages[] = 'RecentComments';
 $ActionPages[] = 'TranslateText';
 $ActionPages[] = 'UriResolver';
- $ActionPages[] = 'WikiBlog';
 }
 
 global $AllAllowedPlugins;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9560
 http://sourceforge.net/p/phpwiki/code/9560
Author: vargenau
Date: 2015年02月25日 15:06:23 +0000 (2015年2月25日)
Log Message:
-----------
Remove debug code
Modified Paths:
--------------
 trunk/lib/ErrorManager.php
Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php	2015年02月25日 15:05:31 UTC (rev 9559)
+++ trunk/lib/ErrorManager.php	2015年02月25日 15:06:23 UTC (rev 9560)
@@ -631,9 +631,8 @@
 $lines = explode("\n", $this->errstr);
 elseif (is_object($this->errstr))
 $lines = array($this->errstr->asXML());
- $errtype = (DEBUG & _DEBUG_VERBOSE) ? sprintf("%s[%d]", $this->getDescription(), $this->errno)
- : sprintf("%s", $this->getDescription());
- if ((DEBUG & _DEBUG_VERBOSE) or $this->isFatal()) {
+ $errtype = sprintf("%s", $this->getDescription());
+ if ($this->isFatal()) {
 $msg = sprintf("%s:%d %s: %s %s",
 $errfile, $this->errline,
 $errtype,
@@ -646,8 +645,7 @@
 array_shift($lines),
 $count > 1 ? sprintf(" (...repeated %d times)", $count) : "");
 }
- $html = HTML::div(array('class' => $this->getHtmlClass()),
- HTML::p($msg));
+ $html = HTML::div(array('class' => $this->getHtmlClass()), HTML::p($msg));
 if ($lines) {
 $list = HTML::ul();
 foreach ($lines as $line)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9559
 http://sourceforge.net/p/phpwiki/code/9559
Author: vargenau
Date: 2015年02月25日 15:05:31 +0000 (2015年2月25日)
Log Message:
-----------
Remove useless error handling code
Modified Paths:
--------------
 trunk/lib/WikiDB/backend/PearDB_pgsql.php
Modified: trunk/lib/WikiDB/backend/PearDB_pgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_pgsql.php	2015年02月25日 15:02:48 UTC (rev 9558)
+++ trunk/lib/WikiDB/backend/PearDB_pgsql.php	2015年02月25日 15:05:31 UTC (rev 9559)
@@ -5,7 +5,6 @@
 
 if (!defined("USE_BYTEA")) // see schemas/psql-initialize.sql
 define("USE_BYTEA", true);
-//define("USE_BYTEA", false);
 
 /*
 Since 1.3.12 changed to use:
@@ -17,34 +16,6 @@
 class WikiDB_backend_PearDB_pgsql
 extends WikiDB_backend_PearDB
 {
- function __construct($dbparams)
- {
- // The pgsql handler of (at least my version of) the PEAR::DB
- // library generates three warnings when a database is opened:
- //
- // Undefined index: options
- // Undefined index: tty
- // Undefined index: port
- //
- // This stuff is all just to catch and ignore these warnings,
- // so that they don't get reported to the user. (They are
- // not consequential.)
-
- global $ErrorManager;
- $ErrorManager->pushErrorHandler(new WikiMethodCb($this, '_pgsql_open_error'));
- parent::__construct($dbparams);
- $ErrorManager->popErrorHandler();
- }
-
- function _pgsql_open_error($error)
- {
- if (preg_match('/^Undefined\s+index:\s+(options|tty|port)/',
- $error->errstr)
- )
- return true; // Ignore error
- return false;
- }
-
 /**
 * Pack tables.
 * NOTE: Only the table owner can do this. Either fix the schema or setup autovacuum.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9558
 http://sourceforge.net/p/phpwiki/code/9558
Author: vargenau
Date: 2015年02月25日 15:02:48 +0000 (2015年2月25日)
Log Message:
-----------
Use plainto_tsquery
Modified Paths:
--------------
 trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2015年02月24日 15:21:23 UTC (rev 9557)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2015年02月25日 15:02:48 UTC (rev 9558)
@@ -621,9 +621,9 @@
 $search_string = str_replace('%', '', $search_string);
 $search_clause = "substring(plugin_wiki_page.pagename from 0 for $len) = '$pat') AND (";
 
- $search_clause .= "idxFTI @@ to_tsquery('english', '$search_string')";
+ $search_clause .= "idxFTI @@ plainto_tsquery('english', '$search_string')";
 if (!$orderby)
- $orderby = " ORDER BY ts_rank(idxFTI, to_tsquery('english', '$search_string')) DESC";
+ $orderby = " ORDER BY ts_rank(idxFTI, plainto_tsquery('english', '$search_string')) DESC";
 } else {
 $callback = new WikiMethodCb($searchobj, "_pagename_match_clause");
 $search_clause = "substring(plugin_wiki_page.pagename from 0 for $len) = '$pat') AND (";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9557
 http://sourceforge.net/p/phpwiki/code/9557
Author: vargenau
Date: 2015年02月24日 15:21:23 +0000 (2015年2月24日)
Log Message:
-----------
Avoid useless warning
Modified Paths:
--------------
 trunk/lib/CachedMarkup.php
Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php	2015年02月20日 16:51:20 UTC (rev 9556)
+++ trunk/lib/CachedMarkup.php	2015年02月24日 15:21:23 UTC (rev 9557)
@@ -226,10 +226,6 @@
 $val = $item->expand($basepage, $this);
 if ($val) {
 $val->printXML();
- } else {
- if (DEBUG) {
- trigger_error('empty item ' . print_r($item, true));
- }
 }
 } else {
 $item->printXML();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9556
 http://sourceforge.net/p/phpwiki/code/9556
Author: vargenau
Date: 2015年02月20日 16:51:20 +0000 (2015年2月20日)
Log Message:
-----------
Update ReleaseNotes
Modified Paths:
--------------
 trunk/pgsrc/ReleaseNotes
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2015年02月20日 16:13:26 UTC (rev 9555)
+++ trunk/pgsrc/ReleaseNotes	2015年02月20日 16:51:20 UTC (rev 9556)
@@ -1,4 +1,4 @@
-Date: 2015年2月20日 17:12:57 +0000
+Date: 2015年2月20日 17:50:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
 Content-Type: application/x-phpwiki;
 pagename=ReleaseNotes;
@@ -17,10 +17,12 @@
 * test again for function 'posix_times', it does not exist on Windows (reported by jdebert)
 * remove FPDF, lib/gif.php, lib/font (were not used)
 * rename plugin _Retransform to ~DebugRetransform
-* use PHP ZIP class instead of home-made functions
+* use PHP ZIP class instead of home-made functions. ziplib renamed to mimelib
 * add SOAP scripts
 * rename FCKeditor to CKeditor
 * load theme pgsrc, if it exists
+* SUBPAGE_SEPARATOR removed, it must be '/'
+* RateIt plugin for Fusionforge
 
 == 1.5.2 2014年10月10日 Marc-Etienne Vargenau ==
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9555
 http://sourceforge.net/p/phpwiki/code/9555
Author: vargenau
Date: 2015年02月20日 16:13:26 +0000 (2015年2月20日)
Log Message:
-----------
Update ReleaseNotes
Modified Paths:
--------------
 trunk/pgsrc/ReleaseNotes
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2015年02月20日 16:10:50 UTC (rev 9554)
+++ trunk/pgsrc/ReleaseNotes	2015年02月20日 16:13:26 UTC (rev 9555)
@@ -1,4 +1,4 @@
-Date: 2015年2月12日 11:04:21 +0000
+Date: 2015年2月20日 17:12:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
 Content-Type: application/x-phpwiki;
 pagename=ReleaseNotes;
@@ -15,11 +15,12 @@
 * improve handling of image insertion icon in edit toolbar (icon did not always appear after image uploading)
 * bigger wikipaging font
 * test again for function 'posix_times', it does not exist on Windows (reported by jdebert)
-* remove FPDF, lib/gif.php, lib/font (was not used)
+* remove FPDF, lib/gif.php, lib/font (were not used)
 * rename plugin _Retransform to ~DebugRetransform
 * use PHP ZIP class instead of home-made functions
 * add SOAP scripts
 * rename FCKeditor to CKeditor
+* load theme pgsrc, if it exists
 
 == 1.5.2 2014年10月10日 Marc-Etienne Vargenau ==
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9554
 http://sourceforge.net/p/phpwiki/code/9554
Author: vargenau
Date: 2015年02月20日 16:10:50 +0000 (2015年2月20日)
Log Message:
-----------
Load theme pgsrc, if it exists
Modified Paths:
--------------
 trunk/lib/loadsave.php
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2015年02月19日 15:49:32 UTC (rev 9553)
+++ trunk/lib/loadsave.php	2015年02月20日 16:10:50 UTC (rev 9554)
@@ -1479,9 +1479,6 @@
 * HomePage was not found so first-time install is supposed to run.
 * - import all pgsrc pages.
 * - Todo: installer interface to edit config/config.ini settings
- * - Todo: ask for existing old index.php to convert to config/config.ini
- * - Todo: theme-specific pages:
- * blog - HomePage, ADMIN_USER/Blogs
 */
 function SetupWiki(&$request)
 {
@@ -1501,13 +1498,19 @@
 
 $pgsrc = FindLocalizedFile(WIKI_PGSRC);
 $default_pgsrc = FindFile(DEFAULT_WIKI_PGSRC);
+ $theme_pgsrc = FindFile("themes/".THEME."/".WIKI_PGSRC, true);
 
 $request->setArg('overwrite', true);
+ // Load theme pgsrc, if it exists
+ if ($theme_pgsrc) {
+ LoadAny($request, $theme_pgsrc);
+ }
 if ($default_pgsrc != $pgsrc) {
 LoadAny($request, $default_pgsrc, $GenericPages);
 }
 $request->setArg('overwrite', false);
 LoadAny($request, $pgsrc);
+
 $dbi =& $request->_dbi;
 
 // Ensure that all mandatory pages are loaded
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9553
 http://sourceforge.net/p/phpwiki/code/9553
Author: vargenau
Date: 2015年02月19日 15:49:32 +0000 (2015年2月19日)
Log Message:
-----------
No str_replace
Modified Paths:
--------------
 trunk/SOAP.php
Modified: trunk/SOAP.php
===================================================================
--- trunk/SOAP.php	2015年02月19日 11:49:07 UTC (rev 9552)
+++ trunk/SOAP.php	2015年02月19日 15:49:32 UTC (rev 9553)
@@ -120,11 +120,8 @@
 {
 global $server;
 checkCredentials($server, $credentials, 'view', $pagename);
- // if (!mayAccessPage('view', $pagename))
- // $server->fault(401, '', "no permission");
 $dbi = WikiDB::open($GLOBALS['DBParams']);
 $page = $dbi->getPage($pagename);
- // $rev = $page->getCurrentRevision();
 $version = $page->getVersion();
 return (double)$version;
 }
@@ -282,7 +279,7 @@
 $desc = $p->getArgumentsDescription();
 $desc = str_replace("<br />", ' ', $desc->asXML());
 if ($desc)
- $plugin_args = ' ' . str_replace($src, $replace, $desc);
+ $plugin_args = ' ' . $desc;
 $synopsis = "<<" . $pluginname . $plugin_args . ">>";
 }
 return $synopsis;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.