forgot to check this in earlier... splits up text and html into two different templat...

[friendica.git] / mod / settings.php

diff --git a/mod/settings.php b/mod/settings.php
index b10f9e3fc0bcbf84e2d6adb9802a31cbdaa18834..dbbac8bdeb3c9b14f2eededb6a74242c64889d29 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -15,12 +15,18 @@ function settings_post(&$a) {
                return;
        }
 
-       call_hooks('settings_post', $_POST);
-
        if(count($a->user) && x($a->user,'uid') && $a->user['uid'] != local_user()) {
                notice( t('Permission denied.') . EOL);
                return;
        }
+
+       if(($a->argc > 1) && ($a->argv[1] == 'addon')) {
+               call_hooks('plugin_settings_post', $_POST);
+               return;
+       }
+
+       call_hooks('settings_post', $_POST);
+
        if((x($_POST,'npassword')) || (x($_POST,'confirm'))) {
 
                $newpass = $_POST['npassword'];
@@ -81,17 +87,24 @@ function settings_post(&$a) {
 
        $err = '';
 
+       $name_change = false;
+
        if($username != $a->user['username']) {
-               if(strlen($username) > 40)
-                       $err .= t(' Please use a shorter name.');
-               if(strlen($username) < 3)
-                       $err .= t(' Name too short.');
+               $name_change = true;
+               if(strlen($username) > 40)
+                       $err .= t(' Please use a shorter name.');
+               if(strlen($username) < 3)
+                       $err .= t(' Name too short.');
        }
 
        if($email != $a->user['email']) {
                $email_changed = true;
         if(! valid_email($email))
                        $err .= t(' Not valid email.');
+               if((x($a->config,'admin_email')) && (strcasecmp($email,$a->config['admin_email']) == 0)) {
+                       $err .= t(' Cannot change to that email.');
+                       $email = $a->user['email'];
+               }
        }
 
        if(strlen($err)) {
@@ -114,11 +127,16 @@ function settings_post(&$a) {
        // If openid has changed or if there's an openid but no openidserver, try and discover it.
 
        if($openid != $a->user['openid'] || (strlen($openid) && (! strlen($openidserver)))) {
-               logger('updating openidserver');
-               require_once('library/openid.php');
-               $open_id_obj = new LightOpenID;
-               $open_id_obj->identity = $openid;
-               $openidserver = $open_id_obj->discover($open_id_obj->identity);
+               $tmp_str = $openid;
+               if(strlen($tmp_str) && validate_url($tmp_str)) {
+                       logger('updating openidserver');
+                       require_once('library/openid.php');
+                       $open_id_obj = new LightOpenID;
+                       $open_id_obj->identity = $openid;
+                       $openidserver = $open_id_obj->discover($open_id_obj->identity);
+               }
+               else
+                       $openidserver = '';
        }
 
        $r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s',  `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `theme` = '%s', `maxreq` = %d, `openidserver` = '%s'  WHERE `uid` = %d LIMIT 1",
@@ -150,13 +168,22 @@ function settings_post(&$a) {
                intval(local_user())
        );
 
+
+       if($name_change) {
+               q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `self` = 1 LIMIT 1",
+                       dbesc($username),
+                       dbesc(datetime_convert()),
+                       intval(local_user())
+               );
+       }               
+
        if($old_visibility != $net_publish) {
                // Update global directory in background
                $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
                $url = $_SESSION['my_url'];
                if($url && strlen(get_config('system','directory_submit_url')))
-                       proc_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &",
-                               array(),$foo));
+                       //proc_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &",array(),$foo));
+                       proc_run($php_path,"include/directory.php","$url");
        }
 
        $_SESSION['theme'] = $theme;
@@ -182,6 +209,21 @@ function settings_content(&$a) {
                return;
        }
 
+       if(($a->argc > 1) && ($a->argv[1] === 'addon')) {
+               $o .= '<h1>' . t('Plugin Settings') . '</h1>';
+               $o .= '<div id="account-settings-link"><a href="settings">' . t('Account Settings') . '</a></div>';
+
+               $o .= '<form action="settings/addon" method="post" >';
+
+               $r = q("SELECT * FROM `hook` WHERE `hook` = 'plugin_settings' ");
+               if(! count($r))
+                       notice( t('No Plugin settings configured') . EOL);
+
+               call_hooks('plugin_settings', $o);
+               $o .= '</form>';
+               return $o;
+       }
+               
        require_once('include/acl_selectors.php');
 
        $p = q("SELECT * FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
@@ -224,13 +266,16 @@ function settings_content(&$a) {
        }
 
 
-
-
-       $opt_tpl = load_view_file("view/profile-in-directory.tpl");
-       $profile_in_dir = replace_macros($opt_tpl,array(
-               '$yes_selected' => (($profile['publish'])      ? " checked=\"checked\" " : ""),
-               '$no_selected'  => (($profile['publish'] == 0) ? " checked=\"checked\" " : "")
-       ));
+       if(get_config('system','publish_all')) {
+               $profile_in_dir = '<input type="hidden" name="profile_in_directory" value="1" />';
+       }
+       else {
+               $opt_tpl = load_view_file("view/profile-in-directory.tpl");
+               $profile_in_dir = replace_macros($opt_tpl,array(
+                       '$yes_selected' => (($profile['publish'])      ? " checked=\"checked\" " : ""),
+                       '$no_selected'  => (($profile['publish'] == 0) ? " checked=\"checked\" " : "")
+               ));
+       }
 
        if(strlen(get_config('system','directory_submit_url'))) {
                $opt_tpl = load_view_file("view/profile-in-netdir.tpl");
@@ -265,10 +310,15 @@ function settings_content(&$a) {
 
        $theme_selector = '<select name="theme" id="theme-select" >';
        $files = glob('view/theme/*');
+
+       $default_theme = get_config('system','theme');
+       if(! $default_theme)
+               $default_theme = 'default';
+
        if($files) {
                foreach($files as $file) {
                        $f = basename($file);
-                       $selected = (($f == $_SESSION['theme']) || ($f === 'default' && (! x($_SESSION,'theme')))
+                       $selected = (($f == $_SESSION['theme']) || ($f === $default_theme && (! x($_SESSION,'theme')))
                                ? ' selected="selected" ' : '' );
                        $theme_selector .= '<option val="' . basename($file) . '"' . $selected . '>' . basename($file) . '</option>';
                }