X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotifications.php;h=ef72023636d78577e34c8b868c7ad6c6b427f303;hb=166424c92eafa55045b8e52f55a7ec7128062397;hp=7d465e1c0b64f855f2d5127503a5c441ea557f33;hpb=35e29e10e69dfb086e990d852aa6b5006ce31d1b;p=friendica.git

diff --git a/mod/notifications.php b/mod/notifications.php
index 7d465e1c0b..ef72023636 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -8,30 +8,34 @@ function notifications_post(&$a) {
 	
 	$request_id = (($a->argc > 1) ? $a->argv[1] : 0);
 	
-	if($request_id == "all")
+	if($request_id === "all")
 		return;
 
 	if($request_id) {
 
-		$r = q("SELECT `id` FROM `intro` 
-			WHERE `request-id` = %d 
+		$r = q("SELECT * FROM `intro` 
+			WHERE `id` = %d 
 			AND `uid` = %d LIMIT 1",
 				intval($request_id),
-				intval($_SESSION['uid'])
+				intval(local_user())
 		);
 	
 		if(count($r)) {
 			$intro_id = $r[0]['id'];
+			$contact_id = $r[0]['contact-id'];
 		}
 		else {
 			notice( t('Invalid request identifier.') . EOL);
 			return;
 		}
-		if($_POST['submit'] == t('Discard'() {
-			$r = q("DELETE FROM `intro` WHERE `id` = %d LIMIT 1", intval($intro_id));	
-			$r = q("DELETE `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", 
-				intval($request_id),
-				intval($_SESSION['uid']));
+		if($_POST['submit'] == t('Discard')) {
+			$r = q("DELETE FROM `intro` WHERE `id` = %d LIMIT 1", 
+				intval($intro_id)
+			);	
+			$r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 LIMIT 1", 
+				intval($contact_id),
+				intval(local_user())
+			);
 			return;
 		}
 		if($_POST['submit'] == t('Ignore')) {
@@ -54,6 +58,7 @@ function notifications_content(&$a) {
 	}
 
 	$o = '';
+	$o .= '<script>	$(document).ready(function() { $(\'#nav-notify-link\').addClass(\'nav-selected\'); });</script>';
 
 	if(($a->argc > 1) && ($a->argv[1] == 'all'))
 		$sql_extra = '';
@@ -61,13 +66,13 @@ function notifications_content(&$a) {
 		$sql_extra = " AND `ignore` = 0 ";
 
 
-	$tpl = file_get_contents('view/intros-top.tpl');
+	$tpl = load_view_file('view/intros-top.tpl');
 	$o .= replace_macros($tpl,array(
 		'$hide_url' => ((strlen($sql_extra)) ? 'notifications/all' : 'notifications' ),
 		'$hide_text' => ((strlen($sql_extra)) ? t('Show Ignored Requests') : t('Hide Ignored Requests'))
 	)); 
 
-	$r = q("SELECT `intro`.`id` AS `intro-id`, `intro`.*, `contact`.* 
+	$r = q("SELECT `intro`.`id` AS `intro_id`, `intro`.*, `contact`.* 
 		FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
 		WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0 ",
 			intval($_SESSION['uid']));
@@ -75,25 +80,77 @@ function notifications_content(&$a) {
 	if(($r !== false) && (count($r))) {
 
 
-		$tpl = file_get_contents("view/intros.tpl");
+		$tpl = load_view_file("view/intros.tpl");
 
 		foreach($r as $rr) {
 
+			$friend_selected = (($rr['network'] !== 'stat') ? ' checked="checked" ' : ' disabled ');
+			$fan_selected = (($rr['network'] === 'stat') ? ' checked="checked" disabled ' : '');
+			$dfrn_tpl = load_view_file('view/netfriend.tpl');
+
+			$knowyou   = '';
+			$dfrn_text = '';
+						
+			if($rr['network'] !== 'stat') {
+				$knowyou = t('Claims to be known to you: ') . (($rr['knowyou']) ? t('yes') : t('no'));
+
+				$dfrn_text = replace_macros($dfrn_tpl,array(
+					'$intro_id' => $rr['intro_id'],
+					'$friend_selected' => $friend_selected,
+					'$fan_selected' => $fan_selected,
+				));
+			}			
+
+
+
 			$o .= replace_macros($tpl,array(
-				'$intro_id' => $rr['intro-id'],
-				'$dfrn-id' => $rr['issued-id'],
+				'$str_notifytype' => t('Notification type: '),
+				'$notify_type' => (($rr['network'] !== 'stat') ? t('Friend/Connect Request') : t('New Follower')),
+				'$dfrn_text' => $dfrn_text,	
+				'$dfrn_id' => $rr['issued-id'],
 				'$uid' => $_SESSION['uid'],
-				'$contact-id' => $rr['contact-id'],
+				'$intro_id' => $rr['intro_id'],
+				'$contact_id' => $rr['contact-id'],
 				'$photo' => ((x($rr,'photo')) ? $rr['photo'] : "images/default-profile.jpg"),
 				'$fullname' => $rr['name'],
-				'$knowyou' => (($rr['knowyou']) ? t('yes') : t('no')),
 				'$url' => $rr['url'],
-				'$note' => $rr['note']
+				'$knowyou' => $knowyou,
+				'$approve' => t('Approve'),
+				'$note' => $rr['note'],
+				'$ignore' => t('Ignore'),
+				'$discard' => t('Discard')
+
 			));
 		}
 	}
 	else
 		notice( t('No notifications.') . EOL);
 
+	if ($a->config['register_policy'] == REGISTER_APPROVE &&	
+		$a->config['admin_email'] === $a->user['email']){
+		$o .= load_view_file('view/registrations-top.tpl');
+		
+		$r = q("SELECT `register`.*, `contact`.`name`, `user`.`email`
+				 FROM `register`
+				 LEFT JOIN `contact` ON `register`.`uid` = `contact`.`uid`
+				 LEFT JOIN `user` ON `register`.`uid` = `user`.`uid`;");
+		if(($r !== false) && (count($r))) {
+			$tpl = load_view_file("view/registrations.tpl");
+			foreach($r as $rr) {
+				$o .= "<ul>";
+				$o .= replace_macros($tpl, array(
+					'$fullname' 	=> $rr['name'],
+					'$email'		=> $rr['email'],
+					'$approvelink' 	=> "regmod/allow/".$rr['hash'],
+					'$denylink' 	=> "regmod/deny/".$rr['hash'],
+				));
+				$o .= "</ul>";
+			}
+		}
+		else
+			notice( t('No registrations.') . EOL);
+
+	}
+
 	return $o;
-}
\ No newline at end of file
+}