X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsettings.php;h=dbbac8bdeb3c9b14f2eededb6a74242c64889d29;hb=3eefe8b50003c858d4930c03cc06d2679a14347c;hp=aef00c8c24b4d2f47aafcae7911f935fbb530e39;hpb=d5a13b1e4c0f35445aa539ff6b3779062907a9cb;p=friendica.git

diff --git a/mod/settings.php b/mod/settings.php
index aef00c8c24..dbbac8bdeb 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -3,7 +3,6 @@
 
 function settings_init(&$a) {
 	if(local_user()) {
-		require_once("mod/profile.php");
 		profile_load($a,$a->user['nickname']);
 	}
 }
@@ -15,14 +14,23 @@ function settings_post(&$a) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
-	if(count($a->user) && x($a->user,'uid') && $a->user['uid'] != get_uid()) {
+
+	if(count($a->user) && x($a->user,'uid') && $a->user['uid'] != local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
+
+	if(($a->argc > 1) && ($a->argv[1] == 'addon')) {
+		call_hooks('plugin_settings_post', $_POST);
+		return;
+	}
+
+	call_hooks('settings_post', $_POST);
+
 	if((x($_POST,'npassword')) || (x($_POST,'confirm'))) {
 
-		$newpass = trim($_POST['npassword']);
-		$confirm = trim($_POST['confirm']);
+		$newpass = $_POST['npassword'];
+		$confirm = $_POST['confirm'];
 
 		$err = false;
 		if($newpass != $confirm ) {
@@ -39,7 +47,7 @@ function settings_post(&$a) {
 			$password = hash('whirlpool',$newpass);
 			$r = q("UPDATE `user` SET `password` = '%s' WHERE `uid` = %d LIMIT 1",
 				dbesc($password),
-				intval(get_uid())
+				intval(local_user())
 			);
 			if($r)
 				notice( t('Password changed.') . EOL);
@@ -48,78 +56,106 @@ function settings_post(&$a) {
 		}
 	}
 
-	$theme            = notags(trim($_POST['theme']));
-	$username         = notags(trim($_POST['username']));
-	$email            = notags(trim($_POST['email']));
-	$timezone         = notags(trim($_POST['timezone']));
-	$defloc           = notags(trim($_POST['defloc']));
+	$theme            = ((x($_POST,'theme'))      ? notags(trim($_POST['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']))     : '');
+	$defloc           = ((x($_POST,'defloc'))     ? notags(trim($_POST['defloc']))       : '');
+	$openid           = ((x($_POST,'openid_url')) ? notags(trim($_POST['openid_url']))   : '');
+	$maxreq           = ((x($_POST,'maxreq'))     ? intval($_POST['maxreq'])             : 0);
 
-	$publish          = (($_POST['profile_in_directory'] == 1) ? 1: 0);
-	$net_publish      = (($_POST['profile_in_netdirectory'] == 1) ? 1: 0);
-	$old_visibility   = ((intval($_POST['visibility']) == 1) ? 1 : 0);
+	$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);
 
 	$notify = 0;
 
-	if($_POST['notify1'])
+	if(x($_POST,'notify1'))
 		$notify += intval($_POST['notify1']);
-	if($_POST['notify2'])
+	if(x($_POST,'notify2'))
 		$notify += intval($_POST['notify2']);
-	if($_POST['notify3'])
+	if(x($_POST,'notify3'))
 		$notify += intval($_POST['notify3']);
-	if($_POST['notify4'])
+	if(x($_POST,'notify4'))
 		$notify += intval($_POST['notify4']);
-	if($_POST['notify5'])
+	if(x($_POST,'notify5'))
 		$notify += intval($_POST['notify5']);
 
 	$email_changed = false;
 
 	$err = '';
 
+	$name_change = false;
+
 	if($username != $a->user['username']) {
-        	if(strlen($username) > 40)
-                	$err .= t(' Please use a shorter name.');
-        	if(strlen($username) < 3)
-                	$err .= t(' Name too short.');
+		$name_change = true;
+		if(strlen($username) > 40)
+			$err .= t(' Please use a shorter name.');
+		if(strlen($username) < 3)
+			$err .= t(' Name too short.');
 	}
+
 	if($email != $a->user['email']) {
 		$email_changed = true;
-        	if(!eregi('[A-Za-z0-9._%-]+@[A-Za-z0-9._%-]+\.[A-Za-z]{2,6}',$email))
-                	$err .= t(' Not valid email.');
-        	$r = q("SELECT `uid` FROM `user`
-                	WHERE `email` = '%s' LIMIT 1",
-                	dbesc($email)
-                	);
-	        if($r !== NULL && count($r))
-        	        $err .= t(' This email address is already registered.');
+        if(! valid_email($email))
+			$err .= t(' Not valid email.');
+		if((x($a->config,'admin_email')) && (strcasecmp($email,$a->config['admin_email']) == 0)) {
+			$err .= t(' Cannot change to that email.');
+			$email = $a->user['email'];
+		}
+	}
+
+	if(strlen($err)) {
+		notice($err . EOL);
+		return;
 	}
 
-        if(strlen($err)) {
-                notice($err . EOL);
-                return;
-        }
 	if($timezone != $a->user['timezone']) {
 		if(strlen($timezone))
 			date_default_timezone_set($timezone);
 	}
 
-
 	$str_group_allow   = perms2str($_POST['group_allow']);
 	$str_contact_allow = perms2str($_POST['contact_allow']);
 	$str_group_deny    = perms2str($_POST['group_deny']);
 	$str_contact_deny  = perms2str($_POST['contact_deny']);
 
-	$r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `timezone` = '%s',  `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `default-location` = '%s', `theme` = '%s'  WHERE `uid` = %d LIMIT 1",
+	$openidserver = $a->user['openidserver'];
+
+	// If openid has changed or if there's an openid but no openidserver, try and discover it.
+
+	if($openid != $a->user['openid'] || (strlen($openid) && (! strlen($openidserver)))) {
+		$tmp_str = $openid;
+		if(strlen($tmp_str) && validate_url($tmp_str)) {
+			logger('updating openidserver');
+			require_once('library/openid.php');
+			$open_id_obj = new LightOpenID;
+			$open_id_obj->identity = $openid;
+			$openidserver = $open_id_obj->discover($open_id_obj->identity);
+		}
+		else
+			$openidserver = '';
+	}
+
+	$r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s',  `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `theme` = '%s', `maxreq` = %d, `openidserver` = '%s'  WHERE `uid` = %d LIMIT 1",
 			dbesc($username),
 			dbesc($email),
+			dbesc($openid),
 			dbesc($timezone),
 			dbesc($str_contact_allow),
 			dbesc($str_group_allow),
 			dbesc($str_contact_deny),
 			dbesc($str_group_deny),
 			intval($notify),
+			intval($page_flags),
 			dbesc($defloc),
+			intval($allow_location),
 			dbesc($theme),
-			intval(get_uid())
+			intval($maxreq),
+			dbesc($openidserver),
+			intval(local_user())
 	);
 	if($r)
 		notice( t('Settings updated.') . EOL);
@@ -129,16 +165,25 @@ function settings_post(&$a) {
 		WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
 		intval($publish),
 		intval($net_publish),
-		intval(get_uid())
+		intval(local_user())
 	);
 
+
+	if($name_change) {
+		q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `self` = 1 LIMIT 1",
+			dbesc($username),
+			dbesc(datetime_convert()),
+			intval(local_user())
+		);
+	}		
+
 	if($old_visibility != $net_publish) {
 		// Update global directory in background
 		$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
 		$url = $_SESSION['my_url'];
 		if($url && strlen(get_config('system','directory_submit_url')))
-			proc_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &",
-				array(),$foo));
+			//proc_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &",array(),$foo));
+			proc_run($php_path,"include/directory.php","$url");
 	}
 
 	$_SESSION['theme'] = $theme;
@@ -155,6 +200,8 @@ function settings_post(&$a) {
 
 if(! function_exists('settings_content')) {
 function settings_content(&$a) {
+
+	$o = '';
 	$o .= '<script>	$(document).ready(function() { $(\'#nav-settings-link\').addClass(\'nav-selected\'); });</script>';
 
 	if(! local_user()) {
@@ -162,10 +209,25 @@ function settings_content(&$a) {
 		return;
 	}
 
-	require_once('view/acl_selectors.php');
+	if(($a->argc > 1) && ($a->argv[1] === 'addon')) {
+		$o .= '<h1>' . t('Plugin Settings') . '</h1>';
+		$o .= '<div id="account-settings-link"><a href="settings">' . t('Account Settings') . '</a></div>';
+
+		$o .= '<form action="settings/addon" method="post" >';
+
+		$r = q("SELECT * FROM `hook` WHERE `hook` = 'plugin_settings' ");
+		if(! count($r))
+			notice( t('No Plugin settings configured') . EOL);
+
+		call_hooks('plugin_settings', $o);
+		$o .= '</form>';
+		return $o;
+	}
+		
+	require_once('include/acl_selectors.php');
 
 	$p = q("SELECT * FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
-		intval($_SESSION['uid'])
+		intval(local_user())
 	);
 	if(count($p))
 		$profile = $p[0];
@@ -176,17 +238,45 @@ function settings_content(&$a) {
 	$timezone = $a->user['timezone'];
 	$notify   = $a->user['notify-flags'];
 	$defloc   = $a->user['default-location'];
+	$openid   = $a->user['openid'];
+	$maxreq   = $a->user['maxreq'];
 
 	if(! strlen($a->user['timezone']))
 		$timezone = date_default_timezone_get();
 
-
-	$opt_tpl = load_view_file("view/profile-in-directory.tpl");
-	$profile_in_dir = replace_macros($opt_tpl,array(
-		'$yes_selected' => (($profile['publish'])      ? " checked=\"checked\" " : ""),
-		'$no_selected'  => (($profile['publish'] == 0) ? " checked=\"checked\" " : "")
+	$pageset_tpl = load_view_file('view/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
 	));
 
+	$noid = get_config('system','no_openid');
+
+	if($noid) {
+		$oidhtml = '';
+	}
+	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.");
+	}
+
+
+	if(get_config('system','publish_all')) {
+		$profile_in_dir = '<input type="hidden" name="profile_in_directory" value="1" />';
+	}
+	else {
+		$opt_tpl = load_view_file("view/profile-in-directory.tpl");
+		$profile_in_dir = replace_macros($opt_tpl,array(
+			'$yes_selected' => (($profile['publish'])      ? " checked=\"checked\" " : ""),
+			'$no_selected'  => (($profile['publish'] == 0) ? " checked=\"checked\" " : "")
+		));
+	}
+
 	if(strlen(get_config('system','directory_submit_url'))) {
 		$opt_tpl = load_view_file("view/profile-in-netdir.tpl");
 
@@ -198,6 +288,14 @@ function settings_content(&$a) {
 	else
 		$profile_in_net_dir = '';
 
+	$loc_checked = (($a->user['allow_location'] == 1)      ? " checked=\"checked\" " : "");
+
+	$invisible = (((! $profile['publish']) && (! $profile['net-publish']))
+		? true : false);
+
+	if($invisible)
+		notice( t('Profile is <strong>not published</strong>.') . EOL );
+
 	$nickname_block = load_view_file("view/settings_nick_set.tpl");
 	
 	$nickname_subdir = '';
@@ -212,10 +310,15 @@ function settings_content(&$a) {
 
 	$theme_selector = '<select name="theme" id="theme-select" >';
 	$files = glob('view/theme/*');
+
+	$default_theme = get_config('system','theme');
+	if(! $default_theme)
+		$default_theme = 'default';
+
 	if($files) {
 		foreach($files as $file) {
 			$f = basename($file);
-			$selected = (($f == $_SESSION['theme']) || ($f == 'default' && (! x($_SESSION,'theme')))
+			$selected = (($f == $_SESSION['theme']) || ($f === $default_theme && (! x($_SESSION,'theme')))
 				? ' selected="selected" ' : '' );
 			$theme_selector .= '<option val="' . basename($file) . '"' . $selected . '>' . basename($file) . '</option>';
 		}
@@ -225,35 +328,47 @@ function settings_content(&$a) {
 
 	$nickname_block = replace_macros($nickname_block,array(
 		'$nickname' => $nickname,
-		'$uid' => $_SESSION['uid'],
+		'$uid' => local_user(),
 		'$subdir' => $nickname_subdir,
 		'$basepath' => $a->get_hostname(),
 		'$baseurl' => $a->get_baseurl()));	
 
 	$stpl = load_view_file('view/settings.tpl');
 
+	$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
+
 	$o .= replace_macros($stpl,array(
 		'$baseurl' => $a->get_baseurl(),
-		'$uid' => $_SESSION['uid'],
+		'$oidhtml' => $oidhtml,
+		'$uid' => local_user(),
 		'$username' => $username,
+		'$openid' => $openid,
 		'$email' => $email,
 		'$nickname_block' => $nickname_block,
 		'$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,
 		'$permissions' => t('Default Post Permissions'),
 		'$visibility' => $profile['net-publish'],
-		'$aclselect' => populate_acl($a->user),
+		'$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" ' : ''),
-		'$theme' => $theme_selector
+		'$maxreq' => $maxreq,
+		'$theme' => $theme_selector,
+		'$pagetype' => $pagetype
 	));
 
+	call_hooks('settings_form',$o);
+
+	$o .= '</form>' . "\r\n";
+
 	return $o;
 
-}}
\ No newline at end of file
+}}
+