X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsettings.php;h=6138463593a0f1f6300797a9b313ad56b11c0e49;hb=da60893590a302bf94dfd86f5586f26509160d34;hp=f13e89cd16be3869c07ee3a24a22f2a5e3f944b1;hpb=f65d6531cafe625d6be011e135d132ae48fc7c06;p=friendica.git
diff --git a/mod/settings.php b/mod/settings.php
index f13e89cd16..6138463593 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -1,45 +1,47 @@
theme_info['extends'];
- if (file_exists("view/theme/$theme/config.php")){
+ if (file_exists("view/theme/$theme/config.php")) {
return "view/theme/$theme/config.php";
}
- if (file_exists("view/theme/$base_theme/config.php")){
+ if (file_exists("view/theme/$base_theme/config.php")) {
return "view/theme/$base_theme/config.php";
}
return null;
}
-function settings_init(App $a) {
-
- if (! local_user()) {
- notice( t('Permission denied.') . EOL );
+function settings_init(App $a)
+{
+ if (!local_user()) {
+ notice(t('Permission denied.') . EOL);
return;
}
- // APC deactivated, since there are problems with PHP 5.5
- //if (function_exists("apc_delete")) {
- // $toDelete = new APCIterator('user', APC_ITER_VALUE);
- // apc_delete($toDelete);
- //}
-
// These lines provide the javascript needed by the acl selector
- $tpl = get_markup_template("settings-head.tpl");
+ $tpl = get_markup_template('settings/head.tpl');
$a->page['htmlhead'] .= replace_macros($tpl,array(
'$ispublic' => t('everybody')
));
-
-
$tabs = array(
array(
'label' => t('Account'),
@@ -49,7 +51,7 @@ function settings_init(App $a) {
),
);
- if(get_features()) {
+ if (Feature::get()) {
$tabs[] = array(
'label' => t('Additional features'),
'url' => 'settings/features',
@@ -117,50 +119,48 @@ function settings_init(App $a) {
}
-
-function settings_post(App $a) {
-
- if (! local_user()) {
+function settings_post(App $a)
+{
+ if (!local_user()) {
return;
}
- if (x($_SESSION,'submanage') && intval($_SESSION['submanage'])) {
+ if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {
return;
}
- if (count($a->user) && x($a->user,'uid') && $a->user['uid'] != local_user()) {
- notice( t('Permission denied.') . EOL);
+ if (count($a->user) && x($a->user, 'uid') && $a->user['uid'] != local_user()) {
+ notice(t('Permission denied.') . EOL);
return;
}
$old_page_flags = $a->user['page-flags'];
- if (($a->argc > 1) && ($a->argv[1] === 'oauth') && x($_POST,'remove')) {
+ if (($a->argc > 1) && ($a->argv[1] === 'oauth') && x($_POST, 'remove')) {
check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
$key = $_POST['remove'];
q("DELETE FROM tokens WHERE id='%s' AND uid=%d",
dbesc($key),
local_user());
- goaway(App::get_baseurl(true)."/settings/oauth/");
+ goaway(System::baseUrl(true)."/settings/oauth/");
return;
}
- if (($a->argc > 2) && ($a->argv[1] === 'oauth') && ($a->argv[2] === 'edit'||($a->argv[2] === 'add')) && x($_POST,'submit')) {
-
+ if (($a->argc > 2) && ($a->argv[1] === 'oauth') && ($a->argv[2] === 'edit'||($a->argv[2] === 'add')) && x($_POST, 'submit')) {
check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
- $name = ((x($_POST,'name')) ? $_POST['name'] : '');
- $key = ((x($_POST,'key')) ? $_POST['key'] : '');
- $secret = ((x($_POST,'secret')) ? $_POST['secret'] : '');
- $redirect = ((x($_POST,'redirect')) ? $_POST['redirect'] : '');
- $icon = ((x($_POST,'icon')) ? $_POST['icon'] : '');
- if ($name=="" || $key=="" || $secret==""){
- notice(t("Missing some important data!"));
+ $name = defaults($_POST, 'name' , '');
+ $key = defaults($_POST, 'key' , '');
+ $secret = defaults($_POST, 'secret' , '');
+ $redirect = defaults($_POST, 'redirect', '');
+ $icon = defaults($_POST, 'icon' , '');
+ if ($name == "" || $key == "" || $secret == "") {
+ notice(t("Missing some important data!"));
} else {
- if ($_POST['submit']==t("Update")){
- $r = q("UPDATE clients SET
+ if ($_POST['submit']==t("Update")) {
+ q("UPDATE clients SET
client_id='%s',
pw='%s',
name='%s',
@@ -176,9 +176,9 @@ function settings_post(App $a) {
local_user(),
dbesc($key));
} else {
- $r = q("INSERT INTO clients
+ q("INSERT INTO clients
(client_id, pw, name, redirect_uri, icon, uid)
- VALUES ('%s','%s','%s','%s','%s',%d)",
+ VALUES ('%s', '%s', '%s', '%s', '%s',%d)",
dbesc($key),
dbesc($secret),
dbesc($name),
@@ -187,60 +187,56 @@ function settings_post(App $a) {
local_user());
}
}
- goaway(App::get_baseurl(true)."/settings/oauth/");
+ goaway(System::baseUrl(true)."/settings/oauth/");
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')) {
- 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')) {
-
- $mail_server = ((x($_POST,'mail_server')) ? $_POST['mail_server'] : '');
- $mail_port = ((x($_POST,'mail_port')) ? $_POST['mail_port'] : '');
- $mail_ssl = ((x($_POST,'mail_ssl')) ? strtolower(trim($_POST['mail_ssl'])) : '');
- $mail_user = ((x($_POST,'mail_user')) ? $_POST['mail_user'] : '');
- $mail_pass = ((x($_POST,'mail_pass')) ? trim($_POST['mail_pass']) : '');
- $mail_action = ((x($_POST,'mail_action')) ? trim($_POST['mail_action']) : '');
- $mail_movetofolder = ((x($_POST,'mail_movetofolder')) ? trim($_POST['mail_movetofolder']) : '');
- $mail_replyto = ((x($_POST,'mail_replyto')) ? $_POST['mail_replyto'] : '');
- $mail_pubmail = ((x($_POST,'mail_pubmail')) ? $_POST['mail_pubmail'] : '');
-
-
- $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
- if(get_config('system','dfrn_only'))
+ if (x($_POST, 'general-submit')) {
+ PConfig::set(local_user(), 'system', 'no_intelligent_shortening', intval($_POST['no_intelligent_shortening']));
+ PConfig::set(local_user(), 'system', 'ostatus_autofriend', intval($_POST['snautofollow']));
+ PConfig::set(local_user(), 'ostatus', 'default_group', $_POST['group-selection']);
+ PConfig::set(local_user(), 'ostatus', 'legacy_contact', $_POST['legacy_contact']);
+ } elseif (x($_POST, 'imap-submit')) {
+
+ $mail_server = ((x($_POST, 'mail_server')) ? $_POST['mail_server'] : '');
+ $mail_port = ((x($_POST, 'mail_port')) ? $_POST['mail_port'] : '');
+ $mail_ssl = ((x($_POST, 'mail_ssl')) ? strtolower(trim($_POST['mail_ssl'])) : '');
+ $mail_user = ((x($_POST, 'mail_user')) ? $_POST['mail_user'] : '');
+ $mail_pass = ((x($_POST, 'mail_pass')) ? trim($_POST['mail_pass']) : '');
+ $mail_action = ((x($_POST, 'mail_action')) ? trim($_POST['mail_action']) : '');
+ $mail_movetofolder = ((x($_POST, 'mail_movetofolder')) ? trim($_POST['mail_movetofolder']) : '');
+ $mail_replyto = ((x($_POST, 'mail_replyto')) ? $_POST['mail_replyto'] : '');
+ $mail_pubmail = ((x($_POST, 'mail_pubmail')) ? $_POST['mail_pubmail'] : '');
+
+
+ $mail_disabled = ((function_exists('imap_open') && (!Config::get('system', 'imap_disabled'))) ? 0 : 1);
+ if (Config::get('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())
);
- if (! dbm::is_result($r)) {
- q("INSERT INTO `mailacct` (`uid`) VALUES (%d)",
- intval(local_user())
- );
+ if (!DBM::is_result($r)) {
+ dba::insert('mailacct', array('uid' => 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",
- dbesc(bin2hex($pass)),
- intval(local_user())
- );
+ openssl_public_encrypt($mail_pass, $pass, $a->user['pubkey']);
+ dba::update('mailacct', array('pass' => bin2hex($pass)), array('uid' => local_user()));
}
$r = q("UPDATE `mailacct` SET `server` = '%s', `port` = %d, `ssltype` = '%s', `user` = '%s',
`action` = %d, `movetofolder` = '%s',
@@ -259,23 +255,24 @@ function settings_post(App $a) {
$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
intval(local_user())
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$eacct = $r[0];
- require_once('include/email.php');
- $mb = construct_mailbox_name($eacct);
- if(strlen($eacct['server'])) {
+ $mb = Email::constructMailboxName($eacct);
+
+ if (strlen($eacct['server'])) {
$dcrpass = '';
- openssl_private_decrypt(hex2bin($eacct['pass']),$dcrpass,$a->user['prvkey']);
- $mbox = email_connect($mb,$mail_user,$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);
+ notice(t('Failed to connect with email account using the settings provided.') . EOL);
}
}
}
- if(! $failed)
- info( t('Email settings updated.') . EOL);
+ if (!$failed) {
+ info(t('Email settings updated.') . EOL);
+ }
}
}
@@ -285,12 +282,12 @@ 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) {
- set_pconfig(local_user(),'feature',substr($k,8),((intval($v)) ? 1 : 0));
+ foreach ($_POST as $k => $v) {
+ if (strpos($k, 'feature_') === 0) {
+ PConfig::set(local_user(), 'feature', substr($k, 8), ((intval($v)) ? 1 : 0));
}
}
- info( t('Features updated') . EOL);
+ info(t('Features updated') . EOL);
return;
}
@@ -305,135 +302,133 @@ function settings_post(App $a) {
$infinite_scroll = x($_POST, 'infinite_scroll') ? intval($_POST['infinite_scroll']) : 0;
$no_auto_update = x($_POST, 'no_auto_update') ? intval($_POST['no_auto_update']) : 0;
$bandwidth_saver = x($_POST, 'bandwidth_saver') ? intval($_POST['bandwidth_saver']) : 0;
+ $smart_threading = x($_POST, 'smart_threading') ? intval($_POST['smart_threading']) : 0;
$nowarn_insecure = x($_POST, 'nowarn_insecure') ? intval($_POST['nowarn_insecure']) : 0;
$browser_update = x($_POST, 'browser_update') ? intval($_POST['browser_update']) : 0;
if ($browser_update != -1) {
$browser_update = $browser_update * 1000;
- if ($browser_update < 10000)
+ if ($browser_update < 10000) {
$browser_update = 10000;
+ }
}
- $itemspage_network = x($_POST,'itemspage_network') ? intval($_POST['itemspage_network']) : 40;
+ $itemspage_network = x($_POST, 'itemspage_network') ? intval($_POST['itemspage_network']) : 40;
if ($itemspage_network > 100) {
$itemspage_network = 100;
}
- $itemspage_mobile_network = x($_POST,'itemspage_mobile_network') ? intval($_POST['itemspage_mobile_network']) : 20;
+ $itemspage_mobile_network = x($_POST, 'itemspage_mobile_network') ? intval($_POST['itemspage_mobile_network']) : 20;
if ($itemspage_mobile_network > 100) {
$itemspage_mobile_network = 100;
}
- if($mobile_theme !== '') {
- set_pconfig(local_user(),'system','mobile_theme',$mobile_theme);
+ if ($mobile_theme !== '') {
+ PConfig::set(local_user(), 'system', 'mobile_theme', $mobile_theme);
}
- set_pconfig(local_user(), 'system', 'nowarn_insecure' , $nowarn_insecure);
- set_pconfig(local_user(), 'system', 'update_interval' , $browser_update);
- set_pconfig(local_user(), 'system', 'itemspage_network' , $itemspage_network);
- set_pconfig(local_user(), 'system', 'itemspage_mobile_network', $itemspage_mobile_network);
- set_pconfig(local_user(), 'system', 'no_smilies' , $nosmile);
- set_pconfig(local_user(), 'system', 'first_day_of_week' , $first_day_of_week);
- set_pconfig(local_user(), 'system', 'ignore_info' , $noinfo);
- set_pconfig(local_user(), 'system', 'infinite_scroll' , $infinite_scroll);
- set_pconfig(local_user(), 'system', 'no_auto_update' , $no_auto_update);
- set_pconfig(local_user(), 'system', 'bandwidth_saver' , $bandwidth_saver);
+ PConfig::set(local_user(), 'system', 'nowarn_insecure' , $nowarn_insecure);
+ PConfig::set(local_user(), 'system', 'update_interval' , $browser_update);
+ PConfig::set(local_user(), 'system', 'itemspage_network' , $itemspage_network);
+ PConfig::set(local_user(), 'system', 'itemspage_mobile_network', $itemspage_mobile_network);
+ PConfig::set(local_user(), 'system', 'no_smilies' , $nosmile);
+ PConfig::set(local_user(), 'system', 'first_day_of_week' , $first_day_of_week);
+ PConfig::set(local_user(), 'system', 'ignore_info' , $noinfo);
+ PConfig::set(local_user(), 'system', 'infinite_scroll' , $infinite_scroll);
+ PConfig::set(local_user(), 'system', 'no_auto_update' , $no_auto_update);
+ PConfig::set(local_user(), 'system', 'bandwidth_saver' , $bandwidth_saver);
+ PConfig::set(local_user(), 'system', 'smart_threading' , $smart_threading);
if ($theme == $a->user['theme']) {
// call theme_post only if theme has not been changed
- if (($themeconfigfile = get_theme_config_file($theme)) != null) {
- require_once($themeconfigfile);
+ if (($themeconfigfile = get_theme_config_file($theme)) !== null) {
+ require_once $themeconfigfile;
theme_post($a);
}
}
-
$r = q("UPDATE `user` SET `theme` = '%s' WHERE `uid` = %d",
dbesc($theme),
intval(local_user())
);
call_hooks('display_settings_post', $_POST);
- goaway('settings/display' );
+ goaway('settings/display');
return; // NOTREACHED
}
check_form_security_token_redirectOnErr('/settings', 'settings');
if (x($_POST,'resend_relocate')) {
- proc_run(PRIORITY_HIGH, 'include/notifier.php', 'relocate', local_user());
+ Worker::add(PRIORITY_HIGH, 'Notifier', 'relocate', local_user());
info(t("Relocate message has been send to your contacts"));
goaway('settings');
}
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 ) {
- notice( t('Passwords do not match. Password unchanged.') . EOL);
+ if ($newpass != $confirm) {
+ notice(t('Passwords do not match. Password unchanged.') . EOL);
$err = true;
}
- if((! x($newpass)) || (! x($confirm))) {
- notice( t('Empty passwords are not allowed. Password unchanged.') . EOL);
+ 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( $oldpass != $r[0]['password'] ) {
- notice( t('Wrong password.') . EOL);
+ // check if the old password was supplied correctly before changing it to the new value
+ if (!User::authenticate(intval(local_user()), $_POST['opassword'])) {
+ notice(t('Wrong password.') . EOL);
$err = true;
}
- if(! $err) {
- $password = hash('whirlpool',$newpass);
+ if (!$err) {
+ $password = hash('whirlpool', $newpass);
$r = q("UPDATE `user` SET `password` = '%s' WHERE `uid` = %d",
dbesc($password),
intval(local_user())
);
- if($r)
- info( t('Password changed.') . EOL);
- else
- notice( t('Password update failed. Please try again.') . EOL);
+ if (DBM::is_result($r)) {
+ info(t('Password changed.') . EOL);
+ } else {
+ notice(t('Password update failed. Please try again.') . EOL);
+ }
}
}
-
- $username = ((x($_POST,'username')) ? notags(trim($_POST['username'])) : '');
- $email = ((x($_POST,'email')) ? notags(trim($_POST['email'])) : '');
- $timezone = ((x($_POST,'timezone')) ? notags(trim($_POST['timezone'])) : '');
- $language = ((x($_POST,'language')) ? notags(trim($_POST['language'])) : '');
-
- $defloc = ((x($_POST,'defloc')) ? notags(trim($_POST['defloc'])) : '');
- $openid = ((x($_POST,'openid_url')) ? notags(trim($_POST['openid_url'])) : '');
- $maxreq = ((x($_POST,'maxreq')) ? intval($_POST['maxreq']) : 0);
- $expire = ((x($_POST,'expire')) ? intval($_POST['expire']) : 0);
- $def_gid = ((x($_POST,'group-selection')) ? intval($_POST['group-selection']) : 0);
-
-
- $expire_items = ((x($_POST,'expire_items')) ? intval($_POST['expire_items']) : 0);
- $expire_notes = ((x($_POST,'expire_notes')) ? intval($_POST['expire_notes']) : 0);
- $expire_starred = ((x($_POST,'expire_starred')) ? intval($_POST['expire_starred']) : 0);
- $expire_photos = ((x($_POST,'expire_photos'))? intval($_POST['expire_photos']) : 0);
- $expire_network_only = ((x($_POST,'expire_network_only'))? intval($_POST['expire_network_only']) : 0);
-
- $allow_location = (((x($_POST,'allow_location')) && (intval($_POST['allow_location']) == 1)) ? 1: 0);
- $publish = (((x($_POST,'profile_in_directory')) && (intval($_POST['profile_in_directory']) == 1)) ? 1: 0);
- $net_publish = (((x($_POST,'profile_in_netdirectory')) && (intval($_POST['profile_in_netdirectory']) == 1)) ? 1: 0);
- $old_visibility = (((x($_POST,'visibility')) && (intval($_POST['visibility']) == 1)) ? 1 : 0);
- $account_type = (((x($_POST,'account-type')) && (intval($_POST['account-type']))) ? intval($_POST['account-type']) : 0);
- $page_flags = (((x($_POST,'page-flags')) && (intval($_POST['page-flags']))) ? intval($_POST['page-flags']) : 0);
- $blockwall = (((x($_POST,'blockwall')) && (intval($_POST['blockwall']) == 1)) ? 0: 1); // this setting is inverted!
- $blocktags = (((x($_POST,'blocktags')) && (intval($_POST['blocktags']) == 1)) ? 0: 1); // this setting is inverted!
- $unkmail = (((x($_POST,'unkmail')) && (intval($_POST['unkmail']) == 1)) ? 1: 0);
- $cntunkmail = ((x($_POST,'cntunkmail')) ? intval($_POST['cntunkmail']) : 0);
- $suggestme = ((x($_POST,'suggestme')) ? intval($_POST['suggestme']) : 0);
+ $username = ((x($_POST, 'username')) ? notags(trim($_POST['username'])) : '');
+ $email = ((x($_POST, 'email')) ? notags(trim($_POST['email'])) : '');
+ $timezone = ((x($_POST, 'timezone')) ? notags(trim($_POST['timezone'])) : '');
+ $language = ((x($_POST, 'language')) ? notags(trim($_POST['language'])) : '');
+
+ $defloc = ((x($_POST, 'defloc')) ? notags(trim($_POST['defloc'])) : '');
+ $openid = ((x($_POST, 'openid_url')) ? notags(trim($_POST['openid_url'])) : '');
+ $maxreq = ((x($_POST, 'maxreq')) ? intval($_POST['maxreq']) : 0);
+ $expire = ((x($_POST, 'expire')) ? intval($_POST['expire']) : 0);
+ $def_gid = ((x($_POST, 'group-selection')) ? intval($_POST['group-selection']) : 0);
+
+
+ $expire_items = ((x($_POST, 'expire_items')) ? intval($_POST['expire_items']) : 0);
+ $expire_notes = ((x($_POST, 'expire_notes')) ? intval($_POST['expire_notes']) : 0);
+ $expire_starred = ((x($_POST, 'expire_starred')) ? intval($_POST['expire_starred']) : 0);
+ $expire_photos = ((x($_POST, 'expire_photos'))? intval($_POST['expire_photos']) : 0);
+ $expire_network_only = ((x($_POST, 'expire_network_only'))? intval($_POST['expire_network_only']) : 0);
+
+ $allow_location = (((x($_POST, 'allow_location')) && (intval($_POST['allow_location']) == 1)) ? 1: 0);
+ $publish = (((x($_POST, 'profile_in_directory')) && (intval($_POST['profile_in_directory']) == 1)) ? 1: 0);
+ $net_publish = (((x($_POST, 'profile_in_netdirectory')) && (intval($_POST['profile_in_netdirectory']) == 1)) ? 1: 0);
+ $old_visibility = (((x($_POST, 'visibility')) && (intval($_POST['visibility']) == 1)) ? 1 : 0);
+ $account_type = (((x($_POST, 'account-type')) && (intval($_POST['account-type']))) ? intval($_POST['account-type']) : 0);
+ $page_flags = (((x($_POST, 'page-flags')) && (intval($_POST['page-flags']))) ? intval($_POST['page-flags']) : 0);
+ $blockwall = (((x($_POST, 'blockwall')) && (intval($_POST['blockwall']) == 1)) ? 0: 1); // this setting is inverted!
+ $blocktags = (((x($_POST, 'blocktags')) && (intval($_POST['blocktags']) == 1)) ? 0: 1); // this setting is inverted!
+ $unkmail = (((x($_POST, 'unkmail')) && (intval($_POST['unkmail']) == 1)) ? 1: 0);
+ $cntunkmail = ((x($_POST, 'cntunkmail')) ? intval($_POST['cntunkmail']) : 0);
+ $suggestme = ((x($_POST, 'suggestme')) ? intval($_POST['suggestme']) : 0);
$hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
$hidewall = (($_POST['hidewall'] == 1) ? 1: 0);
$post_newfriend = (($_POST['post_newfriend'] == 1) ? 1: 0);
@@ -441,35 +436,45 @@ function settings_post(App $a) {
$post_profilechange = (($_POST['post_profilechange'] == 1) ? 1: 0);
$email_textonly = (($_POST['email_textonly'] == 1) ? 1 : 0);
+ $detailed_notif = (($_POST['detailed_notif'] == 1) ? 1 : 0);
$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) && !in_array($page_flags, array(PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE)))
+ if (($account_type == ACCOUNT_TYPE_PERSON) && !in_array($page_flags, array(PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE))) {
$page_flags = PAGE_NORMAL;
- elseif (($account_type == ACCOUNT_TYPE_ORGANISATION) && !in_array($page_flags, array(PAGE_SOAPBOX)))
+ } elseif (($account_type == ACCOUNT_TYPE_ORGANISATION) && !in_array($page_flags, array(PAGE_SOAPBOX))) {
$page_flags = PAGE_SOAPBOX;
- elseif (($account_type == ACCOUNT_TYPE_NEWS) && !in_array($page_flags, array(PAGE_SOAPBOX)))
+ } elseif (($account_type == ACCOUNT_TYPE_NEWS) && !in_array($page_flags, array(PAGE_SOAPBOX))) {
$page_flags = PAGE_SOAPBOX;
- elseif (($account_type == ACCOUNT_TYPE_COMMUNITY) && !in_array($page_flags, array(PAGE_COMMUNITY, PAGE_PRVGROUP)))
+ } elseif (($account_type == ACCOUNT_TYPE_COMMUNITY) && !in_array($page_flags, array(PAGE_COMMUNITY, PAGE_PRVGROUP))) {
$page_flags = PAGE_COMMUNITY;
+ }
$email_changed = false;
@@ -477,45 +482,45 @@ 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()));
- $password = hash('whirlpool', $_POST['mpassword']);
- if ($password != $r[0]['password']) {
+ if (!User::authenticate(intval(local_user()), $_POST['mpassword'])) {
$err .= t('Wrong Password') . EOL;
$email = $a->user['email'];
}
// check the email is valid
- if(! valid_email($email))
- $err .= t(' Not valid email.');
+ if (!valid_email($email)) {
+ $err .= t('Invalid 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.');
+ $err .= t('Cannot change to that email.');
$email = $a->user['email'];
}
}
}
- if(strlen($err)) {
+ if (strlen($err)) {
notice($err . EOL);
return;
}
- if($timezone != $a->user['timezone']) {
- if(strlen($timezone))
- date_default_timezone_set($timezone);
+ if (($timezone != $a->user['timezone']) && strlen($timezone)) {
+ date_default_timezone_set($timezone);
}
$str_group_allow = perms2str($_POST['group_allow']);
@@ -527,42 +532,40 @@ function settings_post(App $a) {
//$openid = normalise_openid($openid);
// 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)))) {
- $tmp_str = $openid;
- if(strlen($tmp_str) && validate_url($tmp_str)) {
+ if ($openid != $a->user['openid'] || (strlen($openid) && (!strlen($openidserver)))) {
+ if (validate_url($openid)) {
logger('updating openidserver');
- require_once('library/openid.php');
+ 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
+ } else {
$openidserver = '';
+ }
}
- set_pconfig(local_user(),'expire','items', $expire_items);
- set_pconfig(local_user(),'expire','notes', $expire_notes);
- set_pconfig(local_user(),'expire','starred', $expire_starred);
- set_pconfig(local_user(),'expire','photos', $expire_photos);
- set_pconfig(local_user(),'expire','network_only', $expire_network_only);
+ PConfig::set(local_user(), 'expire', 'items', $expire_items);
+ PConfig::set(local_user(), 'expire', 'notes', $expire_notes);
+ PConfig::set(local_user(), 'expire', 'starred', $expire_starred);
+ PConfig::set(local_user(), 'expire', 'photos', $expire_photos);
+ PConfig::set(local_user(), 'expire', 'network_only', $expire_network_only);
- set_pconfig(local_user(),'system','suggestme', $suggestme);
- set_pconfig(local_user(),'system','post_newfriend', $post_newfriend);
- set_pconfig(local_user(),'system','post_joingroup', $post_joingroup);
- set_pconfig(local_user(),'system','post_profilechange', $post_profilechange);
+ PConfig::set(local_user(), 'system', 'suggestme', $suggestme);
+ PConfig::set(local_user(), 'system', 'post_newfriend', $post_newfriend);
+ PConfig::set(local_user(), 'system', 'post_joingroup', $post_joingroup);
+ PConfig::set(local_user(), 'system', 'post_profilechange', $post_profilechange);
- set_pconfig(local_user(),'system','email_textonly', $email_textonly);
+ PConfig::set(local_user(), 'system', 'email_textonly', $email_textonly);
+ PConfig::set(local_user(), 'system', 'detailed_notif', $detailed_notif);
- 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) {
- info( t('Private forum has no privacy permissions. Using default privacy group.'). EOL);
+ 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 {
- notice( t('Private forum has no privacy permissions and no default privacy group.') . EOL);
+ } else {
+ notice(t('Private forum has no privacy permissions and no default privacy group.') . EOL);
}
}
}
@@ -601,8 +604,9 @@ function settings_post(App $a) {
dbesc($language),
intval(local_user())
);
- if($r)
- info( t('Settings updated.') . EOL);
+ if (DBM::is_result($r)) {
+ info(t('Settings updated.') . EOL);
+ }
// clear session language
unset($_SESSION['language']);
@@ -621,7 +625,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()),
@@ -632,50 +636,39 @@ function settings_post(App $a) {
if (($old_visibility != $net_publish) || ($page_flags != $old_page_flags)) {
// Update global directory in background
$url = $_SESSION['my_url'];
- if ($url && strlen(get_config('system','directory'))) {
- proc_run(PRIORITY_LOW, "include/directory.php", $url);
+ if ($url && strlen(Config::get('system', 'directory'))) {
+ Worker::add(PRIORITY_LOW, "Directory", $url);
}
}
- proc_run(PRIORITY_LOW, 'include/profile_update.php', local_user());
+ Worker::add(PRIORITY_LOW, 'ProfileUpdate', local_user());
// Update the global contact for the user
- update_gcontact_for_user(local_user());
-
- //$_SESSION['theme'] = $theme;
- if ($email_changed && $a->config['register_policy'] == REGISTER_VERIFY) {
-
- /// @TODO set to un-verified, blocked and redirect to logout
- /// @TODO Why? Are we verifying people or email addresses?
-
- }
+ GContact::updateForUser(local_user());
goaway('settings');
return; // NOTREACHED
}
-function settings_content(App $a) {
-
+function settings_content(App $a)
+{
$o = '';
nav_set_selected('settings');
- if (! local_user()) {
- #notice( t('Permission denied.') . EOL );
+ if (!local_user()) {
+ //notice(t('Permission denied.') . EOL);
return;
}
- if (x($_SESSION,'submanage') && intval($_SESSION['submanage'])) {
- notice( t('Permission denied.') . EOL );
+ if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {
+ notice(t('Permission denied.') . EOL);
return;
}
-
-
if (($a->argc > 1) && ($a->argv[1] === 'oauth')) {
-
if (($a->argc > 2) && ($a->argv[2] === 'add')) {
- $tpl = get_markup_template("settings_oauth_edit.tpl");
+ $tpl = get_markup_template('settings/oauth_edit.tpl');
$o .= replace_macros($tpl, array(
'$form_security_token' => get_form_security_token("settings_oauth"),
'$title' => t('Add application'),
@@ -695,13 +688,13 @@ function settings_content(App $a) {
dbesc($a->argv[3]),
local_user());
- if (!dbm::is_result($r)){
+ if (!DBM::is_result($r)) {
notice(t("You can't edit this application."));
return;
}
$app = $r[0];
- $tpl = get_markup_template("settings_oauth_edit.tpl");
+ $tpl = get_markup_template('settings/oauth_edit.tpl');
$o .= replace_macros($tpl, array(
'$form_security_token' => get_form_security_token("settings_oauth"),
'$title' => t('Add application'),
@@ -716,29 +709,29 @@ 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",
+ q("DELETE FROM clients WHERE client_id='%s' AND uid=%d",
dbesc($a->argv[3]),
local_user());
- goaway(App::get_baseurl(true)."/settings/oauth/");
+ goaway(System::baseUrl(true)."/settings/oauth/");
return;
}
- /// @TODO validate result with dbm::is_result()
+ /// @TODO validate result with DBM::is_result()
$r = q("SELECT clients.*, tokens.id as oauth_token, (clients.uid=%d) AS my
FROM clients
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());
- $tpl = get_markup_template("settings_oauth.tpl");
+ $tpl = get_markup_template('settings/oauth.tpl');
$o .= replace_macros($tpl, array(
'$form_security_token' => get_form_security_token("settings_oauth"),
- '$baseurl' => App::get_baseurl(true),
+ '$baseurl' => System::baseUrl(true),
'$title' => t('Connected Apps'),
'$add' => t('Add application'),
'$edit' => t('Edit'),
@@ -749,21 +742,20 @@ function settings_content(App $a) {
'$apps' => $r,
));
return $o;
-
}
if (($a->argc > 1) && ($a->argv[1] === 'addon')) {
$settings_addons = "";
$r = q("SELECT * FROM `hook` WHERE `hook` = 'plugin_settings' ");
- if (! dbm::is_result($r)) {
+ if (!DBM::is_result($r)) {
$settings_addons = t('No Plugin settings configured');
}
call_hooks('plugin_settings', $settings_addons);
- $tpl = get_markup_template("settings_addons.tpl");
+ $tpl = get_markup_template('settings/addons.tpl');
$o .= replace_macros($tpl, array(
'$form_security_token' => get_form_security_token("settings_addon"),
'$title' => t('Plugin Settings'),
@@ -775,17 +767,16 @@ function settings_content(App $a) {
if (($a->argc > 1) && ($a->argv[1] === 'features')) {
$arr = array();
- $features = get_features();
+ $features = Feature::get();
foreach ($features as $fname => $fdata) {
$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::isEnabled(local_user(), $f[0]))) ? "1" : ''), $f[2],array(t('Off'), t('On')));
}
}
-
- $tpl = get_markup_template("settings_features.tpl");
+ $tpl = get_markup_template('settings/features.tpl');
$o .= replace_macros($tpl, array(
'$form_security_token' => get_form_security_token("settings_features"),
'$title' => t('Additional Features'),
@@ -796,68 +787,32 @@ function settings_content(App $a) {
}
if (($a->argc > 1) && ($a->argv[1] === 'connectors')) {
-
- $settings_connectors = '';
- $settings_connectors .= ''. t('General Social Media Settings').'
';
- $settings_connectors .= '';
- $settings_connectors .= '