[phpwiki-checkins] SF.net SVN: phpwiki:[9417] trunk/lib/WikiDB

[<var...@us...>]

Revision: 9417
          http://sourceforge.net/p/phpwiki/code/9417
Author:   vargenau
Date:     2014-12-04 15:51:47 +0000 (Thu, 04 Dec 2014)
Log Message:
-----------
Add public

Modified Paths:
--------------
    trunk/lib/WikiDB/ADODB.php
    trunk/lib/WikiDB/PDO.php
    trunk/lib/WikiDB/SQL.php

Modified: trunk/lib/WikiDB/ADODB.php
===================================================================
--- trunk/lib/WikiDB/ADODB.php	2014-12-04 15:42:49 UTC (rev 9416)
+++ trunk/lib/WikiDB/ADODB.php	2014-12-04 15:51:47 UTC (rev 9417)
@@ -40,9 +40,9 @@
 
     /**
      * Determine whether page exists (in non-default form).
-     * @see WikiDB::isWikiPage
+     * @see WikiDB::isWikiPage for the slow generic version
      */
-    function isWikiPage($pagename)
+    public function isWikiPage($pagename)
     {
         $pagename = (string)$pagename;
         if ($pagename === '') {
@@ -70,7 +70,7 @@
 
     // ADODB handles everything as string
     // Don't add surrounding quotes '', same as in PearDB
-    function qstr($in)
+    public function qstr($in)
     {
         return $this->_backend->_dbh->addq($in);
     }
@@ -90,7 +90,7 @@
 
     // SQL result: for simple select or create/update queries
     // returns the database specific resource type
-    public function genericSqlQuery($sql, $args = false)
+    public function genericSqlQuery($sql, $args = array())
     {
         if ($args)
             $result = $this->_backend->_dbh->Execute($sql, $args);
@@ -105,7 +105,7 @@
     }
 
     // SQL iter: for simple select or create/update queries
-    // returns the generic iterator object (count,next)
+    // returns the generic iterator object (count, next)
     public function genericSqlIter($sql, $field_list = NULL)
     {
         $result = $this->genericSqlQuery($sql);

Modified: trunk/lib/WikiDB/PDO.php
===================================================================
--- trunk/lib/WikiDB/PDO.php	2014-12-04 15:42:49 UTC (rev 9416)
+++ trunk/lib/WikiDB/PDO.php	2014-12-04 15:51:47 UTC (rev 9417)
@@ -30,17 +30,17 @@
         } else {
             $backend = 'PDO';
         }
-        include_once("lib/WikiDB/backend/$backend.php");
-        $backend_class = "WikiDB_backend_$backend";
+        include_once 'lib/WikiDB/backend/' . $backend . '.php';
+        $backend_class = "WikiDB_backend_" . $backend;
         $backend = new $backend_class($dbparams);
         parent::__construct($backend, $dbparams);
     }
 
     /**
      * Determine whether page exists (in non-default form).
-     * @see WikiDB::isWikiPage
+     * @see WikiDB::isWikiPage for the slow generic version
      */
-    function isWikiPage($pagename)
+    public function isWikiPage($pagename)
     {
         $pagename = (string)$pagename;
         if ($pagename === '') {
@@ -69,7 +69,7 @@
 
     // Don't add surrounding quotes '', same as in PearDB
     // PDO-0.2.1 added now ::quote()
-    function qstr($in)
+    public function qstr($in)
     {
         $in = str_replace(array('\\', "\0"), array('\\\\', "\\\0"), $in);
         return str_replace("'", "\'", $in);

Modified: trunk/lib/WikiDB/SQL.php
===================================================================
--- trunk/lib/WikiDB/SQL.php	2014-12-04 15:42:49 UTC (rev 9416)
+++ trunk/lib/WikiDB/SQL.php	2014-12-04 15:51:47 UTC (rev 9417)
@@ -23,7 +23,7 @@
         parent::__construct($backend, $dbparams);
     }
 
-    static function view_dsn($dsn = false)
+    public static function view_dsn($dsn = false)
     {
         if (!$dsn)
             $dsninfo = DB::parseDSN($GLOBALS['DBParams']['dsn']);
@@ -41,7 +41,7 @@
      * Determine whether page exists (in non-default form).
      * @see WikiDB::isWikiPage for the slow generic version
      */
-    function isWikiPage($pagename)
+    public function isWikiPage($pagename)
     {
         $pagename = (string)$pagename;
         if ($pagename === '') {
@@ -60,7 +60,7 @@
     }
 
     // no surrounding quotes because we know it's a string
-    function qstr($s)
+    public function qstr($s)
     {
         return $this->_backend->_dbh->escapeSimple($s);
     }
@@ -80,7 +80,7 @@
 
     // SQL result: for simple select or create/update queries
     // returns the database specific resource type
-    public function genericSqlQuery($sql, $args = false)
+    public function genericSqlQuery($sql, $args = array())
     {
         if ($args)
             $result = $this->_backend->_dbh->query($sql, $args);
@@ -96,7 +96,7 @@
     }
 
     // SQL iter: for simple select or create/update queries
-    // returns the generic iterator object (count,next)
+    // returns the generic iterator object (count, next)
     public function genericSqlIter($sql, $field_list = NULL)
     {
         $result = $this->genericSqlQuery($sql);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.