Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[8969] trunk/lib
|
From: <var...@us...> - 2014-07-17 09:02:38
|
Revision: 8969
http://sourceforge.net/p/phpwiki/code/8969
Author: vargenau
Date: 2014-07-17 09:02:29 +0000 (Thu, 17 Jul 2014)
Log Message:
-----------
PDO_FETCH_NUM --> PDO::FETCH_NUM; PDO uses class constants since PHP 5.1. Prior releases use global constants in the form PDO_PARAM_BOOL
Modified Paths:
--------------
trunk/lib/WikiDB/PDO.php
trunk/lib/WikiDB/backend/PDO.php
trunk/lib/WikiDB/backend/PDO_mysql.php
trunk/lib/WikiDB/backend/PDO_oci8.php
trunk/lib/WikiUser/PdoDb.php
Modified: trunk/lib/WikiDB/PDO.php
===================================================================
--- trunk/lib/WikiDB/PDO.php 2014-07-17 08:38:53 UTC (rev 8968)
+++ trunk/lib/WikiDB/PDO.php 2014-07-17 09:02:29 UTC (rev 8969)
@@ -83,7 +83,7 @@
// SQL result: for simple select or create/update queries
// returns the database specific resource type
- function genericSqlQuery($sql, $args = false)
+ function genericSqlQuery($sql, $args = array())
{
try {
$sth = $this->_backend->_dbh->prepare($sql);
@@ -93,7 +93,7 @@
}
}
if ($sth->execute())
- $result = $sth->fetch(PDO_FETCH_BOTH);
+ $result = $sth->fetch(PDO::FETCH_BOTH);
else
return false;
} catch (PDOException $e) {
Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php 2014-07-17 08:38:53 UTC (rev 8968)
+++ trunk/lib/WikiDB/backend/PDO.php 2014-07-17 09:02:29 UTC (rev 8969)
@@ -95,9 +95,9 @@
$this->_dbh = new PDO($dbparams['dsn'],
$this->_parsedDSN['username'],
$this->_parsedDSN['password'],
- array(PDO_ATTR_AUTOCOMMIT => true,
- PDO_ATTR_TIMEOUT => DATABASE_TIMEOUT,
- PDO_ATTR_PERSISTENT => !empty($parsed['persistent'])
+ array(PDO::ATTR_AUTOCOMMIT => true,
+ PDO::ATTR_TIMEOUT => DATABASE_TIMEOUT,
+ PDO::ATTR_PERSISTENT => !empty($parsed['persistent'])
or DATABASE_PERSISTENT
));
} catch (PDOException $e) {
@@ -118,7 +118,7 @@
}
$this->_dsn = $dbparams['dsn'];
$this->_dbh->databaseType = $driver;
- $this->_dbh->setAttribute(PDO_ATTR_CASE, PDO_CASE_NATURAL);
+ $this->_dbh->setAttribute(PDO::ATTR_CASE, PDO::CASE_NATURAL);
// Use the faster FETCH_NUM, with some special ASSOC based exceptions.
$this->_hasTransactions = true;
@@ -190,7 +190,7 @@
{
$sth = $this->_dbh->prepare($sql);
if ($sth->execute())
- return $sth->fetch(PDO_FETCH_BOTH);
+ return $sth->fetch(PDO::FETCH_BOTH);
else
return false;
}
@@ -223,7 +223,7 @@
. " FROM $nonempty_tbl, $page_tbl"
. " WHERE $nonempty_tbl.id=$page_tbl.id"
. " AND pagename=?");
- $sth->bindParam(1, $pagename, PDO_PARAM_STR, 100);
+ $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100);
if ($sth->execute())
return $sth->fetchColumn();
else
@@ -238,7 +238,7 @@
. " FROM $nonempty_tbl, $page_tbl"
. " WHERE $nonempty_tbl.id=$page_tbl.id"
. " LIMIT 1");
- return $sth->fetchAll(PDO_FETCH_NUM);
+ return $sth->fetchAll(PDO::FETCH_NUM);
}
function numPages($filter = false, $exclude = '')
@@ -258,7 +258,7 @@
$sth = $dbh->prepare("UPDATE $page_tbl SET hits=hits+1"
. " WHERE pagename=?"
. " LIMIT 1");
- $sth->bindParam(1, $pagename, PDO_PARAM_STR, 100);
+ $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100);
$sth->execute();
}
@@ -271,9 +271,9 @@
$page_tbl = $this->_table_names['page_tbl'];
$sth = $dbh->prepare("SELECT id,pagename,hits,pagedata FROM $page_tbl"
. " WHERE pagename=? LIMIT 1");
- $sth->bindParam(1, $pagename, PDO_PARAM_STR, 100);
+ $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100);
$sth->execute();
- $row = $sth->fetch(PDO_FETCH_NUM);
+ $row = $sth->fetch(PDO::FETCH_NUM);
return $row ? $this->_extract_page_data($row[3], $row[2]) : false;
}
@@ -296,8 +296,8 @@
// have a record in the page table. Since it's just the
// hit count, who cares?
$sth = $dbh->prepare("UPDATE $page_tbl SET hits=? WHERE pagename=? LIMIT 1");
- $sth->bindParam(1, $newdata['hits'], PDO_PARAM_INT);
- $sth->bindParam(2, $pagename, PDO_PARAM_STR, 100);
+ $sth->bindParam(1, $newdata['hits'], PDO::PARAM_INT);
+ $sth->bindParam(2, $pagename, PDO::PARAM_STR, 100);
$sth->execute();
return;
}
@@ -323,9 +323,9 @@
. " SET hits=?, pagedata=?"
. " WHERE pagename=?"
. " LIMIT 1");
- $sth->bindParam(1, $hits, PDO_PARAM_INT);
- $sth->bindParam(2, $this->_serialize($data), PDO_PARAM_LOB);
- $sth->bindParam(3, $pagename, PDO_PARAM_STR, 100);
+ $sth->bindParam(1, $hits, PDO::PARAM_INT);
+ $sth->bindParam(2, $this->_serialize($data), PDO::PARAM_LOB);
+ $sth->bindParam(3, $pagename, PDO::PARAM_STR, 100);
if ($sth->execute()) {
$this->commit();
return true;
@@ -340,9 +340,9 @@
$dbh = &$this->_dbh;
$page_tbl = $this->_table_names['page_tbl'];
$sth = $dbh->prepare("SELECT cached_html FROM $page_tbl WHERE pagename=? LIMIT 1");
- $sth->bindParam(1, $pagename, PDO_PARAM_STR, 100);
+ $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100);
$sth->execute();
- return $sth->fetchColumn(PDO_FETCH_NUM);
+ return $sth->fetchColumn(PDO::FETCH_NUM);
}
function set_cached_html($pagename, $data)
@@ -354,8 +354,8 @@
. " SET cached_html=?"
. " WHERE pagename=?"
. " LIMIT 1");
- $sth->bindParam(1, $data, PDO_PARAM_STR);
- $sth->bindParam(2, $pagename, PDO_PARAM_STR, 100);
+ $sth->bindParam(1, $data, PDO::PARAM_STR);
+ $sth->bindParam(2, $pagename, PDO::PARAM_STR, 100);
$sth->execute();
}
@@ -376,7 +376,7 @@
$dbh = &$this->_dbh;
$page_tbl = $this->_table_names['page_tbl'];
$sth = $dbh->prepare("SELECT id FROM $page_tbl WHERE pagename=? LIMIT 1");
- $sth->bindParam(1, $pagename, PDO_PARAM_STR, 100);
+ $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100);
$id = $sth->fetchColumn();
if (!$create_if_missing) {
return $id;
@@ -388,7 +388,7 @@
$sth = $dbh->prepare("INSERT INTO $page_tbl"
. " (id,pagename)"
. " VALUES (NULL,?)");
- $sth->bindParam(1, $pagename, PDO_PARAM_STR, 100);
+ $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100);
$sth->execute();
$id = $dbh->lastInsertId();
} else {
@@ -400,8 +400,8 @@
. " (id,pagename,hits)"
. " VALUES (?,?,0)");
$id++;
- $sth->bindParam(1, $id, PDO_PARAM_INT);
- $sth->bindParam(2, $pagename, PDO_PARAM_STR, 100);
+ $sth->bindParam(1, $id, PDO::PARAM_INT);
+ $sth->bindParam(2, $pagename, PDO::PARAM_STR, 100);
if ($sth->execute())
$this->commit();
else
@@ -421,7 +421,7 @@
. " WHERE $page_tbl.id=$recent_tbl.id"
. " AND pagename=?"
. " LIMIT 1");
- $sth->bindParam(1, $pagename, PDO_PARAM_STR, 100);
+ $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100);
$sth->execute();
return $sth->fetchColumn();
}
@@ -437,8 +437,8 @@
. " AND version < ?"
. " ORDER BY version DESC"
. " LIMIT 1");
- $sth->bindParam(1, $pagename, PDO_PARAM_STR, 100);
- $sth->bindParam(2, $version, PDO_PARAM_INT);
+ $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100);
+ $sth->bindParam(2, $version, PDO::PARAM_INT);
$sth->execute();
return $sth->fetchColumn();
}
@@ -476,10 +476,10 @@
. " AND pagename=?"
. " AND version=?"
. " LIMIT 1");
- $sth->bindParam(1, $pagename, PDO_PARAM_STR, 100);
- $sth->bindParam(2, $version, PDO_PARAM_INT);
+ $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100);
+ $sth->bindParam(2, $version, PDO::PARAM_INT);
$sth->execute();
- $row = $sth->fetch(PDO_FETCH_NUM);
+ $row = $sth->fetch(PDO::FETCH_NUM);
return $row ? $this->_extract_version_data_num($row, $want_content) : false;
}
@@ -552,28 +552,28 @@
$sth = $dbh->prepare("REPLACE INTO $version_tbl"
. " (id,version,mtime,minor_edit,content,versiondata)"
. " VALUES(?,?,?,?,?,?)");
- $sth->bindParam(1, $id, PDO_PARAM_INT);
- $sth->bindParam(2, $version, PDO_PARAM_INT);
- $sth->bindParam(3, $mtime, PDO_PARAM_INT);
- $sth->bindParam(4, $minor_edit, PDO_PARAM_INT);
- $sth->bindParam(5, $content, PDO_PARAM_STR, 100);
- $sth->bindParam(6, $this->_serialize($data), PDO_PARAM_STR, 100);
+ $sth->bindParam(1, $id, PDO::PARAM_INT);
+ $sth->bindParam(2, $version, PDO::PARAM_INT);
+ $sth->bindParam(3, $mtime, PDO::PARAM_INT);
+ $sth->bindParam(4, $minor_edit, PDO::PARAM_INT);
+ $sth->bindParam(5, $content, PDO::PARAM_STR, 100);
+ $sth->bindParam(6, $this->_serialize($data), PDO::PARAM_STR, 100);
$rs = $sth->execute();
} else {
$sth = $dbh->prepare("DELETE FROM $version_tbl"
. " WHERE id=? AND version=?");
- $sth->bindParam(1, $id, PDO_PARAM_INT);
- $sth->bindParam(2, $version, PDO_PARAM_INT);
+ $sth->bindParam(1, $id, PDO::PARAM_INT);
+ $sth->bindParam(2, $version, PDO::PARAM_INT);
$sth->execute();
$sth = $dbh->prepare("INSERT INTO $version_tbl"
. " (id,version,mtime,minor_edit,content,versiondata)"
. " VALUES(?,?,?,?,?,?)");
- $sth->bindParam(1, $id, PDO_PARAM_INT);
- $sth->bindParam(2, $version, PDO_PARAM_INT);
- $sth->bindParam(3, $mtime, PDO_PARAM_INT);
- $sth->bindParam(4, $minor_edit, PDO_PARAM_INT);
- $sth->bindParam(5, $content, PDO_PARAM_STR, 100);
- $sth->bindParam(6, $this->_serialize($data), PDO_PARAM_STR, 100);
+ $sth->bindParam(1, $id, PDO::PARAM_INT);
+ $sth->bindParam(2, $version, PDO::PARAM_INT);
+ $sth->bindParam(3, $mtime, PDO::PARAM_INT);
+ $sth->bindParam(4, $minor_edit, PDO::PARAM_INT);
+ $sth->bindParam(5, $content, PDO::PARAM_STR, 100);
+ $sth->bindParam(6, $this->_serialize($data), PDO::PARAM_STR, 100);
$rs = $sth->execute();
}
$this->_update_recent_table($id);
@@ -636,12 +636,12 @@
$insert = $dbh->prepare("INSERT INTO $version_tbl"
. " (id,version,mtime,minor_edit,content,versiondata)"
. " VALUES(?,?,?,?,?,?)");
- $insert->bindParam(1, $id, PDO_PARAM_INT);
- $insert->bindParam(2, $version + 1, PDO_PARAM_INT);
- $insert->bindParam(3, $mtime, PDO_PARAM_INT);
- $insert->bindParam(4, 0, PDO_PARAM_INT);
- $insert->bindParam(5, '', PDO_PARAM_STR, 100);
- $insert->bindParam(6, $this->_serialize($meta), PDO_PARAM_STR, 100);
+ $insert->bindParam(1, $id, PDO::PARAM_INT);
+ $insert->bindParam(2, $version + 1, PDO::PARAM_INT);
+ $insert->bindParam(3, $mtime, PDO::PARAM_INT);
+ $insert->bindParam(4, 0, PDO::PARAM_INT);
+ $insert->bindParam(5, '', PDO::PARAM_STR, 100);
+ $insert->bindParam(6, $this->_serialize($meta), PDO::PARAM_STR, 100);
if ($insert->execute()
and $dbh->query("DELETE FROM $nonempty_tbl WHERE id=$id")
and $this->set_links($pagename, false)
@@ -724,7 +724,7 @@
$sth = $dbh->prepare("SELECT $link_tbl.linkto as id FROM $link_tbl" .
" WHERE linkfrom=$pageid");
$sth->execute();
- foreach ($sth->fetchAll(PDO_FETCH_NUM) as $id) {
+ foreach ($sth->fetchAll(PDO::FETCH_NUM) as $id) {
// ...check if the page is empty and has no version
$sth1 = $dbh->prepare("SELECT $page_tbl.id FROM $page_tbl"
. " LEFT JOIN $nonempty_tbl USING (id) "
@@ -779,9 +779,9 @@
. $exclude
. $orderby
. $limit);
- $sth->bindParam(1, $pagename, PDO_PARAM_STR, 100);
+ $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100);
$sth->execute();
- $result = $sth->fetch(PDO_FETCH_BOTH);
+ $result = $sth->fetch(PDO::FETCH_BOTH);
return new WikiDB_backend_PDO_iter($this, $result, $this->page_tbl_field_list);
}
@@ -802,8 +802,8 @@
. " WHERE linkfrom=linker.id AND linkto=linkee.id"
. " AND $have.pagename=?"
. " AND $want.pagename=?");
- $sth->bindParam(1, $pagename, PDO_PARAM_STR, 100);
- $sth->bindParam(2, $link, PDO_PARAM_STR, 100);
+ $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100);
+ $sth->bindParam(2, $link, PDO::PARAM_STR, 100);
$sth->execute();
return $sth->fetchColumn();
}
@@ -857,7 +857,7 @@
}
$sth = $dbh->prepare($sql . $limit);
$sth->execute();
- $result = $sth->fetch(PDO_FETCH_BOTH);
+ $result = $sth->fetch(PDO::FETCH_BOTH);
return new WikiDB_backend_PDO_iter($this, $result, $this->page_tbl_field_list);
}
@@ -899,7 +899,7 @@
. $orderby
. $limit);
$sth->execute();
- $result = $sth->fetch(PDO_FETCH_NUM);
+ $result = $sth->fetch(PDO::FETCH_NUM);
$iter = new WikiDB_backend_PDO_iter($this, $result, $field_list);
$iter->stoplisted = $searchobj->stoplisted;
return $iter;
@@ -952,7 +952,7 @@
$sth = $dbh->prepare($sql);
}
$sth->execute();
- $result = $sth->fetch(PDO_FETCH_NUM);
+ $result = $sth->fetch(PDO::FETCH_NUM);
return new WikiDB_backend_PDO_iter($this, $result, $this->page_tbl_field_list);
}
@@ -1023,7 +1023,7 @@
$sth = $dbh->prepare($sql);
}
$sth->execute();
- $result = $sth->fetch(PDO_FETCH_NUM);
+ $result = $sth->fetch(PDO::FETCH_NUM);
return new WikiDB_backend_PDO_iter($this, $result,
array_merge($this->page_tbl_field_list, $this->version_tbl_field_list));
}
@@ -1066,7 +1066,7 @@
$sth = $dbh->prepare($sql);
}
$sth->execute();
- $result = $sth->fetch(PDO_FETCH_NUM);
+ $result = $sth->fetch(PDO::FETCH_NUM);
return new WikiDB_backend_PDO_iter($this, $result, array('pagename', 'wantedfrom'));
}
@@ -1093,8 +1093,8 @@
$dbh->query("UPDATE $link_tbl SET linkto=$id WHERE linkto=$new");
}
$sth = $dbh->prepare("UPDATE $page_tbl SET pagename=? WHERE id=?");
- $sth->bindParam(1, $to, PDO_PARAM_STR, 100);
- $sth->bindParam(2, $id, PDO_PARAM_INT);
+ $sth->bindParam(1, $to, PDO::PARAM_STR, 100);
+ $sth->bindParam(2, $id, PDO::PARAM_INT);
$sth->execute();
}
$this->unlock(array('page'));
@@ -1309,20 +1309,20 @@
. "request_file,request_uri,request_time,status,bytes_sent,referer,agent,request_duration)"
. " VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)");
// Either use unixtime as %d (long), or the native timestamp format.
- $sth->bindParam(1, $entry->time, PDO_PARAM_INT);
- $sth->bindParam(2, $entry->host, PDO_PARAM_STR, 100);
- $sth->bindParam(3, $entry->user, PDO_PARAM_STR, 50);
- $sth->bindParam(4, $entry->request_method, PDO_PARAM_STR, 10);
- $sth->bindParam(5, $entry->request, PDO_PARAM_STR, 255);
- $sth->bindParam(6, $entry->request_args, PDO_PARAM_STR, 255);
- $sth->bindParam(7, $entry->request_uri, PDO_PARAM_STR, 255);
- $sth->bindParam(8, $entry->_ncsa_time($entry->time), PDO_PARAM_STR, 28);
- $sth->bindParam(9, $entry->time, PDO_PARAM_INT);
- $sth->bindParam(10, $entry->status, PDO_PARAM_INT);
- $sth->bindParam(11, $entry->size, PDO_PARAM_INT);
- $sth->bindParam(12, $entry->referer, PDO_PARAM_STR, 255);
- $sth->bindParam(13, $entry->user_agent, PDO_PARAM_STR, 255);
- $sth->bindParam(14, $entry->duration, PDO_PARAM_FLOAT);
+ $sth->bindParam(1, $entry->time, PDO::PARAM_INT);
+ $sth->bindParam(2, $entry->host, PDO::PARAM_STR, 100);
+ $sth->bindParam(3, $entry->user, PDO::PARAM_STR, 50);
+ $sth->bindParam(4, $entry->request_method, PDO::PARAM_STR, 10);
+ $sth->bindParam(5, $entry->request, PDO::PARAM_STR, 255);
+ $sth->bindParam(6, $entry->request_args, PDO::PARAM_STR, 255);
+ $sth->bindParam(7, $entry->request_uri, PDO::PARAM_STR, 255);
+ $sth->bindParam(8, $entry->_ncsa_time($entry->time), PDO::PARAM_STR, 28);
+ $sth->bindParam(9, $entry->time, PDO::PARAM_INT);
+ $sth->bindParam(10, $entry->status, PDO::PARAM_INT);
+ $sth->bindParam(11, $entry->size, PDO::PARAM_INT);
+ $sth->bindParam(12, $entry->referer, PDO::PARAM_STR, 255);
+ $sth->bindParam(13, $entry->user_agent, PDO::PARAM_STR, 255);
+ $sth->bindParam(14, $entry->duration, PDO::PARAM_FLOAT);
$sth->execute();
}
}
@@ -1352,7 +1352,7 @@
if (!is_object($result)) {
return false;
}
- return $result->fetch(PDO_FETCH_BOTH);
+ return $result->fetch(PDO::FETCH_BOTH);
}
function free()
@@ -1373,7 +1373,7 @@
return false;
}
$this->_backend = &$backend;
- $rec = $result->fetch(PDO_FETCH_ASSOC);
+ $rec = $result->fetch(PDO::FETCH_ASSOC);
if (isset($rec['pagedata']))
$rec['pagedata'] = $backend->_extract_page_data($rec['pagedata'], $rec['hits']);
Modified: trunk/lib/WikiDB/backend/PDO_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_mysql.php 2014-07-17 08:38:53 UTC (rev 8968)
+++ trunk/lib/WikiDB/backend/PDO_mysql.php 2014-07-17 09:02:29 UTC (rev 8969)
@@ -61,7 +61,7 @@
if (empty($this->_dbparams['timeout'])) return;
$sth = $this->_dbh->prepare("SHOW processlist");
if ($sth->execute())
- while ($row = $sth->fetch(PDO_FETCH_ASSOC)) {
+ while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
if ($row["db"] == $this->_dsn['database']
and $row["User"] == $this->_dsn['username']
and $row["Time"] > $this->_dbparams['timeout']
@@ -90,7 +90,7 @@
$sth = $this->_dbh->prepare("SHOW TABLES");
$sth->execute();
$tables = array();
- while ($row = $sth->fetch(PDO_FETCH_NUM)) {
+ while ($row = $sth->fetch(PDO::FETCH_NUM)) {
$tables[] = $row[0];
}
return $tables;
@@ -118,7 +118,7 @@
$sth = $conn->prepare("SHOW COLUMNS FROM $table");
$sth->execute();
$field_list = array();
- while ($row = $sth->fetch(PDO_FETCH_NUM)) {
+ while ($row = $sth->fetch(PDO::FETCH_NUM)) {
$field_list[] = $row[0];
}
if ($database != $old_db) {
Modified: trunk/lib/WikiDB/backend/PDO_oci8.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_oci8.php 2014-07-17 08:38:53 UTC (rev 8968)
+++ trunk/lib/WikiDB/backend/PDO_oci8.php 2014-07-17 09:02:29 UTC (rev 8969)
@@ -73,19 +73,19 @@
. " VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)");
// Either use unixtime as %d (long), or the native timestamp format.
$sth->bindParam(1, date('d-M-Y H:i:s', $entry->time));
- $sth->bindParam(2, $entry->host, PDO_PARAM_STR, 100);
- $sth->bindParam(3, $entry->user, PDO_PARAM_STR, 50);
- $sth->bindParam(4, $entry->request_method, PDO_PARAM_STR, 10);
- $sth->bindParam(5, $entry->request, PDO_PARAM_STR, 255);
- $sth->bindParam(6, $entry->request_args, PDO_PARAM_STR, 255);
- $sth->bindParam(7, $entry->request_uri, PDO_PARAM_STR, 255);
- $sth->bindParam(8, $entry->_ncsa_time($entry->time), PDO_PARAM_STR, 28);
- $sth->bindParam(9, $entry->time, PDO_PARAM_INT);
- $sth->bindParam(10, $entry->status, PDO_PARAM_INT);
- $sth->bindParam(11, $entry->size, PDO_PARAM_INT);
- $sth->bindParam(12, $entry->referer, PDO_PARAM_STR, 255);
- $sth->bindParam(13, $entry->user_agent, PDO_PARAM_STR, 255);
- $sth->bindParam(14, $entry->duration, PDO_PARAM_FLOAT);
+ $sth->bindParam(2, $entry->host, PDO::PARAM_STR, 100);
+ $sth->bindParam(3, $entry->user, PDO::PARAM_STR, 50);
+ $sth->bindParam(4, $entry->request_method, PDO::PARAM_STR, 10);
+ $sth->bindParam(5, $entry->request, PDO::PARAM_STR, 255);
+ $sth->bindParam(6, $entry->request_args, PDO::PARAM_STR, 255);
+ $sth->bindParam(7, $entry->request_uri, PDO::PARAM_STR, 255);
+ $sth->bindParam(8, $entry->_ncsa_time($entry->time), PDO::PARAM_STR, 28);
+ $sth->bindParam(9, $entry->time, PDO::PARAM_INT);
+ $sth->bindParam(10, $entry->status, PDO::PARAM_INT);
+ $sth->bindParam(11, $entry->size, PDO::PARAM_INT);
+ $sth->bindParam(12, $entry->referer, PDO::PARAM_STR, 255);
+ $sth->bindParam(13, $entry->user_agent, PDO::PARAM_STR, 255);
+ $sth->bindParam(14, $entry->duration, PDO::PARAM_FLOAT);
$sth->execute();
}
}
Modified: trunk/lib/WikiUser/PdoDb.php
===================================================================
--- trunk/lib/WikiUser/PdoDb.php 2014-07-17 08:38:53 UTC (rev 8968)
+++ trunk/lib/WikiUser/PdoDb.php 2014-07-17 09:02:29 UTC (rev 8969)
@@ -64,7 +64,7 @@
$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);
+ $prefs = $db_result->fetch(PDO::FETCH_BOTH);
$prefs_blob = @$prefs["prefs"];
if ($restored_from_db = $this->_prefs->retrieve($prefs_blob)) {
$this->_prefs->updatePrefs($restored_from_db);
@@ -138,7 +138,7 @@
and $this->_authselect
) {
try {
- $this->_authselect->bindParam("userid", $this->_userid, PDO_PARAM_STR, 48);
+ $this->_authselect->bindParam("userid", $this->_userid, PDO::PARAM_STR, 48);
$this->_authselect->execute();
} catch (PDOException $e) {
trigger_error("SQL Error: " . $e->getMessage(), E_USER_WARNING);
@@ -151,7 +151,7 @@
trigger_error(fmt("%s is missing", 'DBAUTH_AUTH_USER_EXISTS'),
E_USER_WARNING);
$this->_authcheck = $dbh->prepare($dbi->getAuthParam('auth_check'));
- $this->_authcheck->bindParam("userid", $this->_userid, PDO_PARAM_STR, 48);
+ $this->_authcheck->bindParam("userid", $this->_userid, PDO::PARAM_STR, 48);
$this->_authcheck->execute();
if ($this->_authcheck->fetchColumn())
return true;
@@ -174,8 +174,8 @@
) {
$passwd = $GLOBALS['HTTP_POST_VARS']['auth']['passwd'];
try {
- $this->_authcreate->bindParam("userid", $this->_userid, PDO_PARAM_STR, 48);
- $this->_authcreate->bindParam("password", $passwd, PDO_PARAM_STR, 48);
+ $this->_authcreate->bindParam("userid", $this->_userid, PDO::PARAM_STR, 48);
+ $this->_authcreate->bindParam("password", $passwd, PDO::PARAM_STR, 48);
$rs = $this->_authselect->execute();
} catch (PDOException $e) {
trigger_error("SQL Error: " . $e->getMessage(), E_USER_WARNING);
@@ -210,9 +210,9 @@
//NOTE: for auth_crypt_method='crypt' defined('ENCRYPTED_PASSWD',true) must be set
if ($this->_auth_crypt_method == 'crypt') {
try {
- $this->_authselect->bindParam("userid", $this->_userid, PDO_PARAM_STR, 48);
+ $this->_authselect->bindParam("userid", $this->_userid, PDO::PARAM_STR, 48);
$this->_authselect->execute();
- $rs = $this->_authselect->fetch(PDO_FETCH_BOTH);
+ $rs = $this->_authselect->fetch(PDO::FETCH_BOTH);
} catch (PDOException $e) {
trigger_error("SQL Error: " . $e->getMessage(), E_USER_WARNING);
return false;
@@ -221,10 +221,10 @@
$result = $this->_checkPass($submitted_password, $stored_password);
} else {
try {
- $this->_authselect->bindParam("password", $submitted_password, PDO_PARAM_STR, 48);
- $this->_authselect->bindParam("userid", $this->_userid, PDO_PARAM_STR, 48);
+ $this->_authselect->bindParam("password", $submitted_password, PDO::PARAM_STR, 48);
+ $this->_authselect->bindParam("userid", $this->_userid, PDO::PARAM_STR, 48);
$this->_authselect->execute();
- $rs = $this->_authselect->fetch(PDO_FETCH_BOTH);
+ $rs = $this->_authselect->fetch(PDO::FETCH_BOTH);
} catch (PDOException $e) {
trigger_error("SQL Error: " . $e->getMessage(), E_USER_WARNING);
return false;
@@ -277,8 +277,8 @@
$submitted_password = crypt($submitted_password);
}
try {
- $this->_authupdate->bindParam("password", $submitted_password, PDO_PARAM_STR, 48);
- $this->_authupdate->bindParam("userid", $this->_userid, PDO_PARAM_STR, 48);
+ $this->_authupdate->bindParam("password", $submitted_password, PDO::PARAM_STR, 48);
+ $this->_authupdate->bindParam("userid", $this->_userid, PDO::PARAM_STR, 48);
$this->_authupdate->execute();
} catch (PDOException $e) {
trigger_error("SQL Error: " . $e->getMessage(), E_USER_WARNING);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
