phpwiki-checkins Mailing List for PhpWiki

Revision: 10032
 http://sourceforge.net/p/phpwiki/code/10032
Author: vargenau
Date: 2017年08月10日 15:47:27 +0000 (2017年8月10日)
Log Message:
-----------
Align PDO code with Pear
Modified Paths:
--------------
 trunk/lib/WikiUser/PdoDb.php
Modified: trunk/lib/WikiUser/PdoDb.php
===================================================================
--- trunk/lib/WikiUser/PdoDb.php	2017年08月10日 15:46:30 UTC (rev 10031)
+++ trunk/lib/WikiUser/PdoDb.php	2017年08月10日 15:47:27 UTC (rev 10032)
@@ -45,11 +45,13 @@
 global $request;
 
 if (!$this->_prefs and is_a($this, "_PdoDbPassUser")) {
- if ($prefs) $this->_prefs = $prefs;
+ if ($prefs) {
+ $this->_prefs = $prefs;
+ }
 }
- if (!isset($this->_prefs->_method))
+ if (!isset($this->_prefs->_method)) {
 _PassUser::__construct($UserName);
- elseif (!$this->isValidName($UserName)) {
+ } elseif (!$this->isValidName($UserName)) {
 trigger_error(_("Invalid username."), E_USER_WARNING);
 return false;
 }
@@ -67,7 +69,7 @@
 _AnonUser::getPreferences();
 $this->getAuthDbh();
 if (isset($this->_prefs->_select)) {
- $dbh =& $this->_auth_dbi;
+ $dbh = &$this->_auth_dbi;
 $db_result = $dbh->query(sprintf($this->_prefs->_select, $dbh->quote($this->_userid)));
 // patched by fre...@pa...
 $prefs = $db_result->fetch(PDO::FETCH_BOTH);
@@ -77,7 +79,7 @@
 return $this->_prefs;
 }
 }
- if ($this->_HomePagehandle) {
+ if (isset($this->_HomePagehandle) && $this->_HomePagehandle) {
 if ($restored_from_page = $this->_prefs->retrieve
 ($this->_HomePagehandle->get('pref'))
 ) {
@@ -106,11 +108,11 @@
 return false;
 }
 //delete pageprefs:
- if ($this->_HomePagehandle and $this->_HomePagehandle->get('pref'))
+ if (isset($this->_HomePagehandle) && $this->_HomePagehandle and $this->_HomePagehandle->get('pref'))
 $this->_HomePagehandle->set('pref', '');
 } else {
 //store prefs in homepage, not in cookie
- if ($this->_HomePagehandle and !$id_only)
+ if (isset($this->_HomePagehandle) && $this->_HomePagehandle and !$id_only)
 $this->_HomePagehandle->set('pref', $packed);
 }
 return $count;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10031
 http://sourceforge.net/p/phpwiki/code/10031
Author: vargenau
Date: 2017年08月10日 15:46:30 +0000 (2017年8月10日)
Log Message:
-----------
Remove commented code
Modified Paths:
--------------
 trunk/lib/WikiUser/PearDb.php
Modified: trunk/lib/WikiUser/PearDb.php
===================================================================
--- trunk/lib/WikiUser/PearDb.php	2017年08月10日 15:44:36 UTC (rev 10030)
+++ trunk/lib/WikiUser/PearDb.php	2017年08月10日 15:46:30 UTC (rev 10031)
@@ -98,11 +98,6 @@
 
 // if the prefs are changed
 if ($count = _AnonUser::setPreferences($prefs, 1)) {
- //global $request;
- //$user = $request->_user;
- //unset($user->_auth_dbi);
- // this must be done in $request->_setUser, not here!
- //$request->setSessionVar('wiki_user', $user);
 $this->getAuthDbh();
 $packed = $this->_prefs->store();
 if (!$id_only and isset($this->_prefs->_update)) {
@@ -134,7 +129,7 @@
 if (isset($this->_HomePagehandle) && $this->_HomePagehandle and !$id_only)
 $this->_HomePagehandle->set('pref', $packed);
 }
- return $count; //count($this->_prefs->unpack($packed));
+ return $count;
 }
 return 0;
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10030
 http://sourceforge.net/p/phpwiki/code/10030
Author: vargenau
Date: 2017年08月10日 15:44:36 +0000 (2017年8月10日)
Log Message:
-----------
PHP Doc
Modified Paths:
--------------
 trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php
Modified: trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php	2017年08月10日 15:01:53 UTC (rev 10029)
+++ trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php	2017年08月10日 15:44:36 UTC (rev 10030)
@@ -34,8 +34,8 @@
 extends WikiDB_backend_iterator
 {
 /**
- * @param $backend object A WikiDB_backend.
- * @param $pagename string Page whose revisions to get.
+ * @param WikiDB_backend $backend
+ * @param string $pagename Page whose revisions to get.
 */
 function __construct($backend, $pagename)
 {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10029
 http://sourceforge.net/p/phpwiki/code/10029
Author: vargenau
Date: 2017年08月10日 15:01:53 +0000 (2017年8月10日)
Log Message:
-----------
Align PDO code with Pear
Modified Paths:
--------------
 trunk/lib/WikiDB/backend/PDO.php
Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2017年08月10日 14:27:11 UTC (rev 10028)
+++ trunk/lib/WikiDB/backend/PDO.php	2017年08月10日 15:01:53 UTC (rev 10029)
@@ -225,9 +225,9 @@
 $dbh = &$this->_dbh;
 extract($this->_table_names);
 $sth = $dbh->prepare("SELECT $page_tbl.id AS id"
- . " FROM $nonempty_tbl, $page_tbl"
- . " WHERE $nonempty_tbl.id=$page_tbl.id"
- . " AND pagename=?");
+ . " FROM $nonempty_tbl, $page_tbl"
+ . " WHERE $nonempty_tbl.id=$page_tbl.id"
+ . " AND pagename=?");
 $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100);
 if ($sth->execute())
 return $sth->fetchColumn();
@@ -426,10 +426,10 @@
 $dbh = &$this->_dbh;
 extract($this->_table_names);
 $sth = $dbh->prepare("SELECT latestversion"
- . " FROM $page_tbl, $recent_tbl"
- . " WHERE $page_tbl.id=$recent_tbl.id"
- . " AND pagename=?"
- . " LIMIT 1");
+ . " FROM $page_tbl, $recent_tbl"
+ . " WHERE $page_tbl.id=$recent_tbl.id"
+ . " AND pagename=?"
+ . " LIMIT 1");
 $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100);
 $sth->execute();
 return $sth->fetchColumn();
@@ -473,8 +473,9 @@
 
 // FIXME: optimization: sometimes don't get page data?
 if ($want_content) {
- $fields = $this->page_tbl_fields . ", $page_tbl.pagedata AS pagedata"
- . ', ' . $this->version_tbl_fields;
+ $fields = $this->page_tbl_fields
+ . ",$page_tbl.pagedata AS pagedata,"
+ . $this->version_tbl_fields;
 } else {
 $fields = $this->page_tbl_fields . ", '' AS pagedata"
 . ", $version_tbl.version AS version, $version_tbl.mtime AS mtime, "
@@ -482,11 +483,11 @@
 . "$version_tbl.versiondata as versiondata";
 }
 $sth = $dbh->prepare("SELECT $fields"
- . " FROM $page_tbl, $version_tbl"
- . " WHERE $page_tbl.id=$version_tbl.id"
- . " AND pagename=?"
- . " AND version=?"
- . " LIMIT 1");
+ . " FROM $page_tbl, $version_tbl"
+ . " WHERE $page_tbl.id=$version_tbl.id"
+ . " AND pagename=?"
+ . " AND version=?"
+ . " LIMIT 1");
 $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100);
 $sth->bindParam(2, $version, PDO::PARAM_INT);
 $sth->execute();
@@ -691,9 +692,9 @@
 
 $this->lock(array('version', 'recent', 'nonempty', 'page', 'link'));
 if (($id = $this->_get_pageid($pagename, false))) {
+ $dbh->query("DELETE FROM $nonempty_tbl WHERE id=$id");
+ $dbh->query("DELETE FROM $recent_tbl WHERE id=$id");
 $dbh->query("DELETE FROM $version_tbl WHERE id=$id");
- $dbh->query("DELETE FROM $recent_tbl WHERE id=$id");
- $dbh->query("DELETE FROM $nonempty_tbl WHERE id=$id");
 $this->set_links($pagename, array());
 $sth = $dbh->prepare("SELECT COUNT(*) FROM $link_tbl WHERE linkto=$id");
 $sth->execute();
@@ -837,13 +838,14 @@
 extract($this->_table_names);
 $orderby = $this->sortby($sortby, 'db');
 if ($orderby) $orderby = ' ORDER BY ' . $orderby;
- if ($exclude) // array of pagenames
+ if ($exclude) { // array of pagenames
 $exclude = " AND $page_tbl.pagename NOT IN " . $this->_sql_set($exclude);
- else
+ } else {
 $exclude = '';
+ }
 $limit = $this->_limit_sql($limit);
 
- if (strstr($orderby, 'mtime ')) { // was ' mtime'
+ if (strstr($orderby, 'mtime ')) { // multiple columns possible
 if ($include_empty) {
 $sql = "SELECT "
 . $this->page_tbl_fields
@@ -885,7 +887,7 @@
 }
 
 /*
- * Title and fulltext search.
+ * Text search (title or full text)
 */
 public function text_search($search, $fulltext = false,
 $sortby = '', $limit = '', $exclude = '')
@@ -958,9 +960,10 @@
 } else {
 $where = " AND hits > 0";
 }
+ $orderby = '';
 if ($sortby != '-hits') {
- if ($order = $this->sortby($sortby, 'db')) $orderby = " ORDER BY " . $order;
- else $orderby = "";
+ if ($order = $this->sortby($sortby, 'db'))
+ $orderby = " ORDER BY " . $order;
 } else {
 $orderby = " ORDER BY hits $order";
 }
@@ -1108,13 +1111,13 @@
 // Cludge Alert!
 // This page does not exist (already verified before), but exists in the page table.
 // So we delete this page.
- $dbh->query("DELETE FROM $page_tbl WHERE id=$new");
+ $dbh->query("DELETE FROM $nonempty_tbl WHERE id=$new");
+ $dbh->query("DELETE FROM $recent_tbl WHERE id=$new");
 $dbh->query("DELETE FROM $version_tbl WHERE id=$new");
- $dbh->query("DELETE FROM $recent_tbl WHERE id=$new");
- $dbh->query("DELETE FROM $nonempty_tbl WHERE id=$new");
 // We have to fix all referring tables to the old id
 $dbh->query("UPDATE $link_tbl SET linkfrom=$id WHERE linkfrom=$new");
 $dbh->query("UPDATE $link_tbl SET linkto=$id WHERE linkto=$new");
+ $dbh->query("DELETE FROM $page_tbl WHERE id=$new");
 }
 $sth = $dbh->prepare("UPDATE $page_tbl SET pagename=? WHERE id=?");
 $sth->bindParam(1, $to, PDO::PARAM_STR, 100);
@@ -1137,11 +1140,11 @@
 $backend_type = $this->backendType();
 if (substr($backend_type, 0, 5) == 'mysql') {
 $sth = $dbh->prepare("REPLACE INTO $recent_tbl"
- . " (id, latestversion, latestmajor, latestminor)"
- . " SELECT id, $maxversion, $maxmajor, $maxminor"
- . " FROM $version_tbl"
- . ($pageid ? " WHERE id=$pageid" : "")
- . " GROUP BY id");
+ . " (id, latestversion, latestmajor, latestminor)"
+ . " SELECT id, $maxversion, $maxmajor, $maxminor"
+ . " FROM $version_tbl"
+ . ($pageid ? " WHERE id=$pageid" : "")
+ . " GROUP BY id");
 $sth->execute();
 } else {
 $this->lock(array('recent'));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10028
 http://sourceforge.net/p/phpwiki/code/10028
Author: vargenau
Date: 2017年08月10日 14:27:11 +0000 (2017年8月10日)
Log Message:
-----------
Use __construct
Modified Paths:
--------------
 trunk/lib/DbaPartition.php
Modified: trunk/lib/DbaPartition.php
===================================================================
--- trunk/lib/DbaPartition.php	2017年08月10日 14:23:31 UTC (rev 10027)
+++ trunk/lib/DbaPartition.php	2017年08月10日 14:27:11 UTC (rev 10028)
@@ -25,7 +25,7 @@
 
 class DbaPartition
 {
- function DbaPartition(&$dbm, $prefix)
+ function __construct(&$dbm, $prefix)
 {
 $this->_h = &$dbm;
 $this->_p = $prefix;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10027
 http://sourceforge.net/p/phpwiki/code/10027
Author: vargenau
Date: 2017年08月10日 14:23:31 +0000 (2017年8月10日)
Log Message:
-----------
No self-closing <div>
Modified Paths:
--------------
 trunk/lib/display.php
Modified: trunk/lib/display.php
===================================================================
--- trunk/lib/display.php	2017年08月10日 14:22:04 UTC (rev 10026)
+++ trunk/lib/display.php	2017年08月10日 14:23:31 UTC (rev 10027)
@@ -260,7 +260,7 @@
 $request->finish();
 } else {
 $request->cacheControl();
- echo('<div style="display:none;" />');
+ echo('<div style="display:none;"></div>');
 $request->_is_buffering_output = false; // avoid wrong Content-Length with errors
 $request->finish();
 exit();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10026
 http://sourceforge.net/p/phpwiki/code/10026
Author: vargenau
Date: 2017年08月10日 14:22:04 +0000 (2017年8月10日)
Log Message:
-----------
Remove $Id
Modified Paths:
--------------
 trunk/doc/HISTORY
 trunk/locale/README
Modified: trunk/doc/HISTORY
===================================================================
--- trunk/doc/HISTORY	2017年08月10日 14:13:16 UTC (rev 10025)
+++ trunk/doc/HISTORY	2017年08月10日 14:22:04 UTC (rev 10026)
@@ -595,5 +595,3 @@
 
 Prior to 0.02, there were no numbered releases, and in fact there
 was only one release, so I guess that would be 0.01 :-)
-
-$Id: HISTORY 7665 2010年08月31日 15:54:37Z vargenau $
Modified: trunk/locale/README
===================================================================
--- trunk/locale/README	2017年08月10日 14:13:16 UTC (rev 10025)
+++ trunk/locale/README	2017年08月10日 14:22:04 UTC (rev 10026)
@@ -371,5 +371,3 @@
 Arno Hollosi <aho...@ma...>
 Carsten Klapp <car...@us...>
 Reini Urban <ru...@x-...>
-
-$Id: README 7001 2009年07月06日 14:23:30Z vargenau $
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10025
 http://sourceforge.net/p/phpwiki/code/10025
Author: vargenau
Date: 2017年08月10日 14:13:16 +0000 (2017年8月10日)
Log Message:
-----------
Use __construct
Modified Paths:
--------------
 trunk/themes/Hawaiian/lib/random.php
Modified: trunk/themes/Hawaiian/lib/random.php
===================================================================
--- trunk/themes/Hawaiian/lib/random.php	2017年08月10日 14:12:30 UTC (rev 10024)
+++ trunk/themes/Hawaiian/lib/random.php	2017年08月10日 14:13:16 UTC (rev 10025)
@@ -30,7 +30,7 @@
 * $imgSet = new randomImage($WikiTheme->file("images/pictures"));
 * $imgFile = "pictures/" . $imgSet->filename;
 */
- function randomImage($dirname)
+ function __construct($dirname)
 {
 
 $this->filename = ""; // Pick up your filename here.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10024
 http://sourceforge.net/p/phpwiki/code/10024
Author: vargenau
Date: 2017年08月10日 14:12:30 +0000 (2017年8月10日)
Log Message:
-----------
Remove commented code
Modified Paths:
--------------
 trunk/lib/wikilens/PageListColumns.php
Modified: trunk/lib/wikilens/PageListColumns.php
===================================================================
--- trunk/lib/wikilens/PageListColumns.php	2017年07月11日 13:47:03 UTC (rev 10023)
+++ trunk/lib/wikilens/PageListColumns.php	2017年08月10日 14:12:30 UTC (rev 10024)
@@ -391,7 +391,6 @@
 $html->pushContent(_("None"));
 }
 
- //return $top3list;
 return $html;
 }
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.