X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofiles.php;h=ccd7d54741af192aed688c4449182d6d158aaf42;hb=e25fb2b2f9a822fa7180448ddff7f558dfc34fee;hp=4bbfbb44cbc7f047854086b670b31065da4edc39;hpb=7a21a000a2b02e7dd443fd0f3ee09172de825b08;p=friendica.git diff --git a/mod/profiles.php b/mod/profiles.php old mode 100644 new mode 100755 index 4bbfbb44cb..ccd7d54741 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -4,23 +4,28 @@ function profiles_post(&$a) { if(! local_user()) { - $_SESSION['sysmsg'] .= "Unauthorised." . EOL; + notice( t('Permission denied.') . EOL); return; } - 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", + + $namechanged = false; + + 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($r)) { - $_SESSION['sysmsg'] .= "Profile not found." . EOL; + if(! count($orig)) { + notice( t('Profile not found.') . EOL); return; } - $is_default = (($r[0]['is-default']) ? 1 : 0); + $is_default = (($orig[0]['is-default']) ? 1 : 0); $profile_name = notags(trim($_POST['profile_name'])); if(! strlen($profile_name)) { - $a->$_SESSION['sysmsg'] .= "Profile Name is required." . EOL; + notify( t('Profile Name is required.') . EOL); return; } @@ -39,13 +44,75 @@ function profiles_post(&$a) { $name = notags(trim($_POST['name'])); + + 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']))); + $pub_keywords = notags(trim($_POST['pub_keywords'])); + $prv_keywords = notags(trim($_POST['prv_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'])); @@ -61,14 +128,12 @@ 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(! in_array($gender,array('','Male','Female','Other'))) - $gender = ''; + $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', @@ -77,10 +142,13 @@ function profiles_post(&$a) { `postal-code` = '%s', `country-name` = '%s', `marital` = '%s', + `with` = '%s', `sexual` = '%s', `homepage` = '%s', `politic` = '%s', `religion` = '%s', + `pub_keywords` = '%s', + `prv_keywords` = '%s', `about` = '%s', `interest` = '%s', `contact` = '%s', @@ -90,10 +158,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), @@ -102,10 +172,13 @@ function profiles_post(&$a) { dbesc($postal_code), dbesc($country_name), dbesc($marital), + dbesc($with), dbesc($sexual), dbesc($homepage), dbesc($politic), dbesc($religion), + dbesc($pub_keywords), + dbesc($prv_keywords), dbesc($about), dbesc($interest), dbesc($contact), @@ -116,48 +189,54 @@ function profiles_post(&$a) { dbesc($romance), dbesc($work), dbesc($education), + intval($hide_friends), intval($a->argv[1]), intval($_SESSION['uid']) ); if($r) - $_SESSION['sysmsg'] .= "Profile updated." . EOL; + info( t('Profile updated.') . EOL); - if($is_default) { - $r = q("UPDATE `profile` - SET `publish` = %d - WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($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(local_user()) ); } + if($is_default) { + // Update global directory in background + $url = $_SESSION['my_url']; + if($url && strlen(get_config('system','directory_submit_url'))) + proc_run('php',"include/directory.php","$url"); + require_once('include/profile_update.php'); + profile_change(); + } } - - - } function profiles_content(&$a) { + + $o = ''; + nav_set_selected('profiles'); + if(! local_user()) { - $_SESSION['sysmsg'] .= "Unauthorised." . EOL; + 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 LIMIT 1", intval($a->argv[2]), - intval($_SESSION['uid']) + intval(local_user()) ); if(! count($r)) { - $_SESSION['sysmsg'] .= "Profile not found." . EOL; + notice( t('Profile not found.') . EOL); goaway($a->get_baseurl() . '/profiles'); return; // NOTREACHED } @@ -165,15 +244,16 @@ 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]) + $r = q("DELETE FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1", + intval($a->argv[2]), + intval(local_user()) ); if($r) - notice("Profile deleted." . EOL); + info( t('Profile deleted.') . EOL); goaway($a->get_baseurl() . '/profiles'); return; // NOTREACHED @@ -183,69 +263,71 @@ 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 = "Profile-" . ($num_profiles + 1); + $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) ); - $_SESSION['sysmsg'] .= "New profile created." . EOL; + + info( 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 = "Profile-" . ($num_profiles + 1); + $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)) { - notice("Profile unavailable to clone." . EOL); + notice( t('Profile unavailable to clone.') . EOL); 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 = 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) ); - $_SESSION['sysmsg'] .= "New profile created." . EOL; + info( t('New profile created.') . EOL); if(count($r3) == 1) goaway($a->get_baseurl() . '/profiles/' . $r3[0]['id']); goaway($a->get_baseurl() . '/profiles'); @@ -253,53 +335,87 @@ 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)) { - $_SESSION['sysmsg'] .= "Profile not found." . EOL; + notice( t('Profile not found.') . EOL); return; } - 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'); + require_once('include/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\" " : "") - )); + $tpl = get_markup_template('profed_head.tpl'); - $opt_tpl = file_get_contents("view/profile-hide-friends.tpl"); + $opt_tpl = get_markup_template("profile-hide-friends.tpl"); $hide_friends = replace_macros($opt_tpl,array( + '$desc' => t('Hide your contact/friend list from viewers of this profile?'), + '$yes_str' => t('Yes'), + '$no_str' => t('No'), '$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'] .= ""; - + $a->page['htmlhead'] .= ""; - - + $f = get_config('system','birthday_input_format'); + if(! $f) + $f = 'ymd'; $is_default = (($r[0]['is-default']) ? 1 : 0); - $tpl = file_get_contents("view/profile_edit.tpl"); + $tpl = get_markup_template("profile_edit.tpl"); $o .= replace_macros($tpl,array( + '$banner' => t('Edit Profile Details'), + '$submit' => t('Submit'), + '$viewprof' => t('View this profile'), + '$cr_prof' => t('Create a new profile using these settings'), + '$cl_prof' => t('Clone this profile'), + '$del_prof' => t('Delete this profile'), + '$lbl_profname' => t('Profile Name:'), + '$lbl_fullname' => t('Your Full Name:'), + '$lbl_title' => t('Title/Description:'), + '$lbl_gender' => t('Your Gender:'), + '$lbl_bd' => sprintf( t("Birthday \x28%s\x29:"),datesel_format($f)), + '$lbl_address' => t('Street Address:'), + '$lbl_city' => t('Locality/City:'), + '$lbl_zip' => t('Postal/Zip Code:'), + '$lbl_country' => t('Country:'), + '$lbl_region' => t('Region/State:'), + '$lbl_marital' => t('♥ Marital Status:'), + '$lbl_with' => t("Who: \x28if applicable\x29"), + '$lbl_ex1' => t('Examples: cathy123, Cathy Williams, cathy@example.com'), + '$lbl_sexual' => t('Sexual Preference:'), + '$lbl_homepage' => t('Homepage URL:'), + '$lbl_politic' => t('Political Views:'), + '$lbl_religion' => t('Religious Views:'), + '$lbl_pubkey' => t('Public Keywords:'), + '$lbl_prvkey' => t('Private Keywords:'), + '$lbl_ex2' => t('Example: fishing photography software'), + '$lbl_pubdsc' => t("\x28Used for suggesting potential friends, can be seen by others\x29"), + '$lbl_prvdsc' => t("\x28Used for searching profiles, never shown to others\x29"), + '$lbl_about' => t('Tell us about yourself...'), + '$lbl_hobbies' => t('Hobbies/Interests'), + '$lbl_social' => t('Contact information and Social Networks'), + '$lbl_music' => t('Musical interests'), + '$lbl_book' => t('Books, literature'), + '$lbl_tv' => t('Television'), + '$lbl_film' => t('Film/dance/culture/entertainment'), + '$lbl_love' => t('Love/romance'), + '$lbl_work' => t('Work/employment'), + '$lbl_school' => t('School/education'), + '$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.
It may be visible to anybody using the internet.

" : ""), + '$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'], @@ -307,14 +423,17 @@ function profiles_content(&$a) { '$region' => $r[0]['region'], '$postal_code' => $r[0]['postal-code'], '$country_name' => $r[0]['country-name'], - '$age' => ((intval($r[0]['dob'])) ? '(Age: '. age($r[0]['dob'],$a->user['timezone'],$a->user['timezone']) . ')' : ''), + '$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'], + '$pub_keywords' => $r[0]['pub_keywords'], + '$prv_keywords' => $r[0]['prv_keywords'], '$music' => $r[0]['music'], '$book' => $r[0]['book'], '$tv' => $r[0]['tv'], @@ -323,34 +442,42 @@ 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 : '') + '$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'); + $tpl_header = get_markup_template('profile_listing_header.tpl'); + $o .= replace_macros($tpl_header,array( + '$header' => t('Edit/Manage Profiles'), + '$chg_photo' => t('Change profile photo'), + '$cr_new' => t('Create New Profile') + )); + + + $tpl = get_markup_template('profile_entry.tpl'); foreach($r as $rr) { - $template = (($rr['is-default']) ? $tpl_default : $tpl); - $o .= replace_macros($template, array( + $o .= replace_macros($tpl, array( '$photo' => $rr['thumb'], '$id' => $rr['id'], - '$profile_name' => $rr['profile-name'] + '$alt' => t('Profile Image'), + '$profile_name' => $rr['profile-name'], + '$visible' => (($rr['is-default']) ? '' . t('visible to everybody') . '' + : '' . t('Edit visibility') . '') )); } } return $o; } -} \ No newline at end of file +}