aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-04-17 18:55:26 -0700
committerfriendica <info@friendica.com>2013-04-17 18:55:26 -0700
commit4d5eade991c6c86dc0fd8168331e0f06e43a5dff (patch)
tree0b5100cdf69a57090c4cbe3c66b7e32b8ed6cf87
parent3e1b005de0ba5e596296aed9900c44a8c3116565 (diff)
downloadvolse-hubzilla-4d5eade991c6c86dc0fd8168331e0f06e43a5dff.tar.gz
volse-hubzilla-4d5eade991c6c86dc0fd8168331e0f06e43a5dff.tar.bz2
volse-hubzilla-4d5eade991c6c86dc0fd8168331e0f06e43a5dff.zip
That was a bit premature. I'll hold these for now until they're more production ready.
-rw-r--r--include/dba_driver.php10
-rw-r--r--include/dba_mysql.php63
-rw-r--r--include/dba_mysqli.php60
3 files changed, 0 insertions, 133 deletions
diff --git a/include/dba_driver.php b/include/dba_driver.php
deleted file mode 100644
index a1d4dfab3..000000000
--- a/include/dba_driver.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php /** @file */
-
-abstract class dba_driver {
-
- abstract protected function connect($server,$user,$pass,$db);
- abstract protected function q($sql);
- abstract protected function escape($str);
- abstract protected function close();
-
-} \ No newline at end of file
diff --git a/include/dba_mysql.php b/include/dba_mysql.php
deleted file mode 100644
index f3622ee8e..000000000
--- a/include/dba_mysql.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-require_once('include/dba_driver.php');
-
-
-abstract class dba_mysql extends dba_driver {
-
- protected function connect($server,$user,$pass,$db) {
- $this->db = mysql_connect($server,$user,$pass);
- if($this->db && mysql_select_db($db,$this->db)) {
- $this->connected = true;
- }
- if($this->connected) {
- return true;
- }
- return false;
- }
-
-
- protected function q($sql) {
- if((! $this->db) || (! $this->connected))
- return false;
-
- $this->error = '';
- $result = @mysql_query($sql,$this->db);
-
-
- if(mysql_errno($this->db))
- $this->error = mysql_error($this->db);
-
- if($result === false || $this->error) {
- logger('dba_mysql: ' . printable($sql) . ' returned false.' . "\n" . $this->error);
- if(file_exists('dbfail.out'))
- file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n" . $this->error . "\n", FILE_APPEND);
- }
-
- if(($result === true) || ($result === false))
- return $result;
-
- $r = array();
- if(mysql_num_rows($result)) {
- while($x = mysql_fetch_array($result,MYSQL_ASSOC))
- $r[] = $x;
- mysql_free_result($result);
- if($this->debug)
- logger('dba_mysql: ' . printable(print_r($r,true)));
- }
- return $r;
- }
-
- protected function escape($str) {
- if($this->db && $this->connected) {
- return @mysql_real_escape_string($str,$this->db);
- }
- }
-
- protected function close() {
- if($this->db)
- mysql_close($this->db);
- $this->connected = false;
- }
-
-}
diff --git a/include/dba_mysqli.php b/include/dba_mysqli.php
deleted file mode 100644
index 24b8aad6e..000000000
--- a/include/dba_mysqli.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php /** @file */
-
-require_once('include/dba_driver.php');
-
-abstract class dba_mysqli extends dba_driver {
-
- protected function connect($server,$user,$pass,$db) {
- $this->db = @new mysqli($server,$user,$pass,$db);
- if(! mysqli_connect_errno()) {
- $this->connected = true;
- }
- if($this->connected) {
- return true;
- }
- return false;
- }
-
- protected function q($sql) {
- if((! $this->db) || (! $this->connected))
- return false;
-
- $this->error = '';
- $result = @$this->db->query($sql);
-
- if($this->db->errno)
- $this->error = $this->db->error;
-
- if($result === false || $this->error) {
- logger('dba_mysqli: ' . printable($sql) . ' returned false.' . "\n" . $this->error);
- if(file_exists('dbfail.out'))
- file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n" . $this->error . "\n", FILE_APPEND);
- }
-
- if(($result === true) || ($result === false))
- return $result;
-
- $r = array();
- if($result->num_rows) {
- while($x = $result->fetch_array(MYSQLI_ASSOC))
- $r[] = $x;
- $result->free_result();
- if($this->debug)
- logger('dba_mysqli: ' . printable(print_r($r,true)));
- }
- return $r;
- }
-
- protected function escape($str) {
- if($this->db && $this->connected) {
- return @$this->db->real_escape_string($str);
- }
- }
-
- protected function close() {
- if($this->db)
- $this->db->close();
- $this->connected = flase;
- }
-
-} \ No newline at end of file