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

settings/ajax/lostpassword.php

@@ -8,12 +8,11 @@ OC_JSON::checkLoggedIn();
 $l=OC_L10N::get('core');
 
 // Get data
-if( isset( $_POST['email'] ) ){
-	$email=trim($_POST['email']);
+if( isset( $_POST['email'] ) && filter_var( $_POST['email'], FILTER_VALIDATE_EMAIL) ){
	$email=trim($_POST['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{
-	OC_JSON::error(array("data" => array( "message" => $l->t("Invalid request") )));
+	OC_JSON::error(array("data" => array( "message" => $l->t("Invalid email") )));
 }
 
-?>
+?>
\ No newline at end of file