X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Fprofiles.php;h=01030914c47bd095b7806403ab52ea63eead1a44;hb=737e40b4d9cb363eee831074b9c560bdbbdeba79;hp=b73b969f0c32acd37fc8ba54a9d42f987e75f011;hpb=0cd241bcbe762e38e2eba0c58800eb60a2240e36;p=friendica.git
diff --git a/mod/profiles.php b/mod/profiles.php
index b73b969f0c..01030914c4 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -1,6 +1,10 @@
argv[2]),
intval(local_user())
);
- if ($r) {
+ if (dbm::is_result($r)) {
info(t('Profile deleted.').EOL);
}
@@ -42,17 +46,14 @@ function profiles_init(App $a) {
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);
+
+ $num_profiles = (dbm::is_result($r0) ? count($r0) : 0);
$name = t('Profile-') . ($num_profiles + 1);
@@ -74,8 +75,9 @@ function profiles_init(App $a) {
);
info( t('New profile created.') . EOL);
- if (count($r3) == 1)
- goaway('profiles/'.$r3[0]['id']);
+ if (dbm::is_result($r3) && count($r3) == 1) {
+ goaway('profiles/' . $r3[0]['id']);
+ }
goaway('profiles');
}
@@ -86,14 +88,15 @@ function profiles_init(App $a) {
$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
intval(local_user()));
- $num_profiles = count($r0);
+
+ $num_profiles = (dbm::is_result($r0) ? count($r0) : 0);
$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 (! dbm::is_result($r1)) {
+ if(! dbm::is_result($r1)) {
notice( t('Profile unavailable to clone.') . EOL);
killme();
return;
@@ -117,8 +120,9 @@ function profiles_init(App $a) {
dbesc($name)
);
info( t('New profile created.') . EOL);
- if ((dbm::is_result($r3)) && (count($r3) == 1))
+ if ((dbm::is_result($r3)) && (count($r3) == 1)) {
goaway('profiles/'.$r3[0]['id']);
+ }
goaway('profiles');
@@ -137,7 +141,7 @@ function profiles_init(App $a) {
return;
}
- profile_load($a,$a->user['nickname'],$r[0]['id']);
+ profile_load($a,$a->user['nickname'], $r[0]['id']);
}
@@ -145,15 +149,16 @@ function profiles_init(App $a) {
}
function profile_clean_keywords($keywords) {
- $keywords = str_replace(","," ",$keywords);
+ $keywords = str_replace(",", " ", $keywords);
$keywords = explode(" ", $keywords);
$cleaned = array();
foreach ($keywords as $keyword) {
$keyword = trim(strtolower($keyword));
$keyword = trim($keyword, "#");
- if ($keyword != "")
+ if ($keyword != "") {
$cleaned[] = $keyword;
+ }
}
$keywords = implode(", ", $cleaned);
@@ -177,7 +182,7 @@ function profiles_post(App $a) {
intval($a->argv[1]),
intval(local_user())
);
- if (! count($orig)) {
+ if (! dbm::is_result($orig)) {
notice( t('Profile not found.') . EOL);
return;
}
@@ -192,21 +197,24 @@ function profiles_post(App $a) {
return;
}
- $dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0000-00-00'; // FIXME: Needs to be validated?
+ $dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0001-01-01'; // FIXME: Needs to be validated?
- $y = substr($dob,0,4);
- if ((! ctype_digit($y)) || ($y < 1900))
+ $y = substr($dob, 0, 4);
+ if ((! ctype_digit($y)) || ($y < 1900)) {
$ignore_year = true;
- else
+ } else {
$ignore_year = false;
- if ($dob != '0000-00-00') {
- if (strpos($dob,'0000-') === 0) {
+ }
+ if (!in_array($dob, array('0000-00-00', '0001-01-01'))) {
+ if (strpos($dob, '0000-') === 0 || strpos($dob, '0001-') === 0) {
$ignore_year = true;
- $dob = substr($dob,5);
+ $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 = '0001-' . $dob;
}
- $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']));
@@ -215,10 +223,9 @@ function profiles_post(App $a) {
$name = '[No Name]';
}
- if ($orig[0]['name'] != $name)
+ if ($orig[0]['name'] != $name) {
$namechanged = true;
-
-
+ }
$pdesc = notags(trim($_POST['pdesc']));
$gender = notags(trim($_POST['gender']));
@@ -234,11 +241,11 @@ function profiles_post(App $a) {
$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);
-
+ if (! strlen($howlong)) {
+ $howlong = NULL_DATE;
+ } else {
+ $howlong = datetime_convert(date_default_timezone_get(), 'UTC', $howlong);
+ }
// linkify the relationship target if applicable
$withchanged = false;
@@ -248,10 +255,11 @@ function profiles_post(App $a) {
$withchanged = true;
$prf = '';
$lookup = $with;
- if (strpos($lookup,'@') === 0)
- $lookup = substr($lookup,1);
+ if (strpos($lookup, '@') === 0) {
+ $lookup = substr($lookup, 1);
+ }
$lookup = str_replace('_',' ', $lookup);
- if (strpos($lookup,'@') || (strpos($lookup,'http://'))) {
+ if (strpos($lookup, '@') || (strpos($lookup, 'http://'))) {
$newname = $lookup;
$links = @Probe::lrdd($lookup);
if (count($links)) {
@@ -261,26 +269,14 @@ function profiles_post(App $a) {
}
}
}
- }
- else {
+ } 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())
- );
- }*/
$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
dbesc($newname),
intval(local_user())
);
- if (! $r) {
+ if (! dbm::is_result($r)) {
$r = q("SELECT * FROM `contact` WHERE `nick` = '%s' AND `uid` = %d LIMIT 1",
dbesc($lookup),
intval(local_user())
@@ -293,15 +289,17 @@ function profiles_post(App $a) {
}
if ($prf) {
- $with = str_replace($lookup,'' . $newname . '', $with);
- if (strpos($with,'@') === 0)
- $with = substr($with,1);
+ $with = str_replace($lookup, '' . $newname . '', $with);
+ if (strpos($with, '@') === 0) {
+ $with = substr($with, 1);
+ }
}
- }
- else
+ } else {
$with = $orig[0]['with'];
+ }
}
+ /// @TODO Not flexible enough for later expansion, let's have more OOP here
$sexual = notags(trim($_POST['sexual']));
$xmpp = notags(trim($_POST['xmpp']));
$homepage = notags(trim($_POST['homepage']));
@@ -329,7 +327,7 @@ function profiles_post(App $a) {
$hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
- set_pconfig(local_user(),'system','detailled_profile', (($_POST['detailled_profile'] == 1) ? 1: 0));
+ set_pconfig(local_user(), 'system', 'detailled_profile', (($_POST['detailled_profile'] == 1) ? 1: 0));
$changes = array();
$value = '';
@@ -474,7 +472,7 @@ function profiles_post(App $a) {
);
if ($r) {
- info( t('Profile updated.') . EOL);
+ info(t('Profile updated.') . EOL);
}
@@ -503,12 +501,11 @@ function profiles_post(App $a) {
// Update global directory in background
$url = $_SESSION['my_url'];
- if ($url && strlen(get_config('system','directory'))) {
+ if ($url && strlen(get_config('system', 'directory'))) {
proc_run(PRIORITY_LOW, "include/directory.php", $url);
}
- require_once('include/profile_update.php');
- profile_change();
+ proc_run(PRIORITY_LOW, 'include/profile_update.php', local_user());
// Update the global contact for the user
update_gcontact_for_user(local_user());
@@ -520,23 +517,27 @@ function profiles_post(App $a) {
function profile_activity($changed, $value) {
$a = get_app();
- if (! local_user() || ! is_array($changed) || ! count($changed))
+ if (! local_user() || ! is_array($changed) || ! count($changed)) {
return;
+ }
- if ($a->user['hidewall'] || get_config('system','block_public'))
+ if ($a->user['hidewall'] || get_config('system', 'block_public')) {
return;
+ }
- if (! get_pconfig(local_user(),'system','post_profilechange'))
+ if (! get_pconfig(local_user(), 'system', 'post_profilechange')) {
return;
+ }
- require_once('include/items.php');
+ require_once 'include/items.php';
$self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
intval(local_user())
);
- if (! count($self))
+ if (! dbm::is_result($self)) {
return;
+ }
$arr = array();
@@ -562,10 +563,11 @@ function profile_activity($changed, $value) {
$z = 0;
foreach ($changed as $ch) {
if (strlen($changes)) {
- if ($z == ($t - 1))
+ if ($z == ($t - 1)) {
$changes .= t(' and ');
- else
+ } else {
$changes .= ', ';
+ }
}
$z ++;
$changes .= $ch;
@@ -576,9 +578,9 @@ function profile_activity($changed, $value) {
if ($t == 1 && strlen($value)) {
$message = sprintf( t('%1$s changed %2$s to “%3$s”'), $A, $changes, $value);
$message .= "\n\n" . sprintf( t(' - Visit %1$s\'s %2$s'), $A, $prof);
- }
- else
+ } else {
$message = sprintf( t('%1$s has an updated %2$s, changing %3$s.'), $A, $prof, $changes);
+ }
$arr['body'] = $message;
@@ -621,7 +623,8 @@ function profiles_content(App $a) {
return;
}
- require_once('include/profile_selectors.php');
+ require_once 'include/profile_selectors.php';
+
$a->page['htmlhead'] .= replace_macros(get_markup_template('profed_head.tpl'), array(
'$baseurl' => App::get_baseurl(true),
@@ -637,7 +640,7 @@ function profiles_content(App $a) {
t('Hide contacts and friends:'), //Label
!!$r[0]['hide-friends'], //Value
'', //Help string
- array(t('No'),t('Yes')) //Off - On strings
+ array(t('No'), t('Yes')) //Off - On strings
),
'$desc' => t('Hide your contact/friend list from viewers of this profile?'),
'$yes_str' => t('Yes'),
@@ -649,15 +652,16 @@ function profiles_content(App $a) {
$personal_account = !(in_array($a->user["page-flags"],
array(PAGE_COMMUNITY, PAGE_PRVGROUP)));
- $detailled_profile = (get_pconfig(local_user(),'system','detailled_profile') AND $personal_account);
+ $detailled_profile = (get_pconfig(local_user(), 'system', 'detailled_profile') AND $personal_account);
- $f = get_config('system','birthday_input_format');
- if (! $f)
+ $f = get_config('system', 'birthday_input_format');
+ if (! $f) {
$f = 'ymd';
+ }
$is_default = (($r[0]['is-default']) ? 1 : 0);
$tpl = get_markup_template("profile_edit.tpl");
- $o .= replace_macros($tpl,array(
+ $o .= replace_macros($tpl, array(
'$personal_account' => $personal_account,
'$detailled_profile' => $detailled_profile,
@@ -666,13 +670,13 @@ function profiles_content(App $a) {
t('Show more profile fields:'), //Label
$detailled_profile, //Value
'', //Help string
- array(t('No'),t('Yes')) //Off - On strings
+ array(t('No'), t('Yes')) //Off - On strings
),
- '$multi_profiles' => feature_enabled(local_user(),'multi_profiles'),
+ '$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_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'),
@@ -721,7 +725,7 @@ function profiles_content(App $a) {
'$gender' => gender_selector($r[0]['gender']),
'$marital' => marital_selector($r[0]['marital']),
'$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']))),
+ '$howlong' => array('howlong', t('Since [date]:'), ($r[0]['howlong'] <= NULL_DATE ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong']))),
'$sexual' => sexpref_selector($r[0]['sexual']),
'$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.")),
@@ -738,7 +742,7 @@ function profiles_content(App $a) {
'$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']),
+ '$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']),
@@ -748,25 +752,22 @@ function profiles_content(App $a) {
call_hooks('profile_edit', $arr);
return $o;
- }
+ } else {
- //Profiles list.
- else {
-
- //If we don't support multi profiles, don't display this list.
- if (!feature_enabled(local_user(),'multi_profiles')){
- $r = q(
- "SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`=1",
+ // If we don't support multi profiles, don't display this list.
+ if (!feature_enabled(local_user(), 'multi_profiles')) {
+ $r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`=1",
local_user()
);
- if (dbm::is_result($r)){
+ if (dbm::is_result($r)) {
//Go to the default profile.
- goaway('profiles/'.$r[0]['id']);
+ goaway('profiles/' . $r[0]['id']);
}
}
$r = q("SELECT * FROM `profile` WHERE `uid` = %d",
local_user());
+
if (dbm::is_result($r)) {
$tpl = get_markup_template('profile_entry.tpl');