Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4

This commit is contained in:
Arthur Schiwon 2012-06-04 21:33:02 +02:00
commit ae2bcf968d
1 changed files with 4 additions and 5 deletions

View File

@ -8,12 +8,11 @@ OC_JSON::checkLoggedIn();
$l=OC_L10N::get('core'); $l=OC_L10N::get('core');
// Get data // Get data
if( isset( $_POST['email'] ) ){ if( isset( $_POST['email'] ) && filter_var( $_POST['email'], FILTER_VALIDATE_EMAIL) ){ $email=trim($_POST['email']);
$email=trim($_POST['email']);
OC_Preferences::setValue(OC_User::getUser(),'settings','email',$email); OC_Preferences::setValue(OC_User::getUser(),'settings','email',$email);
OC_JSON::success(array("data" => array( "message" => $l->t("email Changed") ))); OC_JSON::success(array("data" => array( "message" => $l->t("Email saved") )));
}else{ }else{
OC_JSON::error(array("data" => array( "message" => $l->t("Invalid request") ))); OC_JSON::error(array("data" => array( "message" => $l->t("Invalid email") )));
} }
?> ?>