]> git.mxchange.org Git - friendica.git/blobdiff - mod/settings.php
Merge remote-tracking branch 'friendica/master'
[friendica.git] / mod / settings.php
index ea71f7020decdcf238d75a6ece36ac1b1454bab2..ad22ba1a603b456b2651253622820ee0c4e4c490 100644 (file)
@@ -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
@@ -47,11 +49,135 @@ function settings_post(&$a) {
                return;
        }
 
+       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_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',
+                                       `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) {
+                                                       $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'))) {
@@ -91,6 +217,18 @@ function settings_post(&$a) {
        $openid           = ((x($_POST,'openid_url')) ? notags(trim($_POST['openid_url']))   : '');
        $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);
@@ -98,69 +236,13 @@ function settings_post(&$a) {
        $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!
 
-       $hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
-       $hidewall = (($_POST['hidewall'] == 1) ? 1: 0);
-
+       $suggestme        = ((x($_POST,'suggestme')) ? intval($_POST['suggestme'])  : 0);  
+       $hide_friends     = (($_POST['hide-friends'] == 1) ? 1: 0);
+       $hidewall         = (($_POST['hidewall'] == 1) ? 1: 0);
 
 
-
-       $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);
-
-       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;
 
        if(x($_POST,'notify1'))
@@ -230,7 +312,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, `hidewall` = %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),
@@ -249,6 +339,7 @@ function settings_post(&$a) {
                        dbesc($openidserver),
                        intval($blockwall),
                        intval($hidewall),
+                       intval($blocktags),
                        intval(local_user())
        );
        if($r)
@@ -279,8 +370,13 @@ function settings_post(&$a) {
                $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) {
 
@@ -297,21 +393,123 @@ 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;
        }
        
-       $tabtpl = get_markup_template("settings_tabs.tpl");
+       $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(
-               '$account' => array( t('Account settings'), $a->get_baseurl().'/settings'),
-               '$plugins' => array( t('Plugin settings'), $a->get_baseurl().'/settings/addon')
+               '$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')) {
                $settings_addons = "";
                
@@ -330,6 +528,66 @@ function settings_content(&$a) {
                ));
                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_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'), 'TSL'=>'TSL', '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, ''),
+               '$submit' => t('Submit'),               
+               
+
+
+                       '$settings_connectors' => $settings_connectors
+               ));
+               return $o;
+       }
+
                
        require_once('include/acl_selectors.php');
 
@@ -349,29 +607,31 @@ 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;
-       }
+       $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(
@@ -426,15 +686,27 @@ function settings_content(&$a) {
        ));
 
        $hide_wall = replace_macros($opt_tpl,array(
-                       '$field'        => array('hidewall',  t('Hide profile details and all your messages from unknown viewers?'), $a->user['hidewall'], '', array(t('No'),t('Yes'))),
+                       '$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);
@@ -474,7 +746,15 @@ function settings_content(&$a) {
 
        $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
 
-       
+       $expire_arr = array(
+               'days' => array('expire',  t("Automatically expire posts after 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(
                '$tabs'         => $tabs,
@@ -485,12 +765,11 @@ function settings_content(&$a) {
                '$uid' => local_user(),
                
                '$nickname_block' => $prof_addr,
-               '$uexport' => t('Export Personal Data'),
-               
                
                '$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'),
@@ -500,8 +779,7 @@ function settings_content(&$a) {
                '$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'),
 
@@ -510,9 +788,10 @@ function settings_content(&$a) {
                '$permdesc' => t("\x28click to open/close\x29"),
                '$visibility' => $profile['net-publish'],
                '$aclselect' => populate_acl($a->user,$celeb),
-
-               '$blockwall'=> array('blockwall', t('Allow friends to post to your profile page:'), !$blockwall, ''),
-               '$expire'       => array('expire', t("Automatically expire posts after days:"), $expire, t('If empty, posts will not expire. Expired posts will be deleted')),
+               '$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,
@@ -523,26 +802,11 @@ function settings_content(&$a) {
                
                '$h_not'        => t('Notification Settings'),
                '$lbl_not'      => t('Send a notification email when:'),
-               '$notify1'      => array('notify1', t('You receive an introduction'), ($notify & NOTIFY_INTRO), ''),
-               '$notify2'      => array('notify1', t('Your introductions are confirmed'), ($notify & NOTIFY_CONFIRM), ''),
-               '$notify3'      => array('notify1', t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), ''),
-               '$notify4'      => array('notify1', t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), ''),
-               '$notify5'      => array('notify1', t('You receive a private message'), ($notify & NOTIFY_MAIL), ''),
-               
-               
-               
-               '$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:'), $imap_last_check,''),
-               '$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'), 'TSL'=>'TSL', '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, ''),
-               
+               '$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, ''),