X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fsettings.php;h=5168589f7974a758e27d8b730e1f43594900ad83;hb=e4ec867df3377acbec6325e7023b814129981d31;hp=1b62499c2276b40002843db3b704c6005fccda44;hpb=9330a6994c1b9aee49a482efe32e84ca1a944c9b;p=friendica.git
diff --git a/mod/settings.php b/mod/settings.php
index 1b62499c22..5168589f79 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -1,7 +1,9 @@
theme_info['extends'];
@@ -13,9 +15,7 @@ function get_theme_config_file($theme) {
}
return null;
}
-}
-if(! function_exists('settings_init')) {
function settings_init(&$a) {
if(! local_user()) {
@@ -41,7 +41,7 @@ function settings_init(&$a) {
$tabs = array(
array(
'label' => t('Account'),
- 'url' => $a->get_baseurl(true).'/settings',
+ 'url' => 'settings',
'selected' => (($a->argc == 1) && ($a->argv[0] === 'settings')?'active':''),
'accesskey' => 'o',
),
@@ -50,7 +50,7 @@ function settings_init(&$a) {
if(get_features()) {
$tabs[] = array(
'label' => t('Additional features'),
- 'url' => $a->get_baseurl(true).'/settings/features',
+ 'url' => 'settings/features',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'features') ? 'active' : ''),
'accesskey' => 't',
);
@@ -58,49 +58,49 @@ function settings_init(&$a) {
$tabs[] = array(
'label' => t('Display'),
- 'url' => $a->get_baseurl(true).'/settings/display',
+ 'url' => 'settings/display',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
'accesskey' => 'i',
);
$tabs[] = array(
'label' => t('Social Networks'),
- 'url' => $a->get_baseurl(true).'/settings/connectors',
+ 'url' => 'settings/connectors',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
'accesskey' => 'w',
);
$tabs[] = array(
'label' => t('Plugins'),
- 'url' => $a->get_baseurl(true).'/settings/addon',
+ 'url' => 'settings/addon',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
'accesskey' => 'l',
);
$tabs[] = array(
'label' => t('Delegations'),
- 'url' => $a->get_baseurl(true).'/delegate',
+ 'url' => 'delegate',
'selected' => (($a->argc == 1) && ($a->argv[0] === 'delegate')?'active':''),
'accesskey' => 'd',
);
$tabs[] = array(
'label' => t('Connected apps'),
- 'url' => $a->get_baseurl(true) . '/settings/oauth',
+ 'url' => 'settings/oauth',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
'accesskey' => 'b',
);
$tabs[] = array(
'label' => t('Export personal data'),
- 'url' => $a->get_baseurl(true) . '/uexport',
+ 'url' => 'uexport',
'selected' => (($a->argc == 1) && ($a->argv[0] === 'uexport')?'active':''),
'accesskey' => 'e',
);
$tabs[] = array(
'label' => t('Remove account'),
- 'url' => $a->get_baseurl(true) . '/removeme',
+ 'url' => 'removeme',
'selected' => (($a->argc == 1) && ($a->argv[0] === 'removeme')?'active':''),
'accesskey' => 'r',
);
@@ -112,10 +112,10 @@ function settings_init(&$a) {
'$class' => 'settings-widget',
'$items' => $tabs,
));
-}
+
}
-if(! function_exists('settings_post')) {
+
function settings_post(&$a) {
if(! local_user())
@@ -201,6 +201,7 @@ function settings_post(&$a) {
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')) {
@@ -344,7 +345,7 @@ function settings_post(&$a) {
);
call_hooks('display_settings_post', $_POST);
- goaway($a->get_baseurl(true) . '/settings/display' );
+ goaway('settings/display' );
return; // NOTREACHED
}
@@ -353,7 +354,7 @@ function settings_post(&$a) {
if (x($_POST,'resend_relocate')) {
proc_run('php', 'include/notifier.php', 'relocate', local_user());
info(t("Relocate message has been send to your contacts"));
- goaway($a->get_baseurl(true) . '/settings');
+ goaway('settings');
}
call_hooks('settings_post', $_POST);
@@ -602,7 +603,7 @@ function settings_post(&$a) {
if($name_change) {
- q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `self` = 1",
+ q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `self`",
dbesc($username),
dbesc(datetime_convert()),
intval(local_user())
@@ -614,13 +615,14 @@ function settings_post(&$a) {
$url = $_SESSION['my_url'];
if($url && strlen(get_config('system','directory')))
proc_run('php',"include/directory.php","$url");
-
}
-
require_once('include/profile_update.php');
profile_change();
+ // 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) {
@@ -629,12 +631,11 @@ function settings_post(&$a) {
}
- goaway($a->get_baseurl(true) . '/settings' );
+ goaway('settings');
return; // NOTREACHED
}
-}
-if(! function_exists('settings_content')) {
+
function settings_content(&$a) {
$o = '';
@@ -800,8 +801,11 @@ function settings_content(&$a) {
$settings_connectors .= ''.t('If you receive a message from an unknown OStatus user, this option decides what to do. If it is checked, a new contact will be created for every unknown user.').'';
$settings_connectors .= '';
+ $default_group = get_pconfig(local_user(), 'ostatus', 'default_group');
$legacy_contact = get_pconfig(local_user(), 'ostatus', 'legacy_contact');
+ $settings_connectors .= mini_group_select(local_user(), $default_group, t("Default group for OStatus contacts"));
+
if ($legacy_contact != "")
$a->page['htmlhead'] = '';
@@ -1155,7 +1159,7 @@ function settings_content(&$a) {
info( t('Profile is not published.') . EOL );
- //$subdir = ((strlen($a->get_path())) ? '
' . t('or') . ' ' . $a->get_baseurl(true) . '/profile/' . $nickname : '');
+ //$subdir = ((strlen($a->get_path())) ? '
' . t('or') . ' ' . 'profile/' . $nickname : '');
$tpl_addr = get_markup_template("settings_nick_set.tpl");
@@ -1277,7 +1281,7 @@ function settings_content(&$a) {
'$notify7' => array('notify7', t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''),
'$notify8' => array('notify8', t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, ''),
- '$desktop_notifications' => array('desktop_notifications', t('Activate desktop notifications') , false, t('Show desktop popup on new notifications')),
+ '$desktop_notifications' => array('desktop_notifications', t('Activate desktop notifications') , false, t('Show desktop popup on new notifications')),
'$email_textonly' => array('email_textonly', t('Text-only notification emails'),
get_pconfig(local_user(),'system','email_textonly'),
@@ -1298,5 +1302,6 @@ function settings_content(&$a) {
$o .= '' . "\r\n";
return $o;
+
}
-}
+