X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FDatabase%2FDBM.php;h=7daf6b545f0c972a91db565d8d633011b262ab15;hb=3895c87e75a2092c7438dd2cfc2e03333eeffc9a;hp=3efa62b73be471c7490d34e7ffb9e996096687ee;hpb=9e99066fd70a9dd9a291a523afba1a390f0e3a0b;p=friendica.git

diff --git a/src/Database/DBM.php b/src/Database/DBM.php
index 3efa62b73b..7daf6b545f 100644
--- a/src/Database/DBM.php
+++ b/src/Database/DBM.php
@@ -1,13 +1,21 @@
 <?php
+/**
+ * @file src/Database/DBM.php
+ */
 namespace Friendica\Database;
 
 use dba;
+use Friendica\Util\DateTimeFormat;
+
+require_once 'include/dba.php';
+
 /**
  * @brief This class contain functions for the database management
  *
  * This class contains functions that doesn't need to know if pdo, mysqli or whatever is used.
  */
-class DBM {
+class DBM
+{
 	/**
 	 * @brief Return a list of database processes
 	 *
@@ -15,38 +23,42 @@ class DBM {
 	 *      'list' => List of processes, separated in their different states
 	 *      'amount' => Number of concurrent database processes
 	 */
-	public static function processlist() {
+	public static function processlist()
+	{
 		$r = q("SHOW PROCESSLIST");
-		$s = array();
+		$s = [];
 
 		$processes = 0;
-		$states = array();
-		foreach ($r AS $process) {
+		$states = [];
+		foreach ($r as $process) {
 			$state = trim($process["State"]);
 
 			// Filter out all non blocking processes
-			if (!in_array($state, array("", "init", "statistics", "updating"))) {
+			if (!in_array($state, ["", "init", "statistics", "updating"])) {
 				++$states[$state];
 				++$processes;
 			}
 		}
 
 		$statelist = "";
-		foreach ($states AS $state => $usage) {
-			if ($statelist != "")
+		foreach ($states as $state => $usage) {
+			if ($statelist != "") {
 				$statelist .= ", ";
+			}
 			$statelist .= $state.": ".$usage;
 		}
-		return(array("list" => $statelist, "amount" => $processes));
+		return(["list" => $statelist, "amount" => $processes]);
 	}
 
 	/**
 	 * Checks if $array is a filled array with at least one entry.
 	 *
-	 * @param       $array  mixed   A filled array with at least one entry
-	 * @return      Whether $array is a filled array or an object with rows
+	 * @param mixed $array A filled array with at least one entry
+	 *
+	 * @return boolean Whether $array is a filled array or an object with rows
 	 */
-	public static function is_result($array) {
+	public static function is_result($array)
+	{
 		// It could be a return value from an update statement
 		if (is_bool($array)) {
 			return $array;
@@ -62,12 +74,13 @@ class DBM {
 	/**
 	 * @brief Callback function for "esc_array"
 	 *
-	 * @param mixed $value Array value
-	 * @param string $key Array key
+	 * @param mixed   $value         Array value
+	 * @param string  $key           Array key
 	 * @param boolean $add_quotation add quotation marks for string values
+	 * @return void
 	 */
-	private static function esc_array_callback(&$value, $key, $add_quotation) {
-
+	private static function esc_array_callback(&$value, $key, $add_quotation)
+	{
 		if (!$add_quotation) {
 			if (is_bool($value)) {
 				$value = ($value ? '1' : '0');
@@ -89,27 +102,25 @@ class DBM {
 	/**
 	 * @brief Escapes a whole array
 	 *
-	 * @param mixed $arr Array with values to be escaped
+	 * @param mixed   $arr           Array with values to be escaped
 	 * @param boolean $add_quotation add quotation marks for string values
+	 * @return void
 	 */
-	public static function esc_array(&$arr, $add_quotation = false) {
+	public static function esc_array(&$arr, $add_quotation = false)
+	{
 		array_walk($arr, 'self::esc_array_callback', $add_quotation);
 	}
 
 	/**
 	 * Checks Converts any date string into a SQL compatible date string
 	 *
+	 * @deprecated since version 3.6
 	 * @param string $date a date string in any format
+	 *
 	 * @return string SQL style date string
 	 */
-	public static function date($date = 'now') {
-		$timestamp = strtotime($date);
-
-		// Don't allow lower date strings as '0001-01-01 00:00:00'
-		if ($timestamp < -62135596800) {
-			$timestamp = -62135596800;
-		}
-
-		return date('Y-m-d H:i:s', (int)$timestamp);
+	public static function date($date = 'now')
+	{
+		return DateTimeFormat::utc($date);
 	}
 }