Merge pull request #2414 from annando/1603-display-query

[friendica.git] / mod / settings.php

diff --git a/mod/settings.php b/mod/settings.php
index 3efdbf6bde68fe192f07f9d458164ce9d783b292..c7659212bff242359a337e3e88b4cc4ef699d4a1 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -1,5 +1,6 @@
 <?php
 
+require_once('include/group.php');
 
 function get_theme_config_file($theme){
        $a = get_app();
@@ -39,7 +40,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',
                ),
@@ -48,7 +49,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',
                                );
@@ -56,49 +57,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',
        );
@@ -199,6 +200,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')) {
 
@@ -342,7 +344,7 @@ function settings_post(&$a) {
                );
 
                call_hooks('display_settings_post', $_POST);
-               goaway($a->get_baseurl(true) . '/settings/display' );
+               goaway('settings/display' );
                return; // NOTREACHED
        }
 
@@ -351,7 +353,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);
@@ -627,7 +629,7 @@ function settings_post(&$a) {
 
        }
 
-       goaway($a->get_baseurl(true) . '/settings' );
+       goaway('settings' );
        return; // NOTREACHED
 }
 
@@ -797,8 +799,11 @@ function settings_content(&$a) {
                $settings_connectors .= '<span class="field_help">'.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.').'</span>';
                $settings_connectors .= '</div>';
 
+               $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'] = '<meta http-equiv="refresh" content="0; URL='.$a->get_baseurl().'/ostatus_subscribe?url='.urlencode($legacy_contact).'">';
 
@@ -1152,7 +1157,7 @@ function settings_content(&$a) {
                info( t('Profile is <strong>not published</strong>.') . EOL );
 
 
-       //$subdir = ((strlen($a->get_path())) ? '<br />' . t('or') . ' ' . $a->get_baseurl(true) . '/profile/' . $nickname : '');
+       //$subdir = ((strlen($a->get_path())) ? '<br />' . t('or') . ' ' . 'profile/' . $nickname : '');
 
        $tpl_addr = get_markup_template("settings_nick_set.tpl");