friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Some more formatting reverts

This commit is contained in:
Hypolite Petovan 2016-10-24 12:43:38 -04:00
parent 8787587011
commit fb75394766
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mod/settings.php
View File

@ -222,11 +222,11 @@ function settings_post(&$a)
if (!$mail_disabled) { if (!$mail_disabled) {
$failed = false; $failed = false;
$r = q('SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1', $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
intval(local_user()) intval(local_user())
); );
if (!count($r)) { if (!count($r)) {
q('INSERT INTO `mailacct` (`uid`) VALUES (%d)', q("INSERT INTO `mailacct` (`uid`) VALUES (%d)",
intval(local_user()) intval(local_user())
); );
} }
@ -252,7 +252,7 @@ function settings_post(&$a)
intval(local_user()) intval(local_user())
); );
logger('mail: updating mailaccount. Response: '.print_r($r, true)); logger('mail: updating mailaccount. Response: '.print_r($r, true));
$r = q('SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1', $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
intval(local_user()) intval(local_user())
); );
if (count($r)) { if (count($r)) {
@ -382,7 +382,7 @@ function settings_post(&$a)
// check if the old password was supplied correctly before // check if the old password was supplied correctly before
// changing it to the new value // changing it to the new value
$r = q('SELECT `password` FROM `user`WHERE `uid` = %d LIMIT 1', intval(local_user())); $r = q("SELECT `password` FROM `user`WHERE `uid` = %d LIMIT 1", intval(local_user()));
if ($oldpass != $r[0]['password']) { if ($oldpass != $r[0]['password']) {
notice(t('Wrong password.').EOL); notice(t('Wrong password.').EOL);
$err = true; $err = true;
@ -497,7 +497,7 @@ function settings_post(&$a)
if ($email != $a->user['email']) { if ($email != $a->user['email']) {
$email_changed = true; $email_changed = true;
// check for the correct password // check for the correct password
$r = q('SELECT `password` FROM `user`WHERE `uid` = %d LIMIT 1', intval(local_user())); $r = q("SELECT `password` FROM `user`WHERE `uid` = %d LIMIT 1", intval(local_user()));
$password = hash('whirlpool', $_POST['mpassword']); $password = hash('whirlpool', $_POST['mpassword']);
if ($password != $r[0]['password']) { if ($password != $r[0]['password']) {
$err .= t('Wrong Password').EOL; $err .= t('Wrong Password').EOL;
@ -738,10 +738,10 @@ function settings_content(&$a)
return; return;
} }
$r = q('SELECT clients.*, tokens.id as oauth_token, (clients.uid=%d) AS my $r = q("SELECT clients.*, tokens.id as oauth_token, (clients.uid=%d) AS my
FROM clients FROM clients
LEFT JOIN tokens ON clients.client_id=tokens.client_id LEFT JOIN tokens ON clients.client_id=tokens.client_id
WHERE clients.uid IN (%d,0)', WHERE clients.uid IN (%d,0)",
local_user(), local_user(),
local_user()); local_user());
@ -866,7 +866,7 @@ function settings_content(&$a)
} }
if (!$mail_disabled) { if (!$mail_disabled) {
$r = q('SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1', $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
local_user() local_user()
); );
} else { } else {
@ -1045,7 +1045,7 @@ function settings_content(&$a)
require_once 'include/acl_selectors.php'; require_once 'include/acl_selectors.php';
$p = q('SELECT * FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1', $p = q("SELECT * FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
intval(local_user()) intval(local_user())
); );
if (count($p)) { if (count($p)) {