X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdba.php;h=5f633afaaa65328f7087ede40faf130a4e06e637;hb=a7fac5a76fef1be6722e41c91ae3a6601a36110c;hp=a560c023121bc87f59f32829a81ce428e74381ec;hpb=72f32f90d1ac956ff379fab2773c33d1321433c0;p=friendica.git

diff --git a/include/dba.php b/include/dba.php
index a560c02312..5f633afaaa 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -1,47 +1,60 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
-use Friendica\Database\dba;
-
-function dbesc($str) {
-	if (dba::$connected) {
-		return(dba::escape($str));
-	} else {
-		return(str_replace("'","\\'",$str));
-	}
-}
+use Friendica\Database\DBA;
 
 /**
- * @brief execute SQL query with printf style args - deprecated
+ * 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)
+ * @param $sql
  * @return array|bool Query array
+ * @throws Exception
+ * @deprecated
  */
 function q($sql) {
 	$args = func_get_args();
 	unset($args[0]);
 
-	if (!dba::$connected) {
+	if (!DBA::connected()) {
 		return false;
 	}
 
-	$sql = dba::clean_query($sql);
-	$sql = dba::any_value_fallback($sql);
+	$sql = DBA::cleanQuery($sql);
+	$sql = DBA::anyValueFallback($sql);
 
 	$stmt = @vsprintf($sql, $args);
 
-	$ret = dba::p($stmt);
+	$ret = DBA::p($stmt);
 
 	if (is_bool($ret)) {
 		return $ret;
 	}
 
-	$columns = dba::columnCount($ret);
+	$columns = DBA::columnCount($ret);
 
-	$data = dba::inArray($ret);
+	$data = DBA::toArray($ret);
 
 	if ((count($data) == 0) && ($columns == 0)) {
 		return true;
@@ -49,7 +62,3 @@ function q($sql) {
 
 	return $data;
 }
-
-function dba_timer() {
-	return microtime(true);
-}