$namechanged = false;
- if(($a->argc > 1) && ($a->argv[1] != "new") && intval($a->argv[1])) {
+ if(($a->argc > 1) && ($a->argv[1] !== "new") && intval($a->argv[1])) {
$orig = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($a->argv[1]),
- intval($_SESSION['uid'])
+ intval(local_user())
);
if(! count($orig)) {
notice( t('Profile not found.') . EOL);
if($marital != $orig[0]['marital'])
$maritalchanged = true;
+ $with = ((x($_POST,'with')) ? notags(trim($_POST['with'])) : '');
+
+ // linkify the relationship target if applicable
+
+ if(strlen($with)) {
+ if($with != strip_tags($orig[0]['with'])) {
+ $prf = '';
+ $lookup = $with;
+ if((strpos($lookup,'@')) || (strpos($lookup,'http://'))) {
+ $newname = $lookup;
+ $links = @lrdd($lookup);
+ if(count($links)) {
+ foreach($links as $link) {
+ if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page') {
+ $prf = $link['@attributes']['href'];
+ }
+ }
+ }
+ }
+ else {
+ $newname = $lookup;
+ if(strstr($lookup,' ')) {
+ $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
+ dbesc($newname),
+ intval(local_user())
+ );
+ }
+ else {
+ $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,'<a href="' . $prf . '">' . $newname . '</a>', $with);
+ }
+ }
+ else
+ $with = $orig[0]['with'];
+ }
+
$sexual = notags(trim($_POST['sexual']));
$homepage = notags(trim($_POST['homepage']));
$politic = notags(trim($_POST['politic']));
`postal-code` = '%s',
`country-name` = '%s',
`marital` = '%s',
+ `with` = '%s',
`sexual` = '%s',
`homepage` = '%s',
`politic` = '%s',
dbesc($postal_code),
dbesc($country_name),
dbesc($marital),
+ dbesc($with),
dbesc($sexual),
dbesc($homepage),
dbesc($politic),
if($namechanged && $is_default) {
$r = q("UPDATE `contact` SET `name-date` = '%s' WHERE `self` = 1 AND `uid` = %d LIMIT 1",
dbesc(datetime_convert()),
- intval($_SESSION['uid'])
+ intval(local_user())
);
}
function profiles_content(&$a) {
+ $o = '';
$o .= '<script> $(document).ready(function() { $(\'#nav-profiles-link\').addClass(\'nav-selected\'); });</script>';
+
if(! local_user()) {
notice( t('Permission denied.') . EOL);
return;
}
- if(($a->argc > 2) && ($a->argv[1] == "drop") && intval($a->argv[2])) {
+ 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 AND `self` = 0 LIMIT 1",
intval($a->argv[2]),
- intval($_SESSION['uid'])
+ intval(local_user())
);
if(! count($r)) {
notice( t('Profile not found.') . EOL);
// 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(local_user()),
intval($a->argv[2]),
- intval($_SESSION['uid'])
+ intval(local_user())
);
$r = q("DELETE FROM `profile` WHERE `id` = %d LIMIT 1",
intval($a->argv[2])
- if(($a->argc > 1) && ($a->argv[1] == 'new')) {
+ if(($a->argc > 1) && ($a->argv[1] === 'new')) {
$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
- intval($_SESSION['uid']));
+ 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($_SESSION['uid']));
+ intval(local_user()));
$r2 = q("INSERT INTO `profile` (`uid` , `profile-name` , `name`, `photo`, `thumb`)
VALUES ( %d, '%s', '%s', '%s', '%s' )",
- intval($_SESSION['uid']),
+ intval(local_user()),
dbesc($name),
dbesc($r1[0]['name']),
dbesc($r1[0]['photo']),
);
$r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1",
- intval($_SESSION['uid']),
+ intval(local_user()),
dbesc($name)
);
notice( t('New profile created.') . EOL);
goaway($a->get_baseurl() . '/profiles');
}
- if(($a->argc > 2) && ($a->argv[1] == 'clone')) {
+ if(($a->argc > 2) && ($a->argv[1] === 'clone')) {
$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
- intval($_SESSION['uid']));
+ 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($_SESSION['uid']),
+ intval(local_user()),
intval($a->argv[2])
);
if(! count($r1)) {
dbesc_array($r1[0]);
- $r2 = q("INSERT INTO `profile` (`"
+ $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($_SESSION['uid']),
+ intval(local_user()),
dbesc($name)
);
notice( t('New profile created.') . EOL);
}
- if(intval($a->argv[1])) {
+ if(($a->argc > 1) && (intval($a->argv[1]))) {
$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($a->argv[1]),
- intval($_SESSION['uid'])
+ intval(local_user())
);
if(! count($r)) {
notice( t('Profile not found.') . EOL);
return;
}
- require_once('mod/profile.php');
profile_load($a,$a->user['nickname'],$r[0]['id']);
- require_once('view/profile_selectors.php');
+ require_once('include/profile_selectors.php');
$tpl = load_view_file('view/profed_head.tpl');
$a->page['htmlhead'] .= "<script type=\"text/javascript\" src=\"include/country.js\" ></script>";
-
-
-
$is_default = (($r[0]['is-default']) ? 1 : 0);
$tpl = load_view_file("view/profile_edit.tpl");
$o .= replace_macros($tpl,array(
'$age' => ((intval($r[0]['dob'])) ? '(' . t('Age: ') . age($r[0]['dob'],$a->user['timezone'],$a->user['timezone']) . ')' : ''),
'$gender' => gender_selector($r[0]['gender']),
'$marital' => marital_selector($r[0]['marital']),
+ '$with' => strip_tags($r[0]['with']),
'$sexual' => sexpref_selector($r[0]['sexual']),
'$about' => $r[0]['about'],
'$homepage' => $r[0]['homepage'],
));
return $o;
-
-
}
else {
$r = q("SELECT * FROM `profile` WHERE `uid` = %d",
- $_SESSION['uid']);
+ local_user());
if(count($r)) {
$o .= load_view_file('view/profile_listing_header.tpl');