From f9501bd6cef73e88b130c6640087008f8d58ef92 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sun, 13 Feb 2011 19:44:26 +0000
Subject: Fixes #2848 pulls user settings code out of actions into functions.
 We should investigate putting them in a library that is only loaded on demand

git-svn-id: http://code.elgg.org/elgg/trunk@8204 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 actions/email/save.php          | 41 ----------------------------------
 actions/user/default_access.php | 31 --------------------------
 actions/user/language.php       | 29 ------------------------
 actions/user/name.php           | 34 ----------------------------
 actions/user/password.php       | 49 -----------------------------------------
 5 files changed, 184 deletions(-)
 delete mode 100644 actions/email/save.php
 delete mode 100644 actions/user/default_access.php
 delete mode 100644 actions/user/language.php
 delete mode 100644 actions/user/name.php
 delete mode 100644 actions/user/password.php

(limited to 'actions')

diff --git a/actions/email/save.php b/actions/email/save.php
deleted file mode 100644
index d0ce4571b..000000000
--- a/actions/email/save.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Save email address for user.
- *
- * @package Elgg.Core
- * @subpackage Administration.Users
- */
-
-$email = get_input('email');
-$user_id = get_input('guid');
-
-if (!$user_id) {
-	$user = elgg_get_logged_in_user_entity();
-} else {
-	$user = get_entity($user_id);
-}
-
-if (!is_email_address($email)) {
-	register_error(elgg_echo('email:save:fail'));
-	forward(REFERER);
-}
-
-if ($user) {
-	if (strcmp($email, $user->email) != 0) {
-		if (!get_user_by_email($email)) {
-			if ($user->email != $email) {
-
-				$user->email = $email;
-				if ($user->save()) {
-					system_message(elgg_echo('email:save:success'));
-				} else {
-					register_error(elgg_echo('email:save:fail'));
-				}
-			}
-		} else {
-			register_error(elgg_echo('registration:dupeemail'));
-		}
-	}
-} else {
-	register_error(elgg_echo('email:save:fail'));
-}
diff --git a/actions/user/default_access.php b/actions/user/default_access.php
deleted file mode 100644
index 5ddd86296..000000000
--- a/actions/user/default_access.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Action for changing a user's default access level
- *
- * @package Elgg
- * @subpackage Core
- */
-
-if (elgg_get_config('allow_user_default_access')) {
-	$default_access = get_input('default_access');
-	$user_id = get_input('guid');
-
-	if (!$user_id) {
-		$user = elgg_get_logged_in_user_entity();
-	} else {
-		$user = get_entity($user_id);
-	}
-
-	if ($user) {
-		$current_default_access = $user->getPrivateSetting('elgg_default_access');
-		if ($default_access !== $current_default_access) {
-			if ($user->setPrivateSetting('elgg_default_access', $default_access)) {
-				system_message(elgg_echo('user:default_access:success'));
-			} else {
-				register_error(elgg_echo('user:default_access:fail'));
-			}
-		}
-	} else {
-		register_error(elgg_echo('user:default_access:fail'));
-	}
-}
diff --git a/actions/user/language.php b/actions/user/language.php
deleted file mode 100644
index 30d3b45e8..000000000
--- a/actions/user/language.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Action for changing a user's personal language settings
- *
- * @package Elgg
- * @subpackage Core
- */
-
-$language = get_input('language');
-$user_id = get_input('guid');
-
-if (!$user_id) {
-	$user = elgg_get_logged_in_user_entity();
-} else {
-	$user = get_entity($user_id);
-}
-
-if (($user) && ($language)) {
-	if (strcmp($language, $user->language) != 0) {
-		$user->language = $language;
-		if ($user->save()) {
-			system_message(elgg_echo('user:language:success'));
-		} else {
-			register_error(elgg_echo('user:language:fail'));
-		}
-	}
-} else {
-	register_error(elgg_echo('user:language:fail'));
-}
diff --git a/actions/user/name.php b/actions/user/name.php
deleted file mode 100644
index 881019e86..000000000
--- a/actions/user/name.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Action for changing a user's name
- *
- * @package Elgg
- * @subpackage Core
- */
-
-$name = strip_tags(get_input('name'));
-$user_id = get_input('guid');
-
-if (!$user_id) {
-	$user = elgg_get_logged_in_user_entity();
-} else {
-	$user = get_entity($user_id);
-}
-
-if (elgg_strlen($name) > 50) {
-	register_error(elgg_echo('user:name:fail'));
-	forward(REFERER);
-}
-
-if (($user) && ($user->canEdit()) && ($name)) {
-	if ($name != $user->name) {
-		$user->name = $name;
-		if ($user->save()) {
-			system_message(elgg_echo('user:name:success'));
-		} else {
-			register_error(elgg_echo('user:name:fail'));
-		}
-	}
-} else {
-	register_error(elgg_echo('user:name:fail'));
-}
diff --git a/actions/user/password.php b/actions/user/password.php
deleted file mode 100644
index 8619372e4..000000000
--- a/actions/user/password.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Action for changing a user's password
- *
- * @package Elgg
- * @subpackage Core
- */
-
-$current_password = get_input('current_password');
-$password = get_input('password');
-$password2 = get_input('password2');
-$user_id = get_input('guid');
-
-if (!$user_id) {
-	$user = elgg_get_logged_in_user_entity();
-} else {
-	$user = get_entity($user_id);
-}
-
-if (($user) && ($password != "")) {
-	// let admin user change anyone's password without knowing it except his own.
-	if (!elgg_is_admin_logged_in() || elgg_is_admin_logged_in() && $user->guid == elgg_get_logged_in_user_guid()) {
-		$credentials = array(
-			'username' => $user->username,
-			'password' => $current_password
-		);
-
-		if (!pam_auth_userpass($credentials)) {
-			register_error(elgg_echo('user:password:fail:incorrect_current_password'));
-			forward(REFERER);
-		}
-	}
-
-	if (strlen($password) >= 4) {
-		if ($password == $password2) {
-			$user->salt = generate_random_cleartext_password(); // Reset the salt
-			$user->password = generate_user_password($user, $password);
-			if ($user->save()) {
-				system_message(elgg_echo('user:password:success'));
-			} else {
-				register_error(elgg_echo('user:password:fail'));
-			}
-		} else {
-			register_error(elgg_echo('user:password:fail:notsame'));
-		}
-	} else {
-		register_error(elgg_echo('user:password:fail:tooshort'));
-	}
-}
-- 
cgit v1.2.3