From 48215cbdbc59513f54aa281352bdea6a1582d9da Mon Sep 17 00:00:00 2001 From: rurban Date: Tue, 18 May 2004 13:59:15 +0000 Subject: [PATCH] rename simpleQuery to genericQuery git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@3539 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- lib/WikiDB.php | 30 +++++++++++++++++++++++------- lib/upgrade.php | 43 +++++++++++++++++++++++-------------------- 2 files changed, 46 insertions(+), 27 deletions(-) diff --git a/lib/WikiDB.php b/lib/WikiDB.php index fb4a2fcc3..f2071dc7c 100644 --- a/lib/WikiDB.php +++ b/lib/WikiDB.php @@ -1,5 +1,5 @@ set('__global', $data); } - // simple select or create/update queries which do trigger_error - function simpleQuery($sql) { + // simple select or create/update queries + function genericQuery($sql) { global $DBParams; if ($DBParams['dbtype'] == 'SQL') { $result = $this->_backend->_dbh->query($sql); if (DB::isError($result)) { $msg = $result->getMessage(); - trigger_error("SQL Error: ".DB::errorMessage($result),E_USER_WARNING); + trigger_error("SQL Error: ".DB::errorMessage($result), E_USER_WARNING); return false; } else { return $result; } } elseif ($DBParams['dbtype'] == 'ADODB') { if (!($result = $this->_backend->_dbh->Execute($sql))) { - trigger_error("SQL Error: ".$this->_backend->_dbh->ErrorMsg(),E_USER_WARNING); + trigger_error("SQL Error: ".$this->_backend->_dbh->ErrorMsg(), E_USER_WARNING); return false; } else { return $result; } } + return false; } }; @@ -1007,6 +1008,13 @@ class WikiDB_Page $result = $backend->get_links($this->_pagename, $reversed); return new WikiDB_PageIterator($this->_wikidb, $result); } + + function getBackLinks() { + return $this->getLinks(true); + } + function getPageLinks() { + return $this->getLinks(false); + } /** * Access WikiDB_Page meta-data. @@ -1167,8 +1175,8 @@ class WikiDB_Page // The authenticated author of the first revision or empty if not authenticated then. function getCreator() { - $current = $this->getRevision(1); - return $current->get('author_id'); + if ($current = $this->getRevision(1)) return $current->get('author_id'); + else return ''; } }; @@ -1789,6 +1797,14 @@ class WikiDB_cache }; // $Log: not supported by cvs2svn $ +// Revision 1.57 2004/05/16 22:07:35 rurban +// check more config-default and predefined constants +// various PagePerm fixes: +// fix default PagePerms, esp. edit and view for Bogo and Password users +// implemented Creator and Owner +// BOGOUSERS renamed to BOGOUSER +// fixed syntax errors in signin.tmpl +// // Revision 1.56 2004/05/15 22:54:49 rurban // fixed important WikiDB bug with DEBUG > 0: wrong assertion // improved SetAcl (works) and PagePerms, some WikiGroup helpers. diff --git a/lib/upgrade.php b/lib/upgrade.php index e282a860c..b0919257c 100644 --- a/lib/upgrade.php +++ b/lib/upgrade.php @@ -1,5 +1,5 @@ simpleQuery(" + $dbh->genericQuery(" CREATE TABLE $session_tbl ( sess_id CHAR(32) NOT NULL DEFAULT '', sess_data BLOB NOT NULL, @@ -181,57 +181,57 @@ CREATE TABLE $session_tbl ( INDEX (sess_date) )"); } else { - $dbh->simpleQuery(" + $dbh->genericQuery(" CREATE TABLE $session_tbl ( sess_id CHAR(32) NOT NULL DEFAULT '', sess_data ".($backend_type == 'pgsql'?'TEXT':'BLOB')." NOT NULL, sess_date INT, sess_ip CHAR(15) NOT NULL )"); - $dbh->simpleQuery("CREATE UNIQUE INDEX sess_id ON $session_tbl (sess_id)"); + $dbh->genericQuery("CREATE UNIQUE INDEX sess_id ON $session_tbl (sess_id)"); } - $dbh->simpleQuery("CREATE INDEX sess_date on session (sess_date)"); + $dbh->genericQuery("CREATE INDEX sess_date on session (sess_date)"); break; case 'user': $user_tbl = $prefix.'user'; if ($backend_type == 'mysql') { - $dbh->simpleQuery(" + $dbh->genericQuery(" CREATE TABLE $user_tbl ( userid CHAR(48) BINARY NOT NULL UNIQUE, passwd CHAR(48) BINARY DEFAULT '', PRIMARY KEY (userid) )"); } else { - $dbh->simpleQuery(" + $dbh->genericQuery(" CREATE TABLE $user_tbl ( userid CHAR(48) NOT NULL, passwd CHAR(48) DEFAULT '' )"); - $dbh->simpleQuery("CREATE UNIQUE INDEX userid ON $user_tbl (userid)"); + $dbh->genericQuery("CREATE UNIQUE INDEX userid ON $user_tbl (userid)"); } break; case 'pref': $pref_tbl = $prefix.'pref'; if ($backend_type == 'mysql') { - $dbh->simpleQuery(" + $dbh->genericQuery(" CREATE TABLE $pref_tbl ( userid CHAR(48) BINARY NOT NULL UNIQUE, prefs TEXT NULL DEFAULT '', PRIMARY KEY (userid) )"); } else { - $dbh->simpleQuery(" + $dbh->genericQuery(" CREATE TABLE $pref_tbl ( userid CHAR(48) NOT NULL, prefs TEXT NULL DEFAULT '', )"); - $dbh->simpleQuery("CREATE UNIQUE INDEX userid ON $pref_tbl (userid)"); + $dbh->genericQuery("CREATE UNIQUE INDEX userid ON $pref_tbl (userid)"); } break; case 'member': $member_tbl = $prefix.'member'; if ($backend_type == 'mysql') { - $dbh->simpleQuery(" + $dbh->genericQuery(" CREATE TABLE $member_tbl ( userid CHAR(48) BINARY NOT NULL, groupname CHAR(48) BINARY NOT NULL DEFAULT 'users', @@ -239,19 +239,19 @@ CREATE TABLE $member_tbl ( INDEX (groupname) )"); } else { - $dbh->simpleQuery(" + $dbh->genericQuery(" CREATE TABLE $member_tbl ( userid CHAR(48) NOT NULL, groupname CHAR(48) NOT NULL DEFAULT 'users', )"); - $dbh->simpleQuery("CREATE INDEX userid ON $member_tbl (userid)"); - $dbh->simpleQuery("CREATE INDEX groupname ON $member_tbl (groupname)"); + $dbh->genericQuery("CREATE INDEX userid ON $member_tbl (userid)"); + $dbh->genericQuery("CREATE INDEX groupname ON $member_tbl (groupname)"); } break; case 'rating': $rating_tbl = $prefix.'rating'; if ($backend_type == 'mysql') { - $dbh->simpleQuery(" + $dbh->genericQuery(" CREATE TABLE $rating_tbl ( dimension INT(4) NOT NULL, raterpage INT(11) NOT NULL, @@ -262,7 +262,7 @@ CREATE TABLE $rating_tbl ( PRIMARY KEY (dimension, raterpage, rateepage) )"); } else { - $dbh->simpleQuery(" + $dbh->genericQuery(" CREATE TABLE $rating_tbl ( dimension INT(4) NOT NULL, raterpage INT(11) NOT NULL, @@ -271,7 +271,7 @@ CREATE TABLE $rating_tbl ( rateeversion INT(11) NOT NULL, tstamp TIMESTAMP(14) NOT NULL, )"); - $dbh->simpleQuery("CREATE UNIQUE INDEX rating ON $rating_tbl (dimension, raterpage, rateepage)"); + $dbh->genericQuery("CREATE UNIQUE INDEX rating ON $rating_tbl (dimension, raterpage, rateepage)"); } break; } @@ -311,7 +311,7 @@ function CheckDatabaseUpdate($request) { //FIXME: adodb seem to uppercase the fields if (!strstr(strtolower(join(':',$sess_fields)),"sess_ip")) { echo "",_("ADDING"),""," ... "; - $dbh->simpleQuery("ALTER TABLE $session_tbl ADD sess_ip CHAR(15) NOT NULL"); + $dbh->genericQuery("ALTER TABLE $session_tbl ADD sess_ip CHAR(15) NOT NULL"); } else { echo _("OK"); } @@ -333,7 +333,7 @@ function CheckDatabaseUpdate($request) { echo "",_("ADDING"),""," ... "; // MODIFY col_def valid since mysql 3.22.16, // older mysql's need CHANGE old_col col_def - $dbh->simpleQuery("ALTER TABLE $page_tbl CHANGE id id INT NOT NULL AUTO_INCREMENT"); + $dbh->genericQuery("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 " ",_("FAILED"),"
\n"; @@ -389,6 +389,9 @@ function DoUpgrade($request) { /** $Log: not supported by cvs2svn $ + Revision 1.11 2004/05/15 13:06:17 rurban + skip the HomePage, at first upgrade the ActionPages, then the database, then the rest + Revision 1.10 2004/05/15 01:19:41 rurban upgrade prefix fix by Kai Krakow -- 2.45.0