X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotifications.php;h=ed0831aabd058f5454efc60c42a39557f1d5cf38;hb=a41b4c6e6726b1158a8d05f37c1630d67e462fe5;hp=44d0dfe5614a09e4048dc8b067e4ea0d77f58b63;hpb=8c9aa975faeacbffce9314443aebe9ebc220aac3;p=friendica.git

diff --git a/mod/notifications.php b/mod/notifications.php
index 44d0dfe561..ed0831aabd 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -13,7 +13,7 @@ function notifications_post(&$a) {
 
 	if($request_id) {
 
-		$r = q("SELECT `id` FROM `intro` 
+		$r = q("SELECT * FROM `intro` 
 			WHERE `id` = %d 
 			AND `uid` = %d LIMIT 1",
 				intval($request_id),
@@ -22,6 +22,7 @@ function notifications_post(&$a) {
 	
 		if(count($r)) {
 			$intro_id = $r[0]['id'];
+			$contact_id = $r[0]['contact-id'];
 		}
 		else {
 			notice( t('Invalid request identifier.') . EOL);
@@ -31,8 +32,8 @@ function notifications_post(&$a) {
 			$r = q("DELETE FROM `intro` WHERE `id` = %d LIMIT 1", 
 				intval($intro_id)
 			);	
-			$r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", 
-				intval($request_id),
+			$r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 LIMIT 1", 
+				intval($contact_id),
 				intval(local_user())
 			);
 			return;
@@ -64,12 +65,21 @@ function notifications_content(&$a) {
 	else
 		$sql_extra = " AND `ignore` = 0 ";
 
+	$o .= '<h1>' . t('Pending Friend/Connect Notifications') . '</h1>' . "\r\n";
+	
+	$o .= '<div id="notification-show-hide-wrapper" >';
+	$o .= '<a href="' . ((strlen($sql_extra)) ? 'notifications/all' : 'notifications' ) . '" id="notifications-show-hide-link" >'
+		. ((strlen($sql_extra)) ? t('Show Ignored Requests') : t('Hide Ignored Requests')) . '</a></div>' . "\r\n";
+
 
-	$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 COUNT(*)	AS `total` FROM `intro` 
+		WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0 ",
+			intval($_SESSION['uid'])
+	);
+	if($r && count($r)) {
+		$a->set_pager_total($r[0]['total']);
+		$a->set_pager_itemspage(20);
+	}
 
 	$r = q("SELECT `intro`.`id` AS `intro_id`, `intro`.*, `contact`.* 
 		FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
@@ -83,27 +93,31 @@ function notifications_content(&$a) {
 
 		foreach($r as $rr) {
 
-			$friend_selected = (($rr['network'] === 'dfrn') ? ' checked="checked" ' : ' disabled ');
+			$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'] === 'dfrn') {
+			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,
+					'$approve_as' => t('Approve as: '),
+					'$as_friend' => t('Friend'),
+					'$as_fan' => t('Fan/Admirer')
 				));
 			}			
 
 
 
 			$o .= replace_macros($tpl,array(
-				'$notify_type' => (($rr['network'] === 'dfrn') ? t('Friend/Connect Request') : t('New Follower')),
+				'$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'],
@@ -113,12 +127,43 @@ function notifications_content(&$a) {
 				'$fullname' => $rr['name'],
 				'$url' => $rr['url'],
 				'$knowyou' => $knowyou,
-				'$note' => $rr['note']
+				'$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 .= '<h1>' . t('User registrations waiting for confirm') . '</h1>' . "\r\n";
+		
+		$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);
+
+	}
+
+	$o .= paginate($a);
 	return $o;
-}
\ No newline at end of file
+}