Merge pull request #1526 from fraengii/20150421-Bugs-and-Issues.md

[friendica.git] / mod / settings.php

diff --git a/mod/settings.php b/mod/settings.php
index b01c4fabde7b2f3cc7714f21ce33ff2fbf26040c..7db196b0308c6dd112f135520ccef519e37c3c26 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -16,6 +16,11 @@ function get_theme_config_file($theme){
 
 function settings_init(&$a) {
 
+       if(! local_user()) {
+               notice( t('Permission denied.') . EOL );
+               return;
+       }
+
        // APC deactivated, since there are problems with PHP 5.5
        //if (function_exists("apc_delete")) {
        //      $toDelete = new APCIterator('user', APC_ITER_VALUE);
@@ -469,7 +474,7 @@ function settings_post(&$a) {
        $str_contact_deny  = perms2str($_POST['contact_deny']);
 
        $openidserver = $a->user['openidserver'];
-       $openid = normalise_openid($openid);
+       //$openid = normalise_openid($openid);
 
        // If openid has changed or if there's an openid but no openidserver, try and discover it.
 
@@ -593,7 +598,7 @@ function settings_content(&$a) {
        nav_set_selected('settings');
 
        if(! local_user()) {
-               notice( t('Permission denied.') . EOL );
+               #notice( t('Permission denied.') . EOL );
                return;
        }
 
@@ -997,7 +1002,7 @@ function settings_content(&$a) {
                $openid_field = false;
        }
        else {
-               $openid_field = array('openid_url', t('OpenID:'),$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."), "", "", "url");
        }
 
 
@@ -1182,6 +1187,10 @@ 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' => t('Activate desktop notifications'),
+                '$desktop_notifications_note' => t('Note: This is an experimental feature, as being not supported by each browser'),
+                '$desktop_notifications_success_message' => t('You will now receive desktop notifications!'),
+                
                '$email_textonly' => array('email_textonly', t('Text-only notification emails'),
                                                                        get_pconfig(local_user(),'system','email_textonly'),
                                                                        t('Send text only notification emails, without the html part')),