X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsettings.php;h=ad22ba1a603b456b2651253622820ee0c4e4c490;hb=7f2070ca91aca9e92f3ac4c5b714742c6f9ecc3b;hp=86d1ae015ce9ddd67d5ad4573c0c2c893f12e021;hpb=9b93bd25218dc0b4a5e477c3a64d6f74a51a9d21;p=friendica.git
diff --git a/mod/settings.php b/mod/settings.php
index 86d1ae015c..ad22ba1a60 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -6,6 +6,8 @@ function settings_init(&$a) {
profile_load($a,$a->user['nickname']);
}
+ // These lines provide the javascript needed by the acl selector
+
$a->page['htmlhead'] .= "';
+ 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('Connections'),
+ 'url' => $a->get_baseurl() . '/settings/oauth',
+ 'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'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] === 'oauth')) {
+
+ if(($a->argc > 2) && ($a->argv[2] === 'add')) {
+ $tpl = get_markup_template("settings_oauth_edit.tpl");
+ $o .= replace_macros($tpl, array(
+ '$tabs' => $tabs,
+ '$title' => t('Add application'),
+ '$submit' => t('Submit'),
+ '$cancel' => t('Cancel'),
+ '$name' => array('name', t('Name'), '', ''),
+ '$key' => array('key', t('Consumer Key'), '', ''),
+ '$secret' => array('secret', t('Consumer Secret'), '', ''),
+ '$redirect' => array('redirect', t('Redirect'), '', ''),
+ '$icon' => array('icon', t('Icon url'), '', ''),
+ ));
+ return $o;
+ }
+
+ if(($a->argc > 3) && ($a->argv[2] === 'edit')) {
+ $r = q("SELECT * FROM clients WHERE client_id='%s' AND uid=%d",
+ dbesc($a->argv[3]),
+ local_user());
+
+ if (!count($r)){
+ notice(t("You can't edit this application."));
+ return;
+ }
+ $app = $r[0];
+
+ $tpl = get_markup_template("settings_oauth_edit.tpl");
+ $o .= replace_macros($tpl, array(
+ '$tabs' => $tabs,
+ '$title' => t('Add application'),
+ '$submit' => t('Update'),
+ '$cancel' => t('Cancel'),
+ '$name' => array('name', t('Name'), $app['name'] , ''),
+ '$key' => array('key', t('Consumer Key'), $app['client_id'], ''),
+ '$secret' => array('secret', t('Consumer Secret'), $app['pw'], ''),
+ '$redirect' => array('redirect', t('Redirect'), $app['redirect_uri'], ''),
+ '$icon' => array('icon', t('Icon url'), $app['icon'], ''),
+ ));
+ return $o;
+ }
+
+ if(($a->argc > 3) && ($a->argv[2] === 'delete')) {
+ $r = q("DELETE FROM clients WHERE client_id='%s' AND uid=%d",
+ dbesc($a->argv[3]),
+ local_user());
+ goaway($a->get_baseurl()."/settings/oauth/");
+ return;
+ }
+
+
+ $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)",
+ local_user(),
+ local_user());
+
+
+ $tpl = get_markup_template("settings_oauth.tpl");
+ $o .= replace_macros($tpl, array(
+ '$baseurl' => $a->get_baseurl(),
+ '$title' => t('Connected Apps'),
+ '$add' => t('Add application'),
+ '$edit' => t('Edit'),
+ '$delete' => t('Delete'),
+ '$consumerkey' => t('Client key starts with'),
+ '$noname' => t('No name'),
+ '$remove' => t('Remove authorization'),
+ '$tabs' => $tabs,
+ '$apps' => $r,
+ ));
+ return $o;
+
+ }
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');
@@ -327,90 +607,106 @@ function settings_content(&$a) {
$maxreq = $a->user['maxreq'];
$expire = ((intval($a->user['expire'])) ? $a->user['expire'] : '');
$blockwall = $a->user['blockwall'];
+ $blocktags = $a->user['blocktags'];
- if(! strlen($a->user['timezone']))
- $timezone = date_default_timezone_get();
+ $expire_items = get_pconfig(local_user(), 'expire','items');
+ $expire_items = (($expire_items===false)?1:$expire_items); // default if not set: 1
+
+ $expire_notes = get_pconfig(local_user(), 'expire','notes');
+ $expire_notes = (($expire_notes===false)?1:$expire_notes); // default if not set: 1
+ $expire_starred = get_pconfig(local_user(), 'expire','starred');
+ $expire_starred = (($expire_starred===false)?1:$expire_starred); // default if not set: 1
+
+ $expire_photos = get_pconfig(local_user(), 'expire','photos');
+ $expire_photos = (($expire_photos===false)?0:$expire_photos); // default if not set: 0
- $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" ' : '');
- }
+ $suggestme = get_pconfig(local_user(), 'system','suggestme');
+ $suggestme = (($suggestme===false)?0:$suggestme); // default if not set: 0
+
+ $browser_update = intval(get_pconfig(local_user(), 'system','update_interval'));
+ $browser_update = (($browser_update == 0) ? 40 : $browser_update / 1000); // default if not set: 40 seconds
+
+ if(! strlen($a->user['timezone']))
+ $timezone = date_default_timezone_get();
+
- $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\" " : ""),
- '$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 = get_markup_template("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 = get_markup_template("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 your profile details from unknown viewers?'), $a->user['hidewall'], '', array(t('No'),t('Yes'))),
+
+ ));
+
+ $blockwall = replace_macros($opt_tpl,array(
+ '$field' => array('blockwall', t('Allow friends to post to your profile page?'), ! $a->user['blockwall'], '', array(t('No'),t('Yes'))),
+
+ ));
+
+
+ $blocktags = replace_macros($opt_tpl,array(
+ '$field' => array('blocktags', t('Allow friends to tag your posts?'), ! $a->user['blocktags'], '', 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'))),
+
+ ));
+
$invisible = (((! $profile['publish']) && (! $profile['net-publish']))
? true : false);
@@ -419,23 +715,21 @@ function settings_content(&$a) {
info( t('Profile is not published.') . EOL );
- $theme_selector = '';
$subdir = ((strlen($a->get_path())) ? '
' . t('or') . ' ' . $a->get_baseurl() . '/profile/' . $nickname : '');
@@ -452,85 +746,84 @@ function settings_content(&$a) {
$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
- $uexport = '';
-
+ $expire_arr = array(
+ 'days' => array('expire', t("Automatically expire posts after 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'))),
+ );
$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),
+ '$ajaxint' => array('browser_update', t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds, no maximum')),
+
+ '$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,
+ '$suggestme' => $suggestme,
+ '$blockwall'=> $blockwall, // array('blockwall', t('Allow friends to post to your profile page:'), !$blockwall, ''),
+ '$blocktags'=> $blocktags, // array('blocktags', t('Allow friends to tag your posts:'), !$blocktags, ''),
+ '$expire' => $expire_arr,
+
+ '$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:'),
- '$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);