bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert "Coding convention applied - part 1"

Browse source
This commit is contained in:
Hypolite Petovan 2017-03-21 12:02:59 -04:00 • committed by GitHub
commit 7b352f3f74
181 changed files with 3507 additions and 4338 deletions
Download patch file Download diff file Expand all files Collapse all files

149
mod/settings.php
View file

@ -47,7 +47,7 @@ function settings_init(App $a) {
),
);
if (get_features()) {
if(get_features()) {
$tabs[] = array(
'label' => t('Additional features'),
'url' => 'settings/features',
@ -189,23 +189,23 @@ function settings_post(App $a) {
return;
}
if (($a->argc > 1) && ($a->argv[1] == 'addon')) {
if(($a->argc > 1) && ($a->argv[1] == 'addon')) {
check_form_security_token_redirectOnErr('/settings/addon', 'settings_addon');
call_hooks('plugin_settings_post', $_POST);
return;
}
if (($a->argc > 1) && ($a->argv[1] == 'connectors')) {
if(($a->argc > 1) && ($a->argv[1] == 'connectors')) {
check_form_security_token_redirectOnErr('/settings/connectors', 'settings_connectors');
if (x($_POST, 'general-submit')) {
if(x($_POST, 'general-submit')) {
set_pconfig(local_user(), 'system', 'no_intelligent_shortening', intval($_POST['no_intelligent_shortening']));
set_pconfig(local_user(), 'system', 'ostatus_autofriend', intval($_POST['snautofollow']));
set_pconfig(local_user(), 'ostatus', 'default_group', $_POST['group-selection']);
set_pconfig(local_user(), 'ostatus', 'legacy_contact', $_POST['legacy_contact']);
} elseif (x($_POST, 'imap-submit')) {
} elseif(x($_POST, 'imap-submit')) {
$mail_server = ((x($_POST,'mail_server')) ? $_POST['mail_server'] : '');
$mail_port = ((x($_POST,'mail_port')) ? $_POST['mail_port'] : '');
@ -219,10 +219,10 @@ function settings_post(App $a) {
$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
if (get_config('system','dfrn_only'))
if(get_config('system','dfrn_only'))
$mail_disabled = 1;
if (! $mail_disabled) {
if(! $mail_disabled) {
$failed = false;
$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
intval(local_user())
@ -232,7 +232,7 @@ function settings_post(App $a) {
intval(local_user())
);
}
if (strlen($mail_pass)) {
if(strlen($mail_pass)) {
$pass = '';
openssl_public_encrypt($mail_pass,$pass,$a->user['pubkey']);
q("UPDATE `mailacct` SET `pass` = '%s' WHERE `uid` = %d",
@ -261,18 +261,18 @@ function settings_post(App $a) {
$eacct = $r[0];
require_once('include/email.php');
$mb = construct_mailbox_name($eacct);
if (strlen($eacct['server'])) {
if(strlen($eacct['server'])) {
$dcrpass = '';
openssl_private_decrypt(hex2bin($eacct['pass']),$dcrpass,$a->user['prvkey']);
$mbox = email_connect($mb,$mail_user,$dcrpass);
unset($dcrpass);
if (! $mbox) {
if(! $mbox) {
$failed = true;
notice( t('Failed to connect with email account using the settings provided.') . EOL);
}
}
}
if (! $failed)
if(! $failed)
info( t('Email settings updated.') . EOL);
}
}
@ -283,8 +283,8 @@ function settings_post(App $a) {
if (($a->argc > 1) && ($a->argv[1] === 'features')) {
check_form_security_token_redirectOnErr('/settings/features', 'settings_features');
foreach ($_POST as $k => $v) {
if (strpos($k,'feature_') === 0) {
foreach($_POST as $k => $v) {
if(strpos($k,'feature_') === 0) {
set_pconfig(local_user(),'feature',substr($k,8),((intval($v)) ? 1 : 0));
}
}
@ -320,7 +320,7 @@ function settings_post(App $a) {
$itemspage_mobile_network = 100;
}
if ($mobile_theme !== '') {
if($mobile_theme !== '') {
set_pconfig(local_user(),'system','mobile_theme',$mobile_theme);
}
@ -364,45 +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)) {
/// @todo Don't quit silently here
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);
}
}
}
@ -446,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;
@ -488,17 +475,15 @@ function settings_post(App $a) {
$name_change = false;
if ($username != $a->user['username']) {
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()));
@ -508,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')) && (strcasecmp($email,$a->config['admin_email']) == 0)) {
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.');
@ -522,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']);
@ -541,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);
@ -567,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);
}
}
@ -613,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']);
@ -634,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()),
@ -684,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')) {
@ -728,7 +715,7 @@ function settings_content(App $a) {
return $o;
}
if (($a->argc > 3) && ($a->argv[2] === 'delete')) {
if(($a->argc > 3) && ($a->argv[2] === 'delete')) {
check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth', 't');
$r = q("DELETE FROM clients WHERE client_id='%s' AND uid=%d",
@ -866,10 +853,10 @@ function settings_content(App $a) {
}
$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
if (get_config('system','dfrn_only'))
if(get_config('system','dfrn_only'))
$mail_disabled = 1;
if (! $mail_disabled) {
if(! $mail_disabled) {
$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
local_user()
);
@ -1177,7 +1164,7 @@ function settings_content(App $a) {
}
$opt_tpl = get_markup_template("field_yesno.tpl");
if (get_config('system','publish_all')) {
if(get_config('system','publish_all')) {
$profile_in_dir = '<input type="hidden" name="profile_in_directory" value="1" />';
} else {
$profile_in_dir = replace_macros($opt_tpl,array(