X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2FNotificationsManager.php;h=bce65a092d94c08f24e186b7bb2a990ab952fbae;hb=4b16de6d8010323cc63cde302b4ee0becb429d3b;hp=bd2236a5aaf773a8853f42bf057977b408efa071;hpb=951006dd10628151c8f108f82c3260f13846e557;p=friendica.git

diff --git a/include/NotificationsManager.php b/include/NotificationsManager.php
index bd2236a5aa..bce65a092d 100644
--- a/include/NotificationsManager.php
+++ b/include/NotificationsManager.php
@@ -24,7 +24,7 @@ class NotificationsManager {
 	 *
 	 * @param array $notes array of note arrays from db
 	 * @return array Copy of input array with added properties
-	 * 
+	 *
 	 * Set some extra properties to note array from db:
 	 *  - timestamp as int in default TZ
 	 *  - date_rel : relative date string
@@ -33,7 +33,7 @@ class NotificationsManager {
 	 */
 	private function _set_extra($notes) {
 		$rets = array();
-		foreach ($notes as $n) {
+		foreach($notes as $n) {
 			$local_time = datetime_convert('UTC',date_default_timezone_get(),$n['date']);
 			$n['timestamp'] = strtotime($local_time);
 			$n['date_rel'] = relative_date($n['date']);
@@ -58,7 +58,7 @@ class NotificationsManager {
 	public function getAll($filter = array(), $order="-date", $limit="") {
 		$filter_str = array();
 		$filter_sql = "";
-		foreach ($filter as $column => $value) {
+		foreach($filter as $column => $value) {
 			$filter_str[] = sprintf("`%s` = '%s'", $column, dbesc($value));
 		}
 		if (count($filter_str)>0) {
@@ -67,7 +67,7 @@ class NotificationsManager {
 
 		$aOrder = explode(" ", $order);
 		$asOrder = array();
-		foreach ($aOrder as $o) {
+		foreach($aOrder as $o) {
 			$dir = "asc";
 			if ($o[0]==="-") {
 				$dir = "desc";
@@ -81,7 +81,7 @@ class NotificationsManager {
 		}
 		$order_sql = implode(", ", $asOrder);
 
-		if ($limit!="")
+		if($limit!="")
 			$limit = " LIMIT ".$limit;
 
 			$r = q("SELECT * FROM `notify` WHERE `uid` = %d $filter_sql ORDER BY $order_sql $limit",
@@ -143,8 +143,7 @@ class NotificationsManager {
 
 	/**
 	 * @brief List of pages for the Notifications TabBar
-	 * 
-	 * @param app $a The 
+	 *
 	 * @return array with with notifications TabBar data
 	 */
 	public function getTabs() {
@@ -191,7 +190,7 @@ class NotificationsManager {
 
 	/**
 	 * @brief Format the notification query in an usable array
-	 * 
+	 *
 	 * @param array $notifs The array from the db query
 	 * @param string $ident The notifications identifier (e.g. network)
 	 * @return array
@@ -360,7 +359,7 @@ class NotificationsManager {
 	}
 
 	/**
-	 * @brief Total number of network notifications 
+	 * @brief Total number of network notifications
 	 * @param int|string $seen
 	 *	If 0 only include notifications into the query
 	 *	which aren't marked as "seen"
@@ -369,7 +368,7 @@ class NotificationsManager {
 	private function networkTotal($seen = 0) {
 		$sql_seen = "";
 
-		if ($seen === 0)
+		if($seen === 0)
 			$sql_seen = " AND `item`.`unseen` = 1 ";
 
 		$r = q("SELECT COUNT(*) AS `total`
@@ -388,13 +387,13 @@ class NotificationsManager {
 
 	/**
 	 * @brief Get network notifications
-	 * 
+	 *
 	 * @param int|string $seen
 	 *	If 0 only include notifications into the query
 	 *	which aren't marked as "seen"
 	 * @param int $start Start the query at this point
 	 * @param int $limit Maximum number of query results
-	 * 
+	 *
 	 * @return array with
 	 *	string 'ident' => Notification identifier
 	 *	int 'total' => Total number of available network notifications
@@ -406,7 +405,7 @@ class NotificationsManager {
 		$notifs = array();
 		$sql_seen = "";
 
-		if ($seen === 0)
+		if($seen === 0)
 			$sql_seen = " AND `item`.`unseen` = 1 ";
 
 
@@ -436,7 +435,7 @@ class NotificationsManager {
 	}
 
 	/**
-	 * @brief Total number of system notifications 
+	 * @brief Total number of system notifications
 	 * @param int|string $seen
 	 *	If 0 only include notifications into the query
 	 *	which aren't marked as "seen"
@@ -445,7 +444,7 @@ class NotificationsManager {
 	private function systemTotal($seen = 0) {
 		$sql_seen = "";
 
-		if ($seen === 0)
+		if($seen === 0)
 			$sql_seen = " AND `seen` = 0 ";
 
 		$r = q("SELECT COUNT(*) AS `total` FROM `notify` WHERE `uid` = %d $sql_seen",
@@ -460,13 +459,13 @@ class NotificationsManager {
 
 	/**
 	 * @brief Get system notifications
-	 * 
+	 *
 	 * @param int|string $seen
 	 *	If 0 only include notifications into the query
 	 *	which aren't marked as "seen"
 	 * @param int $start Start the query at this point
 	 * @param int $limit Maximum number of query results
-	 * 
+	 *
 	 * @return array with
 	 *	string 'ident' => Notification identifier
 	 *	int 'total' => Total number of available system notifications
@@ -478,7 +477,7 @@ class NotificationsManager {
 		$notifs = array();
 		$sql_seen = "";
 
-		if ($seen === 0)
+		if($seen === 0)
 			$sql_seen = " AND `seen` = 0 ";
 
 		$r = q("SELECT `id`, `url`, `photo`, `msg`, `date`, `seen` FROM `notify`
@@ -502,7 +501,7 @@ class NotificationsManager {
 
 	/**
 	 * @brief Addional SQL query string for the personal notifications
-	 * 
+	 *
 	 * @return string The additional sql query
 	 */
 	private function _personal_sql_extra() {
@@ -520,7 +519,7 @@ class NotificationsManager {
 	}
 
 	/**
-	 * @brief Total number of personal notifications 
+	 * @brief Total number of personal notifications
 	 * @param int|string $seen
 	 *	If 0 only include notifications into the query
 	 *	which aren't marked as "seen"
@@ -530,7 +529,7 @@ class NotificationsManager {
 		$sql_seen = "";
 		$sql_extra = $this->_personal_sql_extra();
 
-		if ($seen === 0)
+		if($seen === 0)
 			$sql_seen = " AND `item`.`unseen` = 1 ";
 
 		$r = q("SELECT COUNT(*) AS `total`
@@ -550,13 +549,13 @@ class NotificationsManager {
 
 	/**
 	 * @brief Get personal notifications
-	 * 
+	 *
 	 * @param int|string $seen
 	 *	If 0 only include notifications into the query
 	 *	which aren't marked as "seen"
 	 * @param int $start Start the query at this point
 	 * @param int $limit Maximum number of query results
-	 * 
+	 *
 	 * @return array with
 	 *	string 'ident' => Notification identifier
 	 *	int 'total' => Total number of available personal notifications
@@ -569,17 +568,17 @@ class NotificationsManager {
 		$notifs = array();
 		$sql_seen = "";
 
-		if ($seen === 0)
+		if($seen === 0)
 			$sql_seen = " AND `item`.`unseen` = 1 ";
 
 		$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
-				`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`, 
-				`pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid` 
+				`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`,
+				`pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid`
 			FROM `item` INNER JOIN `item` AS `pitem` ON  `pitem`.`id`=`item`.`parent`
 			WHERE `item`.`visible` = 1
 				$sql_extra
 				$sql_seen
-				AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 
+				AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0
 			ORDER BY `item`.`created` DESC LIMIT %d, %d " ,
 				intval(local_user()),
 				intval($start),
@@ -588,7 +587,7 @@ class NotificationsManager {
 
 		if (dbm::is_result($r))
 			$notifs = $this->formatNotifs($r, $ident);
-		
+
 		$arr = array (
 			'notifications' => $notifs,
 			'ident' => $ident,
@@ -599,7 +598,7 @@ class NotificationsManager {
 	}
 
 	/**
-	 * @brief Total number of home notifications 
+	 * @brief Total number of home notifications
 	 * @param int|string $seen
 	 *	If 0 only include notifications into the query
 	 *	which aren't marked as "seen"
@@ -608,7 +607,7 @@ class NotificationsManager {
 	private function homeTotal($seen = 0) {
 		$sql_seen = "";
 
-		if ($seen === 0)
+		if($seen === 0)
 			$sql_seen = " AND `item`.`unseen` = 1 ";
 
 		$r = q("SELECT COUNT(*) AS `total` FROM `item`
@@ -626,13 +625,13 @@ class NotificationsManager {
 
 	/**
 	 * @brief Get home notifications
-	 * 
+	 *
 	 * @param int|string $seen
 	 *	If 0 only include notifications into the query
 	 *	which aren't marked as "seen"
 	 * @param int $start Start the query at this point
 	 * @param int $limit Maximum number of query results
-	 * 
+	 *
 	 * @return array with
 	 *	string 'ident' => Notification identifier
 	 *	int 'total' => Total number of available home notifications
@@ -644,7 +643,7 @@ class NotificationsManager {
 		$notifs = array();
 		$sql_seen = "";
 
-		if ($seen === 0)
+		if($seen === 0)
 			$sql_seen = " AND `item`.`unseen` = 1 ";
 
 		$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
@@ -673,7 +672,7 @@ class NotificationsManager {
 	}
 
 	/**
-	 * @brief Total number of introductions 
+	 * @brief Total number of introductions
 	 * @param bool $all
 	 *	If false only include introductions into the query
 	 *	which aren't marked as ignored
@@ -682,7 +681,7 @@ class NotificationsManager {
 	private function introTotal($all = false) {
 		$sql_extra = "";
 
-		if (!$all)
+		if(!$all)
 			$sql_extra = " AND `ignore` = 0 ";
 
 		$r = q("SELECT COUNT(*) AS `total` FROM `intro`
@@ -698,13 +697,13 @@ class NotificationsManager {
 
 	/**
 	 * @brief Get introductions
-	 * 
+	 *
 	 * @param bool $all
 	 *	If false only include introductions into the query
 	 *	which aren't marked as ignored
 	 * @param int $start Start the query at this point
 	 * @param int $limit Maximum number of query results
-	 * 
+	 *
 	 * @return array with
 	 *	string 'ident' => Notification identifier
 	 *	int 'total' => Total number of available introductions
@@ -716,7 +715,7 @@ class NotificationsManager {
 		$notifs = array();
 		$sql_extra = "";
 
-		if (!$all)
+		if(!$all)
 			$sql_extra = " AND `ignore` = 0 ";
 
 		/// @todo Fetch contact details by "get_contact_details_by_url" instead of queries to contact, fcontact and gcontact
@@ -749,19 +748,19 @@ class NotificationsManager {
 
 	/**
 	 * @brief Format the notification query in an usable array
-	 * 
+	 *
 	 * @param array $intros The array from the db query
 	 * @return array with the introductions
 	 */
 	private function formatIntros($intros) {
 		$knowyou = '';
 
-		foreach ($intros as $it) {
+		foreach($intros as $it) {
 			// There are two kind of introduction. Contacts suggested by other contacts and normal connection requests.
 			// We have to distinguish between these two because they use different data.
 
 			// Contact suggestions
-			if ($it['fid']) {
+			if($it['fid']) {
 
 				$return_addr = bin2hex($this->a->user['nickname'] . '@' . $this->a->get_hostname() . (($this->a->path) ? '/' . $this->a->path : ''));
 
@@ -793,7 +792,7 @@ class NotificationsManager {
 					$it['gnetwork'] = $ret["network"];
 
 				// Don't show these data until you are connected. Diaspora is doing the same.
-				if ($it['gnetwork'] === NETWORK_DIASPORA) {
+				if($it['gnetwork'] === NETWORK_DIASPORA) {
 					$it['glocation'] = "";
 					$it['gabout'] = "";
 					$it['ggender'] = "";