]> git.mxchange.org Git - friendica.git/blobdiff - mod/settings.php
Merge pull request #67 from tomtom84/master
[friendica.git] / mod / settings.php
old mode 100644 (file)
new mode 100755 (executable)
index 916e042..a9d00bc
@@ -6,6 +6,8 @@ function settings_init(&$a) {
                profile_load($a,$a->user['nickname']);
        }
 
+       // These lines provide the javascript needed by the acl selector
+
        $a->page['htmlhead'] .= "<script> var ispublic = '" . t('everybody') . "';" ;
 
        $a->page['htmlhead'] .= <<< EOT
@@ -37,21 +39,153 @@ EOT;
 
 function settings_post(&$a) {
 
-       if(! local_user()) {
-               notice( t('Permission denied.') . EOL);
+       if(! local_user())
+               return;
+
+       if(x($_SESSION,'submanage') && intval($_SESSION['submanage']))
                return;
-       }
 
        if(count($a->user) && x($a->user,'uid') && $a->user['uid'] != local_user()) {
                notice( t('Permission denied.') . EOL);
                return;
        }
 
+       $old_page_flags = $a->user['page-flags'];
+
+       if(($a->argc > 1) && ($a->argv[1] === 'oauth') && x($_POST,'remove')){
+               $key = $_POST['remove'];
+               q("DELETE FROM tokens WHERE id='%s' AND uid=%d",
+                       dbesc($key),
+                       local_user());
+               goaway($a->get_baseurl()."/settings/oauth/");
+               return;                 
+       }
+
+       if(($a->argc > 2) && ($a->argv[1] === 'oauth')  && ($a->argv[2] === 'edit'||($a->argv[2] === 'add')) && x($_POST,'submit')) {
+               
+               $name           = ((x($_POST,'name')) ? $_POST['name'] : '');
+               $key            = ((x($_POST,'key')) ? $_POST['key'] : '');
+               $secret         = ((x($_POST,'secret')) ? $_POST['secret'] : '');
+               $redirect       = ((x($_POST,'redirect')) ? $_POST['redirect'] : '');
+               $icon           = ((x($_POST,'icon')) ? $_POST['icon'] : '');
+               if ($name=="" || $key=="" || $secret==""){
+                       notice(t("Missing some important data!"));
+                       
+               } else {
+                       if ($_POST['submit']==t("Update")){
+                               $r = q("UPDATE clients SET
+                                                       client_id='%s',
+                                                       pw='%s',
+                                                       name='%s',
+                                                       redirect_uri='%s',
+                                                       icon='%s',
+                                                       uid=%d
+                                               WHERE client_id='%s'",
+                                               dbesc($key),
+                                               dbesc($secret),
+                                               dbesc($name),
+                                               dbesc($redirect),
+                                               dbesc($icon),
+                                               local_user(),
+                                               dbesc($key));
+                       } else {
+                               $r = q("INSERT INTO clients
+                                                       (client_id, pw, name, redirect_uri, icon, uid)
+                                               VALUES ('%s','%s','%s','%s','%s',%d)",
+                                               dbesc($key),
+                                               dbesc($secret),
+                                               dbesc($name),
+                                               dbesc($redirect),
+                                               dbesc($icon),
+                                               local_user());
+                       }
+               }
+               goaway($a->get_baseurl()."/settings/oauth/");
+               return;
+       }
+
        if(($a->argc > 1) && ($a->argv[1] == 'addon')) {
                call_hooks('plugin_settings_post', $_POST);
                return;
        }
 
+       if(($a->argc > 1) && ($a->argv[1] == 'connectors')) {
+
+               if(x($_POST['imap-submit'])) {
+                       $mail_server       = ((x($_POST,'mail_server')) ? $_POST['mail_server'] : '');
+                       $mail_port         = ((x($_POST,'mail_port')) ? $_POST['mail_port'] : '');
+                       $mail_ssl          = ((x($_POST,'mail_ssl')) ? strtolower(trim($_POST['mail_ssl'])) : '');
+                       $mail_user         = ((x($_POST,'mail_user')) ? $_POST['mail_user'] : '');
+                       $mail_pass         = ((x($_POST,'mail_pass')) ? trim($_POST['mail_pass']) : '');
+                       $mail_action       = ((x($_POST,'mail_action')) ? trim($_POST['mail_action']) : '');
+                       $mail_movetofolder = ((x($_POST,'mail_movetofolder')) ? trim($_POST['mail_movetofolder']) : '');
+                       $mail_replyto      = ((x($_POST,'mail_replyto')) ? $_POST['mail_replyto'] : '');
+                       $mail_pubmail      = ((x($_POST,'mail_pubmail')) ? $_POST['mail_pubmail'] : '');
+
+
+                       $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+                       if(get_config('system','dfrn_only'))
+                               $mail_disabled = 1;
+
+                       if(! $mail_disabled) {
+                               $failed = false;
+                               $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
+                                       intval(local_user())
+                               );
+                               if(! count($r)) {
+                                       q("INSERT INTO `mailacct` (`uid`) VALUES (%d)",
+                                               intval(local_user())
+                                       );
+                               }
+                               if(strlen($mail_pass)) {
+                                       $pass = '';
+                                       openssl_public_encrypt($mail_pass,$pass,$a->user['pubkey']);
+                                       q("UPDATE `mailacct` SET `pass` = '%s' WHERE `uid` = %d LIMIT 1",
+                                               dbesc(bin2hex($pass)),
+                                               intval(local_user())
+                                       );
+                               }
+                               $r = q("UPDATE `mailacct` SET `server` = '%s', `port` = %d, `ssltype` = '%s', `user` = '%s',
+                                       `action` = %d, `movetofolder` = '%s',
+                                       `mailbox` = 'INBOX', `reply_to` = '%s', `pubmail` = %d WHERE `uid` = %d LIMIT 1",
+                                       dbesc($mail_server),
+                                       intval($mail_port),
+                                       dbesc($mail_ssl),
+                                       dbesc($mail_user),
+                                       intval($mail_action),
+                                       dbesc($mail_movetofolder),
+                                       dbesc($mail_replyto),
+                                       intval($mail_pubmail),
+                                       intval(local_user())
+                               );
+                               $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
+                                       intval(local_user())
+                               );
+                               if(count($r)) {
+                                       $eacct = $r[0];
+                                       require_once('include/email.php');
+                                       $mb = construct_mailbox_name($eacct);
+                                       if(strlen($eacct['server'])) {
+                                               $dcrpass = '';
+                                               openssl_private_decrypt(hex2bin($eacct['pass']),$dcrpass,$a->user['prvkey']);
+                                               $mbox = email_connect($mb,$mail_user,$dcrpass);
+                                               unset($dcrpass);
+                                               if(! $mbox) {
+                                                       $failed = true;
+                                                       notice( t('Failed to connect with email account using the settings provided.') . EOL);
+                                               }
+                                       }
+                               }
+                               if(! $failed)
+                                       info( t('Email settings updated.') . EOL);
+                       }
+               }
+
+               call_hooks('connector_settings_post', $_POST);
+               return;
+       }
+
+
        call_hooks('settings_post', $_POST);
 
        if((x($_POST,'npassword')) || (x($_POST,'confirm'))) {
@@ -83,7 +217,7 @@ function settings_post(&$a) {
                }
        }
 
-       $theme            = ((x($_POST,'theme'))      ? notags(trim($_POST['theme']))        : '');
+       $theme            = ((x($_POST,'theme'))      ? notags(trim($_POST['theme']))        : $a->user['theme']);
        $username         = ((x($_POST,'username'))   ? notags(trim($_POST['username']))     : '');
        $email            = ((x($_POST,'email'))      ? notags(trim($_POST['email']))        : '');
        $timezone         = ((x($_POST,'timezone'))   ? notags(trim($_POST['timezone']))     : '');
@@ -92,68 +226,30 @@ function settings_post(&$a) {
        $maxreq           = ((x($_POST,'maxreq'))     ? intval($_POST['maxreq'])             : 0);
        $expire           = ((x($_POST,'expire'))     ? intval($_POST['expire'])             : 0);
 
+
+       $expire_items     = ((x($_POST,'expire_items')) ? intval($_POST['expire_items'])         : 0);
+       $expire_notes     = ((x($_POST,'expire_notes')) ? intval($_POST['expire_notes'])         : 0);
+       $expire_starred   = ((x($_POST,'expire_starred')) ? intval($_POST['expire_starred']) : 0);
+       $expire_photos    = ((x($_POST,'expire_photos'))? intval($_POST['expire_photos'])        : 0);
+
+       $browser_update   = ((x($_POST,'browser_update')) ? intval($_POST['browser_update']) : 0);
+       $browser_update   = $browser_update * 1000;
+       if($browser_update < 10000)
+               $browser_update = 40000;
+
+
        $allow_location   = (((x($_POST,'allow_location')) && (intval($_POST['allow_location']) == 1)) ? 1: 0);
        $publish          = (((x($_POST,'profile_in_directory')) && (intval($_POST['profile_in_directory']) == 1)) ? 1: 0);
        $net_publish      = (((x($_POST,'profile_in_netdirectory')) && (intval($_POST['profile_in_netdirectory']) == 1)) ? 1: 0);
        $old_visibility   = (((x($_POST,'visibility')) && (intval($_POST['visibility']) == 1)) ? 1 : 0);
        $page_flags       = (((x($_POST,'page-flags')) && (intval($_POST['page-flags']))) ? intval($_POST['page-flags']) : 0);
        $blockwall        = (((x($_POST,'blockwall')) && (intval($_POST['blockwall']) == 1)) ? 0: 1); // this setting is inverted!
+       $blocktags        = (((x($_POST,'blocktags')) && (intval($_POST['blocktags']) == 1)) ? 0: 1); // this setting is inverted!
 
-       $mail_server      = ((x($_POST,'mail_server')) ? $_POST['mail_server'] : '');
-       $mail_port        = ((x($_POST,'mail_port')) ? $_POST['mail_port'] : '');
-       $mail_ssl         = ((x($_POST,'mail_ssl')) ? strtolower(trim($_POST['mail_ssl'])) : '');
-       $mail_user        = ((x($_POST,'mail_user')) ? $_POST['mail_user'] : '');
-       $mail_pass        = ((x($_POST,'mail_pass')) ? trim($_POST['mail_pass']) : '');
-       $mail_replyto     = ((x($_POST,'mail_replyto')) ? $_POST['mail_replyto'] : '');
-       $mail_pubmail     = ((x($_POST,'mail_pubmail')) ? $_POST['mail_pubmail'] : '');
-
-
-       $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+       $suggestme        = ((x($_POST,'suggestme')) ? intval($_POST['suggestme'])  : 0);  
+       $hide_friends     = (($_POST['hide-friends'] == 1) ? 1: 0);
+       $hidewall         = (($_POST['hidewall'] == 1) ? 1: 0);
 
-       if(! $mail_disabled) {
-               $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
-                       intval(local_user())
-               );
-               if(! count($r)) {
-                       q("INSERT INTO `mailacct` (`uid`) VALUES (%d)",
-                               intval(local_user())
-                       );
-               }
-               if(strlen($mail_pass)) {
-                       $pass = '';
-                       openssl_public_encrypt($mail_pass,$pass,$a->user['pubkey']);
-                       q("UPDATE `mailacct` SET `pass` = '%s' WHERE `uid` = %d LIMIT 1",
-                                       dbesc(bin2hex($pass)),
-                                       intval(local_user())
-                       );
-               }
-               $r = q("UPDATE `mailacct` SET `server` = '%s', `port` = %d, `ssltype` = '%s', `user` = '%s',
-                       `mailbox` = 'INBOX', `reply_to` = '%s', `pubmail` = %d WHERE `uid` = %d LIMIT 1",
-                       dbesc($mail_server),
-                       intval($mail_port),
-                       dbesc($mail_ssl),
-                       dbesc($mail_user),
-                       dbesc($mail_replyto),
-                       intval($mail_pubmail),
-                       intval(local_user())
-               );
-               $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
-                       intval(local_user())
-               );
-               if(count($r)) {
-                       $eacct = $r[0];
-                       require_once('include/email.php');
-                       $mb = construct_mailbox_name($eacct);
-                       if(strlen($eacct['server'])) {
-                               $dcrpass = '';
-                               openssl_private_decrypt(hex2bin($eacct['pass']),$dcrpass,$a->user['prvkey']);
-                               $mbox = email_connect($mb,$mail_user,$dcrpass);
-                               unset($dcrpass);
-                               if(! $mbox)
-                                       notice( t('Failed to connect with email account using the settings provided.') . EOL);
-                       }
-               }
-       }
 
        $notify = 0;
 
@@ -167,6 +263,10 @@ function settings_post(&$a) {
                $notify += intval($_POST['notify4']);
        if(x($_POST,'notify5'))
                $notify += intval($_POST['notify5']);
+       if(x($_POST,'notify6'))
+               $notify += intval($_POST['notify6']);
+       if(x($_POST,'notify7'))
+               $notify += intval($_POST['notify7']);
 
        $email_changed = false;
 
@@ -224,7 +324,15 @@ function settings_post(&$a) {
                        $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, `expire` = %d, `openidserver` = '%s', `blockwall` = %d  WHERE `uid` = %d LIMIT 1",
+       set_pconfig(local_user(),'expire','items', $expire_items);
+       set_pconfig(local_user(),'expire','notes', $expire_notes);
+       set_pconfig(local_user(),'expire','starred', $expire_starred);
+       set_pconfig(local_user(),'expire','photos', $expire_photos);
+
+       set_pconfig(local_user(),'system','suggestme', $suggestme);
+       set_pconfig(local_user(),'system','update_interval', $browser_update);
+
+       $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, `expire` = %d, `openidserver` = '%s', `blockwall` = %d, `hidewall` = %d, `blocktags` = %d  WHERE `uid` = %d LIMIT 1",
                        dbesc($username),
                        dbesc($email),
                        dbesc($openid),
@@ -242,16 +350,21 @@ function settings_post(&$a) {
                        intval($expire),
                        dbesc($openidserver),
                        intval($blockwall),
+                       intval($hidewall),
+                       intval($blocktags),
                        intval(local_user())
        );
        if($r)
                info( t('Settings updated.') . EOL);
 
        $r = q("UPDATE `profile` 
-               SET `publish` = %d, `net-publish` = %d
+               SET `publish` = %d, 
+               `net-publish` = %d,
+               `hide-friends` = %d
                WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
                intval($publish),
                intval($net_publish),
+               intval($hide_friends),
                intval(local_user())
        );
 
@@ -264,13 +377,18 @@ function settings_post(&$a) {
                );
        }               
 
-       if($old_visibility != $net_publish) {
+       if(($old_visibility != $net_publish) || ($page_flags != $old_page_flags)) {
                // Update global directory in background
                $url = $_SESSION['my_url'];
                if($url && strlen(get_config('system','directory_submit_url')))
                        proc_run('php',"include/directory.php","$url");
+
        }
 
+
+       require_once('include/profile_update.php');
+       profile_change();
+
        $_SESSION['theme'] = $theme;
        if($email_changed && $a->config['register_policy'] == REGISTER_VERIFY) {
 
@@ -287,28 +405,211 @@ if(! function_exists('settings_content')) {
 function settings_content(&$a) {
 
        $o = '';
-       $o .= '<script> $(document).ready(function() { $(\'#nav-settings-link\').addClass(\'nav-selected\'); });</script>';
+       nav_set_selected('settings');
 
        if(! local_user()) {
                notice( t('Permission denied.') . EOL );
                return;
        }
 
+       if(x($_SESSION,'submanage') && intval($_SESSION['submanage'])) {
+               notice( t('Permission denied.') . EOL );
+               return;
+       }
+       
+       $tabs = array(
+               array(
+                       'label' => t('Account settings'),
+                       'url'   => $a->get_baseurl().'/settings',
+                       'sel'   => (($a->argc == 1)?'active':''),
+               ),      
+               array(
+                       'label' => t('Connector settings'),
+                       'url'   => $a->get_baseurl().'/settings/connectors',
+                       'sel'   => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
+               ),
+               array(
+                       'label' => t('Plugin settings'),
+                       'url'   => $a->get_baseurl().'/settings/addon',
+                       'sel'   => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
+               ),
+               array(
+                       'label' => t('Connections'),
+                       'url' => $a->get_baseurl() . '/settings/oauth',
+                       'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
+               ),
+               array(
+                       'label' => t('Export personal data'),
+                       'url' => $a->get_baseurl() . '/uexport',
+                       'sel' => ''
+               )
+       );
+       
+       $tabtpl = get_markup_template("common_tabs.tpl");
+       $tabs = replace_macros($tabtpl, array(
+               '$tabs' => $tabs,
+       ));
+               
+       if(($a->argc > 1) && ($a->argv[1] === 'oauth')) {
+               
+               if(($a->argc > 2) && ($a->argv[2] === 'add')) {
+                       $tpl = get_markup_template("settings_oauth_edit.tpl");
+                       $o .= replace_macros($tpl, array(
+                               '$tabs'         => $tabs,
+                               '$title'        => t('Add application'),
+                               '$submit'       => t('Submit'),
+                               '$cancel'       => t('Cancel'),
+                               '$name'         => array('name', t('Name'), '', ''),
+                               '$key'          => array('key', t('Consumer Key'), '', ''),
+                               '$secret'       => array('secret', t('Consumer Secret'), '', ''),
+                               '$redirect'     => array('redirect', t('Redirect'), '', ''),
+                               '$icon'         => array('icon', t('Icon url'), '', ''),
+                       ));
+                       return $o;
+               }
+               
+               if(($a->argc > 3) && ($a->argv[2] === 'edit')) {
+                       $r = q("SELECT * FROM clients WHERE client_id='%s' AND uid=%d",
+                                       dbesc($a->argv[3]),
+                                       local_user());
+                       
+                       if (!count($r)){
+                               notice(t("You can't edit this application."));
+                               return;
+                       }
+                       $app = $r[0];
+                       
+                       $tpl = get_markup_template("settings_oauth_edit.tpl");
+                       $o .= replace_macros($tpl, array(
+                               '$tabs'         => $tabs,
+                               '$title'        => t('Add application'),
+                               '$submit'       => t('Update'),
+                               '$cancel'       => t('Cancel'),
+                               '$name'         => array('name', t('Name'), $app['name'] , ''),
+                               '$key'          => array('key', t('Consumer Key'), $app['client_id'], ''),
+                               '$secret'       => array('secret', t('Consumer Secret'), $app['pw'], ''),
+                               '$redirect'     => array('redirect', t('Redirect'), $app['redirect_uri'], ''),
+                               '$icon'         => array('icon', t('Icon url'), $app['icon'], ''),
+                       ));
+                       return $o;
+               }
+               
+               if(($a->argc > 3) && ($a->argv[2] === 'delete')) {
+                       $r = q("DELETE FROM clients WHERE client_id='%s' AND uid=%d",
+                                       dbesc($a->argv[3]),
+                                       local_user());
+                       goaway($a->get_baseurl()."/settings/oauth/");
+                       return;                 
+               }
+               
+               
+               $r = q("SELECT clients.*, tokens.id as oauth_token, (clients.uid=%d) AS my 
+                               FROM clients
+                               LEFT JOIN tokens ON clients.client_id=tokens.client_id
+                               WHERE clients.uid IN (%d,0)",
+                               local_user(),
+                               local_user());
+               
+               
+               $tpl = get_markup_template("settings_oauth.tpl");
+               $o .= replace_macros($tpl, array(
+                       '$baseurl'      => $a->get_baseurl(),
+                       '$title'        => t('Connected Apps'),
+                       '$add'          => t('Add application'),
+                       '$edit'         => t('Edit'),
+                       '$delete'               => t('Delete'),
+                       '$consumerkey' => t('Client key starts with'),
+                       '$noname'       => t('No name'),
+                       '$remove'       => t('Remove authorization'),
+                       '$tabs'         => $tabs,
+                       '$apps'         => $r,
+               ));
+               return $o;
+               
+       }
        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" >';
-
+               $settings_addons = "";
+               
                $r = q("SELECT * FROM `hook` WHERE `hook` = 'plugin_settings' ");
                if(! count($r))
-                       notice( t('No Plugin settings configured') . EOL);
+                       $settings_addons = t('No Plugin settings configured');
 
-               call_hooks('plugin_settings', $o);
-               $o .= '</form>';
+               call_hooks('plugin_settings', $settings_addons);
+               
+               
+               $tpl = get_markup_template("settings_addons.tpl");
+               $o .= replace_macros($tpl, array(
+                       '$title'        => t('Plugin Settings'),
+                       '$tabs'         => $tabs,
+                       '$settings_addons' => $settings_addons
+               ));
                return $o;
        }
+
+       if(($a->argc > 1) && ($a->argv[1] === 'connectors')) {
+
+               $settings_connectors = "";
                
+               call_hooks('connector_settings', $settings_connectors);
+
+               $diasp_enabled = sprintf( t('Built-in support for %s connectivity is %s'), t('Diaspora'), ((get_config('system','diaspora_enabled')) ? t('enabled') : t('disabled')));
+               $ostat_enabled = sprintf( t('Built-in support for %s connectivity is %s'), t('StatusNet'), ((get_config('system','ostatus_disabled')) ? t('disabled') : t('enabled')));
+
+       $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+       if(get_config('system','dfrn_only'))
+               $mail_disabled = 1;
+
+       if(! $mail_disabled) {
+               $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
+                       local_user()
+               );
+       }
+       else {
+               $r = null;
+       }
+
+       $mail_server       = ((count($r)) ? $r[0]['server'] : '');
+       $mail_port         = ((count($r) && intval($r[0]['port'])) ? intval($r[0]['port']) : '');
+       $mail_ssl          = ((count($r)) ? $r[0]['ssltype'] : '');
+       $mail_user         = ((count($r)) ? $r[0]['user'] : '');
+       $mail_replyto      = ((count($r)) ? $r[0]['reply_to'] : '');
+       $mail_pubmail      = ((count($r)) ? $r[0]['pubmail'] : 0);
+       $mail_action       = ((count($r)) ? $r[0]['action'] : 0);
+       $mail_movetofolder = ((count($r)) ? $r[0]['movetofolder'] : '');
+       $mail_chk          = ((count($r)) ? $r[0]['last_check'] : '0000-00-00 00:00:00');
+
+
+       $tpl = get_markup_template("settings_connectors.tpl");
+               $o .= replace_macros($tpl, array(
+                       '$title'        => t('Connector Settings'),
+                       '$tabs'         => $tabs,
+
+               '$diasp_enabled' => $diasp_enabled,
+               '$ostat_enabled' => $ostat_enabled,
+
+               '$h_imap' => t('Email/Mailbox Setup'),
+               '$imap_desc' => t("If you wish to communicate with email contacts using this service \x28optional\x29, please specify how to connect to your mailbox."),
+               '$imap_lastcheck' => array('imap_lastcheck', t('Last successful email check:'), $mail_chk,''),
+               '$mail_disabled' => (($mail_disabled) ? t('Email access is disabled on this site.') : ''),
+               '$mail_server'  => array('mail_server',  t('IMAP server name:'), $mail_server, ''),
+               '$mail_port'    => array('mail_port',    t('IMAP port:'), $mail_port, ''),
+               '$mail_ssl'             => array('mail_ssl',     t('Security:'), strtoupper($mail_ssl), '', array( ''=>t('None'), 'TLS'=>'TLS', 'SSL'=>'SSL')),
+               '$mail_user'    => array('mail_user',    t('Email login name:'), $mail_user, ''),
+               '$mail_pass'    => array('mail_pass',    t('Email password:'), '', ''),
+               '$mail_replyto' => array('mail_replyto', t('Reply-to address:'), '', 'Optional'),
+               '$mail_pubmail' => array('mail_pubmail', t('Send public posts to all email contacts:'), $mail_pubmail, ''),
+               '$mail_action'  => array('mail_action',  t('Action after import:'), $mail_action, '', array(0=>t('None'), 1=>t('Delete'), 2=>t('Mark as seen'), 3=>t('Move to folder'))),
+               '$mail_movetofolder'    => array('mail_movetofolder',    t('Move to folder:'), $mail_movetofolder, ''),
+               '$submit' => t('Submit'),
+
+
+
+                       '$settings_connectors' => $settings_connectors
+               ));
+               return $o;
+       }
+
+
        require_once('include/acl_selectors.php');
 
        $p = q("SELECT * FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
@@ -327,90 +628,106 @@ function settings_content(&$a) {
        $maxreq   = $a->user['maxreq'];
        $expire   = ((intval($a->user['expire'])) ? $a->user['expire'] : '');
        $blockwall = $a->user['blockwall'];
+       $blocktags = $a->user['blocktags'];
 
-       if(! strlen($a->user['timezone']))
-               $timezone = date_default_timezone_get();
+       $expire_items = get_pconfig(local_user(), 'expire','items');
+       $expire_items = (($expire_items===false)?1:$expire_items); // default if not set: 1
+       
+       $expire_notes = get_pconfig(local_user(), 'expire','notes');
+       $expire_notes = (($expire_notes===false)?1:$expire_notes); // default if not set: 1
 
+       $expire_starred = get_pconfig(local_user(), 'expire','starred');
+       $expire_starred = (($expire_starred===false)?1:$expire_starred); // default if not set: 1
+       
+       $expire_photos = get_pconfig(local_user(), 'expire','photos');
+       $expire_photos = (($expire_photos===false)?0:$expire_photos); // default if not set: 0
 
-       $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
 
-       if(! $mail_disabled) {
-               $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
-                       local_user()
-               );
-       }
-       else {
-               $r = null;
-               $imap_disabled = (($mail_disabled) ? ' disabled="disabled" ' : '');
-       }
+       $suggestme = get_pconfig(local_user(), 'system','suggestme');
+       $suggestme = (($suggestme===false)?0:$suggestme); // default if not set: 0
+
+       $browser_update = intval(get_pconfig(local_user(), 'system','update_interval'));
+       $browser_update = (($browser_update == 0) ? 40 : $browser_update / 1000); // default if not set: 40 seconds
+       
+       if(! strlen($a->user['timezone']))
+               $timezone = date_default_timezone_get();
+
 
-       $mail_server  = ((count($r)) ? $r[0]['server'] : '');
-       $mail_port    = ((count($r) && intval($r[0]['port'])) ? intval($r[0]['port']) : '');
-       $mail_ssl     = ((count($r)) ? $r[0]['ssltype'] : '');
-       $mail_user    = ((count($r)) ? $r[0]['user'] : '');
-       $mail_replyto = ((count($r)) ? $r[0]['reply_to'] : '');
-       $mail_pubmail = ((count($r)) ? $r[0]['pubmail'] : 0);
-       $mail_chk     = ((count($r)) ? $r[0]['last_check'] : '0000-00-00 00:00:00');
 
        $pageset_tpl = get_markup_template('pagetypes.tpl');
        $pagetype = replace_macros($pageset_tpl,array(
-               '$normal'         => (($a->user['page-flags'] == PAGE_NORMAL)      ? " checked=\"checked\" " : ""),
-               '$soapbox'        => (($a->user['page-flags'] == PAGE_SOAPBOX)     ? " checked=\"checked\" " : ""),
-               '$community'      => (($a->user['page-flags'] == PAGE_COMMUNITY)   ? " checked=\"checked\" " : ""),
-               '$freelove'       => (($a->user['page-flags'] == PAGE_FREELOVE)    ? " checked=\"checked\" " : ""),
-               '$page_normal'    => PAGE_NORMAL,
-               '$page_soapbox'   => PAGE_SOAPBOX,
-               '$page_community' => PAGE_COMMUNITY,
-               '$page_freelove'  => PAGE_FREELOVE,
-               '$n_l'            => t('Normal Account'),
-               '$n_d'            => t('This account is a normal personal profile'),
-               '$s_l'            => t('Soapbox Account'),
-               '$s_d'            => t('Automatically approve all connection/friend requests as read-only fans'),
-               '$c_l'            => t('Community/Celebrity Account'),
-               '$c_d'            => t('Automatically approve all connection/friend requests as read-write fans'),
-               '$f_l'            => t('Automatic Friend Account'),
-               '$f_d'            => t('Automatically approve all connection/friend requests as friends')               
+               '$page_normal'  => array('page-flags', t('Normal Account'), PAGE_NORMAL, 
+                                                                       t('This account is a normal personal profile'), 
+                                                                       ($a->user['page-flags'] == PAGE_NORMAL)),
+                                                               
+               '$page_soapbox'         => array('page-flags', t('Soapbox Account'), PAGE_SOAPBOX, 
+                                                                       t('Automatically approve all connection/friend requests as read-only fans'), 
+                                                                       ($a->user['page-flags'] == PAGE_SOAPBOX)),
+                                                                       
+               '$page_community'       => array('page-flags', t('Community/Celebrity Account'), PAGE_COMMUNITY, 
+                                                                       t('Automatically approve all connection/friend requests as read-write fans'), 
+                                                                       ($a->user['page-flags'] == PAGE_COMMUNITY)),
+                                                                       
+               '$page_freelove'        => array('page-flags', t('Automatic Friend Account'), PAGE_FREELOVE, 
+                                                                       t('Automatically approve all connection/friend requests as friends'), 
+                                                                       ($a->user['page-flags'] == PAGE_FREELOVE)),
        ));
 
        $noid = get_config('system','no_openid');
 
        if($noid) {
-               $oidhtml = '';
+               $openid_field = false;
        }
        else {
-               $oidhtml = '<label id="settings-openid-label" for="settings-openid" >' . t('OpenID: ') . '</label><input type="text" id="settings-openid" class="openid" name="openid_url" value="$openid" />' . t("&nbsp;\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."));
        }
 
 
+       $opt_tpl = get_markup_template("field_yesno.tpl");
        if(get_config('system','publish_all')) {
                $profile_in_dir = '<input type="hidden" name="profile_in_directory" value="1" />';
        }
        else {
-               $opt_tpl = get_markup_template("profile-in-directory.tpl");
                $profile_in_dir = replace_macros($opt_tpl,array(
-                       '$desc'         => t('Publish your default profile in site directory?'),
-                       '$yes_str'      => t('Yes'),
-                       '$no_str'       => t('No'),
-                       '$yes_selected' => (($profile['publish'])      ? " checked=\"checked\" " : ""),
-                       '$no_selected'  => (($profile['publish'] == 0) ? " checked=\"checked\" " : "")
+                       '$field'        => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], '', array(t('No'),t('Yes'))),
                ));
        }
 
        if(strlen(get_config('system','directory_submit_url'))) {
-               $opt_tpl = get_markup_template("profile-in-netdir.tpl");
-
                $profile_in_net_dir = replace_macros($opt_tpl,array(
-                       '$desc'         => t('Publish your default profile in global social directory?'),
-                       '$yes_str'      => t('Yes'),
-                       '$no_str'       => t('No'),
-                       '$yes_selected' => (($profile['net-publish'])      ? " checked=\"checked\" " : ""),
-                       '$no_selected'  => (($profile['net-publish'] == 0) ? " checked=\"checked\" " : "")
+                       '$field'        => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', array(t('No'),t('Yes'))),
                ));
        }
        else
                $profile_in_net_dir = '';
 
-       $loc_checked = (($a->user['allow_location'] == 1)      ? " checked=\"checked\" " : "");
+
+       $hide_friends = replace_macros($opt_tpl,array(
+                       '$field'        => array('hide-friends', t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], '', array(t('No'),t('Yes'))),
+       ));
+
+       $hide_wall = replace_macros($opt_tpl,array(
+                       '$field'        => array('hidewall',  t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], '', array(t('No'),t('Yes'))),
+
+       ));
+
+       $blockwall = replace_macros($opt_tpl,array(
+                       '$field'        => array('blockwall',  t('Allow friends to post to your profile page?'), ! $a->user['blockwall'], '', array(t('No'),t('Yes'))),
+
+       ));
+
+       $blocktags = replace_macros($opt_tpl,array(
+                       '$field'        => array('blocktags',  t('Allow friends to tag your posts?'), ! $a->user['blocktags'], '', array(t('No'),t('Yes'))),
+
+       ));
+
+
+       $suggestme = replace_macros($opt_tpl,array(
+                       '$field'        => array('suggestme',  t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', array(t('No'),t('Yes'))),
+
+       ));
+
 
        $invisible = (((! $profile['publish']) && (! $profile['net-publish']))
                ? true : false);
@@ -419,24 +736,34 @@ function settings_content(&$a) {
                info( t('Profile is <strong>not published</strong>.') . EOL );
 
        
-       $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_theme && (! x($_SESSION,'theme')))
-                               ? ' selected="selected" ' : '' );
-                       $theme_name = ((file_exists($file . '/experimental')) ?  sprintf("%s - \x28Experimental\x29", $f) : $f);
-                       $theme_selector .= '<option value="' . $f . '"' . $selected . '>' . $theme_name . '</option>';
+       $allowed_themes_str = get_config('system','allowed_themes');
+       $allowed_themes_raw = explode(',',$allowed_themes_str);
+       $allowed_themes = array();
+       if(count($allowed_themes_raw))
+               foreach($allowed_themes_raw as $x)
+                       if(strlen(trim($x)))
+                               $allowed_themes[] = trim($x);
+
+       
+       $themes = array();
+       $files = glob('view/theme/*');
+       if($allowed_themes) {
+               foreach($allowed_themes as $th) {
+                       $f = $th;
+                       $is_experimental = file_exists('view/theme/' . $th . '/experimental');
+                       $unsupported = file_exists('view/theme/' . $th . '/unsupported');
+                       if (!$is_experimental or ($is_experimental && (get_config('experimentals','exp_themes')==1 or get_config('experimentals','exp_themes')===false))){ 
+                               $theme_name = (($is_experimental) ?  sprintf("%s - \x28Experimental\x29", $f) : $f);
+                               $themes[$f]=$theme_name;
+                       }
                }
        }
+       $theme_selected = (!x($_SESSION,'theme')? $default_theme : $_SESSION['theme']);
 
-       $theme_selector .= '</select>';
 
        $subdir = ((strlen($a->get_path())) ? '<br />' . t('or') . ' ' . $a->get_baseurl() . '/profile/' . $nickname : '');
 
@@ -453,85 +780,85 @@ function settings_content(&$a) {
 
        $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
 
-       $uexport = '<div id="uexport-link"><a href="uexport" >' . t('Export Personal Data') . '</a></div>';
-
+       $expire_arr = array(
+               'days' => array('expire',  t("Automatically expire posts after this many days:"), $expire, t('If empty, posts will not expire. Expired posts will be deleted')),
+               'advanced' => t('Advanced expiration settings'),
+               'label' => t('Advanced Expiration'),
+               'items' => array('expire_items',  t("Expire posts:"), $expire_items, '', array(t('No'),t('Yes'))),
+               'notes' => array('expire_notes',  t("Expire personal notes:"), $expire_notes, '', array(t('No'),t('Yes'))),
+               'starred' => array('expire_starred',  t("Expire starred posts:"), $expire_starred, '', array(t('No'),t('Yes'))),
+               'photos' => array('expire_photos',  t("Expire photos:"), $expire_photos, '', array(t('No'),t('Yes'))),          
+       );
 
        $o .= replace_macros($stpl,array(
-               '$ptitle' => t('Account Settings'),
-               '$lbl_plug' => t('Plugin Settings'),
-               '$lbl_basic' => t('Basic Settings'),
-               '$lbl_fn' => t('Full Name:'),
-               '$lbl_email' => t('Email Address:'),
-               '$lbl_tz' => t('Your Timezone:'),
-               '$lbl_loc1' => t('Default Post Location:'),
-               '$lbl_loc2' => t('Use Browser Location:'),
-               '$lbl_theme' => t('Display Theme:'),
-               '$submit' => t('Submit'),
-               '$lbl_prv' => t('Security and Privacy Settings'),
-               '$lbl_maxreq' => t('Maximum Friend Requests/Day:'),
-               '$lbl_maxrdesc' => t("\x28to prevent spam abuse\x29"),
-               '$lbl_rempost' => t('Allow friends to post to your profile page:'),
-               '$lbl_exp1' => t("Automatically expire \x28delete\x29 posts older than"),
-               '$lbl_exp2' => t('days'),
-               '$lbl_not1' => t('Notification Settings'),
-               '$lbl_not2' => t('Send a notification email when:'),
-               '$lbl_not3' => t('You receive an introduction'),
-               '$lbl_not4' => t('Your introductions are confirmed'),
-               '$lbl_not5' => t('Someone writes on your profile wall'),
-               '$lbl_not6' => t('Someone writes a followup comment'),
-               '$lbl_not7' => t('You receive a private message'),
-               '$lbl_pass1' => t('Password Settings'),
-               '$lbl_pass2' => t('Leave password fields blank unless changing'),
-               '$lbl_pass3' => t('New Password:'),
-               '$lbl_pass4' => t('Confirm:'),
-               '$lbl_advn' => t('Advanced Page Settings'),
+               '$tabs'         => $tabs,
+               '$ptitle'       => t('Account Settings'),
+
+               '$submit'       => t('Submit'),
                '$baseurl' => $a->get_baseurl(),
-               '$oidhtml' => $oidhtml,
-               '$uexport' => $uexport,
                '$uid' => local_user(),
-               '$username' => $username,
-               '$openid' => $openid,
-               '$email' => $email,
+               
                '$nickname_block' => $prof_addr,
-               '$timezone' => $timezone,
-               '$zoneselect' => select_timezone($timezone),
-               '$defloc' => $defloc,
-               '$loc_checked' => $loc_checked,
-               '$profile_in_dir' => $profile_in_dir,
-               '$profile_in_net_dir' => $profile_in_net_dir,
+               
+               '$h_pass'       => t('Password Settings'),
+               '$password1'=> array('npassword', t('New Password:'), '', ''),
+               '$password2'=> array('confirm', t('Confirm:'), '', t('Leave password fields blank unless changing')),
+               '$oid_enable' => (! get_config('system','no_openid')),
+               '$openid'       => $openid_field,
+               
+               '$h_basic'      => t('Basic Settings'),
+               '$username' => array('username',  t('Full Name:'), $username,''),
+               '$email'        => array('email', t('Email Address:'), $email, ''),
+               '$timezone' => array('timezone_select' , t('Your Timezone:'), select_timezone($timezone), ''),
+               '$defloc'       => array('defloc', t('Default Post Location:'), $defloc, ''),
+               '$allowloc' => array('allow_location', t('Use Browser Location:'), ($a->user['allow_location'] == 1), ''),
+               '$theme'        => array('theme', t('Display Theme:'), $theme_selected, '', $themes),
+               '$ajaxint'   => array('browser_update',  t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds, no maximum')),
+
+               '$h_prv'        => t('Security and Privacy Settings'),
+
+               '$maxreq'       => array('maxreq', t('Maximum Friend Requests/Day:'), $maxreq ,t("\x28to prevent spam abuse\x29")),
                '$permissions' => t('Default Post Permissions'),
                '$permdesc' => t("\x28click to open/close\x29"),
                '$visibility' => $profile['net-publish'],
                '$aclselect' => populate_acl($a->user,$celeb),
-               '$sel_notify1' => (($notify & NOTIFY_INTRO)   ? ' checked="checked" ' : ''),
-               '$sel_notify2' => (($notify & NOTIFY_CONFIRM) ? ' checked="checked" ' : ''),
-               '$sel_notify3' => (($notify & NOTIFY_WALL)    ? ' checked="checked" ' : ''),
-               '$sel_notify4' => (($notify & NOTIFY_COMMENT) ? ' checked="checked" ' : ''),
-               '$sel_notify5' => (($notify & NOTIFY_MAIL)    ? ' checked="checked" ' : ''),
-               '$maxreq' => $maxreq,
-               '$expire' => $expire,
-               '$blockw_checked' => (($blockwall) ? '' : ' checked="checked" ' ),
-               '$theme' => $theme_selector,
+               '$suggestme' => $suggestme,
+               '$blockwall'=> $blockwall, // array('blockwall', t('Allow friends to post to your profile page:'), !$blockwall, ''),
+               '$blocktags'=> $blocktags, // array('blocktags', t('Allow friends to tag your posts:'), !$blocktags, ''),
+               '$expire'       => $expire_arr,
+
+               '$profile_in_dir' => $profile_in_dir,
+               '$profile_in_net_dir' => $profile_in_net_dir,
+               '$hide_friends' => $hide_friends,
+               '$hide_wall' => $hide_wall,
+               
+               
+               
+               '$h_not'        => t('Notification Settings'),
+               '$lbl_not'      => t('Send a notification email when:'),
+               '$notify1'      => array('notify1', t('You receive an introduction'), ($notify & NOTIFY_INTRO), NOTIFY_INTRO, ''),
+               '$notify2'      => array('notify2', t('Your introductions are confirmed'), ($notify & NOTIFY_CONFIRM), NOTIFY_CONFIRM, ''),
+               '$notify3'      => array('notify3', t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), NOTIFY_WALL, ''),
+               '$notify4'      => array('notify4', t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), NOTIFY_COMMENT, ''),
+               '$notify5'      => array('notify5', t('You receive a private message'), ($notify & NOTIFY_MAIL), NOTIFY_MAIL, ''),
+               '$notify6'  => array('notify6', t('You receive a friend suggestion'), ($notify & NOTIFY_SUGGEST), NOTIFY_SUGGEST, ''),          
+               '$notify7'  => array('notify7', t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''),         
+               
+               
+               '$h_advn' => t('Advanced Page Settings'),
                '$pagetype' => $pagetype,
-               '$lbl_imap0' => t('Email/Mailbox Setup'),
-               '$imap_desc' => t("If you wish to communicate with email contacts using this service \x28optional\x29, please specify how to connect to your mailbox."),
-               '$lbl_imap1' => t('IMAP server name:'),
-               '$imap_server' => $mail_server,
-               '$lbl_imap2' => t('IMAP port:'),
-               '$imap_port' => $mail_port,
-               '$lbl_imap3' => t("Security \x28TLS or SSL\x29:"),
-               '$imap_ssl' => $mail_ssl,
-               '$lbl_imap4' => t('Email login name:'),
-               '$imap_user' => $mail_user,
-               '$lbl_imap5' => t('Email password:'),
-               '$lbl_imap6' => t("Reply-to address \x28Optional\x29:"),
-               '$imap_replyto' => $mail_replyto,
-               '$lbl_imap7' => t('Send public posts to all email contacts:'),
-               '$lbl_imap8' => t('Last successful email check:'),
-               '$lbl_imap9' => (($mail_chk === '0000-00-00 00:00:00') ? t('never') : datetime_convert('UTC', date_default_timezone_get(), $mail_chk, t('g A l F d Y'))), 
-               '$pubmail_checked' => (($mail_pubmail) ? ' checked="checked" ' : ''),
-               '$mail_disabled' => (($mail_disabled) ? '<div class="info-message">' . t('Email access is disabled on this site.') . '</div>' : ''),
-               '$imap_disabled' => $imap_disabled
+               
+
+               
+               
+
+               
+
+
+
+
+               
+
        ));
 
        call_hooks('settings_form',$o);