X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Fsettings.php;h=b5997fbe73d1aee72cbf70635982aa7ab2a1e9e2;hb=df7702709b07560af1d469f0835586af317f39b0;hp=8b7e3c5d690664cebd9a7b35521e8ad277dae5bb;hpb=229eb9c681d62edc5faa63bb1d66046d123c3f35;p=friendica.git
diff --git a/mod/settings.php b/mod/settings.php
index 8b7e3c5d69..b5997fbe73 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -6,6 +6,32 @@ function settings_init(&$a) {
profile_load($a,$a->user['nickname']);
}
+ $a->page['htmlhead'] .= "
+EOT;
+
+
}
@@ -26,6 +52,78 @@ function settings_post(&$a) {
return;
}
+ if(($a->argc > 1) && ($a->argv[1] == 'connectors')) {
+
+ if(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_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'))
+ $mail_disabled = 1;
+
+ if(! $mail_disabled) {
+ $failed = false;
+ $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) {
+ $failed = true;
+ notice( t('Failed to connect with email account using the settings provided.') . EOL);
+ }
+ }
+ }
+ if(! $failed)
+ info( t('Email settings updated.') . EOL);
+ }
+ }
+
+ call_hooks('connector_settings_post', $_POST);
+ return;
+ }
+
+
call_hooks('settings_post', $_POST);
if((x($_POST,'npassword')) || (x($_POST,'confirm'))) {
@@ -51,7 +149,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);
}
@@ -73,40 +171,9 @@ function settings_post(&$a) {
$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!
- $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'] : '');
+ $hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
+ $hidewall = (($_POST['hidewall'] == 1) ? 1: 0);
- $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(private_encrypt($mail_pass,$pass,$a->user['pubkey']));
- q("UPDATE `mailacct` SET `pass` = '%s' WHERE `uid` = %d LIMIT 1",
- dbesc(hex2bin($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())
- );
$notify = 0;
@@ -177,7 +244,7 @@ function settings_post(&$a) {
$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",
+ $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, `hidewall` = %d WHERE `uid` = %d LIMIT 1",
dbesc($username),
dbesc($email),
dbesc($openid),
@@ -195,16 +262,20 @@ function settings_post(&$a) {
intval($expire),
dbesc($openidserver),
intval($blockwall),
+ intval($hidewall),
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
WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
intval($publish),
intval($net_publish),
+ intval($hide_friends),
intval(local_user())
);
@@ -240,27 +311,121 @@ if(! function_exists('settings_content')) {
function settings_content(&$a) {
$o = '';
- $o .= '';
+ nav_set_selected('settings');
if(! local_user()) {
notice( t('Permission denied.') . EOL );
return;
}
+
+ $tabs = array(
+ array(
+ 'label' => t('Account settings'),
+ 'url' => $a->get_baseurl().'/settings',
+ 'sel' => (($a->argc == 1)?'active':''),
+ ),
+ array(
+ 'label' => t('Connector settings'),
+ 'url' => $a->get_baseurl().'/settings/connectors',
+ 'sel' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
+ ),
+ array(
+ 'label' => t('Plugin settings'),
+ 'url' => $a->get_baseurl().'/settings/addon',
+ 'sel' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
+ ),
+ array(
+ 'label' => t('Export personal data'),
+ 'url' => $a->get_baseurl() . '/uexport',
+ 'sel' => ''
+ )
+ );
+
+ $tabtpl = get_markup_template("common_tabs.tpl");
+ $tabs = replace_macros($tabtpl, array(
+ '$tabs' => $tabs,
+ ));
+
+
if(($a->argc > 1) && ($a->argv[1] === 'addon')) {
- $o .= '
' . t('Plugin Settings') . '
';
- $o .= '';
-
- $o .= '';
+
+ '$settings_connectors' => $settings_connectors
+ ));
return $o;
}
+
require_once('include/acl_selectors.php');
@@ -285,106 +450,91 @@ function settings_content(&$a) {
$timezone = date_default_timezone_get();
- $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
- local_user()
- );
-
- $mail_server = ((count($r)) ? $r[0]['server'] : '');
- $mail_port = ((count($r)) ? $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);
-
- $pageset_tpl = load_view_file('view/pagetypes.tpl');
+ $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\" " : ""),
- '$community' => (($a->user['page-flags'] == PAGE_COMMUNITY) ? " checked=\"checked\" " : ""),
- '$freelove' => (($a->user['page-flags'] == PAGE_FREELOVE) ? " checked=\"checked\" " : ""),
- '$page_normal' => PAGE_NORMAL,
- '$page_soapbox' => PAGE_SOAPBOX,
- '$page_community' => PAGE_COMMUNITY,
- '$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')
+ '$page_normal' => array('page-flags', t('Normal Account'), PAGE_NORMAL,
+ t('This account is a normal personal profile'),
+ ($a->user['page-flags'] == PAGE_NORMAL)),
+
+ '$page_soapbox' => array('page-flags', t('Soapbox Account'), PAGE_SOAPBOX,
+ t('Automatically approve all connection/friend requests as read-only fans'),
+ ($a->user['page-flags'] == PAGE_SOAPBOX)),
+
+ '$page_community' => array('page-flags', t('Community/Celebrity Account'), PAGE_COMMUNITY,
+ t('Automatically approve all connection/friend requests as read-write fans'),
+ ($a->user['page-flags'] == PAGE_COMMUNITY)),
+
+ '$page_freelove' => array('page-flags', t('Automatic Friend Account'), PAGE_FREELOVE,
+ t('Automatically approve all connection/friend requests as friends'),
+ ($a->user['page-flags'] == PAGE_FREELOVE)),
));
$noid = get_config('system','no_openid');
if($noid) {
- $oidhtml = '';
+ $openid_field = false;
}
else {
- $oidhtml = '' . t(" \x28Optional\x29 Allow this OpenID to login to this account.");
+ $openid_field = array('openid_url', t('OpenID:'),$openid, t("\x28Optional\x29 Allow this OpenID to login to this account."));
}
+ $opt_tpl = get_markup_template("field_yesno.tpl");
if(get_config('system','publish_all')) {
$profile_in_dir = '';
}
else {
- $opt_tpl = load_view_file("view/profile-in-directory.tpl");
$profile_in_dir = replace_macros($opt_tpl,array(
- '$desc' => t('Publish your default profile in site directory?'),
- '$yes_str' => t('Yes'),
- '$no_str' => t('No'),
- '$yes_selected' => (($profile['publish']) ? " checked=\"checked\" " : ""),
- '$no_selected' => (($profile['publish'] == 0) ? " checked=\"checked\" " : "")
+ '$field' => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], '', array(t('No'),t('Yes'))),
));
}
if(strlen(get_config('system','directory_submit_url'))) {
- $opt_tpl = load_view_file("view/profile-in-netdir.tpl");
-
$profile_in_net_dir = replace_macros($opt_tpl,array(
- '$desc' => t('Publish your default profile in 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\" " : "")
+ '$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 = '';
- $loc_checked = (($a->user['allow_location'] == 1) ? " checked=\"checked\" " : "");
+
+ $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'))),
+ ));
+
+ $hide_wall = replace_macros($opt_tpl,array(
+ '$field' => array('hidewall', t('Hide profile details and all your messages from unknown viewers?'), $a->user['hidewall'], '', array(t('No'),t('Yes'))),
+
+ ));
+
$invisible = (((! $profile['publish']) && (! $profile['net-publish']))
? true : false);
if($invisible)
- notice( t('Profile is not published.') . EOL );
+ info( t('Profile is not published.') . EOL );
- $theme_selector = '';
$subdir = ((strlen($a->get_path())) ? '
' . t('or') . ' ' . $a->get_baseurl() . '/profile/' . $nickname : '');
- $tpl_addr = load_view_file("view/settings_nick_set.tpl");
+ $tpl_addr = get_markup_template("settings_nick_set.tpl");
$prof_addr = replace_macros($tpl_addr,array(
'$desc' => t('Your Identity Address is'),
@@ -393,85 +543,79 @@ function settings_content(&$a) {
'$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'),
+ '$tabs' => $tabs,
+ '$ptitle' => t('Account Settings'),
+
+ '$submit' => t('Submit'),
'$baseurl' => $a->get_baseurl(),
- '$oidhtml' => $oidhtml,
- '$uexport' => $uexport,
'$uid' => local_user(),
- '$username' => $username,
- '$openid' => $openid,
- '$email' => $email,
+
'$nickname_block' => $prof_addr,
- '$timezone' => $timezone,
- '$zoneselect' => select_timezone($timezone),
- '$defloc' => $defloc,
- '$loc_checked' => $loc_checked,
- '$profile_in_dir' => $profile_in_dir,
- '$profile_in_net_dir' => $profile_in_net_dir,
+
+ '$h_pass' => t('Password Settings'),
+ '$password1'=> array('npassword', t('New Password:'), '', ''),
+ '$password2'=> array('confirm', t('Confirm:'), '', t('Leave password fields blank unless changing')),
+ '$oid_enable' => (! get_config('system','no_openid')),
+ '$openid' => $openid_field,
+
+ '$h_basic' => t('Basic Settings'),
+ '$username' => array('username', t('Full Name:'), $username,''),
+ '$email' => array('email', t('Email Address:'), $email, ''),
+ '$timezone' => array('timezone_select' , t('Your Timezone:'), select_timezone($timezone), ''),
+ '$defloc' => array('defloc', t('Default Post Location:'), $defloc, ''),
+ '$allowloc' => array('allow_location', t('Use Browser Location:'), ($a->user['allow_location'] == 1), ''),
+ '$theme' => array('theme', t('Display Theme:'), $theme_selected, '', $themes),
+
+
+
+ '$h_prv' => t('Security and Privacy Settings'),
+
+ '$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'],
'$aclselect' => populate_acl($a->user,$celeb),
- '$sel_notify1' => (($notify & NOTIFY_INTRO) ? ' checked="checked" ' : ''),
- '$sel_notify2' => (($notify & NOTIFY_CONFIRM) ? ' checked="checked" ' : ''),
- '$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,
+
+ '$blockwall'=> array('blockwall', t('Allow friends to post to your profile page:'), !$blockwall, ''),
+ '$expire' => array('expire', t("Automatically expire posts after days:"), $expire, t('If empty, posts will not expire. Expired posts will be deleted')),
+
+ '$profile_in_dir' => $profile_in_dir,
+ '$profile_in_net_dir' => $profile_in_net_dir,
+ '$hide_friends' => $hide_friends,
+ '$hide_wall' => $hide_wall,
+
+
+
+ '$h_not' => t('Notification Settings'),
+ '$lbl_not' => t('Send a notification email when:'),
+ '$notify1' => array('notify1', t('You receive an introduction'), ($notify & NOTIFY_INTRO), NOTIFY_INTRO, ''),
+ '$notify2' => array('notify2', t('Your introductions are confirmed'), ($notify & NOTIFY_CONFIRM), NOTIFY_CONFIRM, ''),
+ '$notify3' => array('notify3', t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), NOTIFY_WALL, ''),
+ '$notify4' => array('notify4', t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), NOTIFY_COMMENT, ''),
+ '$notify5' => array('notify5', t('You receive a private message'), ($notify & NOTIFY_MAIL), NOTIFY_MAIL, ''),
+
+
+
+ '$h_advn' => t('Advanced Page Settings'),
'$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:'),
- '$pubmail_checked' => (($mail_pubmail) ? ' checked="checked" ' : ''),
+
+
+
+
+
+
+
+
+
+
+
));