X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofiles.php;h=39382fbdd5b6c14b671289b60680151c51531776;hb=49d52faab5900dfe0ec66d8eec7a51473e7c1344;hp=ca3890eb9466e39aa7be7354e450fd0e38662b76;hpb=040d1467f356eb7a5d940b9cd779eb735b401794;p=friendica.git
diff --git a/mod/profiles.php b/mod/profiles.php
index ca3890eb94..39382fbdd5 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -1,5 +1,163 @@
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(local_user())
+ );
+ if(! count($r)) {
+ notice( t('Profile not found.') . EOL);
+ goaway('profiles');
+ return; // NOTREACHED
+ }
+
+ check_form_security_token_redirectOnErr('/profiles', 'profile_drop', 't');
+
+ // 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(local_user()),
+ intval($a->argv[2]),
+ intval(local_user())
+ );
+ $r = q("DELETE FROM `profile` WHERE `id` = %d AND `uid` = %d",
+ intval($a->argv[2]),
+ intval(local_user())
+ );
+ if($r)
+ info(t('Profile deleted.').EOL);
+
+ goaway('profiles');
+ return; // NOTREACHED
+ }
+
+
+
+
+
+ if(($a->argc > 1) && ($a->argv[1] === 'new')) {
+
+ check_form_security_token_redirectOnErr('/profiles', 'profile_new', 't');
+
+ $r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
+ intval(local_user()));
+ $num_profiles = count($r0);
+
+ $name = t('Profile-') . ($num_profiles + 1);
+
+ $r1 = q("SELECT `name`, `photo`, `thumb` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
+ intval(local_user()));
+
+ $r2 = q("INSERT INTO `profile` (`uid` , `profile-name` , `name`, `photo`, `thumb`)
+ VALUES ( %d, '%s', '%s', '%s', '%s' )",
+ intval(local_user()),
+ dbesc($name),
+ dbesc($r1[0]['name']),
+ dbesc($r1[0]['photo']),
+ dbesc($r1[0]['thumb'])
+ );
+
+ $r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1",
+ intval(local_user()),
+ dbesc($name)
+ );
+
+ info( t('New profile created.') . EOL);
+ if(count($r3) == 1)
+ goaway('profiles/'.$r3[0]['id']);
+
+ goaway('profiles');
+ }
+
+ if(($a->argc > 2) && ($a->argv[1] === 'clone')) {
+
+ check_form_security_token_redirectOnErr('/profiles', 'profile_clone', 't');
+
+ $r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
+ intval(local_user()));
+ $num_profiles = count($r0);
+
+ $name = t('Profile-') . ($num_profiles + 1);
+ $r1 = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d LIMIT 1",
+ intval(local_user()),
+ intval($a->argv[2])
+ );
+ if(! count($r1)) {
+ notice( t('Profile unavailable to clone.') . EOL);
+ killme();
+ return;
+ }
+ unset($r1[0]['id']);
+ $r1[0]['is-default'] = 0;
+ $r1[0]['publish'] = 0;
+ $r1[0]['net-publish'] = 0;
+ $r1[0]['profile-name'] = dbesc($name);
+
+ dbesc_array($r1[0]);
+
+ $r2 = dbq("INSERT INTO `profile` (`"
+ . implode("`, `", array_keys($r1[0]))
+ . "`) VALUES ('"
+ . implode("', '", array_values($r1[0]))
+ . "')" );
+
+ $r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1",
+ intval(local_user()),
+ dbesc($name)
+ );
+ info( t('New profile created.') . EOL);
+ if(count($r3) == 1)
+ goaway('profiles/'.$r3[0]['id']);
+
+ goaway('profiles');
+
+ return; // NOTREACHED
+ }
+
+
+ if(($a->argc > 1) && (intval($a->argv[1]))) {
+ $r = q("SELECT id FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+ intval($a->argv[1]),
+ intval(local_user())
+ );
+ if(! count($r)) {
+ notice( t('Profile not found.') . EOL);
+ killme();
+ return;
+ }
+
+ profile_load($a,$a->user['nickname'],$r[0]['id']);
+ }
+
+
+
+}
+
+function profile_clean_keywords($keywords) {
+ $keywords = str_replace(","," ",$keywords);
+ $keywords = explode(" ", $keywords);
+
+ $cleaned = array();
+ foreach ($keywords as $keyword) {
+ $keyword = trim(strtolower($keyword));
+ $keyword = trim($keyword, "#");
+ if ($keyword != "")
+ $cleaned[] = $keyword;
+ }
+
+ $keywords = implode(", ", $cleaned);
+
+ return $keywords;
+}
function profiles_post(&$a) {
@@ -21,37 +179,45 @@ function profiles_post(&$a) {
notice( t('Profile not found.') . EOL);
return;
}
-
+
check_form_security_token_redirectOnErr('/profiles', 'profile_edit');
-
+
$is_default = (($orig[0]['is-default']) ? 1 : 0);
$profile_name = notags(trim($_POST['profile_name']));
if(! strlen($profile_name)) {
- notify( t('Profile Name is required.') . EOL);
+ notice( t('Profile Name is required.') . EOL);
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);
-
-
+
+ $dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0000-00-00'; // FIXME: Needs to be validated?
+
+ $y = substr($dob,0,4);
+ if((! ctype_digit($y)) || ($y < 1900))
+ $ignore_year = true;
+ else
+ $ignore_year = false;
+ if($dob != '0000-00-00') {
+ if(strpos($dob,'0000-') === 0) {
+ $ignore_year = true;
+ $dob = substr($dob,5);
+ }
+ $dob = datetime_convert('UTC','UTC',(($ignore_year) ? '1900-' . $dob : $dob),(($ignore_year) ? 'm-d' : 'Y-m-d'));
+ if($ignore_year)
+ $dob = '0000-' . $dob;
+ }
+
$name = notags(trim($_POST['name']));
+ if(! strlen($name)) {
+ $name = '[No Name]';
+ }
+
if($orig[0]['name'] != $name)
$namechanged = true;
+
$pdesc = notags(trim($_POST['pdesc']));
$gender = notags(trim($_POST['gender']));
$address = notags(trim($_POST['address']));
@@ -59,12 +225,18 @@ function profiles_post(&$a) {
$region = notags(trim($_POST['region']));
$postal_code = notags(trim($_POST['postal_code']));
$country_name = notags(trim($_POST['country_name']));
- $pub_keywords = notags(trim($_POST['pub_keywords']));
- $prv_keywords = notags(trim($_POST['prv_keywords']));
+ $pub_keywords = profile_clean_keywords(notags(trim($_POST['pub_keywords'])));
+ $prv_keywords = profile_clean_keywords(notags(trim($_POST['prv_keywords'])));
$marital = notags(trim($_POST['marital']));
+ $howlong = notags(trim($_POST['howlong']));
$with = ((x($_POST,'with')) ? notags(trim($_POST['with'])) : '');
+ if(! strlen($howlong))
+ $howlong = '0000-00-00 00:00:00';
+ else
+ $howlong = datetime_convert(date_default_timezone_get(),'UTC',$howlong);
+
// linkify the relationship target if applicable
$withchanged = false;
@@ -90,7 +262,7 @@ function profiles_post(&$a) {
}
else {
$newname = $lookup;
- if(strstr($lookup,' ')) {
+/* if(strstr($lookup,' ')) {
$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
dbesc($newname),
intval(local_user())
@@ -101,13 +273,24 @@ function profiles_post(&$a) {
dbesc($lookup),
intval(local_user())
);
+ }*/
+
+ $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
+ dbesc($newname),
+ intval(local_user())
+ );
+ if(! $r) {
+ $r = q("SELECT * FROM `contact` WHERE `nick` = '%s' AND `uid` = %d LIMIT 1",
+ dbesc($lookup),
+ intval(local_user())
+ );
}
if(count($r)) {
$prf = $r[0]['url'];
$newname = $r[0]['name'];
}
}
-
+
if($prf) {
$with = str_replace($lookup,'' . $newname . '', $with);
if(strpos($with,'@') === 0)
@@ -120,9 +303,17 @@ function profiles_post(&$a) {
$sexual = notags(trim($_POST['sexual']));
$homepage = notags(trim($_POST['homepage']));
+ if ((strpos($homepage, 'http') !== 0) && (strlen($homepage))) {
+ // neither http nor https in URL, add them
+ $homepage = 'http://'.$homepage;
+ }
+ $hometown = notags(trim($_POST['hometown']));
$politic = notags(trim($_POST['politic']));
$religion = notags(trim($_POST['religion']));
+ $likes = fix_mce_lf(escape_tags(trim($_POST['likes'])));
+ $dislikes = fix_mce_lf(escape_tags(trim($_POST['dislikes'])));
+
$about = fix_mce_lf(escape_tags(trim($_POST['about'])));
$interest = fix_mce_lf(escape_tags(trim($_POST['interest'])));
$contact = fix_mce_lf(escape_tags(trim($_POST['contact'])));
@@ -136,7 +327,7 @@ function profiles_post(&$a) {
$hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
-
+ set_pconfig(local_user(),'system','detailled_profile', (($_POST['detailled_profile'] == 1) ? 1: 0));
$changes = array();
$value = '';
@@ -148,7 +339,15 @@ function profiles_post(&$a) {
if($withchanged) {
$changes[] = '[color=#ff0000]♥[/color] ' . t('Romantic Partner');
$value = strip_tags($with);
- }
+ }
+ if($likes != $orig[0]['likes']) {
+ $changes[] = t('Likes');
+ $value = $likes;
+ }
+ if($dislikes != $orig[0]['dislikes']) {
+ $changes[] = t('Dislikes');
+ $value = $dislikes;
+ }
if($work != $orig[0]['work']) {
$changes[] = t('Work/Employment');
}
@@ -192,9 +391,9 @@ function profiles_post(&$a) {
profile_activity($changes,$value);
- }
-
- $r = q("UPDATE `profile`
+ }
+
+ $r = q("UPDATE `profile`
SET `profile-name` = '%s',
`name` = '%s',
`pdesc` = '%s',
@@ -207,12 +406,16 @@ function profiles_post(&$a) {
`country-name` = '%s',
`marital` = '%s',
`with` = '%s',
+ `howlong` = '%s',
`sexual` = '%s',
`homepage` = '%s',
+ `hometown` = '%s',
`politic` = '%s',
`religion` = '%s',
`pub_keywords` = '%s',
`prv_keywords` = '%s',
+ `likes` = '%s',
+ `dislikes` = '%s',
`about` = '%s',
`interest` = '%s',
`contact` = '%s',
@@ -224,7 +427,7 @@ function profiles_post(&$a) {
`work` = '%s',
`education` = '%s',
`hide-friends` = %d
- WHERE `id` = %d AND `uid` = %d LIMIT 1",
+ WHERE `id` = %d AND `uid` = %d",
dbesc($profile_name),
dbesc($name),
dbesc($pdesc),
@@ -237,12 +440,16 @@ function profiles_post(&$a) {
dbesc($country_name),
dbesc($marital),
dbesc($with),
+ dbesc($howlong),
dbesc($sexual),
dbesc($homepage),
+ dbesc($hometown),
dbesc($politic),
dbesc($religion),
dbesc($pub_keywords),
dbesc($prv_keywords),
+ dbesc($likes),
+ dbesc($dislikes),
dbesc($about),
dbesc($interest),
dbesc($contact),
@@ -263,16 +470,31 @@ function profiles_post(&$a) {
if($namechanged && $is_default) {
- $r = q("UPDATE `contact` SET `name-date` = '%s' WHERE `self` = 1 AND `uid` = %d LIMIT 1",
+ $r = q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `self` = 1 AND `uid` = %d",
+ dbesc($name),
dbesc(datetime_convert()),
intval(local_user())
);
+ $r = q("UPDATE `user` set `username` = '%s' where `uid` = %d",
+ dbesc($name),
+ intval(local_user())
+ );
}
if($is_default) {
+ $location = formatted_location(array("locality" => $locality, "region" => $region, "country-name" => $country_name));
+
+ $r = q("UPDATE `contact` SET `about` = '%s', `location` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `self` = 1 AND `uid` = %d",
+ dbesc($about),
+ dbesc($location),
+ dbesc($pub_keywords),
+ dbesc($gender),
+ intval(local_user())
+ );
+
// Update global directory in background
$url = $_SESSION['my_url'];
- if($url && strlen(get_config('system','directory_submit_url')))
+ if($url && strlen(get_config('system','directory')))
proc_run('php',"include/directory.php","$url");
require_once('include/profile_update.php');
@@ -304,7 +526,9 @@ function profile_activity($changed, $value) {
return;
$arr = array();
- $arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), local_user());
+
+ $arr['guid'] = get_guid(32);
+ $arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), local_user());
$arr['uid'] = local_user();
$arr['contact-id'] = $self[0]['id'];
$arr['wall'] = 1;
@@ -316,7 +540,7 @@ function profile_activity($changed, $value) {
$arr['author-avatar'] = $arr['owner-avatar'] = $self[0]['thumb'];
$arr['verb'] = ACTIVITY_UPDATE;
$arr['object-type'] = ACTIVITY_OBJ_PROFILE;
-
+
$A = '[url=' . $self[0]['url'] . ']' . $self[0]['name'] . '[/url]';
@@ -334,7 +558,7 @@ function profile_activity($changed, $value) {
$changes .= $ch;
}
- $prof = '[url=' . $self[0]['url'] . '?tab=profile' . ']' . t('public profile') . '[/url]';
+ $prof = '[url=' . $self[0]['url'] . '?tab=profile' . ']' . t('public profile') . '[/url]';
if($t == 1 && strlen($value)) {
$message = sprintf( t('%1$s changed %2$s to “%3$s”'), $A, $changes, $value);
@@ -342,9 +566,9 @@ function profile_activity($changed, $value) {
}
else
$message = sprintf( t('%1$s has an updated %2$s, changing %3$s.'), $A, $prof, $changes);
-
- $arr['body'] = $message;
+
+ $arr['body'] = $message;
$arr['object'] = '