More code standard

[friendica.git] / include / dba.php

diff --git a/include/dba.php b/include/dba.php
index 4b7fb8009ed75ee6e1b7a0eba736bf927a6e9654..9e168eac799c36e6a53eefdd8ab68e9e99313405 100644 (file)
--- a/include/dba.php
+++ b/include/dba.php
@@ -2,23 +2,16 @@
 
 use Friendica\Database\DBA;
 
-function dbesc($str) {
-       if (DBA::$connected) {
-               return(DBA::escape($str));
-       } else {
-               return(str_replace("'","\\'",$str));
-       }
-}
-
 /**
  * @brief execute SQL query with printf style args - deprecated
  *
- * Please use the dba:: functions instead:
- * dba::select, dba::exists, dba::insert
- * dba::delete, dba::update, dba::p, dba::e
+ * Please use the DBA:: functions instead:
+ * DBA::select, DBA::exists, DBA::insert
+ * DBA::delete, DBA::update, DBA::p, DBA::e
  *
  * @param $args Query parameters (1 to N parameters of different types)
  * @return array|bool Query array
+ * @deprecated
  */
 function q($sql) {
        $args = func_get_args();
@@ -28,7 +21,7 @@ function q($sql) {
                return false;
        }
 
-       $sql = DBA::clean_query($sql);
+       $sql = DBA::cleanQuery($sql);
        $sql = DBA::anyValueFallback($sql);
 
        $stmt = @vsprintf($sql, $args);
@@ -41,7 +34,7 @@ function q($sql) {
 
        $columns = DBA::columnCount($ret);
 
-       $data = DBA::inArray($ret);
+       $data = DBA::toArray($ret);
 
        if ((count($data) == 0) && ($columns == 0)) {
                return true;
@@ -49,7 +42,3 @@ function q($sql) {
 
        return $data;
 }
-
-function dba_timer() {
-       return microtime(true);
-}