]> git.mxchange.org Git - friendica.git/blobdiff - mod/settings.php
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
[friendica.git] / mod / settings.php
old mode 100644 (file)
new mode 100755 (executable)
index 6cc80e3..f694b58
@@ -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,27 +39,34 @@ 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')){
+               check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
+               
                $key = $_POST['remove'];
                q("DELETE FROM tokens WHERE id='%s' AND uid=%d",
                        dbesc($key),
                        local_user());
-               goaway($a->get_baseurl()."/settings/oauth/");
+               goaway($a->get_baseurl(true)."/settings/oauth/");
                return;                 
        }
 
        if(($a->argc > 2) && ($a->argv[1] === 'oauth')  && ($a->argv[2] === 'edit'||($a->argv[2] === 'add')) && x($_POST,'submit')) {
                
+               check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
+               
                $name           = ((x($_POST,'name')) ? $_POST['name'] : '');
                $key            = ((x($_POST,'key')) ? $_POST['key'] : '');
                $secret         = ((x($_POST,'secret')) ? $_POST['secret'] : '');
@@ -95,25 +104,32 @@ function settings_post(&$a) {
                                                local_user());
                        }
                }
-               goaway($a->get_baseurl()."/settings/oauth/");
+               goaway($a->get_baseurl(true)."/settings/oauth/");
                return;
        }
 
        if(($a->argc > 1) && ($a->argv[1] == 'addon')) {
+               check_form_security_token_redirectOnErr('/settings/addon', 'settings_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'] : '');
+               
+               check_form_security_token_redirectOnErr('/settings/connectors', 'settings_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);
@@ -139,11 +155,14 @@ function settings_post(&$a) {
                                        );
                                }
                                $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())
@@ -175,7 +194,8 @@ function settings_post(&$a) {
                return;
        }
 
-
+       check_form_security_token_redirectOnErr('/settings', 'settings');
+       
        call_hooks('settings_post', $_POST);
 
        if((x($_POST,'npassword')) || (x($_POST,'confirm'))) {
@@ -207,7 +227,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']))     : '');
@@ -216,6 +236,22 @@ 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;
+
+       $itemspage_network   = ((x($_POST,'itemspage_network')) ? intval($_POST['itemspage_network']) : 40);
+       if($itemspage_network > 100)
+                $itemspage_network = 40;
+
+
        $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);
@@ -224,8 +260,9 @@ function settings_post(&$a) {
        $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);
 
 
        $notify = 0;
@@ -240,6 +277,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;
 
@@ -297,6 +338,15 @@ function settings_post(&$a) {
                        $openidserver = '';
        }
 
+       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);
+       set_pconfig(local_user(),'system','itemspage_network', $itemspage_network);
+
        $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),
@@ -342,7 +392,7 @@ 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')))
@@ -361,7 +411,7 @@ function settings_post(&$a) {
 
        }
 
-       goaway($a->get_baseurl() . '/settings' );
+       goaway($a->get_baseurl(true) . '/settings' );
        return; // NOTREACHED
 }
                
@@ -376,31 +426,36 @@ function settings_content(&$a) {
                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',
+                       'url'   => $a->get_baseurl(true).'/settings',
                        'sel'   => (($a->argc == 1)?'active':''),
                ),      
                array(
                        'label' => t('Connector settings'),
-                       'url'   => $a->get_baseurl().'/settings/connectors',
+                       'url'   => $a->get_baseurl(true).'/settings/connectors',
                        'sel'   => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
                ),
                array(
                        'label' => t('Plugin settings'),
-                       'url'   => $a->get_baseurl().'/settings/addon',
+                       'url'   => $a->get_baseurl(true).'/settings/addon',
                        'sel'   => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
                ),
                array(
                        'label' => t('Connections'),
-                       'url' => $a->get_baseurl() . '/settings/oauth',
+                       'url' => $a->get_baseurl(true) . '/settings/oauth',
                        'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
                ),
                array(
                        'label' => t('Export personal data'),
-                       'url' => $a->get_baseurl() . '/uexport',
+                       'url' => $a->get_baseurl(true) . '/uexport',
                        'sel' => ''
                )
        );
@@ -415,6 +470,7 @@ function settings_content(&$a) {
                if(($a->argc > 2) && ($a->argv[2] === 'add')) {
                        $tpl = get_markup_template("settings_oauth_edit.tpl");
                        $o .= replace_macros($tpl, array(
+                               '$form_security_token' => get_form_security_token("settings_oauth"),
                                '$tabs'         => $tabs,
                                '$title'        => t('Add application'),
                                '$submit'       => t('Submit'),
@@ -441,6 +497,7 @@ function settings_content(&$a) {
                        
                        $tpl = get_markup_template("settings_oauth_edit.tpl");
                        $o .= replace_macros($tpl, array(
+                               '$form_security_token' => get_form_security_token("settings_oauth"),
                                '$tabs'         => $tabs,
                                '$title'        => t('Add application'),
                                '$submit'       => t('Update'),
@@ -455,10 +512,12 @@ function settings_content(&$a) {
                }
                
                if(($a->argc > 3) && ($a->argv[2] === 'delete')) {
+                       check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth', 't');
+               
                        $r = q("DELETE FROM clients WHERE client_id='%s' AND uid=%d",
                                        dbesc($a->argv[3]),
                                        local_user());
-                       goaway($a->get_baseurl()."/settings/oauth/");
+                       goaway($a->get_baseurl(true)."/settings/oauth/");
                        return;                 
                }
                
@@ -473,7 +532,8 @@ function settings_content(&$a) {
                
                $tpl = get_markup_template("settings_oauth.tpl");
                $o .= replace_macros($tpl, array(
-                       '$baseurl'      => $a->get_baseurl(),
+                       '$form_security_token' => get_form_security_token("settings_oauth"),
+                       '$baseurl'      => $a->get_baseurl(true),
                        '$title'        => t('Connected Apps'),
                        '$add'          => t('Add application'),
                        '$edit'         => t('Edit'),
@@ -499,6 +559,7 @@ function settings_content(&$a) {
                
                $tpl = get_markup_template("settings_addons.tpl");
                $o .= replace_macros($tpl, array(
+                       '$form_security_token' => get_form_security_token("settings_addon"),
                        '$title'        => t('Plugin Settings'),
                        '$tabs'         => $tabs,
                        '$settings_addons' => $settings_addons
@@ -528,44 +589,48 @@ function settings_content(&$a) {
                $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');
+       $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(
+                       '$form_security_token' => get_form_security_token("settings_connectors"),
+                       
                        '$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'),               
-               
 
+                       '$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",
@@ -586,6 +651,28 @@ function settings_content(&$a) {
        $blockwall = $a->user['blockwall'];
        $blocktags = $a->user['blocktags'];
 
+       $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
+
+
+       $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
+
+       $itemspage_network = intval(get_pconfig(local_user(), 'system','itemspage_network'));
+       $itemspage_network = (($itemspage_network > 0 && $itemspage_network < 101) ? $itemspage_network : 40); // default if not set: 40 items
+       
        if(! strlen($a->user['timezone']))
                $timezone = date_default_timezone_get();
 
@@ -644,7 +731,7 @@ 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'))),
 
        ));
 
@@ -660,6 +747,12 @@ function settings_content(&$a) {
        ));
 
 
+       $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);
 
@@ -670,20 +763,33 @@ function settings_content(&$a) {
        $default_theme = get_config('system','theme');
        if(! $default_theme)
                $default_theme = 'default';
+
+       $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($files) {
-               foreach($files as $file) {
-                       $f = basename($file);
-                       $theme_name = ((file_exists($file . '/experimental')) ?  sprintf("%s - \x28Experimental\x29", $f) : $f);
-                       $themes[$f]=$theme_name;
+       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']);
 
 
-       $subdir = ((strlen($a->get_path())) ? '<br />' . t('or') . ' ' . $a->get_baseurl() . '/profile/' . $nickname : '');
+       $subdir = ((strlen($a->get_path())) ? '<br />' . t('or') . ' ' . $a->get_baseurl(true) . '/profile/' . $nickname : '');
 
        $tpl_addr = get_markup_template("settings_nick_set.tpl");
 
@@ -698,15 +804,24 @@ 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 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(
                '$tabs'         => $tabs,
                '$ptitle'       => t('Account Settings'),
 
                '$submit'       => t('Submit'),
-               '$baseurl' => $a->get_baseurl(),
+               '$baseurl' => $a->get_baseurl(true),
                '$uid' => local_user(),
+               '$form_security_token' => get_form_security_token("settings"),
                
                '$nickname_block' => $prof_addr,
                
@@ -723,8 +838,8 @@ 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')),
+               '$itemspage_network'   => array('itemspage_network',  t("Number of items to display on the network page:"), $itemspage_network, t('Maximum of 100 items')),
 
                '$h_prv'        => t('Security and Privacy Settings'),
 
@@ -733,10 +848,10 @@ function settings_content(&$a) {
                '$permdesc' => t("\x28click to open/close\x29"),
                '$visibility' => $profile['net-publish'],
                '$aclselect' => populate_acl($a->user,$celeb),
-
+               '$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'       => array('expire', t("Automatically expire posts after days:"), $expire, t('If empty, posts will not expire. Expired posts will be deleted')),
+               '$expire'       => $expire_arr,
 
                '$profile_in_dir' => $profile_in_dir,
                '$profile_in_net_dir' => $profile_in_net_dir,
@@ -752,7 +867,8 @@ function settings_content(&$a) {
                '$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'),