X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofiles.php;h=abc9dda5560e1bdd5d54fea48c5326ae5c473ace;hb=a7ce601580b07e9b3e7653cbdb0a9b6bbb5c474e;hp=780a279b54897df42dd88c623ba9ac90e6a82bdb;hpb=de431e185e81cf7fe3f73b2977f777c040964479;p=friendica.git diff --git a/mod/profiles.php b/mod/profiles.php index 780a279b54..abc9dda556 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -1,11 +1,12 @@ argv[2]), intval(local_user()) ); - if(! count($r)) { + if (! dbm::is_result($r)) { notice( t('Profile not found.') . EOL); goaway('profiles'); return; // NOTREACHED @@ -91,7 +92,7 @@ function profiles_init(&$a) { intval(local_user()), intval($a->argv[2]) ); - if(! count($r1)) { + if(! dbm::is_result($r1)) { notice( t('Profile unavailable to clone.') . EOL); killme(); return; @@ -115,7 +116,7 @@ function profiles_init(&$a) { dbesc($name) ); info( t('New profile created.') . EOL); - if(count($r3) == 1) + if ((dbm::is_result($r3)) && (count($r3) == 1)) goaway('profiles/'.$r3[0]['id']); goaway('profiles'); @@ -129,7 +130,7 @@ function profiles_init(&$a) { intval($a->argv[1]), intval(local_user()) ); - if(! count($r)) { + if (! dbm::is_result($r)) { notice( t('Profile not found.') . EOL); killme(); return; @@ -159,9 +160,9 @@ function profile_clean_keywords($keywords) { return $keywords; } -function profiles_post(&$a) { +function profiles_post(App $a) { - if(! local_user()) { + if (! local_user()) { notice( t('Permission denied.') . EOL); return; } @@ -251,11 +252,11 @@ function profiles_post(&$a) { $lookup = str_replace('_',' ', $lookup); if(strpos($lookup,'@') || (strpos($lookup,'http://'))) { $newname = $lookup; - $links = @lrdd($lookup); + $links = @Probe::lrdd($lookup); if(count($links)) { foreach($links as $link) { if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page') { - $prf = $link['@attributes']['href']; + $prf = $link['@attributes']['href']; } } } @@ -285,7 +286,7 @@ function profiles_post(&$a) { intval(local_user()) ); } - if(count($r)) { + if (dbm::is_result($r)) { $prf = $r[0]['url']; $newname = $r[0]['name']; } @@ -302,10 +303,11 @@ function profiles_post(&$a) { } $sexual = notags(trim($_POST['sexual'])); + $xmpp = notags(trim($_POST['xmpp'])); $homepage = notags(trim($_POST['homepage'])); if ((strpos($homepage, 'http') !== 0) && (strlen($homepage))) { - // neither http nor https in URL, add them - $homepage = 'http://'.$homepage; + // neither http nor https in URL, add them + $homepage = 'http://'.$homepage; } $hometown = notags(trim($_POST['hometown'])); $politic = notags(trim($_POST['politic'])); @@ -367,6 +369,10 @@ function profiles_post(&$a) { $changes[] = t('Sexual Preference'); $value = $sexual; } + if($xmpp != $orig[0]['xmpp']) { + $changes[] = t('XMPP'); + $value = $xmpp; + } if($homepage != $orig[0]['homepage']) { $changes[] = t('Homepage'); $value = $homepage; @@ -408,6 +414,7 @@ function profiles_post(&$a) { `with` = '%s', `howlong` = '%s', `sexual` = '%s', + `xmpp` = '%s', `homepage` = '%s', `hometown` = '%s', `politic` = '%s', @@ -442,6 +449,7 @@ function profiles_post(&$a) { dbesc($with), dbesc($howlong), dbesc($sexual), + dbesc($xmpp), dbesc($homepage), dbesc($hometown), dbesc($politic), @@ -494,8 +502,9 @@ function profiles_post(&$a) { // Update global directory in background $url = $_SESSION['my_url']; - if($url && strlen(get_config('system','directory'))) - proc_run('php',"include/directory.php","$url"); + if ($url && strlen(get_config('system','directory'))) { + proc_run(PRIORITY_LOW, "include/directory.php", $url); + } require_once('include/profile_update.php'); profile_change(); @@ -586,15 +595,15 @@ function profile_activity($changed, $value) { $arr['deny_gid'] = $a->user['deny_gid']; $i = item_store($arr); - if($i) { - proc_run('php',"include/notifier.php","activity","$i"); + if ($i) { + proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i); } } -function profiles_content(&$a) { +function profiles_content(App $a) { - if(! local_user()) { + if (! local_user()) { notice( t('Permission denied.') . EOL); return; } @@ -606,7 +615,7 @@ function profiles_content(&$a) { intval($a->argv[1]), intval(local_user()) ); - if(! count($r)) { + if (! dbm::is_result($r)) { notice( t('Profile not found.') . EOL); return; } @@ -622,11 +631,11 @@ function profiles_content(&$a) { $editselect = 'textareas'; $a->page['htmlhead'] .= replace_macros(get_markup_template('profed_head.tpl'), array( - '$baseurl' => $a->get_baseurl(true), + '$baseurl' => App::get_baseurl(true), '$editselect' => $editselect, )); $a->page['end'] .= replace_macros(get_markup_template('profed_end.tpl'), array( - '$baseurl' => $a->get_baseurl(true), + '$baseurl' => App::get_baseurl(true), '$editselect' => $editselect, )); @@ -663,25 +672,29 @@ function profiles_content(&$a) { '$detailled_profile' => $detailled_profile, '$details' => array( - 'detailled_profile', //Name - t('Show more profile fields:'), //Label - $detailled_profile, //Value - '', //Help string - array(t('No'),t('Yes')) //Off - On strings - ), - - '$multi_profiles' => feature_enabled(local_user(),'multi_profiles'), - '$form_security_token' => get_form_security_token("profile_edit"), - '$form_security_token_photo' => get_form_security_token("profile_photo"), - '$profile_clone_link' => 'profiles/clone/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_clone"), - '$profile_drop_link' => 'profiles/drop/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_drop"), - '$banner' => t('Edit Profile Details'), - '$submit' => t('Submit'), - '$profpic' => t('Change Profile Photo'), - '$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'), + 'detailled_profile', //Name + t('Show more profile fields:'), //Label + $detailled_profile, //Value + '', //Help string + array(t('No'),t('Yes')) //Off - On strings + ), + + '$multi_profiles' => feature_enabled(local_user(),'multi_profiles'), + '$form_security_token' => get_form_security_token("profile_edit"), + '$form_security_token_photo' => get_form_security_token("profile_photo"), + '$profile_clone_link' => ((feature_enabled(local_user(),'multi_profiles')) ? 'profiles/clone/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_clone") : ""), + '$profile_drop_link' => 'profiles/drop/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_drop"), + + '$profile_action' => t('Profile Actions'), + '$banner' => t('Edit Profile Details'), + '$submit' => t('Submit'), + '$profpic' => t('Change Profile Photo'), + '$viewprof' => t('View this profile'), + '$editvis' => t('Edit visibility'), + '$cr_prof' => t('Create a new profile using these settings'), + '$cl_prof' => t('Clone this profile'), + '$del_prof' => t('Delete this profile'), + '$lbl_basic_section' => t('Basic information'), '$lbl_picture_section' => t('Profile picture'), '$lbl_location_section' => t('Location'), @@ -689,81 +702,56 @@ function profiles_content(&$a) { '$lbl_status_section' => t('Status information'), '$lbl_about_section' => t('Additional information'), '$lbl_interests_section' => t('Interests'), + '$lbl_personal_section' => t('Personal'), + '$lbl_relation_section' => t('Relation'), + '$lbl_miscellaneous_section' => t('Miscellaneous'), + '$lbl_profile_photo' => t('Upload Profile Photo'), - '$lbl_profname' => t('Profile Name:'), - '$lbl_fullname' => t('Your Full Name:'), - '$lbl_title' => t('Title/Description:'), '$lbl_gender' => t('Your Gender:'), - '$lbl_bd' => t("Birthday :"), - '$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_howlong' => t('Since [date]:'), '$lbl_sexual' => t('Sexual Preference:'), - '$lbl_homepage' => t('Homepage URL:'), - '$lbl_hometown' => t('Hometown:'), - '$lbl_politic' => t('Political Views:'), - '$lbl_religion' => t('Religious Views:'), - '$lbl_pubkey' => t('Public Keywords:'), - '$lbl_prvkey' => t('Private Keywords:'), - '$lbl_likes' => t('Likes:'), - '$lbl_dislikes' => t('Dislikes:'), '$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(true), + '$baseurl' => App::get_baseurl(true), '$profile_id' => $r[0]['id'], - '$profile_name' => $r[0]['profile-name'], + '$profile_name' => array('profile_name', t('Profile Name:'), $r[0]['profile-name'], t('Required'), '*'), + '$is_default' => $is_default, '$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'], + '$name' => array('name', t('Your Full Name:'), $r[0]['name']), + '$pdesc' => array('pdesc', t('Title/Description:'), $r[0]['pdesc']), '$dob' => dob($r[0]['dob']), '$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'], + '$address' => array('address', t('Street Address:'), $r[0]['address']), + '$locality' => array('locality', t('Locality/City:'), $r[0]['locality']), + '$region' => array('region', t('Region/State:'), $r[0]['region']), + '$postal_code' => array('postal_code', t('Postal/Zip Code:'), $r[0]['postal-code']), + '$country_name' => array('country_name', t('Country:'), $r[0]['country-name']), '$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']), - '$howlong' => ($r[0]['howlong'] === '0000-00-00 00:00:00' ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong'])), + '$with' => array('with', t("Who: \x28if applicable\x29"), strip_tags($r[0]['with']), t('Examples: cathy123, Cathy Williams, cathy@example.com')), + '$howlong' => array('howlong', t('Since [date]:'), ($r[0]['howlong'] === '0000-00-00 00:00:00' ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong']))), '$sexual' => sexpref_selector($r[0]['sexual']), - '$about' => $r[0]['about'], - '$homepage' => $r[0]['homepage'], - '$hometown' => $r[0]['hometown'], - '$politic' => $r[0]['politic'], - '$religion' => $r[0]['religion'], - '$pub_keywords' => $r[0]['pub_keywords'], - '$prv_keywords' => $r[0]['prv_keywords'], - '$likes' => $r[0]['likes'], - '$dislikes' => $r[0]['dislikes'], - '$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'] + '$about' => array('about', t('Tell us about yourself...'), $r[0]['about']), + '$xmpp' => array('xmpp', t('XMPP (Jabber) address:'), $r[0]['xmpp'], t("The XMPP address will be propagated to your contacts so that they can follow you.")), + '$homepage' => array('homepage', t('Homepage URL:'), $r[0]['homepage']), + '$hometown' => array('hometown', t('Hometown:'), $r[0]['hometown']), + '$politic' => array('politic', t('Political Views:'), $r[0]['politic']), + '$religion' => array('religion', t('Religious Views:'), $r[0]['religion']), + '$pub_keywords' => array('pub_keywords', t('Public Keywords:'), $r[0]['pub_keywords'], t("\x28Used for suggesting potential friends, can be seen by others\x29")), + '$prv_keywords' => array('prv_keywords', t('Private Keywords:'), $r[0]['prv_keywords'], t("\x28Used for searching profiles, never shown to others\x29")), + '$likes' => array('likes', t('Likes:'), $r[0]['likes']), + '$dislikes' => array('dislikes', t('Dislikes:'), $r[0]['dislikes']), + '$music' => array('music', t('Musical interests'), $r[0]['music']), + '$book' => array('book', t('Books, literature'), $r[0]['book']), + '$tv' => array('tv', t('Television'), $r[0]['tv']), + '$film' => array('film', t('Film/dance/culture/entertainment'), $r[0]['film']), + '$interest' => array('interest', t('Hobbies/Interests'), $r[0]['interest']), + '$romance' => array('romance',t('Love/romance'), $r[0]['romance']), + '$work' => array('work', t('Work/employment'), $r[0]['work']), + '$education' => array('education', t('School/education'), $r[0]['education']), + '$contact' => array('contact', t('Contact information and Social Networks'), $r[0]['contact']), )); $arr = array('profile' => $r[0], 'entry' => $o); @@ -781,7 +769,7 @@ function profiles_content(&$a) { "SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`=1", local_user() ); - if(count($r)){ + if (dbm::is_result($r)){ //Go to the default profile. goaway('profiles/'.$r[0]['id']); } @@ -789,29 +777,30 @@ function profiles_content(&$a) { $r = q("SELECT * FROM `profile` WHERE `uid` = %d", local_user()); - if(count($r)) { - - $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'), - '$cr_new_link' => 'profiles/new?t=' . get_form_security_token("profile_new") - )); - + if (dbm::is_result($r)) { $tpl = get_markup_template('profile_entry.tpl'); - foreach($r as $rr) { - $o .= replace_macros($tpl, array( - '$photo' => $a->remove_baseurl($rr['thumb']), - '$id' => $rr['id'], - '$alt' => t('Profile Image'), + $profiles = ''; + foreach ($r as $rr) { + $profiles .= replace_macros($tpl, array( + '$photo' => $a->remove_baseurl($rr['thumb']), + '$id' => $rr['id'], + '$alt' => t('Profile Image'), '$profile_name' => $rr['profile-name'], - '$visible' => (($rr['is-default']) ? '' . t('visible to everybody') . '' + '$visible' => (($rr['is-default']) ? '' . t('visible to everybody') . '' : '' . t('Edit visibility') . '') )); } + + $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'), + '$cr_new_link' => 'profiles/new?t=' . get_form_security_token("profile_new"), + '$profiles' => $profiles + )); } return $o; }