Merge branch 'master' of git://github.com/friendika/friendika

12 files changed, 72 insertions, 6 deletions

diff --git a/include/main.js b/include/main.js
index d137d4c9c..fcd1d6fee 100644
--- a/include/main.js
+++ b/include/main.js
@@ -44,10 +44,11 @@
 					$('#pause').html('');
 				}
 			}
-			if(event.keyCode == '36') {
-				event.preventDefault();
-				if(homebase)
+			if(event.keyCode == '36' && event.shiftKey == true) {
+				if(homebase !== undefined) {
+					event.preventDefault();
 					document.location = homebase;
+				}
 			}
 		});					
 	});
@@ -82,8 +83,12 @@
 					if(mail == 0) { mail = ''; }
 					$('#mail-update').html(mail);
 					var intro = $(this).find('intro').text();
+					var register = $(this).find('register').text();
 					if(intro == 0) { intro = ''; }
+					if(register != 0 && intro != '') { intro = intro+'/'+register; }
+					if(register != 0 && intro == '') { intro = '0/'+register; }
 					$('#notify-update').html(intro);
+
 				});
 			}) ;
 		}
diff --git a/index.php b/index.php
index cbc85accf..456c0a144 100644
--- a/index.php
+++ b/index.php
@@ -173,8 +173,15 @@ if($a->module_loaded) {
 
 }
 
+// let javascript take you home
+
 if(x($_SESSION,'visitor_home'))
-	$a->page['content'] .= '<script>var homebase="' . $_SESSION['visitor_home'] . '" ; </script>';
+	$homebase = $_SESSION['visitor_home'];
+elseif(local_user())
+	$homebase = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
+
+if(isset($homebase))
+	$a->page['content'] .= '<script>var homebase="' . $homebase . '" ; </script>';
 
 if(stristr($_SESSION['sysmsg'], t('Permission denied'))) {
 	header($_SERVER["SERVER_PROTOCOL"] . ' 403 ' . t('Permission denied.'));
diff --git a/mod/notifications.php b/mod/notifications.php
index 1c680794e..c425d092e 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -126,5 +126,31 @@ function notifications_content(&$a) {
 	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
+}
diff --git a/mod/ping.php b/mod/ping.php
index 0831e57bf..00c4a3105 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -25,6 +25,15 @@ function ping_init(&$a) {
 	);
 	$intro = $r[0]['total'];
 
+	if ($a->config['register_policy'] = REGISTER_APPROVE &&	
+		$a->config['admin_email'] = $a->user['email']){
+			$r = q("SELECT COUNT(*) AS `total` FROM `register`");
+			$register = $r[0]['total'];
+	} else {
+		$register = "0";
+	}
+
+
 	$myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ;
 	$r = q("SELECT COUNT(*) AS `total` FROM `mail`
 		WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
@@ -35,7 +44,7 @@ function ping_init(&$a) {
 	$mail = $r[0]['total'];
 	
 	header("Content-type: text/xml");
-	echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\r\n<result><intro>$intro</intro><mail>$mail</mail><net>$network</net><home>$home</home></result>\r\n";
+	echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\r\n<result><register>$register</register><intro>$intro</intro><mail>$mail</mail><net>$network</net><home>$home</home></result>\r\n";
 
 	killme();
 }
diff --git a/mod/regmod.php b/mod/regmod.php
index 772351ac5..eabbec090 100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -12,6 +12,11 @@ function regmod_content(&$a) {
 		return $o;
 	}
 
+	if((! (x($a->config,'admin_email'))) || ($a->config['admin_email'] !== $a->user['email'])) {
+		notice( t('Permission denied.') . EOL);
+		return '';
+	}
+
 	if($a->argc != 3)
 		killme();
 
diff --git a/mod/settings.php b/mod/settings.php
index a40883f35..9a9fde5c6 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -95,6 +95,10 @@ function settings_post(&$a) {
 		$email_changed = true;
         if(! valid_email($email))
 			$err .= t(' Not valid email.');
+		if((x($a->config,'admin_email')) && (strcasecmp($email,$a->config['admin_email']) == 0)) {
+			$err .= t(' Cannot change to that email.');
+			$email = $a->user['email'];
+		}
 	}
 
 	if(strlen($err)) {
diff --git a/util/strings.php b/util/strings.php
index e8f3b47af..0871da51e 100644
--- a/util/strings.php
+++ b/util/strings.php
@@ -242,6 +242,7 @@ $a->strings['Friend/Connect Request'] = 'Friend/Connect Request';
 $a->strings['New Follower'] = 'New Follower';
 $a->strings['Approve'] = 'Approve';
 $a->strings['No notifications.'] = 'No notifications.';
+$a->strings['No registrations.'] = 'No registrations.';
 $a->strings['Login failed.'] = 'Login failed.';
 $a->strings["Welcome back "] = "Welcome back ";
 $a->strings['Photo Albums'] = 'Photo Albums';
diff --git a/view/en/registrations-top.tpl b/view/en/registrations-top.tpl
new file mode 100644
index 000000000..d8faf3439
--- /dev/null
+++ b/view/en/registrations-top.tpl
@@ -0,0 +1,3 @@
+<h1>User registrations waiting for confirm</h1>
+
+
diff --git a/view/en/registrations.tpl b/view/en/registrations.tpl
new file mode 100644
index 000000000..c8646043e
--- /dev/null
+++ b/view/en/registrations.tpl
@@ -0,0 +1 @@
+<li>$fullname ($email) : <a href="$approvelink">Approve</a> - <a href="$denylink">Deny</a></li>
diff --git a/view/it/registrations-top.tpl b/view/it/registrations-top.tpl
new file mode 100644
index 000000000..8134aa210
--- /dev/null
+++ b/view/it/registrations-top.tpl
@@ -0,0 +1,3 @@
+<h1>Registrazioni in attesa di conferma</h1>
+
+
diff --git a/view/it/registrations.tpl b/view/it/registrations.tpl
new file mode 100644
index 000000000..698c766f7
--- /dev/null
+++ b/view/it/registrations.tpl
@@ -0,0 +1 @@
+<li>$fullname ($email) : <a href="$approvelink">Approva</a> - <a href="$denylink">Rifiuta</a></li>
diff --git a/view/it/strings.php b/view/it/strings.php
index 0e6def3df..b18904eac 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -244,6 +244,7 @@ $a->strings['Friend/Connect Request'] = 'Richiesta Amicizia/Connessione';
 $a->strings['New Follower'] = 'Nuovo Seguace';
 $a->strings['Approve'] = 'Approva';
 $a->strings['No notifications.'] = 'Nessuna notifica.';
+$a->strings['No registrations.'] = 'Nessuna registrazione.';
 $a->strings['Login failed.'] = 'Accesso fallito.';
 $a->strings["Welcome back "] = "Bentornato ";
 $a->strings['Photo Albums'] = 'Album Foto';