Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[8392] trunk/lib/upgrade.php
|
From: <var...@us...> - 2012-10-05 11:53:17
|
Revision: 8392
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8392&view=rev
Author: vargenau
Date: 2012-10-05 11:53:09 +0000 (Fri, 05 Oct 2012)
Log Message:
-----------
Reformat code
Modified Paths:
--------------
trunk/lib/upgrade.php
Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php 2012-10-02 14:59:08 UTC (rev 8391)
+++ trunk/lib/upgrade.php 2012-10-05 11:53:09 UTC (rev 8392)
@@ -42,110 +42,115 @@
* 5. Check for changed theme variables. (hard, not yet)
* 6. Convert the single-request upgrade to a class-based multi-page
* version. (hard)
-
+ *
* Done: overwrite=1 link on edit conflicts at first occurence "Overwrite all".
*
* @author: Reini Urban
*/
require_once 'lib/loadsave.php';
-class Upgrade {
+class Upgrade
+{
- function Upgrade (&$request) {
- $this->request =& $request;
- $this->dbi =& $request->_dbi; // no reference for dbadmin ?
- $this->phpwiki_version = $this->current_db_version = phpwiki_version();
- //$this->current_db_version = 1030.13; // should be stored in the db. should be phpwiki_version
+ function Upgrade(&$request)
+ {
+ $this->request =& $request;
+ $this->dbi =& $request->_dbi; // no reference for dbadmin ?
+ $this->phpwiki_version = $this->current_db_version = phpwiki_version();
+ //$this->current_db_version = 1030.13; // should be stored in the db. should be phpwiki_version
- $this->db_version = $this->dbi->get_db_version();
- $this->isSQL = $this->dbi->_backend->isSQL();
+ $this->db_version = $this->dbi->get_db_version();
+ $this->isSQL = $this->dbi->_backend->isSQL();
}
/**
* TODO: check for the pgsrc_version number, not the revision mtime only
*/
- function doPgsrcUpdate($pagename, $path, $filename) {
- // don't ever update the HomePage
- if ((defined(HOME_PAGE) and ($pagename == HOME_PAGE))
- or ($pagename == _("HomePage"))
- or ($pagename == "HomePage")) {
- echo "$path/$pagename: ",_("always skip the HomePage."),
- _(" Skipped"),".<br />\n";
+ function doPgsrcUpdate($pagename, $path, $filename)
+ {
+ // don't ever update the HomePage
+ if ((defined(HOME_PAGE) and ($pagename == HOME_PAGE))
+ or ($pagename == _("HomePage"))
+ or ($pagename == "HomePage")
+ ) {
+ echo "$path/$pagename: ", _("always skip the HomePage."),
+ _(" Skipped"), ".<br />\n";
return;
- }
+ }
- $page = $this->dbi->getPage($pagename);
- if ($page->exists()) {
- // check mtime: update automatically if pgsrc is newer
- $rev = $page->getCurrentRevision();
- $page_mtime = $rev->get('mtime');
- $data = implode("", file($path."/".$filename));
- if (($parts = ParseMimeifiedPages($data))) {
- usort($parts, 'SortByPageVersion');
- reset($parts);
- $pageinfo = $parts[0];
- $stat = stat($path."/".$filename);
- $new_mtime = 0;
- if (isset($pageinfo['versiondata']['mtime']))
- $new_mtime = $pageinfo['versiondata']['mtime'];
- if (!$new_mtime and isset($pageinfo['versiondata']['lastmodified']))
- $new_mtime = $pageinfo['versiondata']['lastmodified'];
- if (!$new_mtime and isset($pageinfo['pagedata']['date']))
- $new_mtime = $pageinfo['pagedata']['date'];
- if (!$new_mtime)
- $new_mtime = $stat[9];
- if ($new_mtime > $page_mtime) {
- echo "$path/$pagename: ",_("newer than the existing page."),
- _(" replace "),"($new_mtime > $page_mtime)","<br />\n";
- LoadAny($this->request, $path."/".$filename);
+ $page = $this->dbi->getPage($pagename);
+ if ($page->exists()) {
+ // check mtime: update automatically if pgsrc is newer
+ $rev = $page->getCurrentRevision();
+ $page_mtime = $rev->get('mtime');
+ $data = implode("", file($path . "/" . $filename));
+ if (($parts = ParseMimeifiedPages($data))) {
+ usort($parts, 'SortByPageVersion');
+ reset($parts);
+ $pageinfo = $parts[0];
+ $stat = stat($path . "/" . $filename);
+ $new_mtime = 0;
+ if (isset($pageinfo['versiondata']['mtime']))
+ $new_mtime = $pageinfo['versiondata']['mtime'];
+ if (!$new_mtime and isset($pageinfo['versiondata']['lastmodified']))
+ $new_mtime = $pageinfo['versiondata']['lastmodified'];
+ if (!$new_mtime and isset($pageinfo['pagedata']['date']))
+ $new_mtime = $pageinfo['pagedata']['date'];
+ if (!$new_mtime)
+ $new_mtime = $stat[9];
+ if ($new_mtime > $page_mtime) {
+ echo "$path/$pagename: ", _("newer than the existing page."),
+ _(" replace "), "($new_mtime > $page_mtime)", "<br />\n";
+ LoadAny($this->request, $path . "/" . $filename);
+ echo "<br />\n";
+ } else {
+ echo "$path/$pagename: ", _("older than the existing page."),
+ _(" Skipped"), ".<br />\n";
+ }
+ } else {
+ echo "$path/$pagename: ", _("unknown format."),
+ _(" Skipped"), ".<br />\n";
+ }
+ } else {
+ echo sprintf(_("%s does not exist"), $pagename), "<br />\n";
+ LoadAny($this->request, $path . "/" . $filename);
echo "<br />\n";
- } else {
- echo "$path/$pagename: ",_("older than the existing page."),
- _(" Skipped"),".<br />\n";
}
- } else {
- echo "$path/$pagename: ",_("unknown format."),
- _(" Skipped"),".<br />\n";
- }
- } else {
- echo sprintf(_("%s does not exist"),$pagename),"<br />\n";
- LoadAny($this->request, $path."/".$filename);
- echo "<br />\n";
}
- }
- function CheckActionPageUpdate() {
- echo "<h3>",sprintf(_("Check for necessary %s updates"),
- _("ActionPage")),"</h3>\n";
- // 1.3.13 before we pull in all missing pages, we rename existing ones
- $this->_rename_page_helper(_("_AuthInfo"), _("DebugAuthInfo"));
- // this is in some templates. so we keep the old name
- //$this->_rename_page_helper($this->dbi, _("DebugInfo"), _("DebugBackendInfo"));
- $this->_rename_page_helper(_("_GroupInfo"), _("GroupAuthInfo")); //never officially existed
- $this->_rename_page_helper("InterWikiKarte", "InterWikiListe"); // german only
+ function CheckActionPageUpdate()
+ {
+ echo "<h2>", sprintf(_("Check for necessary %s updates"),
+ _("ActionPage")), "</h2>\n";
+ // 1.3.13 before we pull in all missing pages, we rename existing ones
+ $this->_rename_page_helper(_("_AuthInfo"), _("DebugAuthInfo"));
+ // this is in some templates. so we keep the old name
+ //$this->_rename_page_helper($this->dbi, _("DebugInfo"), _("DebugBackendInfo"));
+ $this->_rename_page_helper(_("_GroupInfo"), _("GroupAuthInfo")); //never officially existed
+ $this->_rename_page_helper("InterWikiKarte", "InterWikiListe"); // german only
- $path = FindFile('pgsrc');
- $pgsrc = new fileSet($path);
- // most actionpages have the same name as the plugin
- $loc_path = FindLocalizedFile('pgsrc');
- foreach ($pgsrc->getFiles() as $filename) {
- if (substr($filename,-1,1) == '~') continue;
- if (substr($filename,-5,5) == '.orig') continue;
- $pagename = urldecode($filename);
- if (isActionPage($pagename)) {
- $translation = gettext($pagename);
- if ($translation == $pagename)
- $this->doPgsrcUpdate($pagename, $path, $filename);
- elseif (FindLocalizedFile('pgsrc/'.urlencode($translation),1))
- $this->doPgsrcUpdate($translation, $loc_path, urlencode($translation));
- else
- $this->doPgsrcUpdate($pagename, $path, $filename);
+ $path = FindFile('pgsrc');
+ $pgsrc = new fileSet($path);
+ // most actionpages have the same name as the plugin
+ $loc_path = FindLocalizedFile('pgsrc');
+ foreach ($pgsrc->getFiles() as $filename) {
+ if (substr($filename, -1, 1) == '~') continue;
+ if (substr($filename, -5, 5) == '.orig') continue;
+ $pagename = urldecode($filename);
+ if (isActionPage($pagename)) {
+ $translation = gettext($pagename);
+ if ($translation == $pagename)
+ $this->doPgsrcUpdate($pagename, $path, $filename);
+ elseif (FindLocalizedFile('pgsrc/' . urlencode($translation), 1))
+ $this->doPgsrcUpdate($translation, $loc_path, urlencode($translation)); else
+ $this->doPgsrcUpdate($pagename, $path, $filename);
+ }
}
}
- }
// see loadsave.php for saving new pages.
- function CheckPgsrcUpdate() {
+ function CheckPgsrcUpdate()
+ {
// Check some theme specific pgsrc files (blog, wikilens, fusionforge, custom).
// We check theme specific pgsrc first in case the page is present in both
// theme specific and global pgsrc
@@ -155,27 +160,27 @@
// Notice: Unable to open directory 'themes/MonoBook/pgsrc' for reading
$pgsrc = new fileSet($path);
if ($pgsrc->getFiles()) {
- echo "<h3>",sprintf(_("Check for necessary theme %s updates"),
- "pgsrc"),"</h3>\n";
+ echo "<h2>", sprintf(_("Check for necessary theme %s updates"),
+ "pgsrc"), "</h2>\n";
foreach ($pgsrc->getFiles() as $filename) {
- if (substr($filename,-1,1) == '~') continue;
- if (substr($filename,-5,5) == '.orig') continue;
+ if (substr($filename, -1, 1) == '~') continue;
+ if (substr($filename, -5, 5) == '.orig') continue;
$pagename = urldecode($filename);
- $this->doPgsrcUpdate($pagename,$path,$filename);
+ $this->doPgsrcUpdate($pagename, $path, $filename);
}
}
- echo "<h3>",sprintf(_("Check for necessary %s updates"),
- "pgsrc"),"</h3>\n";
+ echo "<h2>", sprintf(_("Check for necessary %s updates"),
+ "pgsrc"), "</h2>\n";
if ($this->db_version < 1030.12200612) {
- echo "<h4>",_("rename to Help: pages"),"</h4>\n";
+ echo "<h4>", _("rename to Help: pages"), "</h4>\n";
}
$path = FindLocalizedFile(WIKI_PGSRC);
$pgsrc = new fileSet($path);
// fixme: verification, ...
foreach ($pgsrc->getFiles() as $filename) {
- if (substr($filename,-1,1) == '~') continue;
- if (substr($filename,-5,5) == '.orig') continue;
+ if (substr($filename, -1, 1) == '~') continue;
+ if (substr($filename, -5, 5) == '.orig') continue;
$pagename = urldecode($filename);
if (!isActionPage($filename)) {
// There're a lot of now unneeded pages around.
@@ -183,29 +188,31 @@
if ($this->db_version < 1030.12200612) {
$this->_rename_to_help_page($pagename);
}
- $this->doPgsrcUpdate($pagename,$path,$filename);
+ $this->doPgsrcUpdate($pagename, $path, $filename);
}
}
}
- function _rename_page_helper($oldname, $pagename) {
- echo sprintf(_("rename %s to %s"), $oldname, $pagename)," ...";
- if ($this->dbi->isWikiPage($oldname) and !$this->dbi->isWikiPage($pagename)) {
- if ($this->dbi->_backend->rename_page($oldname, $pagename))
- echo _("OK")," <br />\n";
- else
- echo " <b><font color=\"red\">", _("FAILED"), "</font></b>",
- " <br />\n";
- } else {
- echo _(" Skipped")," <br />\n";
+ function _rename_page_helper($oldname, $pagename)
+ {
+ echo sprintf(_("rename %s to %s"), $oldname, $pagename), " ...";
+ if ($this->dbi->isWikiPage($oldname) and !$this->dbi->isWikiPage($pagename)) {
+ if ($this->dbi->_backend->rename_page($oldname, $pagename))
+ echo _("OK"), " <br />\n";
+ else
+ echo " <b><font color=\"red\">", _("FAILED"), "</font></b>",
+ " <br />\n";
+ } else {
+ echo _(" Skipped"), " <br />\n";
+ }
}
- }
- function _rename_to_help_page($pagename) {
- $newprefix = _("Help") . "/";
- if (substr($pagename,0,strlen($newprefix)) != $newprefix) return;
- $oldname = substr($pagename,strlen($newprefix));
- $this->_rename_page_helper($oldname, $pagename);
+ function _rename_to_help_page($pagename)
+ {
+ $newprefix = _("Help") . "/";
+ if (substr($pagename, 0, strlen($newprefix)) != $newprefix) return;
+ $oldname = substr($pagename, strlen($newprefix));
+ $this->_rename_page_helper($oldname, $pagename);
}
/**
@@ -213,26 +220,27 @@
* and create it.
* Supported: mysql and generic SQL, for ADODB and PearDB.
*/
- function installTable($table, $backend_type) {
- global $DBParams;
- if (!$this->isSQL) return;
- echo _("MISSING")," ... \n";
- $backend = &$this->dbi->_backend->_dbh;
- /*
- $schema = findFile("schemas/${backend_type}.sql");
- if (!$schema) {
- echo " ",_("FAILED"),": ",sprintf(_("no schema %s found"),
- "schemas/${backend_type}.sql")," ... <br />\n";
- return false;
- }
- */
- extract($this->dbi->_backend->_table_names);
- $prefix = isset($DBParams['prefix']) ? $DBParams['prefix'] : '';
- switch ($table) {
- case 'session':
- assert($session_tbl);
- if ($backend_type == 'mysql') {
- $this->dbi->genericSqlQuery("
+ function installTable($table, $backend_type)
+ {
+ global $DBParams;
+ if (!$this->isSQL) return;
+ echo _("MISSING"), " ... \n";
+ $backend = &$this->dbi->_backend->_dbh;
+ /*
+ $schema = findFile("schemas/${backend_type}.sql");
+ if (!$schema) {
+ echo " ",_("FAILED"),": ",sprintf(_("no schema %s found"),
+ "schemas/${backend_type}.sql")," ... <br />\n";
+ return false;
+ }
+ */
+ extract($this->dbi->_backend->_table_names);
+ $prefix = isset($DBParams['prefix']) ? $DBParams['prefix'] : '';
+ switch ($table) {
+ case 'session':
+ assert($session_tbl);
+ if ($backend_type == 'mysql') {
+ $this->dbi->genericSqlQuery("
CREATE TABLE $session_tbl (
sess_id CHAR(32) NOT NULL DEFAULT '',
sess_data BLOB NOT NULL,
@@ -241,63 +249,63 @@
PRIMARY KEY (sess_id),
INDEX (sess_date)
)");
- } else {
- $this->dbi->genericSqlQuery("
+ } else {
+ $this->dbi->genericSqlQuery("
CREATE TABLE $session_tbl (
sess_id CHAR(32) NOT NULL DEFAULT '',
- sess_data ".($backend_type == 'pgsql'?'TEXT':'BLOB')." NOT NULL,
+ sess_data " . ($backend_type == 'pgsql' ? 'TEXT' : 'BLOB') . " NOT NULL,
sess_date INT,
sess_ip CHAR(15) NOT NULL
)");
- $this->dbi->genericSqlQuery("CREATE UNIQUE INDEX sess_id ON $session_tbl (sess_id)");
- }
- $this->dbi->genericSqlQuery("CREATE INDEX sess_date on session (sess_date)");
- echo " ",_("CREATED");
- break;
- case 'pref':
- $pref_tbl = $prefix.'pref';
- if ($backend_type == 'mysql') {
- $this->dbi->genericSqlQuery("
+ $this->dbi->genericSqlQuery("CREATE UNIQUE INDEX sess_id ON $session_tbl (sess_id)");
+ }
+ $this->dbi->genericSqlQuery("CREATE INDEX sess_date on session (sess_date)");
+ echo " ", _("CREATED");
+ break;
+ case 'pref':
+ $pref_tbl = $prefix . 'pref';
+ if ($backend_type == 'mysql') {
+ $this->dbi->genericSqlQuery("
CREATE TABLE $pref_tbl (
userid CHAR(48) BINARY NOT NULL UNIQUE,
prefs TEXT NULL DEFAULT '',
PRIMARY KEY (userid)
)");
- } else {
- $this->dbi->genericSqlQuery("
+ } else {
+ $this->dbi->genericSqlQuery("
CREATE TABLE $pref_tbl (
userid CHAR(48) NOT NULL,
prefs TEXT NULL DEFAULT ''
)");
- $this->dbi->genericSqlQuery("CREATE UNIQUE INDEX userid ON $pref_tbl (userid)");
- }
- echo " ",_("CREATED");
- break;
- case 'member':
- $member_tbl = $prefix.'member';
- if ($backend_type == 'mysql') {
- $this->dbi->genericSqlQuery("
+ $this->dbi->genericSqlQuery("CREATE UNIQUE INDEX userid ON $pref_tbl (userid)");
+ }
+ echo " ", _("CREATED");
+ break;
+ case 'member':
+ $member_tbl = $prefix . 'member';
+ if ($backend_type == 'mysql') {
+ $this->dbi->genericSqlQuery("
CREATE TABLE $member_tbl (
userid CHAR(48) BINARY NOT NULL,
groupname CHAR(48) BINARY NOT NULL DEFAULT 'users',
INDEX (userid),
INDEX (groupname)
)");
- } else {
- $this->dbi->genericSqlQuery("
+ } else {
+ $this->dbi->genericSqlQuery("
CREATE TABLE $member_tbl (
userid CHAR(48) NOT NULL,
groupname CHAR(48) NOT NULL DEFAULT 'users'
)");
- $this->dbi->genericSqlQuery("CREATE INDEX userid ON $member_tbl (userid)");
- $this->dbi->genericSqlQuery("CREATE INDEX groupname ON $member_tbl (groupname)");
- }
- echo " ",_("CREATED");
- break;
- case 'rating':
- $rating_tbl = $prefix.'rating';
- if ($backend_type == 'mysql') {
- $this->dbi->genericSqlQuery("
+ $this->dbi->genericSqlQuery("CREATE INDEX userid ON $member_tbl (userid)");
+ $this->dbi->genericSqlQuery("CREATE INDEX groupname ON $member_tbl (groupname)");
+ }
+ echo " ", _("CREATED");
+ break;
+ case 'rating':
+ $rating_tbl = $prefix . 'rating';
+ if ($backend_type == 'mysql') {
+ $this->dbi->genericSqlQuery("
CREATE TABLE $rating_tbl (
dimension INT(4) NOT NULL,
raterpage INT(11) NOT NULL,
@@ -307,8 +315,8 @@
tstamp TIMESTAMP(14) NOT NULL,
PRIMARY KEY (dimension, raterpage, rateepage)
)");
- } else {
- $this->dbi->genericSqlQuery("
+ } else {
+ $this->dbi->genericSqlQuery("
CREATE TABLE $rating_tbl (
dimension INT(4) NOT NULL,
raterpage INT(11) NOT NULL,
@@ -317,38 +325,38 @@
rateeversion INT(11) NOT NULL,
tstamp TIMESTAMP(14) NOT NULL
)");
- $this->dbi->genericSqlQuery("CREATE UNIQUE INDEX rating"
- ." ON $rating_tbl (dimension, raterpage, rateepage)");
- }
- echo " ",_("CREATED");
- break;
- case 'accesslog':
- $log_tbl = $prefix.'accesslog';
- // fields according to http://www.outoforder.cc/projects/apache/mod_log_sql/docs-2.0/#id2756178
- /*
- A User Agent agent varchar(255) Mozilla/4.0 (compat; MSIE 6.0; Windows)
- a CGi request arguments request_args varchar(255) user=Smith&cart=1231&item=532
- b Bytes transfered bytes_sent int unsigned 32561
- c??? Text of cookie cookie varchar(255) Apache=sdyn.fooonline.net 1300102700823
- f Local filename requested request_file varchar(255) /var/www/html/books-cycroad.html
- H HTTP request_protocol request_protocol varchar(10) HTTP/1.1
- h Name of remote host remote_host varchar(50) blah.foobar.com
- I Request ID (from modd_unique_id) id char(19) POlFcUBRH30AAALdBG8
- l Ident user info remote_logname varcgar(50) bobby
- M Machine ID??? machine_id varchar(25) web01
- m HTTP request method request_method varchar(10) GET
- P httpd cchild PID child_pid smallint unsigned 3215
- p http port server_port smallint unsigned 80
- R Referer referer varchar(255) http://www.biglinks4u.com/linkpage.html
- r Request in full form request_line varchar(255) GET /books-cycroad.html HTTP/1.1
- S Time of request in UNIX time_t format time_stamp int unsigned 1005598029
- T Seconds to service request request_duration smallint unsigned 2
- t Time of request in human format request_time char(28) [02/Dec/2001:15:01:26 -0800]
- U Request in simple form request_uri varchar(255) /books-cycroad.html
- u User info from HTTP auth remote_user varchar(50) bobby
- v Virtual host servicing the request virtual_host varchar(255)
- */
- $this->dbi->genericSqlQuery("
+ $this->dbi->genericSqlQuery("CREATE UNIQUE INDEX rating"
+ . " ON $rating_tbl (dimension, raterpage, rateepage)");
+ }
+ echo " ", _("CREATED");
+ break;
+ case 'accesslog':
+ $log_tbl = $prefix . 'accesslog';
+ // fields according to http://www.outoforder.cc/projects/apache/mod_log_sql/docs-2.0/#id2756178
+ /*
+ A User Agent agent varchar(255) Mozilla/4.0 (compat; MSIE 6.0; Windows)
+ a CGi request arguments request_args varchar(255) user=Smith&cart=1231&item=532
+ b Bytes transfered bytes_sent int unsigned 32561
+ c??? Text of cookie cookie varchar(255) Apache=sdyn.fooonline.net 1300102700823
+ f Local filename requested request_file varchar(255) /var/www/html/books-cycroad.html
+ H HTTP request_protocol request_protocol varchar(10) HTTP/1.1
+ h Name of remote host remote_host varchar(50) blah.foobar.com
+ I Request ID (from modd_unique_id) id char(19) POlFcUBRH30AAALdBG8
+ l Ident user info remote_logname varcgar(50) bobby
+ M Machine ID??? machine_id varchar(25) web01
+ m HTTP request method request_method varchar(10) GET
+ P httpd cchild PID child_pid smallint unsigned 3215
+ p http port server_port smallint unsigned 80
+ R Referer referer varchar(255) http://www.biglinks4u.com/linkpage.html
+ r Request in full form request_line varchar(255) GET /books-cycroad.html HTTP/1.1
+ S Time of request in UNIX time_t format time_stamp int unsigned 1005598029
+ T Seconds to service request request_duration smallint unsigned 2
+ t Time of request in human format request_time char(28) [02/Dec/2001:15:01:26 -0800]
+ U Request in simple form request_uri varchar(255) /books-cycroad.html
+ u User info from HTTP auth remote_user varchar(50) bobby
+ v Virtual host servicing the request virtual_host varchar(255)
+ */
+ $this->dbi->genericSqlQuery("
CREATE TABLE $log_tbl (
time_stamp int unsigned,
remote_host varchar(100),
@@ -364,13 +372,13 @@
agent varchar(255),
request_duration float
)");
- $this->dbi->genericSqlQuery("CREATE INDEX log_time ON $log_tbl (time_stamp)");
- $this->dbi->genericSqlQuery("CREATE INDEX log_host ON $log_tbl (remote_host)");
- echo " ",_("CREATED");
- break;
+ $this->dbi->genericSqlQuery("CREATE INDEX log_time ON $log_tbl (time_stamp)");
+ $this->dbi->genericSqlQuery("CREATE INDEX log_host ON $log_tbl (remote_host)");
+ echo " ", _("CREATED");
+ break;
+ }
+ echo "<br />\n";
}
- echo "<br />\n";
- }
/**
* Update from ~1.3.4 to current.
@@ -378,20 +386,21 @@
* jeffs-hacks database api (around 1.3.2) later:
* people should export/import their pages if using that old versions.
*/
- function CheckDatabaseUpdate() {
- global $DBAuthParams, $DBParams;
+ function CheckDatabaseUpdate()
+ {
+ global $DBAuthParams, $DBParams;
- echo "<h3>",sprintf(_("Check for necessary %s updates"),
- _("database")),
- " - ", DATABASE_TYPE,"</h3>\n";
- $dbadmin = $this->request->getArg('dbadmin');
- if ($this->isSQL) {
- $this->_db_init();
- if (isset($dbadmin['cancel'])) {
- echo _("CANCEL")," <br />\n";
- return;
+ echo "<h2>", sprintf(_("Check for necessary %s updates"),
+ _("database")),
+ " - ", DATABASE_TYPE, "</h2>\n";
+ $dbadmin = $this->request->getArg('dbadmin');
+ if ($this->isSQL) {
+ $this->_db_init();
+ if (isset($dbadmin['cancel'])) {
+ echo _("CANCEL"), " <br />\n";
+ return;
+ }
}
- }
echo "db version: we want ", $this->current_db_version, "\n<br />";
echo "db version: we have ", $this->db_version, "\n<br />";
if ($this->db_version >= $this->current_db_version) {
@@ -399,301 +408,300 @@
return;
}
- $backend_type = $this->dbi->_backend->backendType();
- if ($this->isSQL) {
- echo "<h4>",_("Backend type: "),$backend_type,"</h4>\n";
- $prefix = isset($DBParams['prefix']) ? $DBParams['prefix'] : '';
- $tables = $this->dbi->_backend->listOfTables();
- foreach (explode(':','session:pref:member') as $table) {
- echo sprintf(_("Check for table %s"), $table)," ...";
- if (!in_array($prefix.$table, $tables)) {
- $this->installTable($table, $backend_type);
- } else {
- echo _("OK")," <br />\n";
+ $backend_type = $this->dbi->_backend->backendType();
+ if ($this->isSQL) {
+ echo "<h4>", _("Backend type: "), $backend_type, "</h4>\n";
+ $prefix = isset($DBParams['prefix']) ? $DBParams['prefix'] : '';
+ $tables = $this->dbi->_backend->listOfTables();
+ foreach (explode(':', 'session:pref:member') as $table) {
+ echo sprintf(_("Check for table %s"), $table), " ...";
+ if (!in_array($prefix . $table, $tables)) {
+ $this->installTable($table, $backend_type);
+ } else {
+ echo _("OK"), " <br />\n";
+ }
+ }
}
- }
- }
- if ($this->phpwiki_version >= 1030.12200612 and $this->db_version < 1030.13) {
- if ($this->isSQL and preg_match("/(pgsql|postgres)/", $backend_type)) {
- trigger_error("You need to upgrade to schema/psql-initialize.sql manually!",
- E_USER_WARNING);
- // $this->_upgrade_psql_tsearch2();
+ if ($this->phpwiki_version >= 1030.12200612 and $this->db_version < 1030.13) {
+ if ($this->isSQL and preg_match("/(pgsql|postgres)/", $backend_type)) {
+ trigger_error("You need to upgrade to schema/psql-initialize.sql manually!",
+ E_USER_WARNING);
+ // $this->_upgrade_psql_tsearch2();
+ }
+ $this->_upgrade_relation_links();
}
- $this->_upgrade_relation_links();
- }
- if (ACCESS_LOG_SQL and $this->isSQL) {
- $table = "accesslog";
- echo sprintf(_("Check for table %s"), $table)," ...";
- if (!in_array($prefix.$table, $tables)) {
- $this->installTable($table, $backend_type);
- } else {
- echo _("OK")," <br />\n";
+ if (ACCESS_LOG_SQL and $this->isSQL) {
+ $table = "accesslog";
+ echo sprintf(_("Check for table %s"), $table), " ...";
+ if (!in_array($prefix . $table, $tables)) {
+ $this->installTable($table, $backend_type);
+ } else {
+ echo _("OK"), " <br />\n";
+ }
}
- }
- if ($this->isSQL and (class_exists("RatingsUserFactory") or $this->dbi->isWikiPage(_("RateIt")))) {
- $table = "rating";
- echo sprintf(_("Check for table %s"), $table)," ...";
- if (!in_array($prefix.$table, $tables)) {
- $this->installTable($table, $backend_type);
- } else {
- echo _("OK")," <br />\n";
+ if ($this->isSQL and (class_exists("RatingsUserFactory") or $this->dbi->isWikiPage(_("RateIt")))) {
+ $table = "rating";
+ echo sprintf(_("Check for table %s"), $table), " ...";
+ if (!in_array($prefix . $table, $tables)) {
+ $this->installTable($table, $backend_type);
+ } else {
+ echo _("OK"), " <br />\n";
+ }
}
- }
- $backend = &$this->dbi->_backend->_dbh;
- if ($this->isSQL)
- extract($this->dbi->_backend->_table_names);
+ $backend = &$this->dbi->_backend->_dbh;
+ if ($this->isSQL)
+ extract($this->dbi->_backend->_table_names);
- // 1.3.8 added session.sess_ip
- if ($this->isSQL and $this->phpwiki_version >= 1030.08 and USE_DB_SESSION
- and isset($this->request->_dbsession))
- {
- echo _("Check for new session.sess_ip column")," ... ";
- $database = $this->dbi->_backend->database();
- assert(!empty($DBParams['db_session_table']));
- $session_tbl = $prefix . $DBParams['db_session_table'];
- $sess_fields = $this->dbi->_backend->listOfFields($database, $session_tbl);
- if (!$sess_fields) {
- echo _("SKIP");
- } elseif (!strstr(strtolower(join(':', $sess_fields)), "sess_ip")) {
- // TODO: postgres test (should be able to add columns at the end, but not in between)
- echo "<b>",_("ADDING"),"</b>"," ... ";
- $this->dbi->genericSqlQuery("ALTER TABLE $session_tbl ADD sess_ip CHAR(15) NOT NULL");
- $this->dbi->genericSqlQuery("CREATE INDEX sess_date ON $session_tbl (sess_date)");
- } else {
- echo _("OK");
- }
- echo "<br />\n";
- if (substr($backend_type,0,5) == 'mysql') {
- // upgrade to 4.1.8 destroyed my session table:
- // sess_id => varchar(10), sess_data => varchar(5). For others obviously also.
- echo _("Check for mysql session.sess_id sanity")," ... ";
- $result = $this->dbi->genericSqlQuery("DESCRIBE $session_tbl");
- if (DATABASE_TYPE == 'SQL') {
- $iter = new WikiDB_backend_PearDB_generic_iter($backend, $result);
- } elseif (DATABASE_TYPE == 'ADODB') {
- $iter = new WikiDB_backend_ADODB_generic_iter($backend, $result,
- array("Field", "Type", "Null", "Key", "Default", "Extra"));
- } elseif (DATABASE_TYPE == 'PDO') {
- $iter = new WikiDB_backend_PDO_generic_iter($backend, $result);
- }
- while ($col = $iter->next()) {
- if ($col["Field"] == 'sess_id' and !strstr(strtolower($col["Type"]), 'char(32)')) {
- $this->dbi->genericSqlQuery("ALTER TABLE $session_tbl CHANGE sess_id"
- ." sess_id CHAR(32) NOT NULL");
- echo "sess_id ", $col["Type"], " ", _("fixed"), " => CHAR(32) ";
+ // 1.3.8 added session.sess_ip
+ if ($this->isSQL and $this->phpwiki_version >= 1030.08 and USE_DB_SESSION
+ and isset($this->request->_dbsession)
+ ) {
+ echo _("Check for new session.sess_ip column"), " ... ";
+ $database = $this->dbi->_backend->database();
+ assert(!empty($DBParams['db_session_table']));
+ $session_tbl = $prefix . $DBParams['db_session_table'];
+ $sess_fields = $this->dbi->_backend->listOfFields($database, $session_tbl);
+ if (!$sess_fields) {
+ echo _("SKIP");
+ } elseif (!strstr(strtolower(join(':', $sess_fields)), "sess_ip")) {
+ // TODO: postgres test (should be able to add columns at the end, but not in between)
+ echo "<b>", _("ADDING"), "</b>", " ... ";
+ $this->dbi->genericSqlQuery("ALTER TABLE $session_tbl ADD sess_ip CHAR(15) NOT NULL");
+ $this->dbi->genericSqlQuery("CREATE INDEX sess_date ON $session_tbl (sess_date)");
+ } else {
+ echo _("OK");
}
- if ($col["Field"] == 'sess_ip' and !strstr(strtolower($col["Type"]), 'char(15)')) {
- $this->dbi->genericSqlQuery("ALTER TABLE $session_tbl CHANGE sess_ip"
- ." sess_ip CHAR(15) NOT NULL");
- echo "sess_ip ", $col["Type"], " ", _("fixed"), " => CHAR(15) ";
+ echo "<br />\n";
+ if (substr($backend_type, 0, 5) == 'mysql') {
+ // upgrade to 4.1.8 destroyed my session table:
+ // sess_id => varchar(10), sess_data => varchar(5). For others obviously also.
+ echo _("Check for mysql session.sess_id sanity"), " ... ";
+ $result = $this->dbi->genericSqlQuery("DESCRIBE $session_tbl");
+ if (DATABASE_TYPE == 'SQL') {
+ $iter = new WikiDB_backend_PearDB_generic_iter($backend, $result);
+ } elseif (DATABASE_TYPE == 'ADODB') {
+ $iter = new WikiDB_backend_ADODB_generic_iter($backend, $result,
+ array("Field", "Type", "Null", "Key", "Default", "Extra"));
+ } elseif (DATABASE_TYPE == 'PDO') {
+ $iter = new WikiDB_backend_PDO_generic_iter($backend, $result);
+ }
+ while ($col = $iter->next()) {
+ if ($col["Field"] == 'sess_id' and !strstr(strtolower($col["Type"]), 'char(32)')) {
+ $this->dbi->genericSqlQuery("ALTER TABLE $session_tbl CHANGE sess_id"
+ . " sess_id CHAR(32) NOT NULL");
+ echo "sess_id ", $col["Type"], " ", _("fixed"), " => CHAR(32) ";
+ }
+ if ($col["Field"] == 'sess_ip' and !strstr(strtolower($col["Type"]), 'char(15)')) {
+ $this->dbi->genericSqlQuery("ALTER TABLE $session_tbl CHANGE sess_ip"
+ . " sess_ip CHAR(15) NOT NULL");
+ echo "sess_ip ", $col["Type"], " ", _("fixed"), " => CHAR(15) ";
+ }
+ }
+ echo _("OK"), "<br />\n";
}
}
- echo _("OK"), "<br />\n";
- }
- }
- /* TODO:
- ALTER TABLE link ADD relation INT DEFAULT 0;
- CREATE INDEX linkrelation ON link (relation);
- */
+ /* TODO:
+ ALTER TABLE link ADD relation INT DEFAULT 0;
+ CREATE INDEX linkrelation ON link (relation);
+ */
- // mysql >= 4.0.4 requires LOCK TABLE privileges
- if (substr($backend_type,0,5) == 'mysql') {
- echo _("Check for mysql LOCK TABLE privilege")," ...";
- $mysql_version = $this->dbi->_backend->_serverinfo['version'];
- if ($mysql_version > 400.40) {
- if (!empty($this->dbi->_backend->_parsedDSN))
- $parseDSN = $this->dbi->_backend->_parsedDSN;
- elseif (function_exists('parseDSN')) // ADODB or PDO
- $parseDSN = parseDSN($DBParams['dsn']);
- else // pear
- $parseDSN = DB::parseDSN($DBParams['dsn']);
- $username = $this->dbi->_backend->qstr($parseDSN['username']);
- // on db level
- $query = "SELECT lock_tables_priv FROM mysql.db WHERE user='$username'";
- //mysql_select_db("mysql", $this->dbi->_backend->connection());
- $db_fields = $this->dbi->_backend->listOfFields("mysql", "db");
- if (!strstr(strtolower(join(':', $db_fields)), "lock_tables_priv")) {
- echo join(':', $db_fields);
- die("lock_tables_priv missing. The DB Admin must run mysql_fix_privilege_tables");
- }
- $row = $this->dbi->_backend->getRow($query);
- if (isset($row[0]) and $row[0] == 'N') {
- $this->dbi->genericSqlQuery("UPDATE mysql.db SET lock_tables_priv='Y'"
- ." WHERE mysql.user='$username'");
- $this->dbi->genericSqlQuery("FLUSH PRIVILEGES");
- echo "mysql.db user='$username'", _("fixed"), "<br />\n";
- } elseif (!$row) {
- // or on user level
- $query = "SELECT lock_tables_priv FROM mysql.user WHERE user='$username'";
- $row = $this->dbi->_backend->getRow($query);
- if ($row and $row[0] == 'N') {
- $this->dbi->genericSqlQuery("UPDATE mysql.user SET lock_tables_priv='Y'"
- ." WHERE mysql.user='$username'");
- $this->dbi->genericSqlQuery("FLUSH PRIVILEGES");
- echo "mysql.user user='$username'", _("fixed"), "<br />\n";
- } elseif (!$row) {
- echo " <b><font color=\"red\">", _("FAILED"), "</font></b>: ",
- "Neither mysql.db nor mysql.user has a user='$username'"
- ." or the lock_tables_priv field",
- "<br />\n";
+ // mysql >= 4.0.4 requires LOCK TABLE privileges
+ if (substr($backend_type, 0, 5) == 'mysql') {
+ echo _("Check for mysql LOCK TABLE privilege"), " ...";
+ $mysql_version = $this->dbi->_backend->_serverinfo['version'];
+ if ($mysql_version > 400.40) {
+ if (!empty($this->dbi->_backend->_parsedDSN))
+ $parseDSN = $this->dbi->_backend->_parsedDSN;
+ elseif (function_exists('parseDSN')) // ADODB or PDO
+ $parseDSN = parseDSN($DBParams['dsn']); else // pear
+ $parseDSN = DB::parseDSN($DBParams['dsn']);
+ $username = $this->dbi->_backend->qstr($parseDSN['username']);
+ // on db level
+ $query = "SELECT lock_tables_priv FROM mysql.db WHERE user='$username'";
+ //mysql_select_db("mysql", $this->dbi->_backend->connection());
+ $db_fields = $this->dbi->_backend->listOfFields("mysql", "db");
+ if (!strstr(strtolower(join(':', $db_fields)), "lock_tables_priv")) {
+ echo join(':', $db_fields);
+ die("lock_tables_priv missing. The DB Admin must run mysql_fix_privilege_tables");
+ }
+ $row = $this->dbi->_backend->getRow($query);
+ if (isset($row[0]) and $row[0] == 'N') {
+ $this->dbi->genericSqlQuery("UPDATE mysql.db SET lock_tables_priv='Y'"
+ . " WHERE mysql.user='$username'");
+ $this->dbi->genericSqlQuery("FLUSH PRIVILEGES");
+ echo "mysql.db user='$username'", _("fixed"), "<br />\n";
+ } elseif (!$row) {
+ // or on user level
+ $query = "SELECT lock_tables_priv FROM mysql.user WHERE user='$username'";
+ $row = $this->dbi->_backend->getRow($query);
+ if ($row and $row[0] == 'N') {
+ $this->dbi->genericSqlQuery("UPDATE mysql.user SET lock_tables_priv='Y'"
+ . " WHERE mysql.user='$username'");
+ $this->dbi->genericSqlQuery("FLUSH PRIVILEGES");
+ echo "mysql.user user='$username'", _("fixed"), "<br />\n";
+ } elseif (!$row) {
+ echo " <b><font color=\"red\">", _("FAILED"), "</font></b>: ",
+ "Neither mysql.db nor mysql.user has a user='$username'"
+ . " or the lock_tables_priv field",
+ "<br />\n";
+ } else {
+ echo _("OK"), "<br />\n";
+ }
+ } else {
+ echo _("OK"), "<br />\n";
+ }
+ //mysql_select_db($this->dbi->_backend->database(), $this->dbi->_backend->connection());
} else {
- echo _("OK"), "<br />\n";
+ echo sprintf(_("version <em>%s</em> not affected"), $mysql_version), "<br />\n";
}
- } else {
- echo _("OK"), "<br />\n";
}
- //mysql_select_db($this->dbi->_backend->database(), $this->dbi->_backend->connection());
- } else {
- echo sprintf(_("version <em>%s</em> not affected"), $mysql_version),"<br />\n";
- }
- }
- // 1.3.10 mysql requires page.id auto_increment
- // mysql, mysqli or mysqlt
- if ($this->phpwiki_version >= 1030.099 and substr($backend_type,0,5) == 'mysql'
- and DATABASE_TYPE != 'PDO')
- {
- echo _("Check for mysql page.id auto_increment flag")," ...";
- assert(!empty($page_tbl));
- $database = $this->dbi->_backend->database();
- $fields = mysql_list_fields($database, $page_tbl, $this->dbi->_backend->connection());
- $columns = mysql_num_fields($fields);
- for ($i = 0; $i < $columns; $i++) {
- if (mysql_field_name($fields, $i) == 'id') {
- $flags = mysql_field_flags($fields, $i);
- //DONE: something was wrong with ADODB here.
- if (!strstr(strtolower($flags), "auto_increment")) {
- echo "<b>",_("ADDING"),"</b>"," ... ";
- // MODIFY col_def valid since mysql 3.22.16,
- // older mysql's need CHANGE old_col col_def
- $this->dbi->genericSqlQuery("ALTER TABLE $page_tbl CHANGE id"
- ." id INT NOT NULL AUTO_INCREMENT");
- $fields = mysql_list_fields($database, $page_tbl);
- if (!strstr(strtolower(mysql_field_flags($fields, $i)), "auto_increment"))
- echo " <b><font color=\"red\">", _("FAILED"), "</font></b><br />\n";
- else
- echo _("OK"), "<br />\n";
- } else {
- echo _("OK"), "<br />\n";
+ // 1.3.10 mysql requires page.id auto_increment
+ // mysql, mysqli or mysqlt
+ if ($this->phpwiki_version >= 1030.099 and substr($backend_type, 0, 5) == 'mysql'
+ and DATABASE_TYPE != 'PDO'
+ ) {
+ echo _("Check for mysql page.id auto_increment flag"), " ...";
+ assert(!empty($page_tbl));
+ $database = $this->dbi->_backend->database();
+ $fields = mysql_list_fields($database, $page_tbl, $this->dbi->_backend->connection());
+ $columns = mysql_num_fields($fields);
+ for ($i = 0; $i < $columns; $i++) {
+ if (mysql_field_name($fields, $i) == 'id') {
+ $flags = mysql_field_flags($fields, $i);
+ //DONE: something was wrong with ADODB here.
+ if (!strstr(strtolower($flags), "auto_increment")) {
+ echo "<b>", _("ADDING"), "</b>", " ... ";
+ // MODIFY col_def valid since mysql 3.22.16,
+ // older mysql's need CHANGE old_col col_def
+ $this->dbi->genericSqlQuery("ALTER TABLE $page_tbl CHANGE id"
+ . " id INT NOT NULL AUTO_INCREMENT");
+ $fields = mysql_list_fields($database, $page_tbl);
+ if (!strstr(strtolower(mysql_field_flags($fields, $i)), "auto_increment"))
+ echo " <b><font color=\"red\">", _("FAILED"), "</font></b><br />\n";
+ else
+ echo _("OK"), "<br />\n";
+ } else {
+ echo _("OK"), "<br />\n";
+ }
+ break;
+ }
}
- break;
+ mysql_free_result($fields);
}
- }
- mysql_free_result($fields);
- }
- // Check for mysql 4.1.x/5.0.0a binary search problem.
- // http://bugs.mysql.com/bug.php?id=4398
- // "select * from page where LOWER(pagename) like '%search%'" does not apply LOWER!
- // Confirmed for 4.1.0alpha,4.1.3-beta,5.0.0a; not yet tested for 4.1.2alpha,
- // On windows only, though utf8 would be useful elsewhere also.
- // Illegal mix of collations (latin1_bin,IMPLICIT) and
- // (utf8_general_ci, COERCIBLE) for operation '='])
- if (isWindows() and substr($backend_type,0,5) == 'mysql') {
- echo _("Check for mysql 4.1.x/5.0.0 binary search on windows problem")," ...";
- $mysql_version = $this->dbi->_backend->_serverinfo['version'];
- if ($mysql_version < 401.0) {
- echo sprintf(_("version <em>%s</em>"), $mysql_version)," ",
- _("not affected"),"<br />\n";
- } elseif ($mysql_version >= 401.6) { // FIXME: since which version?
- $row = $this->dbi->_backend->getRow("SHOW CREATE TABLE $page_tbl");
- $result = join(" ", $row);
- if (strstr(strtolower($result), "character set")
- and strstr(strtolower($result), "collate"))
- {
- echo _("OK"), "<br />\n";
- } else {
- //SET CHARACTER SET latin1
- $charset = CHARSET;
- if ($charset == 'iso-8859-1') $charset = 'latin1';
- $this->dbi->genericSqlQuery("ALTER TABLE $page_tbl CHANGE pagename "
- ."pagename VARCHAR(100) "
- ."CHARACTER SET '$charset' COLLATE '$charset"."_bin' NOT NULL");
- echo sprintf(_("version <em>%s</em>"), $mysql_version),
- " <b>",_("FIXED"),"</b>",
- "<br />\n";
- }
- } elseif (DATABASE_TYPE != 'PDO') {
- // check if already fixed
- extract($this->dbi->_backend->_table_names);
- assert(!empty($page_tbl));
- $database = $this->dbi->_backend->database();
- $fields = mysql_list_fields($database, $page_tbl, $this->dbi->_backend->connection());
- $columns = mysql_num_fields($fields);
- for ($i = 0; $i < $columns; $i++) {
- if (mysql_field_name($fields, $i) == 'pagename') {
- $flags = mysql_field_flags($fields, $i);
- // I think it was fixed with 4.1.6, but I tested it only with 4.1.8
- if ($mysql_version > 401.0 and $mysql_version < 401.6) {
- // remove the binary flag
- if (strstr(strtolower($flags), "binary")) {
- // FIXME: on duplicate pagenames this will fail!
- $this->dbi->genericSqlQuery("ALTER TABLE $page_tbl CHANGE pagename"
- ." pagename VARCHAR(100) NOT NULL");
- echo sprintf(_("version <em>%s</em>"), $mysql_version),
- "<b>",_("FIXED"),"</b>"
- ,"<br />\n";
+ // Check for mysql 4.1.x/5.0.0a binary search problem.
+ // http://bugs.mysql.com/bug.php?id=4398
+ // "select * from page where LOWER(pagename) like '%search%'" does not apply LOWER!
+ // Confirmed for 4.1.0alpha,4.1.3-beta,5.0.0a; not yet tested for 4.1.2alpha,
+ // On windows only, though utf8 would be useful elsewhere also.
+ // Illegal mix of collations (latin1_bin,IMPLICIT) and
+ // (utf8_general_ci, COERCIBLE) for operation '='])
+ if (isWindows() and substr($backend_type, 0, 5) == 'mysql') {
+ echo _("Check for mysql 4.1.x/5.0.0 binary search on windows problem"), " ...";
+ $mysql_version = $this->dbi->_backend->_serverinfo['version'];
+ if ($mysql_version < 401.0) {
+ echo sprintf(_("version <em>%s</em>"), $mysql_version), " ",
+ _("not affected"), "<br />\n";
+ } elseif ($mysql_version >= 401.6) { // FIXME: since which version?
+ $row = $this->dbi->_backend->getRow("SHOW CREATE TABLE $page_tbl");
+ $result = join(" ", $row);
+ if (strstr(strtolower($result), "character set")
+ and strstr(strtolower($result), "collate")
+ ) {
+ echo _("OK"), "<br />\n";
+ } else {
+ //SET CHARACTER SET latin1
+ $charset = CHARSET;
+ if ($charset == 'iso-8859-1') $charset = 'latin1';
+ $this->dbi->genericSqlQuery("ALTER TABLE $page_tbl CHANGE pagename "
+ . "pagename VARCHAR(100) "
+ . "CHARACTER SET '$charset' COLLATE '$charset" . "_bin' NOT NULL");
+ echo sprintf(_("version <em>%s</em>"), $mysql_version),
+ " <b>", _("FIXED"), "</b>",
+ "<br />\n";
}
+ } elseif (DATABASE_TYPE != 'PDO') {
+ // check if already fixed
+ extract($this->dbi->_backend->_table_names);
+ assert(!empty($page_tbl));
+ $database = $this->dbi->_backend->database();
+ $fields = mysql_list_fields($database, $page_tbl, $this->dbi->_backend->connection());
+ $columns = mysql_num_fields($fields);
+ for ($i = 0; $i < $columns; $i++) {
+ if (mysql_field_name($fields, $i) == 'pagename') {
+ $flags = mysql_field_flags($fields, $i);
+ // I think it was fixed with 4.1.6, but I tested it only with 4.1.8
+ if ($mysql_version > 401.0 and $mysql_version < 401.6) {
+ // remove the binary flag
+ if (strstr(strtolower($flags), "binary")) {
+ // FIXME: on duplicate pagenames this will fail!
+ $this->dbi->genericSqlQuery("ALTER TABLE $page_tbl CHANGE pagename"
+ . " pagename VARCHAR(100) NOT NULL");
+ echo sprintf(_("version <em>%s</em>"), $mysql_version),
+ "<b>", _("FIXED"), "</b>"
+ , "<br />\n";
+ }
+ }
+ break;
+ }
+ }
}
- break;
+ }
+ if ($this->isSQL and ACCESS_LOG_SQL & 2) {
+ echo _("Check for ACCESS_LOG_SQL passwords in POST requests"), " ...";
+ // Don't display passwords in POST requests (up to 2005-02-04 12:03:20)
+ $res = $this->dbi->genericSqlIter("SELECT time_stamp, remote_host, " .
+ "request_args FROM ${prefix}accesslog WHERE request_args LIKE " .
+ "'%s:6:\"passwd\"%' AND request_args NOT LIKE '%s:6:\"passwd\";" .
+ "s:15:\"<not displayed>\"%'");
+ $count = 0;
+ while ($row = $res->next()) {
+ $args = preg_replace("/(s:6:\"passwd\";s:15:\").*(\")/",
+ "$1<not displayed>$2", $row["request_args"]);
+ $ts = $row["time_stamp"];
+ $rh = $row["remote_host"];
+ $this->dbi->genericSqlQuery("UPDATE ${prefix}accesslog SET " .
+ "request_args='$args' WHERE time_stamp=$ts AND " .
+ "remote_host='$rh'");
+ $count++;
}
- }
- }
- }
- if ($this->isSQL and ACCESS_LOG_SQL & 2) {
- echo _("Check for ACCESS_LOG_SQL passwords in POST requests")," ...";
- // Don't display passwords in POST requests (up to 2005-02-04 12:03:20)
- $res = $this->dbi->genericSqlIter("SELECT time_stamp, remote_host, " .
- "request_args FROM ${prefix}accesslog WHERE request_args LIKE " .
- "'%s:6:\"passwd\"%' AND request_args NOT LIKE '%s:6:\"passwd\";" .
- "s:15:\"<not displayed>\"%'");
- $count = 0;
- while ($row = $res->next()) {
- $args = preg_replace("/(s:6:\"passwd\";s:15:\").*(\")/",
- "$1<not displayed>$2", $row["request_args"]);
- $ts = $row["time_stamp"];
- $rh = $row["remote_host"];
- $this->dbi->genericSqlQuery("UPDATE ${prefix}accesslog SET " .
- "request_args='$args' WHERE time_stamp=$ts AND " .
- "remote_host='$rh'");
- $count++;
- }
- if ($count > 0)
- echo "<b>",_("FIXED"),"</b>", "<br />\n";
- else
- echo _("OK"),"<br />\n";
+ if ($count > 0)
+ echo "<b>", _("FIXED"), "</b>", "<br />\n";
+ else
+ echo _("OK"), "<br />\n";
- if ($this->phpwiki_version >= 1030.13) {
- echo _("Check for ACCESS_LOG_SQL remote_host varchar(50)")," ...";
- $database = $this->dbi->_backend->database();
- $accesslog_tbl = $prefix . 'accesslog';
- $fields = $this->dbi->_backend->listOfFields($database, $accesslog_tbl);
- if (!$fields) {
- echo _("SKIP");
- } elseif (strstr(strtolower(join(':', $sess_fields)), "remote_host")) {
- // TODO: how to check size, already done?
- echo "<b>",_("FIXING"),"remote_host</b>"," ... ";
- $this->dbi->genericSqlQuery("ALTER TABLE $accesslog_tbl CHANGE remote_host VARCHAR(100)");
- } else {
- echo _("FAILED");
+ if ($this->phpwiki_version >= 1030.13) {
+ echo _("Check for ACCESS_LOG_SQL remote_host varchar(50)"), " ...";
+ $database = $this->dbi->_backend->database();
+ $accesslog_tbl = $prefix . 'accesslog';
+ $fields = $this->dbi->_backend->listOfFields($database, $accesslog_tbl);
+ if (!$fields) {
+ echo _("SKIP");
+ } elseif (strstr(strtolower(join(':', $sess_fields)), "remote_host")) {
+ // TODO: how to check size, already done?
+ echo "<b>", _("FIXING"), "remote_host</b>", " ... ";
+ $this->dbi->genericSqlQuery("ALTER TABLE $accesslog_tbl CHANGE remote_host VARCHAR(100)");
+ } else {
+ echo _("FAILED");
+ }
+ echo "<br />\n";
+ }
}
- echo "<br />\n";
- }
- }
- $this->_upgrade_cached_html();
+ $this->_upgrade_cached_html();
- if ($this->db_version < $this->current_db_version) {
- $this->dbi->set_db_version($this->current_db_version);
- $this->db_version = $this->dbi->get_db_version();
- echo "db version: upgrade to ", $this->db_version," ";
+ if ($this->db_version < $this->current_db_version) {
+ $this->dbi->set_db_version($this->current_db_version);
+ $this->db_version = $this->dbi->get_db_version();
+ echo "db version: upgrade to ", $this->db_version, " ";
echo _("OK"), "<br />\n";
flush();
- }
+ }
- return;
+ return;
}
/**
@@ -703,100 +711,103 @@
* @see _is_false_error, ErrorManager
* @access private
*/
- function _dbpermission_filter($err) {
- if ( $err->isWarning() ) {
- global $ErrorManager;
- $this->error_caught = 1;
- $ErrorManager->_postponed_errors[] = $err;
- return true;
+ function _dbpermission_filter($err)
+ {
+ if ($err->isWarning()) {
+ global $ErrorManager;
+ $this->error_caught = 1;
+ $ErrorManager->_postponed_errors[] = $err;
+ return true;
+ }
+ return false;
}
- return false;
- }
- function _try_dbadmin_user ($user, $passwd) {
- global $DBParams, $DBAuthParams;
- $AdminParams = $DBParams;
- if (DATABASE_TYPE == 'SQL')
- $dsn = DB::parseDSN($AdminParams['dsn']);
- else {
- $dsn = parseDSN($AdminParams['dsn']);
+ function _try_dbadmin_user($user, $passwd)
+ {
+ global $DBParams, $DBAuthParams;
+ $AdminParams = $DBParams;
+ if (DATABASE_TYPE == 'SQL')
+ $dsn = DB::parseDSN($AdminParams['dsn']);
+ else {
+ $dsn = parseDSN($AdminParams['dsn']);
+ }
+ $AdminParams['dsn'] = sprintf("%s://%s:%s@%s/%s",
+ $dsn['phptype'],
+ $user,
+ $passwd,
+ $dsn['hostspec'],
+ $dsn['database']);
+ $AdminParams['_tryroot_from_upgrade'] = 1;
+ // add error handler to warn about missing permissions for DBADMIN_USER
+ global $ErrorManager;
+ $ErrorManager->pushErrorHandler(new WikiMethodCb($this, '_dbpermission_filter'));
+ $this->error_caught = 0;
+ $this->dbi = WikiDB::open($AdminParams);
+ if (!$this->error_caught) return true;
+ // FAILED: redo our connection with the wikiuser
+ $this->dbi = WikiDB::open($DBParams);
+ $ErrorManager->flushPostponedErrors();
+ $ErrorManager->popErrorHandler();
+ return false;
}
- $AdminParams['dsn'] = sprintf("%s://%s:%s@%s/%s",
- $dsn['phptype'],
- $user,
- $passwd,
- $dsn['hostspec'],
- $dsn['database']);
- $AdminParams['_tryroot_from_upgrade'] = 1;
- // add error handler to warn about missing permissions for DBADMIN_USER
- global $ErrorManager;
- $ErrorManager->pushErrorHandler(new WikiMethodCb($this, '_dbpermission_filter'));
- $this->error_caught = 0;
- $this->dbi = WikiDB::open($AdminParams);
- if (!$this->error_caught) return true;
- // FAILED: redo our connection with the wikiuser
- $this->dbi = WikiDB::open($DBParams);
- $ErrorManager->flushPostponedErrors();
- $ErrorManager->popErrorHandler();
- return false;
- }
- function _db_init () {
- if (!$this->isSQL) return;
+ function _db_init()
+ {
+ if (!$this->isSQL) return;
- /* SQLite never needs admin params */
- $backend_type = $this->dbi->_backend->backendType();
- if (substr($backend_type,0,6)=="sqlite") {
- return;
- }
- $dbadmin_user = 'root';
- if ($dbadmin = $this->request->getArg('dbadmin')) {
- $dbadmin_user = $dbadmin['user'];
- if (isset($dbadmin['cancel'])) {
- return;
- } elseif (!empty($dbadmin_user)) {
- if ($this->_try_dbadmin_user($dbadmin['user'], $dbadmin['passwd']))
+ /* SQLite never needs admin params */
+ $backend_type = $this->dbi->_backend->backendType();
+ if (substr($backend_type, 0, 6) == "sqlite") {
return;
}
- } elseif (DBADMIN_USER) {
- if ($this->_try_dbadmin_user(DBADMIN_USER, DBADMIN_PASSWD))
- return true;
+ $dbadmin_user = 'root';
+ if ($dbadmin = $this->request->getArg('dbadmin')) {
+ $dbadmin_user = $dbadmin['user'];
+ if (isset($dbadmin['cancel'])) {
+ return;
+ } elseif (!empty($dbadmin_user)) {
+ if ($this->_try_dbadmin_user($dbadmin['user'], $dbadmin['passwd']))
+ return;
+ }
+ } elseif (DBADMIN_USER) {
+ if ($this->_try_dbadmin_user(DBADMIN_USER, DBADMIN_PASSWD))
+ return true;
+ }
+ // Check if the privileges are enough. Need CREATE and ALTER perms.
+ // And on windows: SELECT FROM mysql, possibly: UPDATE mysql.
+ $form = HTML::form(array("method" => "post",
+ "action" => $this->request->getPostURL(),
+ "accept-charset" => $GLOBALS['charset']),
+ HTML::p(_("Upgrade requir...
[truncated message content] |
