X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsettings.php;h=5c9c439e0ae0c2c47ea3338d465bac5a7d4bc91e;hb=fb94a0add71642b08bab610d1cfb70eab4598ffc;hp=4d23621cb76ccc2c11c0b6e229df4080e54194e2;hpb=5f71da586274cf09d2df0b1e67ae432598bb7799;p=friendica.git

diff --git a/mod/settings.php b/mod/settings.php
index 4d23621cb7..5c9c439e0a 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -364,44 +364,41 @@ function settings_post(App $a) {
 
 	call_hooks('settings_post', $_POST);
 
-	if ((x($_POST,'password')) || (x($_POST,'confirm'))) {
+	if((x($_POST,'password')) || (x($_POST,'confirm'))) {
 
 		$newpass = $_POST['password'];
 		$confirm = $_POST['confirm'];
 		$oldpass = hash('whirlpool', $_POST['opassword']);
 
 		$err = false;
-		if ($newpass != $confirm ) {
+		if($newpass != $confirm ) {
 			notice( t('Passwords do not match. Password unchanged.') . EOL);
 			$err = true;
 		}
 
-		if ((! x($newpass)) || (! x($confirm))) {
+		if((! x($newpass)) || (! x($confirm))) {
 			notice( t('Empty passwords are not allowed. Password unchanged.') . EOL);
 			$err = true;
-		}
+        }
 
-		//  check if the old password was supplied correctly before
-		//  changing it to the new value
-		$r = q("SELECT `password` FROM `user`WHERE `uid` = %d LIMIT 1", intval(local_user()));
-		if (!dbm::is_result($r)) {
-			killme();
-		} elseif ( $oldpass != $r[0]['password'] ) {
-			notice( t('Wrong password.') . EOL);
-			$err = true;
-		}
+        //  check if the old password was supplied correctly before
+        //  changing it to the new value
+        $r = q("SELECT `password` FROM `user`WHERE `uid` = %d LIMIT 1", intval(local_user()));
+        if( $oldpass != $r[0]['password'] ) {
+            notice( t('Wrong password.') . EOL);
+            $err = true;
+        }
 
-		if (! $err) {
+		if(! $err) {
 			$password = hash('whirlpool',$newpass);
 			$r = q("UPDATE `user` SET `password` = '%s' WHERE `uid` = %d",
 				dbesc($password),
 				intval(local_user())
 			);
-			if ($r) {
+			if($r)
 				info( t('Password changed.') . EOL);
-			} else {
+			else
 				notice( t('Password update failed. Please try again.') . EOL);
-			}
 		}
 	}
 
@@ -445,41 +442,32 @@ function settings_post(App $a) {
 
 	$notify = 0;
 
-	if (x($_POST,'notify1')) {
+	if(x($_POST,'notify1'))
 		$notify += intval($_POST['notify1']);
-	}
-	if (x($_POST,'notify2')) {
+	if(x($_POST,'notify2'))
 		$notify += intval($_POST['notify2']);
-	}
-	if (x($_POST,'notify3')) {
+	if(x($_POST,'notify3'))
 		$notify += intval($_POST['notify3']);
-	}
-	if (x($_POST,'notify4')) {
+	if(x($_POST,'notify4'))
 		$notify += intval($_POST['notify4']);
-	}
-	if (x($_POST,'notify5')) {
+	if(x($_POST,'notify5'))
 		$notify += intval($_POST['notify5']);
-	}
-	if (x($_POST,'notify6')) {
+	if(x($_POST,'notify6'))
 		$notify += intval($_POST['notify6']);
-	}
-	if (x($_POST,'notify7')) {
+	if(x($_POST,'notify7'))
 		$notify += intval($_POST['notify7']);
-	}
-	if (x($_POST,'notify8')) {
+	if(x($_POST,'notify8'))
 		$notify += intval($_POST['notify8']);
-	}
 
 	// Adjust the page flag if the account type doesn't fit to the page flag.
-	if (($account_type == ACCOUNT_TYPE_PERSON) AND !in_array($page_flags, array(PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE))) {
+	if (($account_type == ACCOUNT_TYPE_PERSON) AND !in_array($page_flags, array(PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE)))
 		$page_flags = PAGE_NORMAL;
-	} elseif (($account_type == ACCOUNT_TYPE_ORGANISATION) AND !in_array($page_flags, array(PAGE_SOAPBOX))) {
+	elseif (($account_type == ACCOUNT_TYPE_ORGANISATION) AND !in_array($page_flags, array(PAGE_SOAPBOX)))
 		$page_flags = PAGE_SOAPBOX;
-	} elseif (($account_type == ACCOUNT_TYPE_NEWS) AND !in_array($page_flags, array(PAGE_SOAPBOX))) {
+	elseif (($account_type == ACCOUNT_TYPE_NEWS) AND !in_array($page_flags, array(PAGE_SOAPBOX)))
 		$page_flags = PAGE_SOAPBOX;
-	} elseif (($account_type == ACCOUNT_TYPE_COMMUNITY) AND !in_array($page_flags, array(PAGE_COMMUNITY, PAGE_PRVGROUP))) {
+	elseif (($account_type == ACCOUNT_TYPE_COMMUNITY) AND !in_array($page_flags, array(PAGE_COMMUNITY, PAGE_PRVGROUP)))
 		$page_flags = PAGE_COMMUNITY;
-	}
 
 	$email_changed = false;
 
@@ -489,15 +477,13 @@ function settings_post(App $a) {
 
 	if($username != $a->user['username']) {
 		$name_change = true;
-		if (strlen($username) > 40) {
+		if(strlen($username) > 40)
 			$err .= t(' Please use a shorter name.');
-		}
-		if (strlen($username) < 3) {
+		if(strlen($username) < 3)
 			$err .= t(' Name too short.');
-		}
 	}
 
-	if ($email != $a->user['email']) {
+	if($email != $a->user['email']) {
 		$email_changed = true;
 		//  check for the correct password
 		$r = q("SELECT `password` FROM `user`WHERE `uid` = %d LIMIT 1", intval(local_user()));
@@ -507,12 +493,11 @@ function settings_post(App $a) {
 			$email = $a->user['email'];
 		}
 		//  check the email is valid
-		if (! valid_email($email)) {
+		if(! valid_email($email))
 			$err .= t(' Not valid email.');
-		}
 		//  ensure new email is not the admin mail
 		//if((x($a->config,'admin_email')) && (strcasecmp($email,$a->config['admin_email']) == 0)) {
-		if (x($a->config,'admin_email')) {
+		if(x($a->config,'admin_email')) {
 			$adminlist = explode(",", str_replace(" ", "", strtolower($a->config['admin_email'])));
 			if (in_array(strtolower($email), $adminlist)) {
 				$err .= t(' Cannot change to that email.');
@@ -521,13 +506,14 @@ function settings_post(App $a) {
 		}
 	}
 
-	if (strlen($err)) {
+	if(strlen($err)) {
 		notice($err . EOL);
 		return;
 	}
 
-	if ($timezone != $a->user['timezone'] && strlen($timezone)) {
-		date_default_timezone_set($timezone);
+	if($timezone != $a->user['timezone']) {
+		if(strlen($timezone))
+			date_default_timezone_set($timezone);
 	}
 
 	$str_group_allow   = perms2str($_POST['group_allow']);
@@ -540,17 +526,17 @@ function settings_post(App $a) {
 
 	// If openid has changed or if there's an openid but no openidserver, try and discover it.
 
-	if ($openid != $a->user['openid'] || (strlen($openid) && (! strlen($openidserver)))) {
+	if($openid != $a->user['openid'] || (strlen($openid) && (! strlen($openidserver)))) {
 		$tmp_str = $openid;
-		if (strlen($tmp_str) && validate_url($tmp_str)) {
+		if(strlen($tmp_str) && validate_url($tmp_str)) {
 			logger('updating openidserver');
 			require_once('library/openid.php');
 			$open_id_obj = new LightOpenID;
 			$open_id_obj->identity = $openid;
 			$openidserver = $open_id_obj->discover($open_id_obj->identity);
-		} else {
-			$openidserver = '';
 		}
+		else
+			$openidserver = '';
 	}
 
 	set_pconfig(local_user(),'expire','items', $expire_items);
@@ -566,13 +552,14 @@ function settings_post(App $a) {
 
 	set_pconfig(local_user(),'system','email_textonly', $email_textonly);
 
-	if ($page_flags == PAGE_PRVGROUP) {
+	if($page_flags == PAGE_PRVGROUP) {
 		$hidewall = 1;
-		if ((! $str_contact_allow) && (! $str_group_allow) && (! $str_contact_deny) && (! $str_group_deny)) {
-			if ($def_gid) {
+		if((! $str_contact_allow) && (! $str_group_allow) && (! $str_contact_deny) && (! $str_group_deny)) {
+			if($def_gid) {
 				info( t('Private forum has no privacy permissions. Using default privacy group.'). EOL);
 				$str_group_allow = '<' . $def_gid . '>';
-			} else {
+			}
+			else {
 				notice( t('Private forum has no privacy permissions and no default privacy group.') . EOL);
 			}
 		}
@@ -612,9 +599,8 @@ function settings_post(App $a) {
 			dbesc($language),
 			intval(local_user())
 	);
-	if ($r) {
+	if($r)
 		info( t('Settings updated.') . EOL);
-	}
 
 	// clear session language
 	unset($_SESSION['language']);
@@ -633,7 +619,7 @@ function settings_post(App $a) {
 	);
 
 
-	if ($name_change) {
+	if($name_change) {
 		q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `self`",
 			dbesc($username),
 			dbesc(datetime_convert()),
@@ -683,6 +669,8 @@ function settings_content(App $a) {
 		return;
 	}
 
+
+
 	if (($a->argc > 1) && ($a->argv[1] === 'oauth')) {
 
 		if (($a->argc > 2) && ($a->argv[2] === 'add')) {
@@ -884,7 +872,7 @@ function settings_content(App $a) {
 		$mail_pubmail      = ((dbm::is_result($r)) ? $r[0]['pubmail'] : 0);
 		$mail_action       = ((dbm::is_result($r)) ? $r[0]['action'] : 0);
 		$mail_movetofolder = ((dbm::is_result($r)) ? $r[0]['movetofolder'] : '');
-		$mail_chk          = ((dbm::is_result($r)) ? $r[0]['last_check'] : '0000-00-00 00:00:00');
+		$mail_chk          = ((dbm::is_result($r)) ? $r[0]['last_check'] : NULL_DATE);
 
 
 		$tpl = get_markup_template("settings_connectors.tpl");