X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofiles.php;h=9e19caa0b0a4ff60e10cf8561a03233ce4ce6e0e;hb=c3cb3d75e593faa06e4050a016ef1893bd5a4a3a;hp=71e037718e7df5552195ea60c04640fcd2bdb63c;hpb=e0045a43e22082e0a47fd57288105a21311e911a;p=friendica.git diff --git a/mod/profiles.php b/mod/profiles.php index 71e037718e..9e19caa0b0 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -10,10 +10,12 @@ function profiles_post(&$a) { $namechanged = false; - if(($a->argc > 1) && ($a->argv[1] != "new") && intval($a->argv[1])) { + call_hooks('profile_post', $_POST); + + 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); @@ -46,17 +48,70 @@ function profiles_post(&$a) { if($orig[0]['name'] != $name) $namechanged = true; + $pdesc = notags(trim($_POST['pdesc'])); $gender = notags(trim($_POST['gender'])); $address = notags(trim($_POST['address'])); $locality = notags(trim($_POST['locality'])); $region = notags(trim($_POST['region'])); $postal_code = notags(trim($_POST['postal_code'])); $country_name = notags(trim($_POST['country_name'])); - - $marital = notags(trim(implode(', ',$_POST['marital']))); + $keywords = notags(trim($_POST['keywords'])); + $marital = notags(trim($_POST['marital'])); 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,'@') === 0) + $lookup = substr($lookup,1); + $lookup = str_replace('_',' ', $lookup); + 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,'' . $newname . '', $with); + if(strpos($with,'@') === 0) + $with = substr($with,1); + } + } + else + $with = $orig[0]['with']; + } + $sexual = notags(trim($_POST['sexual'])); $homepage = notags(trim($_POST['homepage'])); $politic = notags(trim($_POST['politic'])); @@ -72,15 +127,13 @@ function profiles_post(&$a) { $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(x($_POST,'profile_in_netdirectory')) - $net_publish = (($_POST['profile_in_netdirectory'] == 1) ? 1: 0); + $hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0); $r = q("UPDATE `profile` SET `profile-name` = '%s', `name` = '%s', + `pdesc` = '%s', `gender` = '%s', `dob` = '%s', `address` = '%s', @@ -89,10 +142,12 @@ function profiles_post(&$a) { `postal-code` = '%s', `country-name` = '%s', `marital` = '%s', + `with` = '%s', `sexual` = '%s', `homepage` = '%s', `politic` = '%s', `religion` = '%s', + `keywords` = '%s', `about` = '%s', `interest` = '%s', `contact` = '%s', @@ -102,10 +157,12 @@ function profiles_post(&$a) { `film` = '%s', `romance` = '%s', `work` = '%s', - `education` = '%s' + `education` = '%s', + `hide-friends` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1", dbesc($profile_name), dbesc($name), + dbesc($pdesc), dbesc($gender), dbesc($dob), dbesc($address), @@ -114,10 +171,12 @@ function profiles_post(&$a) { dbesc($postal_code), dbesc($country_name), dbesc($marital), + dbesc($with), dbesc($sexual), dbesc($homepage), dbesc($politic), dbesc($religion), + dbesc($keywords), dbesc($about), dbesc($interest), dbesc($contact), @@ -128,6 +187,7 @@ function profiles_post(&$a) { dbesc($romance), dbesc($work), dbesc($education), + intval($hide_friends), intval($a->argv[1]), intval($_SESSION['uid']) ); @@ -136,30 +196,18 @@ function profiles_post(&$a) { notice( t('Profile updated.') . EOL); - if($is_default) { - $r = q("UPDATE `profile` - SET `publish` = %d, `net-publish` = %d - WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($publish), - intval($net_publish), - intval($a->argv[1]), - intval($_SESSION['uid']) - - ); - } 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()) ); } + if($is_default) { // 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_run('php',"include/directory.php","$url"); } } } @@ -168,15 +216,19 @@ function profiles_post(&$a) { function profiles_content(&$a) { + + $o = ''; + $o .= ''; + if(! local_user()) { notice( t('Permission denied.') . EOL); 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", + 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); @@ -187,9 +239,9 @@ function profiles_content(&$a) { // 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]) @@ -205,45 +257,46 @@ function profiles_content(&$a) { - 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']), - dbesc($ra[0]['thumb']) + dbesc($r1[0]['thumb']) ); $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(count($r3) == 1) goaway($a->get_baseurl() . '/profiles/' . $r3[0]['id']); 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)) { @@ -253,18 +306,19 @@ function profiles_content(&$a) { 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 = 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); @@ -275,41 +329,23 @@ function profiles_content(&$a) { } - 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'); - - $tpl = file_get_contents('view/profed_head.tpl'); - $opt_tpl = file_get_contents("view/profile-in-directory.tpl"); - $profile_in_dir = replace_macros($opt_tpl,array( - '$yes_selected' => (($r[0]['publish']) ? " checked=\"checked\" " : ""), - '$no_selected' => (($r[0]['publish'] == 0) ? " checked=\"checked\" " : "") - )); - - if(strlen(get_config('system','directory_submit_url'))) { - $opt_tpl = file_get_contents("view/profile-in-netdir.tpl"); - - $profile_in_net_dir = replace_macros($opt_tpl,array( - '$yes_selected' => (($r[0]['net-publish']) ? " checked=\"checked\" " : ""), - '$no_selected' => (($r[0]['net-publish'] == 0) ? " checked=\"checked\" " : "") - )); - } - else - $profile_in_net_dir = ''; + require_once('include/profile_selectors.php'); + $tpl = load_view_file('view/profed_head.tpl'); - $opt_tpl = file_get_contents("view/profile-hide-friends.tpl"); + $opt_tpl = load_view_file("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\" " : "") @@ -320,11 +356,8 @@ function profiles_content(&$a) { $a->page['htmlhead'] .= ""; - - - $is_default = (($r[0]['is-default']) ? 1 : 0); - $tpl = file_get_contents("view/profile_edit.tpl"); + $tpl = load_view_file("view/profile_edit.tpl"); $o .= replace_macros($tpl,array( '$disabled' => (($is_default) ? 'onclick="return false;" style="color: #BBBBFF;"' : ''), '$baseurl' => $a->get_baseurl(), @@ -332,6 +365,7 @@ function profiles_content(&$a) { '$profile_name' => $r[0]['profile-name'], '$default' => (($is_default) ? '

' . t('This is your public profile.
It may be visible to anybody using the internet.') . '

' : ""), '$name' => $r[0]['name'], + '$pdesc' => $r[0]['pdesc'], '$dob' => dob($r[0]['dob']), '$hide_friends' => $hide_friends, '$address' => $r[0]['address'], @@ -342,11 +376,13 @@ function profiles_content(&$a) { '$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'], '$politic' => $r[0]['politic'], '$religion' => $r[0]['religion'], + '$keywords' => $r[0]['keywords'], '$music' => $r[0]['music'], '$book' => $r[0]['book'], '$tv' => $r[0]['tv'], @@ -355,30 +391,30 @@ function profiles_content(&$a) { '$romance' => $r[0]['romance'], '$work' => $r[0]['work'], '$education' => $r[0]['education'], - '$contact' => $r[0]['contact'], - '$profile_in_dir' => (($is_default) ? $profile_in_dir : ''), - '$profile_in_net_dir' => (($is_default) ? $profile_in_net_dir : '') + '$contact' => $r[0]['contact'] )); - return $o; - + $arr = array('profile' => $r[0], 'entry' => $o); + call_hooks('profile_edit', $arr); + return $o; } else { $r = q("SELECT * FROM `profile` WHERE `uid` = %d", - $_SESSION['uid']); + local_user()); if(count($r)) { - $o .= file_get_contents('view/profile_listing_header.tpl'); - $tpl_default = file_get_contents('view/profile_entry_default.tpl'); - $tpl = file_get_contents('view/profile_entry.tpl'); + $o .= load_view_file('view/profile_listing_header.tpl'); + $tpl_default = load_view_file('view/profile_entry_default.tpl'); + $tpl = load_view_file('view/profile_entry.tpl'); foreach($r as $rr) { $template = (($rr['is-default']) ? $tpl_default : $tpl); $o .= replace_macros($template, array( '$photo' => $rr['thumb'], '$id' => $rr['id'], + '$alt' => t('Profile Image'), '$profile_name' => $rr['profile-name'] )); }