X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fregister.php;h=2e5d02273a002ee10b4a239a52b0fd980eb22094;hb=f937de932d87737d14278003f80b5bc5025acdc6;hp=5e14870286eb9f251479542044532604d471f5e7;hpb=6817c5d59ad578370a2b60dbdcdba16e43dbac65;p=friendica.git

diff --git a/mod/register.php b/mod/register.php
index 5e14870286..2e5d02273a 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -22,10 +22,10 @@ function register_post(&$a) {
 	default:
 	case REGISTER_CLOSED:
 		if((! x($_SESSION,'authenticated') && (! x($_SESSION,'administrator')))) {
-			$_SESSION['sysmsg'] .= "Permission denied." . EOL;
+			notice( "Permission denied." . EOL );
 			return;
 		}
-		$blocked = 0;
+		$blocked = 1;
 		$verified = 0;
 		break;
 	}
@@ -36,7 +36,7 @@ function register_post(&$a) {
 		$email =notags(trim($_POST['email']));
 
 	if((! x($username)) || (! x($email))) {
-		$_SESSION['sysmsg'] .= "Please enter the required information.". EOL;
+		notice( "Please enter the required information.". EOL );
 		return;
 	}
 
@@ -53,9 +53,9 @@ function register_post(&$a) {
 		dbesc($email)
 		);
 	if($r !== false && count($r))
-		$err .= " This email address is already registered." . EOL;
+		$err .= " This email address is already registered.";
 	if(strlen($err)) {
-		$_SESSION['sysmsg'] .= $err;
+		notice( $err . EOL );
 		return;
 	}
 
@@ -101,7 +101,7 @@ function register_post(&$a) {
 			$newuid = intval($r[0]['uid']);
 	}
 	else {
-		$_SESSION['sysmsg'] .= "An error occurred during registration. Please try again." . EOL;
+		notice( "An error occurred during registration. Please try again." . EOL );
 		return;
 	} 		
 
@@ -117,7 +117,7 @@ function register_post(&$a) {
 
 		);
 		if($r === false) {
-			$_SESSION['sysmsg'] .= "An error occurred creating your default profile. Please try again." . EOL ;
+			notice( "An error occurred creating your default profile. Please try again." . EOL );
 			// Start fresh next time.
 			$r = q("DELETE FROM `user` WHERE `uid` = %d",
 				intval($newuid));
@@ -157,11 +157,11 @@ function register_post(&$a) {
 	}
 
 	if($res) {
-		$_SESSION['sysmsg'] .= "Registration successful. Please check your email for further instructions." . EOL ;
+		notice( "Registration successful. Please check your email for further instructions." . EOL ) ;
 		goaway($a->get_baseurl());
 	}
 	else {
-		$_SESSION['sysmsg'] .= "Failed to send email message. Here is the message that failed. $email_tpl " . EOL;
+		notice( "Failed to send email message. Here is the message that failed. $email_tpl " . EOL );
 	}
 	
 	return;
@@ -175,6 +175,11 @@ function register_post(&$a) {
 if(! function_exists('register_content')) {
 function register_content(&$a) {
 
+	if($a->config['register_policy'] == REGISTER_CLOSED) {
+		notice("Permission denied." . EOL);
+		return;
+	}
+
 	$o = file_get_contents("view/register.tpl");
 	$o = replace_macros($o, array('$registertext' =>((x($a->config,'register_text'))? $a->config['register_text'] : "" )));
 	return $o;