),
);
- if (get_features()) {
+ if(get_features()) {
$tabs[] = array(
'label' => t('Additional features'),
'url' => 'settings/features',
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'] : '');
$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())
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",
$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);
}
}
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));
}
}
$itemspage_mobile_network = 100;
}
- if ($mobile_theme !== '') {
+ if($mobile_theme !== '') {
set_pconfig(local_user(),'system','mobile_theme',$mobile_theme);
}
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);
- }
}
}
$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;
$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()));
$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.');
}
}
- 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']);
// 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);
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);
}
}
dbesc($language),
intval(local_user())
);
- if ($r) {
+ if($r)
info( t('Settings updated.') . EOL);
- }
// clear session language
unset($_SESSION['language']);
);
- 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()),
return;
}
+
+
if (($a->argc > 1) && ($a->argv[1] === 'oauth')) {
if (($a->argc > 2) && ($a->argv[2] === 'add')) {
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",
$arr[$fname] = array();
$arr[$fname][0] = $fdata[0];
foreach (array_slice($fdata,1) as $f) {
- $arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(feature_enabled(local_user(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On')));
+ $arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(feature_enabled(local_user(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'), t('On')));
}
}
}
$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()
);
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(
- '$field' => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], '', array(t('No'),t('Yes'))),
+ $profile_in_dir = replace_macros($opt_tpl, array(
+ '$field' => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], t("Your profile may be visible in public."), array(t('No'), t('Yes')))
));
}
if (strlen(get_config('system','directory'))) {
- $profile_in_net_dir = replace_macros($opt_tpl,array(
- '$field' => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', array(t('No'),t('Yes'))),
+ $profile_in_net_dir = replace_macros($opt_tpl, array(
+ '$field' => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', array(t('No'), t('Yes')))
));
} else {
$profile_in_net_dir = '';
}
$hide_friends = replace_macros($opt_tpl,array(
- '$field' => array('hide-friends', t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], '', array(t('No'),t('Yes'))),
+ '$field' => array('hide-friends', t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], '', array(t('No'), t('Yes'))),
));
$hide_wall = replace_macros($opt_tpl,array(
- '$field' => array('hidewall', t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], t("If enabled, posting public messages to Diaspora and other networks isn't possible."), array(t('No'),t('Yes'))),
+ '$field' => array('hidewall', t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], t("If enabled, posting public messages to Diaspora and other networks isn't possible."), array(t('No'), t('Yes'))),
));
$blockwall = replace_macros($opt_tpl,array(
- '$field' => array('blockwall', t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), '', array(t('No'),t('Yes'))),
+ '$field' => array('blockwall', t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), '', array(t('No'), t('Yes'))),
));
$blocktags = replace_macros($opt_tpl,array(
- '$field' => array('blocktags', t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), '', array(t('No'),t('Yes'))),
+ '$field' => array('blocktags', t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), '', array(t('No'), t('Yes'))),
));
$suggestme = replace_macros($opt_tpl,array(
- '$field' => array('suggestme', t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', array(t('No'),t('Yes'))),
+ '$field' => array('suggestme', t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', array(t('No'), t('Yes'))),
));
$unkmail = replace_macros($opt_tpl,array(
- '$field' => array('unkmail', t('Permit unknown people to send you private mail?'), $unkmail, '', array(t('No'),t('Yes'))),
+ '$field' => array('unkmail', t('Permit unknown people to send you private mail?'), $unkmail, '', array(t('No'), t('Yes'))),
));
'days' => array('expire', t("Automatically expire posts after this many days:"), $expire, t('If empty, posts will not expire. Expired posts will be deleted')),
'advanced' => t('Advanced expiration settings'),
'label' => t('Advanced Expiration'),
- 'items' => array('expire_items', t("Expire posts:"), $expire_items, '', array(t('No'),t('Yes'))),
- 'notes' => array('expire_notes', t("Expire personal notes:"), $expire_notes, '', array(t('No'),t('Yes'))),
- 'starred' => array('expire_starred', t("Expire starred posts:"), $expire_starred, '', array(t('No'),t('Yes'))),
- 'photos' => array('expire_photos', t("Expire photos:"), $expire_photos, '', array(t('No'),t('Yes'))),
- 'network_only' => array('expire_network_only', t("Only expire posts by others:"), $expire_network_only, '', array(t('No'),t('Yes'))),
+ 'items' => array('expire_items', t("Expire posts:"), $expire_items, '', array(t('No'), t('Yes'))),
+ 'notes' => array('expire_notes', t("Expire personal notes:"), $expire_notes, '', array(t('No'), t('Yes'))),
+ 'starred' => array('expire_starred', t("Expire starred posts:"), $expire_starred, '', array(t('No'), t('Yes'))),
+ 'photos' => array('expire_photos', t("Expire photos:"), $expire_photos, '', array(t('No'), t('Yes'))),
+ 'network_only' => array('expire_network_only', t("Only expire posts by others:"), $expire_network_only, '', array(t('No'), t('Yes'))),
);
require_once('include/group.php');
'$h_prv' => t('Security and Privacy Settings'),
- '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), $maxreq ,t("\x28to prevent spam abuse\x29")),
+ '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), $maxreq , t("\x28to prevent spam abuse\x29")),
'$permissions' => t('Default Post Permissions'),
'$permdesc' => t("\x28click to open/close\x29"),
'$visibility' => $profile['net-publish'],
'$hide_friends' => $hide_friends,
'$hide_wall' => $hide_wall,
'$unkmail' => $unkmail,
- '$cntunkmail' => array('cntunkmail', t('Maximum private messages per day from unknown people:'), $cntunkmail ,t("\x28to prevent spam abuse\x29")),
+ '$cntunkmail' => array('cntunkmail', t('Maximum private messages per day from unknown people:'), $cntunkmail , t("\x28to prevent spam abuse\x29")),
'$h_not' => t('Notification Settings'),
projects / friendica.git / blobdiff