Merge branch 'master' into newmaster

Author: TheTechsTech

.gitignore

@@ -8,9 +8,6 @@ clover.xml
 *.sqlite3
 vendor
 build/logs/clover.xml
-tests/pdo/ez_test.sqlite
-tests/sqlite/ez_test.sqlite
-tests/sqlite/ez_test.sqlite3
 .vscode/settings.json
 *.crt
 *.csr

CONTRIBUTORS.md

@@ -0,0 +1,34 @@
+**ezSQL** *Contributors*
+============================================
+
+* **[Justin Vincent](http://twitter.com/justinvincent)**
+  > [email protected]
+  * Author: ezSQL class - *mySQL, PDO, PostgreSQL, Cubrid, Oracle8_9*
+
+* **[Stefanie Janine Stoelting](https://stefanie-stoelting.de)**
+  > [email protected]
+  * Author: 
+    - *ezSQL version 3.00*
+    - *oracleTNS*
+    - *phpunit tests*
+    - *RecordSet - for working with query results*
+
+* **davisjw**
+  > [email protected]
+  * Author: ezSQL class - *Sqlserver*
+
+* **Silvio Wanka**
+  * Author: ezSQL class - *sqlite3*
+
+----
+
+**[L. Stubbs]**
+  > [email protected]
+  * Author/Maintainer: 
+    - ezSQL version 3
+    - In Development version *4.0*
+    - *ezQuery, ezFunctions, ezSchema*
+
+----
+
+**[Full contributors list.](https://github.com/ezsql/ezsql/contributors)**

cacert.pem

@@ -1,17 +1,4 @@
 <?php
-/**
- * ezSQL Database specific class - mySQL
- * Desc..: mySQL component (part of ezSQL databse abstraction library)
- *
- * @author  Justin Vincent ([email protected])
- * @author  Stefanie Janine Stoelting <[email protected]>
- * Contributor:  Lawrence Stubbs <[email protected]>
- * @link    http://twitter.com/justinvincent
- * @name    ezSQL_mysql
- * @package ezSQL
- * @license FREE / Donation (LGPL - You may do what you like with ezSQL - no exceptions.)
- *
- */
 
 class ezSQL_mysqli extends ezSQLcore
 {
@@ -78,8 +65,11 @@ class ezSQL_mysqli extends ezSQLcore
      */
     public $dbh;
 
-	protected $preparedvalues = [];
+	protected $preparedValues = [];
 
+    private static $isSecure = false;
+    private static $secure = null;
+
     /**
      * Constructor - allow the user to perform a quick connect at the same time
      * as initializing the ezSQL_mysql class

lib/ez_sql_mysqli.php

@@ -1,17 +1,4 @@
 <?php
-/**
- * ezSQL class - PDO
- * Desc..: PDO component (part of ezSQL database abstraction library)
- *
- * @author  Justin Vincent ([email protected])
- * @author  Stefanie Janine Stoelting <[email protected]>
- * Contributor:  Lawrence Stubbs <[email protected]>
- * @link    http://twitter.com/justinvincent
- * @name    ezSQL_pdo
- * @package ezSQL
- * @license FREE / Donation (LGPL - You may do what you like with ezSQL - no exceptions.)
- *
- */
 
 class ezSQL_pdo extends ezSQLcore
 {
@@ -47,26 +34,30 @@ class ezSQL_pdo extends ezSQLcore
      * The array for connection options, MySQL connection charset, for example
      * @var array
      */
-    private $_options;
+    private static $_options = array();
 
     /**
      * Whether it is a file based database connection, for example to a SQLite
      * database file, or not
      * @var boolean Default is false
      */
-    private $_isFileBased=false;
+    private $_isFileBased = false;
+
+    private static $isSecure = false;
+    private static $secure = null;
+    private $dbh;
 
     /**
      * Show errors
      * @var boolean Default is true
      */
     public $show_errors = true;
 
-	protected $preparedvalues = array();
+    protected $preparedValues = array();
 
     /**
-     * Constructor - allow the user to perform a qucik connect at the same time
-     * as initialising the ezSQL_sqlite class
+     * Constructor - allow the user to perform a quick connect at the same time
+     * as initializing the ezSQL_sqlite class
      *
      * @param string $dsn The connection parameter string
      *                    Default is empty string
@@ -82,12 +73,13 @@ class ezSQL_pdo extends ezSQLcore
      *                             dsn parameter
      *                             Default is false
      */
-    public function __construct($dsn='', $user='', $password='', $options=array(), $isFileBased=false) {
+    public function __construct($dsn = '', $user = '', $password = '', $options = array(), $isFileBased = false) 
+    {
         if ( ! \class_exists ('PDO') ) {
-            throw new Exception('<b>Fatal Error:</b> ezSQL_pdo requires PDO Lib to be compiled and or linked in to the PHP engine');
+            throw new \Exception('<b>Fatal Error:</b> ezSQL_pdo requires PDO Lib to be compiled and or linked in to the PHP engine');
         }
         if ( ! \class_exists ('ezSQLcore') ) {
-            throw new Exception('<b>Fatal Error:</b> ezSQL_pdo requires ezSQLcore (ez_sql_core.php) to be included/loaded before it can be used');
+            throw new \Exception('<b>Fatal Error:</b> ezSQL_pdo requires ezSQLcore (ez_sql_core.php) to be included/loaded before it can be used');
         }
 
         parent::__construct();
@@ -103,6 +95,33 @@ public function __construct($dsn='', $user='', $password='', $options=array(), $
         \setQuery($this);
     } // __construct
 
+    public static function securePDO(
+        $vendor = null, 
+        $key = 'certificate.key', 
+        $cert = 'certificate.crt', 
+        $ca = 'cacert.pem', 
+        $path = '.'.\_DS) 
+    {
+        if (\array_key_exists(\strtolower($vendor), \VENDOR) 
+            && (! \file_exists($path.$cert) || ! \file_exists($path.$key)))
+            ezQuery::createCertificate();
+
+        if (($vendor == 'pgsql') || ($vendor == 'postgresql')) {
+            self::$secure = "sslmode=require;sslcert=".$path.$cert.";sslkey=".$path.$key.";sslrootcert=".$path.$ca.";";
+            self::$isSecure = true;
+        } elseif (($vendor == 'mysql') || ($vendor == 'mysqli')) {
+            self::$_options = array(
+                \PDO::MYSQL_ATTR_SSL_KEY => $path.$key,
+                \PDO::MYSQL_ATTR_SSL_CERT => $path.$cert,
+                \PDO::MYSQL_ATTR_SSL_CA => $path.$ca,
+                \PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT => false,
+            );
+        } elseif (($vendor == 'sqlserver') || ($vendor == 'mssql') || ($vendor == 'sqlsrv')) {
+            self::$secure = ";Encrypt=true;TrustServerCertificate=true";
+            self::$isSecure = true;
+        }
+    }
+
     /**
      * Try to connect to the database server in the DSN parameters
      *
@@ -121,16 +140,21 @@ public function __construct($dsn='', $user='', $password='', $options=array(), $
      *                             Default is false
      * @return boolean
      */
-    public function connect($dsn='', $dbuser='', $dbpassword='', $options=array(), $isFileBased=false) {
+    public function connect($dsn = '', $dbuser = '', $dbpassword = '', $options = array(), $isFileBased = false) 
+    {
         $this->_connected = false;
 
-        $this->_dsn = empty($dsn) ? $this->_dsn : $dsn;
+        if (self::$isSecure)
+            $this->_dsn = empty($dsn) ? $this->_dsn.$this->secure : $dsn.$this->secure;
+        else
+            $this->_dsn = empty($dsn) ? $this->_dsn : $dsn;
+
         $this->_isFileBased = $isFileBased;
 
         if (!$isFileBased) {
             $this->_dbuser = empty($dbuser) ? $this->_dbuser : $dbuser;
             $this->_dbpassword = empty($dbpassword) ? $this->_dbpassword : $dbpassword;
-            $this->_options = $options;        
+            $this->_options = empty($options) ? $this->_options : $options;        
 
             // Must have a user and a password if not file based
             if ( empty($this->_dsn) || empty($this->_dbuser) || empty($this->_dbpassword) ) {
@@ -156,8 +180,7 @@ public function connect($dsn='', $dbuser='', $dbpassword='', $options=array(), $
                 $this->dbh = new \PDO($this->_dsn, $this->_dbuser, $this->_dbpassword, $this->_options);
                 $this->_connected = true;
             }
-        }
-        catch (\PDOException $e) {
+        } catch (\PDOException $e) {
             $this->register_error($e->getMessage());
             $this->show_errors ? \trigger_error($e->getMessage() . '- $dsn: ' . $dsn, \E_USER_WARNING) : null;
             return false;
@@ -186,7 +209,8 @@ public function connect($dsn='', $dbuser='', $dbpassword='', $options=array(), $
      *                             Default is false
      * @return boolean
      */
-    public function quick_connect($dsn='', $user='', $password='', $options=array(), $isFileBased=false) {
+    public function quick_connect($dsn = '', $user = '', $password = '', $options = array(), $isFileBased = false) 
+    {
         return $this->connect($dsn, $user, $password, $options, $isFileBased);
     } // quick_connect
 
@@ -201,7 +225,8 @@ public function quick_connect($dsn='', $user='', $password='', $options=array(),
      * @param string $str
      * @return string
      */
-    public function escape($str) {
+    public function escape($str) 
+    {
         // If there is no existing database connection then try to connect
         if ( ! isset($this->dbh) || ! $this->dbh ) {
             $this->connect($this->_dsn, $this->user, $this->password, $this->_options, $this->_isFileBased);
@@ -219,7 +244,8 @@ public function escape($str) {
      *
      * @return string
      */
-    public function sysdate() {
+    public function sysdate() 
+    {
         return "datetime('now')";
     } // sysdate
 
@@ -228,7 +254,8 @@ public function sysdate() {
      *
      * @return string
      */
-    public function catch_error(){
+    public function catch_error()
+    {
         $error_str = 'No error info';
 
         $err_array = $this->dbh->errorInfo();
@@ -277,7 +304,9 @@ public function query_prepared($query, $param = null, $isselect = false)
      * @param type $query
      * @return object
      */
-    public function query($query, $use_prepare = false) {
+    public function query($query, $use_prepare = false) 
+    {
+        $param = [];
         if ($use_prepare)
             $param = $this->prepareValues();
 
@@ -418,11 +447,20 @@ public function query($query, $use_prepare = false) {
     /**
      * Close the database connection
      */
-    public function disconnect(){
+    public function disconnect()
+    {
         if ($this->dbh) {
             $this->dbh = null;
             $this->_connected = false;
         }
      } // disconnect
 
+    /**
+     * Get connection handle
+     */
+    public function connection()
+    {
+        return $this->dbh;
+    }
+
 } // ezSQL_pdo

lib/ez_sql_pdo.php

@@ -1,19 +1,5 @@
 <?php
 
-	/**********************************************************************
-          * ezSQL Database specific class - PostgreSQL
-          * Desc..: PostgreSQL component (part of ezSQL databse abstraction library)
-          *
-          * @author  Justin Vincent ([email protected])
-          * @author  Stefanie Janine Stoelting <[email protected]>
-          * Contributor:  Lawrence Stubbs <[email protected]>
-          * @link	   http://twitter.com/justinvincent
-          * @name	   ezSQL_postgresql
-          * @package ezSQL
-          * @license FREE / Donation (LGPL - You may do what you like with ezSQL - no exceptions.)
-          *
-		  */
-
 	class ezSQL_postgresql extends ezSQLcore
 	{
 
@@ -74,8 +60,11 @@ class ezSQL_postgresql extends ezSQLcore
 
 		private $rows_affected = false;
 
-		protected $preparedvalues = array();
-
+		protected $preparedValues = array();
+	
+		private static $isSecure = false;
+		private static $secure = null;
+		
 		/**
 		* Constructor - allow the user to perform a quick connect at the same time
 		* as initializing the ezSQL_postgresql class

lib/ez_sql_postgresql.php

@@ -1,14 +1,5 @@
 <?php
-/**
- * ezSQL Database specific class for working with query results
- * Desc..: recordset component (part of ezSQL databse abstraction library)
- *
- * @author  Stefanie Janine Stoelting <[email protected]>
- * @name    ezSQL_recordset
- * @package ezSQL
- * @license FREE / Donation (LGPL - You may do what you like with ezSQL - no exceptions.)
- *
- */
+
 class ezSQL_recordset implements \Iterator
 {
     /**

lib/ez_sql_recordset.php

@@ -1,14 +1,5 @@
 <?php
 
-	/**********************************************************************
-	*  Author: Justin Vincent ([email protected]) / Silvio Wanka 
-	* Contributor:  Lawrence Stubbs <[email protected]>
-	*  Web...: http://twitter.com/justinvincent
-	*  Name..: ezSQL_sqlite3
-	*  Desc..: SQLite3 component (part of ezSQL databse abstraction library)
-	*
-	*/
-
 	/**********************************************************************
 	*  ezSQL error strings - SQLite
 	*/
@@ -32,7 +23,7 @@ class ezSQL_sqlite3 extends ezSQLcore
 
 		private $rows_affected = false;
 
-		protected $preparedvalues = array();
+		protected $preparedValues = array();
 
 		/**********************************************************************
 		*  Constructor - allow the user to perform a quick connect at the