X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofiles.php;h=db442647446ab2c524e7599d394ed8fa4b8865d7;hb=8c1adbefe39e16823bf101f5e063f966f9ec8aa3;hp=34678a237dd4a57ca4f59edb124a7d0969f232b0;hpb=44b19841360099cc3e78d1a3612f7aa23e2e6524;p=friendica.git
diff --git a/mod/profiles.php b/mod/profiles.php
index 34678a237d..db44264744 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -4,12 +4,9 @@
function profiles_post(&$a) {
if(! local_user()) {
- $_SESSION['sysmsg'] .= "Unauthorised." . EOL;
+ notice( "Permission denied." . EOL);
return;
}
-
- // todo - delete... ensure that all contacts using the to-be-deleted profile are moved to the default.
-
if(($a->argc > 1) && ($a->argv[1] != "new") && intval($a->argv[1])) {
$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($a->argv[1]),
@@ -27,6 +24,20 @@ function profiles_post(&$a) {
return;
}
+ $year = intval($_POST['year']);
+ if($year < 1900 || $year > 2100 || $year < 0)
+ $year = 0;
+ $month = intval($_POST['month']);
+ if(($month > 12) || ($month < 0))
+ $month = 0;
+ $mtab = array(0,31,29,31,30,31,30,31,31,30,31,30,31);
+ $day = intval($_POST['day']);
+ if(($day > $mtab[$month]) || ($day < 0))
+ $day = 0;
+ $dob = '0000-00-00';
+ $dob = sprintf('%04d-%02d-%02d',$year,$month,$day);
+
+
$name = notags(trim($_POST['name']));
$gender = notags(trim($_POST['gender']));
$address = notags(trim($_POST['address']));
@@ -35,37 +46,74 @@ function profiles_post(&$a) {
$postal_code = notags(trim($_POST['postal_code']));
$country_name = notags(trim($_POST['country_name']));
$marital = notags(trim(implode(', ',$_POST['marital'])));
+ $sexual = notags(trim($_POST['sexual']));
$homepage = notags(trim($_POST['homepage']));
- $about = str_replace(array('<','>','&'),array('<','>','&'),trim($_POST['about']));
+ $politic = notags(trim($_POST['politic']));
+ $religion = notags(trim($_POST['religion']));
+
+ $about = escape_tags(trim($_POST['about']));
+ $interest = escape_tags(trim($_POST['interest']));
+ $contact = escape_tags(trim($_POST['contact']));
+ $music = escape_tags(trim($_POST['music']));
+ $book = escape_tags(trim($_POST['book']));
+ $tv = escape_tags(trim($_POST['tv']));
+ $film = escape_tags(trim($_POST['film']));
+ $romance = escape_tags(trim($_POST['romance']));
+ $work = escape_tags(trim($_POST['work']));
+ $education = escape_tags(trim($_POST['education']));
if(x($_POST,'profile_in_directory'))
$publish = (($_POST['profile_in_directory'] == 1) ? 1: 0);
- if(! in_array($gender,array('','Male','Female','Other')))
- $gender = '';
$r = q("UPDATE `profile`
SET `profile-name` = '%s',
`name` = '%s',
`gender` = '%s',
+ `dob` = '%s',
`address` = '%s',
`locality` = '%s',
`region` = '%s',
`postal-code` = '%s',
`country-name` = '%s',
`marital` = '%s',
+ `sexual` = '%s',
`homepage` = '%s',
- `about` = '%s'
+ `politic` = '%s',
+ `religion` = '%s',
+ `about` = '%s',
+ `interest` = '%s',
+ `contact` = '%s',
+ `music` = '%s',
+ `book` = '%s',
+ `tv` = '%s',
+ `film` = '%s',
+ `romance` = '%s',
+ `work` = '%s',
+ `education` = '%s'
WHERE `id` = %d AND `uid` = %d LIMIT 1",
dbesc($profile_name),
dbesc($name),
dbesc($gender),
+ dbesc($dob),
dbesc($address),
dbesc($locality),
dbesc($region),
dbesc($postal_code),
dbesc($country_name),
dbesc($marital),
+ dbesc($sexual),
dbesc($homepage),
+ dbesc($politic),
+ dbesc($religion),
dbesc($about),
+ dbesc($interest),
+ dbesc($contact),
+ dbesc($music),
+ dbesc($book),
+ dbesc($tv),
+ dbesc($film),
+ dbesc($romance),
+ dbesc($work),
+ dbesc($education),
intval($a->argv[1]),
intval($_SESSION['uid'])
);
@@ -101,6 +149,38 @@ function profiles_content(&$a) {
return;
}
+ if(($a->argc > 2) && ($a->argv[1] == "drop") && intval($a->argv[2])) {
+ $r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is-default` = 0 LIMIT 1",
+ intval($a->argv[2]),
+ intval($_SESSION['uid'])
+ );
+ if(! count($r)) {
+ $_SESSION['sysmsg'] .= "Profile not found." . EOL;
+ goaway($a->get_baseurl() . '/profiles');
+ return; // NOTREACHED
+ }
+
+ // move every contact using this profile as their default to the user default
+
+ $r = q("UPDATE `contact` SET `profile-id` = (SELECT `profile`.`id` AS `profile-id` FROM `profile` WHERE `profile`.`is-default` = 1 AND `profile`.`uid` = %d LIMIT 1) WHERE `profile-id` = %d AND `uid` = %d ",
+ intval($_SESSION['uid']),
+ intval($a->argv[2]),
+ intval($_SESSION['uid'])
+ );
+ $r = q("DELETE FROM `profile` WHERE `id` = %d LIMIT 1",
+ intval($a->argv[2])
+ );
+ if($r)
+ notice("Profile deleted." . EOL);
+
+ goaway($a->get_baseurl() . '/profiles');
+ return; // NOTREACHED
+ }
+
+
+
+
+
if(($a->argc > 1) && ($a->argv[1] == 'new')) {
$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
@@ -171,9 +251,6 @@ function profiles_content(&$a) {
}
-
-
-
if(intval($a->argv[1])) {
$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($a->argv[1]),
@@ -185,7 +262,7 @@ function profiles_content(&$a) {
}
require_once('mod/profile.php');
- profile_load($a,$_SESSION['uid'],$r[0]['id']);
+ profile_load($a,$a->user['nickname'],$r[0]['id']);
require_once('view/profile_selectors.php');
@@ -196,6 +273,12 @@ function profiles_content(&$a) {
'$no_selected' => (($r[0]['publish'] == 0) ? " checked=\"checked\" " : "")
));
+ $opt_tpl = file_get_contents("view/profile-hide-friends.tpl");
+ $hide_friends = replace_macros($opt_tpl,array(
+ '$yes_selected' => (($r[0]['hide-friends']) ? " checked=\"checked\" " : ""),
+ '$no_selected' => (($r[0]['hide-friends'] == 0) ? " checked=\"checked\" " : "")
+ ));
+
$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
$a->page['htmlhead'] .= "";
@@ -207,24 +290,36 @@ function profiles_content(&$a) {
$is_default = (($r[0]['is-default']) ? 1 : 0);
$tpl = file_get_contents("view/profile_edit.tpl");
$o .= replace_macros($tpl,array(
+ '$disabled' => (($is_default) ? 'onclick="return false;" style="color: #BBBBFF;"' : ''),
'$baseurl' => $a->get_baseurl(),
'$profile_id' => $r[0]['id'],
'$profile_name' => $r[0]['profile-name'],
- '$default' => (($is_default) ? "This is your public profile.
" : ""),
+ '$default' => (($is_default) ? "This is your public profile.
It may be visible to anybody using the internet.
" : ""),
'$name' => $r[0]['name'],
'$dob' => dob($r[0]['dob']),
- '$hide_birth' => (($r[0]['dob_hide']) ? " checked=\"checked\" " : ""),
+ '$hide_friends' => $hide_friends,
'$address' => $r[0]['address'],
'$locality' => $r[0]['locality'],
'$region' => $r[0]['region'],
'$postal_code' => $r[0]['postal-code'],
'$country_name' => $r[0]['country-name'],
- '$age' => $r[0]['age'],
+ '$age' => ((intval($r[0]['dob'])) ? '(Age: '. age($r[0]['dob'],$a->user['timezone'],$a->user['timezone']) . ')' : ''),
'$gender' => gender_selector($r[0]['gender']),
'$marital' => marital_selector($r[0]['marital']),
'$sexual' => sexpref_selector($r[0]['sexual']),
'$about' => $r[0]['about'],
'$homepage' => $r[0]['homepage'],
+ '$politic' => $r[0]['politic'],
+ '$religion' => $r[0]['religion'],
+ '$music' => $r[0]['music'],
+ '$book' => $r[0]['book'],
+ '$tv' => $r[0]['tv'],
+ '$film' => $r[0]['film'],
+ '$interest' => $r[0]['interest'],
+ '$romance' => $r[0]['romance'],
+ '$work' => $r[0]['work'],
+ '$education' => $r[0]['education'],
+ '$contact' => $r[0]['contact'],
'$profile_in_dir' => (($is_default) ? $profile_in_dir : '')
));