From: Fabrixxm <fabrix.xm@gmail.com>
Date: Tue, 9 Feb 2016 13:06:57 +0000 (+0100)
Subject: Merge branch 'develop' into api_ping
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=04dceb955109eed93db5da1bd6c6d4cdd411a9be;p=friendica.git

Merge branch 'develop' into api_ping
---

04dceb955109eed93db5da1bd6c6d4cdd411a9be
diff --cc mod/notify.php
index 7c367708bb,02260514af..938e2ffbe3
--- a/mod/notify.php
+++ b/mod/notify.php
@@@ -1,16 -1,23 +1,16 @@@
  <?php
 +require_once('include/NotificationsManager.php');
- if(! function_exists('notify_init')) {
+ 
+ 
  function notify_init(&$a) {
 -	if(! local_user())
 -		return;
 -
 +	if(! local_user()) return;
- 
 +	$nm = new NotificationsManager();
 +		
  	if($a->argc > 2 && $a->argv[1] === 'view' && intval($a->argv[2])) {
 -		$r = q("select * from notify where id = %d and uid = %d limit 1",
 -			intval($a->argv[2]),
 -			intval(local_user())
 -		);
 -		if(count($r)) {
 -			q("update notify set seen = 1 where ( link = '%s' or ( parent != 0 and parent = %d and otype = '%s' )) and uid = %d",
 -				dbesc($r[0]['link']),
 -				intval($r[0]['parent']),
 -				dbesc($r[0]['otype']),
 -				intval(local_user())
 -			);
 -
 +		$note = $nm->getByID($a->argv[2]);
 +		if ($note) {
 +			$nm->setSeen($note);
 +		
  			// The friendica client has problems with the GUID. this is some workaround
  			if ($a->is_friendica_app()) {
  				require_once("include/items.php");
@@@ -33,39 -42,41 +33,38 @@@
  		echo $j;
  		killme();
  	}
- }
+ 
  }
  
- if(! function_exists('notify_content')) {
 -
  function notify_content(&$a) {
 -	if(! local_user())
 -		return login();
 -
 -		$notif_tpl = get_markup_template('notifications.tpl');
 -
 -		$not_tpl = get_markup_template('notify.tpl');
 -		require_once('include/bbcode.php');
 -
 -		$r = q("SELECT * from notify where uid = %d and seen = 0 order by date desc",
 -			intval(local_user())
 -		);
 -
 -		if (count($r) > 0) {
 -			foreach ($r as $it) {
 -				$notif_content .= replace_macros($not_tpl,array(
 -					'$item_link' => $a->get_baseurl(true).'/notify/view/'. $it['id'],
 -					'$item_image' => $it['photo'],
 -					'$item_text' => strip_tags(bbcode($it['msg'])),
 -					'$item_when' => relative_date($it['date'])
 -				));
 -			}
 -		} else {
 -			$notif_content .= t('No more system notifications.');
 +	if(! local_user()) return login();
 +
 +	$nm = new NotificationsManager();
 +	
 +	$notif_tpl = get_markup_template('notifications.tpl');
 +
 +	$not_tpl = get_markup_template('notify.tpl');
 +	require_once('include/bbcode.php');
 +
 +	$r = $nm->getAll(array('seen'=>0));
 +	if ($r!==false && count($r) > 0) {
 +		foreach ($r as $it) {
 +			$notif_content .= replace_macros($not_tpl,array(
 +				'$item_link' => $a->get_baseurl(true).'/notify/view/'. $it['id'],
 +				'$item_image' => $it['photo'],
 +				'$item_text' => strip_tags(bbcode($it['msg'])),
 +				'$item_when' => relative_date($it['date'])
 +			));
  		}
 +	} else {
 +		$notif_content .= t('No more system notifications.');
 +	}
  
 -		$o .= replace_macros($notif_tpl, array(
 -			'$notif_header' => t('System Notifications'),
 -			'$tabs' => '', // $tabs,
 -			'$notif_content' => $notif_content,
 -		));
 +	$o .= replace_macros($notif_tpl, array(
 +		'$notif_header' => t('System Notifications'),
 +		'$tabs' => false, // $tabs,
 +		'$notif_content' => $notif_content,
 +	));
  
  	return $o;