From 404e2e3603c852a3f82a21c14b8888005e2b3f99 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 17 Apr 2013 15:36:34 +0400 Subject: more work on singleton-based DB --- include/db.php | 114 +++++---------------------------------------------------- 1 file changed, 10 insertions(+), 104 deletions(-) (limited to 'include/db.php') diff --git a/include/db.php b/include/db.php index a70a1d878..cfa4ccda5 100644 --- a/include/db.php +++ b/include/db.php @@ -1,138 +1,44 @@ connect($host, $user, $pass, $db, 0); } function db_escape_string($link, $s, $strip_tags = true) { - if ($strip_tags) $s = strip_tags($s); - - if (DB_TYPE == "pgsql") { - return pg_escape_string($link, $s); - } else { - return mysql_real_escape_string($s, $link); - } + return Db::get()->escape_string($s, $strip_tags); } function db_query($link, $query, $die_on_error = true) { - if (DB_TYPE == "pgsql") { - $result = pg_query($link, $query); - if (!$result) { - $query = htmlspecialchars($query); // just in case - if ($die_on_error) { - die("Query $query failed [$result]: " . ($link ? pg_last_error($link) : "No connection")); - } - } - return $result; - } else if (DB_TYPE == "mysql") { - $result = mysql_query($query, $link); - if (!$result) { - $query = htmlspecialchars($query); - if ($die_on_error) { - die("Query $query failed: " . ($link ? mysql_error($link) : "No connection")); - } - } - return $result; - } + return Db::get()->query($query, $die_on_error); } function db_fetch_assoc($result) { - if (DB_TYPE == "pgsql") { - return pg_fetch_assoc($result); - } else if (DB_TYPE == "mysql") { - return mysql_fetch_assoc($result); - } + return Db::get()->fetch_assoc($result); } function db_num_rows($result) { - if (DB_TYPE == "pgsql") { - return pg_num_rows($result); - } else if (DB_TYPE == "mysql") { - return mysql_num_rows($result); - } + return Db::get()->num_rows($result); } function db_fetch_result($result, $row, $param) { - if (DB_TYPE == "pgsql") { - return pg_fetch_result($result, $row, $param); - } else if (DB_TYPE == "mysql") { - // I hate incoherent naming of PHP functions - return mysql_result($result, $row, $param); - } -} - -function db_unescape_string($str) { - $tmp = str_replace("\\\"", "\"", $str); - $tmp = str_replace("\\'", "'", $tmp); - return $tmp; + return Db::get()->fetch_result($result, $row, $param); } function db_close($link) { - if (DB_TYPE == "pgsql") { - - return pg_close($link); - - } else if (DB_TYPE == "mysql") { - return mysql_close($link); - } + return Db::get()->close(); } function db_affected_rows($link, $result) { - if (DB_TYPE == "pgsql") { - return pg_affected_rows($result); - } else if (DB_TYPE == "mysql") { - return mysql_affected_rows($link); - } + return Db::get()->affected_rows($result); } function db_last_error($link) { - if (DB_TYPE == "pgsql") { - return pg_last_error($link); - } else if (DB_TYPE == "mysql") { - return mysql_error($link); - } + return Db::get()->last_error(); } function db_quote($str){ - return("'$str'"); + return Db::get()->quote($str); } ?> -- cgit v1.2.3 From 6322ac79a020ab584d412d782d62b2ee77d7c6cf Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 17 Apr 2013 16:23:15 +0400 Subject: remove $link --- include/db.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'include/db.php') diff --git a/include/db.php b/include/db.php index cfa4ccda5..11e7312ad 100644 --- a/include/db.php +++ b/include/db.php @@ -4,11 +4,11 @@ function db_connect($host, $user, $pass, $db) { return Db::get()->connect($host, $user, $pass, $db, 0); } -function db_escape_string($link, $s, $strip_tags = true) { +function db_escape_string( $s, $strip_tags = true) { return Db::get()->escape_string($s, $strip_tags); } -function db_query($link, $query, $die_on_error = true) { +function db_query( $query, $die_on_error = true) { return Db::get()->query($query, $die_on_error); } @@ -25,15 +25,15 @@ function db_fetch_result($result, $row, $param) { return Db::get()->fetch_result($result, $row, $param); } -function db_close($link) { +function db_close() { return Db::get()->close(); } -function db_affected_rows($link, $result) { +function db_affected_rows( $result) { return Db::get()->affected_rows($result); } -function db_last_error($link) { +function db_last_error() { return Db::get()->last_error(); } -- cgit v1.2.3 From eefaa2df381686f771396baae2d0ae71b345c2e7 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 17 Apr 2013 17:00:24 +0400 Subject: remove db_connect, db_close; CLI fixes --- include/db.php | 8 -------- 1 file changed, 8 deletions(-) (limited to 'include/db.php') diff --git a/include/db.php b/include/db.php index 11e7312ad..72c78474a 100644 --- a/include/db.php +++ b/include/db.php @@ -1,9 +1,5 @@ connect($host, $user, $pass, $db, 0); -} - function db_escape_string( $s, $strip_tags = true) { return Db::get()->escape_string($s, $strip_tags); } @@ -25,10 +21,6 @@ function db_fetch_result($result, $row, $param) { return Db::get()->fetch_result($result, $row, $param); } -function db_close() { - return Db::get()->close(); -} - function db_affected_rows( $result) { return Db::get()->affected_rows($result); } -- cgit v1.2.3 From a42c55f02b7e313ab61bf826794d0888f2dceae1 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 17 Apr 2013 18:34:18 +0400 Subject: fix blank character after opening bracket in function calls --- include/db.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/db.php') diff --git a/include/db.php b/include/db.php index 72c78474a..55d1d654e 100644 --- a/include/db.php +++ b/include/db.php @@ -1,10 +1,10 @@ escape_string($s, $strip_tags); } -function db_query( $query, $die_on_error = true) { +function db_query($query, $die_on_error = true) { return Db::get()->query($query, $die_on_error); } @@ -21,7 +21,7 @@ function db_fetch_result($result, $row, $param) { return Db::get()->fetch_result($result, $row, $param); } -function db_affected_rows( $result) { +function db_affected_rows($result) { return Db::get()->affected_rows($result); } -- cgit v1.2.3