Merge pull request #267 from tomtom84/master

add link "remove account" to /mod/settings.php

diff --git a/mod/settings.php b/mod/settings.php
index 8c8b3062d4923b7fcb9f9318b9c37e488054f410..3072d3d65fc12f635a4523f52ff5c6f6006c46e8 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -75,6 +75,11 @@ EOT;
                        'label' => t('Export personal data'),
                        'url' => $a->get_baseurl(true) . '/uexport',
                        'selected' => ''
+               ),
+               array(
+                       'label' => t('Remove account'),
+                       'url' => $a->get_baseurl(true) . '/removeme',
+                       'selected' => ''
                )
        );
        

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 073e270ef9de4803f34b7d2c9945fcd7233ddcfc..c45db9884d756ef20393881c6a103c8af1b35b7a 100755 (executable)
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -14,12 +14,17 @@ $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
 $cssFile = null;
+
 $resolution=false;
 $resolution = get_pconfig(local_user(), "diabook", "resolution");
 if ($resolution===false) $resolution="normal";
+
 $color = false;
-$color = get_pconfig(local_user(), "diabook", "color");
+$site_color = get_config("diabook", "color" );
+if (local_user()) {$color = get_pconfig(local_user(), "diabook", "color");}
+if ($color===false) $color=$site_color;
 if ($color===false) $color="diabook";
+
 if ($color=="diabook") $color_path = "/";
 if ($color=="aerith") $color_path = "/diabook-aerith/";
 if ($color=="blue") $color_path = "/diabook-blue/";