X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsettings.php;h=7ed7ad32e8359911047188c52b8d111c9a0f8a6f;hb=9513f1f1668a33be3fc2b241fe3662e9de42d84b;hp=b453fa8258f24d634fb38b052fdc2c32a7432bcb;hpb=3876cab8eac1364e7074e8da9aeb83badb3b65b3;p=friendica.git
diff --git a/mod/settings.php b/mod/settings.php
index b453fa8258..7ed7ad32e8 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -48,28 +48,30 @@ 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']));
-
- $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);
- $page_flags = ((intval($_POST['page-flags'])) ? intval($_POST['page-flags']) : 0);
+ $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'])) : '');
+
+ $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;
@@ -85,8 +87,8 @@ function settings_post(&$a) {
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.');
+ if(! valid_email($email))
+ $err .= t(' Not valid email.');
}
if(strlen($err)) {
@@ -104,9 +106,10 @@ function settings_post(&$a) {
$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, `page-flags` = %d, `default-location` = '%s', `theme` = '%s' WHERE `uid` = %d LIMIT 1",
+ $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' WHERE `uid` = %d LIMIT 1",
dbesc($username),
dbesc($email),
+ dbesc($openid),
dbesc($timezone),
dbesc($str_contact_allow),
dbesc($str_group_allow),
@@ -115,6 +118,7 @@ function settings_post(&$a) {
intval($notify),
intval($page_flags),
dbesc($defloc),
+ intval($allow_location),
dbesc($theme),
intval(local_user())
);
@@ -153,6 +157,7 @@ function settings_post(&$a) {
if(! function_exists('settings_content')) {
function settings_content(&$a) {
+ $o = '';
$o .= '';
if(! local_user()) {
@@ -160,10 +165,10 @@ function settings_content(&$a) {
return;
}
- require_once('view/acl_selectors.php');
+ 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];
@@ -174,6 +179,7 @@ function settings_content(&$a) {
$timezone = $a->user['timezone'];
$notify = $a->user['notify-flags'];
$defloc = $a->user['default-location'];
+ $openid = $a->user['openid'];
if(! strlen($a->user['timezone']))
$timezone = date_default_timezone_get();
@@ -190,6 +196,17 @@ function settings_content(&$a) {
'$page_freelove' => PAGE_FREELOVE
));
+ $noid = get_config('system','no_openid');
+
+ if($noid) {
+ $oidhtml = '';
+ }
+ else {
+ $oidhtml = '' . t(" \x28Optional\x29 Allow this OpenID to login to this account.");
+ }
+
+
+
$opt_tpl = load_view_file("view/profile-in-directory.tpl");
$profile_in_dir = replace_macros($opt_tpl,array(
@@ -208,6 +225,8 @@ 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);
@@ -241,7 +260,7 @@ 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()));
@@ -252,13 +271,16 @@ function settings_content(&$a) {
$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'),