mirror of
https://git.friendi.ca/friendica/friendica.git
synced 2025-06-17 03:25:15 +02:00
Update settings page to use field templates.
Add tabs to switch user settings/plugin settings Add new field templates 'custom', 'password', radio' and 'yesno' Update main.js to support advanced fileds Update duepuntozero, dispy e loozah themes
This commit is contained in:
Fabio Comuni
parent
84d12c3e08
commit
e7834e60f8
11 changed files with 385 additions and 853 deletions
256
mod/settings.php
256
mod/settings.php
|
|
@ -303,19 +303,31 @@ function settings_content(&$a) {
|
|||
notice( t('Permission denied.') . EOL );
|
||||
return;
|
||||
}
|
||||
|
||||
$tabtpl = get_markup_template("settings_tabs.tpl");
|
||||
$tabs = replace_macros($tabtpl, array(
|
||||
'$account' => array( t('Account settings'), $a->get_baseurl().'/settings'),
|
||||
'$plugins' => array( t('Plugin settings'), $a->get_baseurl().'/settings/addon')
|
||||
));
|
||||
|
||||
|
||||
|
||||
if(($a->argc > 1) && ($a->argv[1] === 'addon')) {
|
||||
$o .= '<h1>' . t('Plugin Settings') . '</h1>';
|
||||
$o .= '<div id="account-settings-link"><a href="settings">' . t('Account Settings') . '</a></div>';
|
||||
|
||||
$o .= '<form action="settings/addon" method="post" >';
|
||||
|
||||
$settings_addons = "";
|
||||
|
||||
$r = q("SELECT * FROM `hook` WHERE `hook` = 'plugin_settings' ");
|
||||
if(! count($r))
|
||||
notice( t('No Plugin settings configured') . EOL);
|
||||
$settings_addons = t('No Plugin settings configured');
|
||||
|
||||
call_hooks('plugin_settings', $o);
|
||||
$o .= '</form>';
|
||||
call_hooks('plugin_settings', $settings_addons);
|
||||
|
||||
|
||||
$tpl = get_markup_template("settings_addons.tpl");
|
||||
$o .= replace_macros($tpl, array(
|
||||
'$title' => t('Plugin Settings'),
|
||||
'$tabs' => $tabs,
|
||||
'$settings_addons' => $settings_addons
|
||||
));
|
||||
return $o;
|
||||
}
|
||||
|
||||
|
|
@ -351,7 +363,6 @@ function settings_content(&$a) {
|
|||
}
|
||||
else {
|
||||
$r = null;
|
||||
$imap_disabled = (($mail_disabled) ? ' disabled="disabled" ' : '');
|
||||
}
|
||||
|
||||
$mail_server = ((count($r)) ? $r[0]['server'] : '');
|
||||
|
|
@ -364,79 +375,59 @@ function settings_content(&$a) {
|
|||
|
||||
$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_NORMAL)),
|
||||
|
||||
$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 = '<label id="settings-openid-label" for="settings-openid" >' . t('OpenID: ') . '</label><input type="text" id="settings-openid" class="openid" name="openid_url" value="$openid" />' . 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 = '<input type="hidden" name="profile_in_directory" value="1" />';
|
||||
}
|
||||
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\" " : "")
|
||||
'$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 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\" " : "")
|
||||
'$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 = '';
|
||||
|
||||
|
||||
$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\" " : "")
|
||||
'$field' => array('hide-friends', t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], '', array(t('No'),t('Yes'))),
|
||||
));
|
||||
|
||||
$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' => (($a->user['hidewall']) ? " checked=\"checked\" " : ""),
|
||||
'$no_selected' => (($a->user['hidewall'] == 0) ? " checked=\"checked\" " : "")
|
||||
'$field' => array('hidewall', t('Hide profile details and all your messages from unknown viewers?'), $a->user['hidewall'], '', array(t('No'),t('Yes'))),
|
||||
|
||||
));
|
||||
|
||||
|
||||
|
|
@ -444,7 +435,6 @@ function settings_content(&$a) {
|
|||
|
||||
|
||||
|
||||
$loc_checked = (($a->user['allow_location'] == 1) ? " checked=\"checked\" " : "");
|
||||
|
||||
$invisible = (((! $profile['publish']) && (! $profile['net-publish']))
|
||||
? true : false);
|
||||
|
|
@ -453,24 +443,21 @@ function settings_content(&$a) {
|
|||
info( t('Profile is <strong>not published</strong>.') . EOL );
|
||||
|
||||
|
||||
$theme_selector = '<select name="theme" id="theme-select" >';
|
||||
$files = glob('view/theme/*');
|
||||
|
||||
$default_theme = get_config('system','theme');
|
||||
if(! $default_theme)
|
||||
$default_theme = 'default';
|
||||
|
||||
|
||||
$themes = array();
|
||||
$files = glob('view/theme/*');
|
||||
if($files) {
|
||||
foreach($files as $file) {
|
||||
$f = basename($file);
|
||||
$selected = (($f == $_SESSION['theme']) || ($f === $default_theme && (! x($_SESSION,'theme')))
|
||||
? ' selected="selected" ' : '' );
|
||||
$theme_name = ((file_exists($file . '/experimental')) ? sprintf("%s - \x28Experimental\x29", $f) : $f);
|
||||
$theme_selector .= '<option value="' . $f . '"' . $selected . '>' . $theme_name . '</option>';
|
||||
$themes[$f]=$theme_name;
|
||||
}
|
||||
}
|
||||
$theme_selected = (!x($_SESSION,'theme')? $default_theme : $_SESSION['theme']);
|
||||
|
||||
$theme_selector .= '</select>';
|
||||
|
||||
$subdir = ((strlen($a->get_path())) ? '<br />' . t('or') . ' ' . $a->get_baseurl() . '/profile/' . $nickname : '');
|
||||
|
||||
|
|
@ -487,87 +474,92 @@ function settings_content(&$a) {
|
|||
|
||||
$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
|
||||
|
||||
$uexport = '<div id="uexport-link"><a href="uexport" >' . t('Export Personal Data') . '</a></div>';
|
||||
|
||||
|
||||
|
||||
$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(),
|
||||
'$hide_friends' => $hide_friends,
|
||||
'$hide_wall' => $hide_wall,
|
||||
'$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,
|
||||
'$uexport' => t('Export Personal Data'),
|
||||
|
||||
|
||||
'$h_pass' => t('Password Settings'),
|
||||
'$password1'=> array('npassword', t('New Password:'), '', ''),
|
||||
'$password2'=> array('confirm', t('Confirm:'), '', t('Leave password fields blank unless changing')),
|
||||
'$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,
|
||||
'$pagetype' => $pagetype,
|
||||
'$lbl_imap0' => t('Email/Mailbox Setup'),
|
||||
|
||||
'$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), ''),
|
||||
'$notify2' => array('notify1', t('Your introductions are confirmed'), ($notify & NOTIFY_CONFIRM), ''),
|
||||
'$notify3' => array('notify1', t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), ''),
|
||||
'$notify4' => array('notify1', t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), ''),
|
||||
'$notify5' => array('notify1', t('You receive a private message'), ($notify & NOTIFY_MAIL), ''),
|
||||
|
||||
|
||||
|
||||
'$h_imap' => 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) ? '<div class="info-message">' . t('Email access is disabled on this site.') . '</div>' : ''),
|
||||
'$imap_disabled' => $imap_disabled
|
||||
'$imap_lastcheck' => array('imap_lastcheck', t('Last successful email check:'), $imap_last_check,''),
|
||||
'$mail_disabled' => (($mail_disabled) ? t('Email access is disabled on this site.') : ''),
|
||||
'$mail_server' => array('mail_server', t('IMAP server name:'), $mail_server, ''),
|
||||
'$mail_port' => array('mail_port', t('IMAP port:'), $mail_port, ''),
|
||||
'$mail_ssl' => array('mail_ssl', t('Security:'), $mail_ssl, '', array( ''=>t('None'), 'TSL'=>'TSL', 'SSL'=>'SSL')),
|
||||
'$mail_user' => array('mail_server', t('Email login name:'), $mail_server, ''),
|
||||
'$mail_pass' => array('mail_pass', t('Email password:'), '', ''),
|
||||
'$mail_replyto' => array('mail_replyto', t('Reply-to address:'), '', 'Optional'),
|
||||
'$mail_pubmail' => array('mail_pubmail', t('Send public posts to all email contacts:'), $mail_pubmail, ''),
|
||||
|
||||
|
||||
|
||||
|
||||
'$h_advn' => t('Advanced Page Settings'),
|
||||
'$pagetype' => $pagetype,
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
));
|
||||
|
||||
call_hooks('settings_form',$o);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue