contactedit-actions-button: move repair back to tabbar

[friendica.git] / mod / settings.php

diff --git a/mod/settings.php b/mod/settings.php
index 1b62499c2276b40002843db3b704c6005fccda44..905a5ed08d5cbbbbc74ef4c677c44370a578c7b1 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -1,7 +1,7 @@
 <?php
 
-if(! function_exists('get_theme_config_file')) {
-function get_theme_config_file($theme) {
+
+function get_theme_config_file($theme){
        $a = get_app();
        $base_theme = $a->theme_info['extends'];
 
@@ -13,9 +13,7 @@ function get_theme_config_file($theme) {
        }
        return null;
 }
-}
 
-if(! function_exists('settings_init')) {
 function settings_init(&$a) {
 
        if(! local_user()) {
@@ -41,7 +39,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 +48,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 +56,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 +110,10 @@ function settings_init(&$a) {
                '$class' => 'settings-widget',
                '$items' => $tabs,
        ));
+
 }
-}
 
-if(! function_exists('settings_post')) {
+
 function settings_post(&$a) {
 
        if(! local_user())
@@ -344,7 +342,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 +351,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);
@@ -629,12 +627,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 = '';
@@ -1155,7 +1152,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");
 
@@ -1298,5 +1295,6 @@ function settings_content(&$a) {
        $o .= '</form>' . "\r\n";
 
        return $o;
+
 }
-}
+