Standardized actions/*

git-svn-id: http://code.elgg.org/elgg/trunk@3542 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 48 insertions, 52 deletions

diff --git a/actions/useradd.php b/actions/useradd.php
index 0149a9753..2a8f64fd5 100644
--- a/actions/useradd.php
+++ b/actions/useradd.php
@@ -1,57 +1,53 @@
 <?php
+/**
+ * Elgg add action
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 
-	/**
-	 * Elgg add action
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @author Curverider Ltd
-	 * @link http://elgg.org/
-	 */
-
-	require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
-
-	admin_gatekeeper(); // Only admins can add a user
-	action_gatekeeper();
-	
-	// Get variables
-	global $CONFIG;
-	$username = get_input('username');
-	$password = get_input('password');
-	$password2 = get_input('password2');
-	$email = get_input('email');
-	$name = get_input('name');
-	
-	$admin = get_input('admin');
-	if (is_array($admin)) $admin = $admin[0];
-	
-	// For now, just try and register the user
-	try {
-		if (
-			(
-				(trim($password)!="") &&
-				(strcmp($password, $password2)==0) 
-			) &&
-			($guid = register_user($username, $password, $name, $email, true))
-		) {
-			$new_user = get_entity($guid);
-			if (($guid) && ($admin))
-				$new_user->admin = 'yes';
-			
-			$new_user->admin_created = true;
-			$new_user->created_by_guid = get_loggedin_userid();
-			
-			
-			notify_user($new_user->guid, $CONFIG->site->guid, elgg_echo('useradd:subject'), sprintf(elgg_echo('useradd:body'), $name, $CONFIG->site->name, $CONFIG->site->url, $username, $password));
-			
-			system_message(sprintf(elgg_echo("adduser:ok"),$CONFIG->sitename));
-		} else {
-			register_error(elgg_echo("adduser:bad"));
+require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
+
+admin_gatekeeper(); // Only admins can add a user
+action_gatekeeper();
+
+// Get variables
+global $CONFIG;
+$username = get_input('username');
+$password = get_input('password');
+$password2 = get_input('password2');
+$email = get_input('email');
+$name = get_input('name');
+
+$admin = get_input('admin');
+if (is_array($admin)) {
+	$admin = $admin[0];
+}
+
+// For now, just try and register the user
+try {
+	$guid = register_user($username, $password, $name, $email, true);
+
+	if (((trim($password) != "") && (strcmp($password, $password2)==0)) && ($guid)) {
+		$new_user = get_entity($guid);
+		if (($guid) && ($admin)) {
+			$new_user->admin = 'yes';
 		}
-	} catch (RegistrationException $r) {
-		register_error($r->getMessage());
+
+		$new_user->admin_created = true;
+		$new_user->created_by_guid = get_loggedin_userid();
+
+		notify_user($new_user->guid, $CONFIG->site->guid, elgg_echo('useradd:subject'), sprintf(elgg_echo('useradd:body'), $name, $CONFIG->site->name, $CONFIG->site->url, $username, $password));
+
+		system_message(sprintf(elgg_echo("adduser:ok"),$CONFIG->sitename));
+	} else {
+		register_error(elgg_echo("adduser:bad"));
 	}
+} catch (RegistrationException $r) {
+	register_error($r->getMessage());
+}
 
-	forward($_SERVER['HTTP_REFERER']);
-	exit;
-?>
\ No newline at end of file
+forward($_SERVER['HTTP_REFERER']);
+exit;
\ No newline at end of file