X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsettings.php;h=ad22ba1a603b456b2651253622820ee0c4e4c490;hb=7f2070ca91aca9e92f3ac4c5b714742c6f9ecc3b;hp=2b9cde735343b99194b5f962b30e443d92bb814a;hpb=4407fc2c5d47ee1a7dfb8bfdfd47e73b22ec7e2a;p=friendica.git

diff --git a/mod/settings.php b/mod/settings.php
index 2b9cde7353..ad22ba1a60 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -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
@@ -56,7 +58,7 @@ function settings_post(&$a) {
 		return;			
 	}
 
-	if(($a->argc > 2) && ($a->argv[1] === 'oauth')  && ($a->argv[2] === 'edit') && x($_POST,'submit')) {
+	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'] : '');
@@ -215,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);
@@ -222,9 +236,11 @@ 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);
 
 
 	$notify = 0;
@@ -296,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),
@@ -315,6 +339,7 @@ function settings_post(&$a) {
 			dbesc($openidserver),
 			intval($blockwall),
 			intval($hidewall),
+			intval($blocktags),
 			intval(local_user())
 	);
 	if($r)
@@ -348,9 +373,9 @@ function settings_post(&$a) {
 
 	}
 
-// not yet ready for prime time
-//		require_once('include/profile_update.php');
-//		profile_change();
+
+	require_once('include/profile_update.php');
+	profile_change();
 
 	$_SESSION['theme'] = $theme;
 	if($email_changed && $a->config['register_policy'] == REGISTER_VERIFY) {
@@ -582,7 +607,27 @@ function settings_content(&$a) {
 	$maxreq   = $a->user['maxreq'];
 	$expire   = ((intval($a->user['expire'])) ? $a->user['expire'] : '');
 	$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
+	
 	if(! strlen($a->user['timezone']))
 		$timezone = date_default_timezone_get();
 
@@ -641,7 +686,24 @@ 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'))),
 
 	));
 
@@ -684,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,
@@ -709,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'),
 
@@ -719,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,