X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fsettings.php;h=2e942231a8cbbcd3e8cefd51b509ac13f639cfce;hb=5e1335ac892ce07bf7b1a3a043f71b8abbed8dba;hp=7ed7ad32e8359911047188c52b8d111c9a0f8a6f;hpb=62bb471ba0bf8d996e4548b835cd23fa3da92696;p=friendica.git
diff --git a/mod/settings.php b/mod/settings.php
index 7ed7ad32e8..2e942231a8 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -3,9 +3,35 @@
function settings_init(&$a) {
if(local_user()) {
- require_once("mod/profile.php");
profile_load($a,$a->user['nickname']);
}
+
+ $a->page['htmlhead'] .= "
+EOT;
+
+
}
@@ -15,10 +41,19 @@ function settings_post(&$a) {
notice( t('Permission denied.') . EOL);
return;
}
+
if(count($a->user) && x($a->user,'uid') && $a->user['uid'] != local_user()) {
notice( t('Permission denied.') . EOL);
return;
}
+
+ if(($a->argc > 1) && ($a->argv[1] == 'addon')) {
+ call_hooks('plugin_settings_post', $_POST);
+ return;
+ }
+
+ call_hooks('settings_post', $_POST);
+
if((x($_POST,'npassword')) || (x($_POST,'confirm'))) {
$newpass = $_POST['npassword'];
@@ -42,7 +77,7 @@ function settings_post(&$a) {
intval(local_user())
);
if($r)
- notice( t('Password changed.') . EOL);
+ info( t('Password changed.') . EOL);
else
notice( t('Password update failed. Please try again.') . EOL);
}
@@ -54,12 +89,77 @@ function settings_post(&$a) {
$timezone = ((x($_POST,'timezone')) ? notags(trim($_POST['timezone'])) : '');
$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);
$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);
$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!
+
+ $hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
+ $hidewall = (($_POST['hidewall'] == 1) ? 1: 0);
+
+
+
+
+ $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_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(! $mail_disabled) {
+ $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
+ intval(local_user())
+ );
+ if(! count($r)) {
+ q("INSERT INTO `mailacct` (`uid`) VALUES (%d)",
+ intval(local_user())
+ );
+ }
+ if(strlen($mail_pass)) {
+ $pass = '';
+ openssl_public_encrypt($mail_pass,$pass,$a->user['pubkey']);
+ q("UPDATE `mailacct` SET `pass` = '%s' WHERE `uid` = %d LIMIT 1",
+ dbesc(bin2hex($pass)),
+ intval(local_user())
+ );
+ }
+ $r = q("UPDATE `mailacct` SET `server` = '%s', `port` = %d, `ssltype` = '%s', `user` = '%s',
+ `mailbox` = 'INBOX', `reply_to` = '%s', `pubmail` = %d WHERE `uid` = %d LIMIT 1",
+ dbesc($mail_server),
+ intval($mail_port),
+ dbesc($mail_ssl),
+ dbesc($mail_user),
+ dbesc($mail_replyto),
+ intval($mail_pubmail),
+ intval(local_user())
+ );
+ $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
+ intval(local_user())
+ );
+ if(count($r)) {
+ $eacct = $r[0];
+ require_once('include/email.php');
+ $mb = construct_mailbox_name($eacct);
+ 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)
+ notice( t('Failed to connect with email account using the settings provided.') . EOL);
+ }
+ }
+ }
$notify = 0;
@@ -78,17 +178,24 @@ function settings_post(&$a) {
$err = '';
+ $name_change = false;
+
if($username != $a->user['username']) {
- if(strlen($username) > 40)
- $err .= t(' Please use a shorter name.');
- if(strlen($username) < 3)
- $err .= t(' Name too short.');
+ $name_change = true;
+ if(strlen($username) > 40)
+ $err .= t(' Please use a shorter name.');
+ if(strlen($username) < 3)
+ $err .= t(' Name too short.');
}
if($email != $a->user['email']) {
$email_changed = true;
if(! valid_email($email))
$err .= t(' Not valid email.');
+ if((x($a->config,'admin_email')) && (strcasecmp($email,$a->config['admin_email']) == 0)) {
+ $err .= t(' Cannot change to that email.');
+ $email = $a->user['email'];
+ }
}
if(strlen($err)) {
@@ -106,7 +213,24 @@ function settings_post(&$a) {
$str_group_deny = perms2str($_POST['group_deny']);
$str_contact_deny = perms2str($_POST['contact_deny']);
- $r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `theme` = '%s' WHERE `uid` = %d LIMIT 1",
+ $openidserver = $a->user['openidserver'];
+
+ // 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)) {
+ 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 = '';
+ }
+
+ $r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `theme` = '%s', `maxreq` = %d, `expire` = %d, `openidserver` = '%s', `blockwall` = %d WHERE `uid` = %d LIMIT 1",
dbesc($username),
dbesc($email),
dbesc($openid),
@@ -120,26 +244,42 @@ function settings_post(&$a) {
dbesc($defloc),
intval($allow_location),
dbesc($theme),
+ intval($maxreq),
+ intval($expire),
+ dbesc($openidserver),
+ intval($blockwall),
intval(local_user())
);
if($r)
- notice( t('Settings updated.') . EOL);
+ info( t('Settings updated.') . EOL);
$r = q("UPDATE `profile`
- SET `publish` = %d, `net-publish` = %d
+ SET `publish` = %d,
+ `net-publish` = %d,
+ `hide-friends` = %d,
+ `hidewall` = %d
WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
intval($publish),
intval($net_publish),
+ intval($hide_friends),
+ intval($hidewall),
intval(local_user())
);
+
+ if($name_change) {
+ q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `self` = 1 LIMIT 1",
+ dbesc($username),
+ dbesc(datetime_convert()),
+ intval(local_user())
+ );
+ }
+
if($old_visibility != $net_publish) {
// Update global directory in background
- $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
$url = $_SESSION['my_url'];
if($url && strlen(get_config('system','directory_submit_url')))
- proc_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &",
- array(),$foo));
+ proc_run('php',"include/directory.php","$url");
}
$_SESSION['theme'] = $theme;
@@ -165,6 +305,21 @@ function settings_content(&$a) {
return;
}
+ if(($a->argc > 1) && ($a->argv[1] === 'addon')) {
+ $o .= '
' . t('Plugin Settings') . '
';
+ $o .= '';
+
+ $o .= '';
+ return $o;
+ }
+
require_once('include/acl_selectors.php');
$p = q("SELECT * FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
@@ -180,11 +335,35 @@ function settings_content(&$a) {
$notify = $a->user['notify-flags'];
$defloc = $a->user['default-location'];
$openid = $a->user['openid'];
+ $maxreq = $a->user['maxreq'];
+ $expire = ((intval($a->user['expire'])) ? $a->user['expire'] : '');
+ $blockwall = $a->user['blockwall'];
if(! strlen($a->user['timezone']))
$timezone = date_default_timezone_get();
- $pageset_tpl = load_view_file('view/pagetypes.tpl');
+
+ $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+
+ if(! $mail_disabled) {
+ $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
+ local_user()
+ );
+ }
+ else {
+ $r = null;
+ $imap_disabled = (($mail_disabled) ? ' disabled="disabled" ' : '');
+ }
+
+ $mail_server = ((count($r)) ? $r[0]['server'] : '');
+ $mail_port = ((count($r) && intval($r[0]['port'])) ? intval($r[0]['port']) : '');
+ $mail_ssl = ((count($r)) ? $r[0]['ssltype'] : '');
+ $mail_user = ((count($r)) ? $r[0]['user'] : '');
+ $mail_replyto = ((count($r)) ? $r[0]['reply_to'] : '');
+ $mail_pubmail = ((count($r)) ? $r[0]['pubmail'] : 0);
+ $mail_chk = ((count($r)) ? $r[0]['last_check'] : '0000-00-00 00:00:00');
+
+ $pageset_tpl = get_markup_template('pagetypes.tpl');
$pagetype = replace_macros($pageset_tpl,array(
'$normal' => (($a->user['page-flags'] == PAGE_NORMAL) ? " checked=\"checked\" " : ""),
'$soapbox' => (($a->user['page-flags'] == PAGE_SOAPBOX) ? " checked=\"checked\" " : ""),
@@ -193,7 +372,15 @@ function settings_content(&$a) {
'$page_normal' => PAGE_NORMAL,
'$page_soapbox' => PAGE_SOAPBOX,
'$page_community' => PAGE_COMMUNITY,
- '$page_freelove' => PAGE_FREELOVE
+ '$page_freelove' => PAGE_FREELOVE,
+ '$n_l' => t('Normal Account'),
+ '$n_d' => t('This account is a normal personal profile'),
+ '$s_l' => t('Soapbox Account'),
+ '$s_d' => t('Automatically approve all connection/friend requests as read-only fans'),
+ '$c_l' => t('Community/Celebrity Account'),
+ '$c_d' => t('Automatically approve all connection/friend requests as read-write fans'),
+ '$f_l' => t('Automatic Friend Account'),
+ '$f_d' => t('Automatically approve all connection/friend requests as friends')
));
$noid = get_config('system','no_openid');
@@ -206,18 +393,27 @@ function settings_content(&$a) {
}
-
-
- $opt_tpl = load_view_file("view/profile-in-directory.tpl");
- $profile_in_dir = replace_macros($opt_tpl,array(
- '$yes_selected' => (($profile['publish']) ? " checked=\"checked\" " : ""),
- '$no_selected' => (($profile['publish'] == 0) ? " checked=\"checked\" " : "")
- ));
+ if(get_config('system','publish_all')) {
+ $profile_in_dir = '';
+ }
+ else {
+ $opt_tpl = get_markup_template("profile-in-directory.tpl");
+ $profile_in_dir = replace_macros($opt_tpl,array(
+ '$desc' => t('Publish your default profile in your local site directory?'),
+ '$yes_str' => t('Yes'),
+ '$no_str' => t('No'),
+ '$yes_selected' => (($profile['publish']) ? " checked=\"checked\" " : ""),
+ '$no_selected' => (($profile['publish'] == 0) ? " checked=\"checked\" " : "")
+ ));
+ }
if(strlen(get_config('system','directory_submit_url'))) {
- $opt_tpl = load_view_file("view/profile-in-netdir.tpl");
+ $opt_tpl = get_markup_template("profile-in-netdir.tpl");
$profile_in_net_dir = replace_macros($opt_tpl,array(
+ '$desc' => t('Publish your default profile in the global social directory?'),
+ '$yes_str' => t('Yes'),
+ '$no_str' => t('No'),
'$yes_selected' => (($profile['net-publish']) ? " checked=\"checked\" " : ""),
'$no_selected' => (($profile['net-publish'] == 0) ? " checked=\"checked\" " : "")
));
@@ -225,58 +421,115 @@ function settings_content(&$a) {
else
$profile_in_net_dir = '';
+
+ $opt_tpl = get_markup_template("profile-hide-friends.tpl");
+ $hide_friends = replace_macros($opt_tpl,array(
+ '$desc' => t('Hide your contact/friend list from viewers of your default profile?'),
+ '$yes_str' => t('Yes'),
+ '$no_str' => t('No'),
+ '$yes_selected' => (($profile['hide-friends']) ? " checked=\"checked\" " : ""),
+ '$no_selected' => (($profile['hide-friends'] == 0) ? " checked=\"checked\" " : "")
+ ));
+
+ $opt_tpl = get_markup_template("profile-hide-wall.tpl");
+ $hide_wall = replace_macros($opt_tpl,array(
+ '$desc' => t('Hide profile details and all your messages from unknown viewers?'),
+ '$yes_str' => t('Yes'),
+ '$no_str' => t('No'),
+ '$yes_selected' => (($profile['hidewall']) ? " checked=\"checked\" " : ""),
+ '$no_selected' => (($profile['hidewall'] == 0) ? " checked=\"checked\" " : "")
+ ));
+
+
+
+
+
+
$loc_checked = (($a->user['allow_location'] == 1) ? " checked=\"checked\" " : "");
$invisible = (((! $profile['publish']) && (! $profile['net-publish']))
? true : false);
if($invisible)
- notice( t('Profile is not published.') . EOL );
+ info( t('Profile is not published.') . EOL );
- $nickname_block = load_view_file("view/settings_nick_set.tpl");
- $nickname_subdir = '';
- if(strlen($a->get_path())) {
- $subdir_tpl = load_view_file('view/settings_nick_subdir.tpl');
- $nickname_subdir = replace_macros($subdir_tpl, array(
- '$baseurl' => $a->get_baseurl(),
- '$nickname' => $nickname,
- '$hostname' => $a->get_hostname()
- ));
- }
-
$theme_selector = '';
+ $subdir = ((strlen($a->get_path())) ? '
' . t('or') . ' ' . $a->get_baseurl() . '/profile/' . $nickname : '');
+
+ $tpl_addr = get_markup_template("settings_nick_set.tpl");
- $nickname_block = replace_macros($nickname_block,array(
+ $prof_addr = replace_macros($tpl_addr,array(
+ '$desc' => t('Your Identity Address is'),
'$nickname' => $nickname,
- '$uid' => local_user(),
- '$subdir' => $nickname_subdir,
- '$basepath' => $a->get_hostname(),
- '$baseurl' => $a->get_baseurl()));
+ '$subdir' => $subdir,
+ '$basepath' => $a->get_hostname()
+ ));
- $stpl = load_view_file('view/settings.tpl');
+ $stpl = get_markup_template('settings.tpl');
$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
+ $uexport = '';
+
+
$o .= replace_macros($stpl,array(
+ '$ptitle' => t('Account Settings'),
+ '$lbl_plug' => t('Plugin Settings'),
+ '$lbl_basic' => t('Basic Settings'),
+ '$lbl_fn' => t('Full Name:'),
+ '$lbl_email' => t('Email Address:'),
+ '$lbl_tz' => t('Your Timezone:'),
+ '$lbl_loc1' => t('Default Post Location:'),
+ '$lbl_loc2' => t('Use Browser Location:'),
+ '$lbl_theme' => t('Display Theme:'),
+ '$submit' => t('Submit'),
+ '$lbl_prv' => t('Security and Privacy Settings'),
+ '$lbl_maxreq' => t('Maximum Friend Requests/Day:'),
+ '$lbl_maxrdesc' => t("\x28to prevent spam abuse\x29"),
+ '$lbl_rempost' => t('Allow friends to post to your profile page:'),
+ '$lbl_exp1' => t("Automatically expire \x28delete\x29 posts older than"),
+ '$lbl_exp2' => t('days'),
+ '$lbl_not1' => t('Notification Settings'),
+ '$lbl_not2' => t('Send a notification email when:'),
+ '$lbl_not3' => t('You receive an introduction'),
+ '$lbl_not4' => t('Your introductions are confirmed'),
+ '$lbl_not5' => t('Someone writes on your profile wall'),
+ '$lbl_not6' => t('Someone writes a followup comment'),
+ '$lbl_not7' => t('You receive a private message'),
+ '$lbl_pass1' => t('Password Settings'),
+ '$lbl_pass2' => t('Leave password fields blank unless changing'),
+ '$lbl_pass3' => t('New Password:'),
+ '$lbl_pass4' => t('Confirm:'),
+ '$lbl_advn' => t('Advanced Page Settings'),
'$baseurl' => $a->get_baseurl(),
+ '$hide_friends' => $hide_friends,
+ '$hide_wall' => $hide_wall,
'$oidhtml' => $oidhtml,
+ '$uexport' => $uexport,
'$uid' => local_user(),
'$username' => $username,
'$openid' => $openid,
'$email' => $email,
- '$nickname_block' => $nickname_block,
+ '$nickname_block' => $prof_addr,
'$timezone' => $timezone,
'$zoneselect' => select_timezone($timezone),
'$defloc' => $defloc,
@@ -284,6 +537,7 @@ function settings_content(&$a) {
'$profile_in_dir' => $profile_in_dir,
'$profile_in_net_dir' => $profile_in_net_dir,
'$permissions' => t('Default Post Permissions'),
+ '$permdesc' => t("\x28click to open/close\x29"),
'$visibility' => $profile['net-publish'],
'$aclselect' => populate_acl($a->user,$celeb),
'$sel_notify1' => (($notify & NOTIFY_INTRO) ? ' checked="checked" ' : ''),
@@ -291,10 +545,37 @@ function settings_content(&$a) {
'$sel_notify3' => (($notify & NOTIFY_WALL) ? ' checked="checked" ' : ''),
'$sel_notify4' => (($notify & NOTIFY_COMMENT) ? ' checked="checked" ' : ''),
'$sel_notify5' => (($notify & NOTIFY_MAIL) ? ' checked="checked" ' : ''),
+ '$maxreq' => $maxreq,
+ '$expire' => $expire,
+ '$blockw_checked' => (($blockwall) ? '' : ' checked="checked" ' ),
'$theme' => $theme_selector,
- '$pagetype' => $pagetype
+ '$pagetype' => $pagetype,
+ '$lbl_imap0' => t('Email/Mailbox Setup'),
+ '$imap_desc' => t("If you wish to communicate with email contacts using this service \x28optional\x29, please specify how to connect to your mailbox."),
+ '$lbl_imap1' => t('IMAP server name:'),
+ '$imap_server' => $mail_server,
+ '$lbl_imap2' => t('IMAP port:'),
+ '$imap_port' => $mail_port,
+ '$lbl_imap3' => t("Security \x28TLS or SSL\x29:"),
+ '$imap_ssl' => $mail_ssl,
+ '$lbl_imap4' => t('Email login name:'),
+ '$imap_user' => $mail_user,
+ '$lbl_imap5' => t('Email password:'),
+ '$lbl_imap6' => t("Reply-to address \x28Optional\x29:"),
+ '$imap_replyto' => $mail_replyto,
+ '$lbl_imap7' => t('Send public posts to all email contacts:'),
+ '$lbl_imap8' => t('Last successful email check:'),
+ '$lbl_imap9' => (($mail_chk === '0000-00-00 00:00:00') ? t('never') : datetime_convert('UTC', date_default_timezone_get(), $mail_chk, t('g A l F d Y'))),
+ '$pubmail_checked' => (($mail_pubmail) ? ' checked="checked" ' : ''),
+ '$mail_disabled' => (($mail_disabled) ? '' . t('Email access is disabled on this site.') . '
' : ''),
+ '$imap_disabled' => $imap_disabled
));
+ call_hooks('settings_form',$o);
+
+ $o .= '' . "\r\n";
+
return $o;
-}}
\ No newline at end of file
+}}
+