X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotifications.php;h=c7f8e1bbd912e9cab3e97d9a1db9d87c6ca76aa9;hb=ec14d06647cc4cf5c4cbcdddc1e65e6b3aaf1fd1;hp=547a26d9e06c4a87954577fcc751f49ed384df72;hpb=dec529824897066b90f2967d719b343304a7b7d0;p=friendica.git

diff --git a/mod/notifications.php b/mod/notifications.php
index 547a26d9e0..c7f8e1bbd9 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -144,7 +144,8 @@ function notifications_content(&$a) {
 				if($rr['fid']) {
 
 					$return_addr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : ''));
-					$notif_content .= replace_macros($sugg,array(
+
+					$notif_content .= replace_macros($sugg, array(
 						'$str_notifytype' => t('Notification type: '),
 						'$notify_type' => t('Friend Suggestion'),
 						'$intro_id' => $rr['intro_id'],
@@ -161,7 +162,7 @@ function notifications_content(&$a) {
 						'$note' => $rr['note'],
 						'$request' => $rr['frequest'] . '?addr=' . $return_addr,
 						'$ignore' => t('Ignore'),
-						'$discard' => t('Discard')
+						'$discard' => t('Discard'),
 
 					));
 
@@ -190,7 +191,7 @@ function notifications_content(&$a) {
 					));
 				}			
 
-				$notif_content .= replace_macros($tpl,array(
+				$notif_content .= replace_macros($tpl, array(
 					'$str_notifytype' => t('Notification type: '),
 					'$notify_type' => (($rr['network'] !== NETWORK_OSTATUS) ? t('Friend/Connect Request') : t('New Follower')),
 					'$dfrn_text' => $dfrn_text,	
@@ -207,7 +208,7 @@ function notifications_content(&$a) {
 					'$approve' => t('Approve'),
 					'$note' => $rr['note'],
 					'$ignore' => t('Ignore'),
-					'$discard' => t('Discard')
+					'$discard' => t('Discard'),
 
 				));
 			}
@@ -215,7 +216,7 @@ function notifications_content(&$a) {
 		else
 			info( t('No introductions.') . EOL);
 
-		$o .= replace_macros($notif_tpl,array(
+		$o .= replace_macros($notif_tpl, array(
 			'$notif_header' => t('Notifications'),
 			'$tabs' => $tabs,
 			'$notif_content' => $notif_content,
@@ -232,7 +233,7 @@ function notifications_content(&$a) {
 				`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`, 
 				`pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink` 
 				FROM `item` INNER JOIN `item` as `pitem` ON  `pitem`.`id`=`item`.`parent`
-				WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND `pitem`.`parent` != 0
+				WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND `pitem`.`parent` != 0 AND
 				 `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 ORDER BY `item`.`created` DESC" ,
 			intval(local_user())
 		);
@@ -245,7 +246,7 @@ function notifications_content(&$a) {
 		
 		$notif_content = '';
 		
-		if (count($r) > 0) {
+		if ($r) {
 			
 			foreach ($r as $it) {
 				switch($it['verb']){
@@ -301,7 +302,7 @@ function notifications_content(&$a) {
 			$notif_content = t('No more network notifications.');
 		}
 		
-		$o .= replace_macros($notif_tpl,array(
+		$o .= replace_macros($notif_tpl, array(
 			'$notif_header' => t('Network Notifications'),
 			'$tabs' => $tabs,
 			'$notif_content' => $notif_content,
@@ -331,7 +332,7 @@ function notifications_content(&$a) {
 			$notif_content .= t('No more system notifications.');
 		}
 		
-		$o .= replace_macros($notif_tpl,array(
+		$o .= replace_macros($notif_tpl, array(
 			'$notif_header' => t('System Notifications'),
 			'$tabs' => $tabs,
 			'$notif_content' => $notif_content,
@@ -426,7 +427,7 @@ function notifications_content(&$a) {
 			$notif_content = t('No more personal notifications.');
 		}
 		
-		$o .= replace_macros($notif_tpl,array(
+		$o .= replace_macros($notif_tpl, array(
 			'$notif_header' => t('Personal Notifications'),
 			'$tabs' => $tabs,
 			'$notif_content' => $notif_content,
@@ -507,7 +508,7 @@ function notifications_content(&$a) {
 			$notif_content = t('No more home notifications.');
 		}
 		
-		$o .= replace_macros($notif_tpl,array(
+		$o .= replace_macros($notif_tpl, array(
 			'$notif_header' => t('Home Notifications'),
 			'$tabs' => $tabs,
 			'$notif_content' => $notif_content,