Revert "Coding convention applied - part 1"
This commit is contained in:
Hypolite Petovan
GitHub
parent
9c2c483996
commit
7b352f3f74
181 changed files with 3507 additions and 4338 deletions
122
mod/profiles.php
122
mod/profiles.php
|
|
@ -10,7 +10,7 @@ function profiles_init(App $a) {
|
|||
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(local_user())
|
||||
|
|
@ -34,9 +34,8 @@ function profiles_init(App $a) {
|
|||
intval($a->argv[2]),
|
||||
intval(local_user())
|
||||
);
|
||||
if ($r) {
|
||||
if($r)
|
||||
info(t('Profile deleted.').EOL);
|
||||
}
|
||||
|
||||
goaway('profiles');
|
||||
return; // NOTREACHED
|
||||
|
|
@ -46,7 +45,7 @@ function profiles_init(App $a) {
|
|||
|
||||
|
||||
|
||||
if (($a->argc > 1) && ($a->argv[1] === 'new')) {
|
||||
if(($a->argc > 1) && ($a->argv[1] === 'new')) {
|
||||
|
||||
check_form_security_token_redirectOnErr('/profiles', 'profile_new', 't');
|
||||
|
||||
|
|
@ -74,13 +73,13 @@ function profiles_init(App $a) {
|
|||
);
|
||||
|
||||
info( t('New profile created.') . EOL);
|
||||
if (count($r3) == 1)
|
||||
if(count($r3) == 1)
|
||||
goaway('profiles/'.$r3[0]['id']);
|
||||
|
||||
goaway('profiles');
|
||||
}
|
||||
|
||||
if (($a->argc > 2) && ($a->argv[1] === 'clone')) {
|
||||
if(($a->argc > 2) && ($a->argv[1] === 'clone')) {
|
||||
|
||||
check_form_security_token_redirectOnErr('/profiles', 'profile_clone', 't');
|
||||
|
||||
|
|
@ -93,7 +92,7 @@ function profiles_init(App $a) {
|
|||
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;
|
||||
|
|
@ -126,7 +125,7 @@ function profiles_init(App $a) {
|
|||
}
|
||||
|
||||
|
||||
if (($a->argc > 1) && (intval($a->argv[1]))) {
|
||||
if(($a->argc > 1) && (intval($a->argv[1]))) {
|
||||
$r = q("SELECT id FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||
intval($a->argv[1]),
|
||||
intval(local_user())
|
||||
|
|
@ -172,12 +171,12 @@ function profiles_post(App $a) {
|
|||
|
||||
call_hooks('profile_post', $_POST);
|
||||
|
||||
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(local_user())
|
||||
);
|
||||
if (! count($orig)) {
|
||||
if(! count($orig)) {
|
||||
notice( t('Profile not found.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
|
@ -187,7 +186,7 @@ function profiles_post(App $a) {
|
|||
$is_default = (($orig[0]['is-default']) ? 1 : 0);
|
||||
|
||||
$profile_name = notags(trim($_POST['profile_name']));
|
||||
if (! strlen($profile_name)) {
|
||||
if(! strlen($profile_name)) {
|
||||
notice( t('Profile Name is required.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
|
@ -195,27 +194,27 @@ function profiles_post(App $a) {
|
|||
$dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0000-00-00'; // FIXME: Needs to be validated?
|
||||
|
||||
$y = substr($dob,0,4);
|
||||
if ((! ctype_digit($y)) || ($y < 1900))
|
||||
if((! ctype_digit($y)) || ($y < 1900))
|
||||
$ignore_year = true;
|
||||
else
|
||||
$ignore_year = false;
|
||||
if ($dob != '0000-00-00') {
|
||||
if (strpos($dob,'0000-') === 0) {
|
||||
if($dob != '0000-00-00') {
|
||||
if(strpos($dob,'0000-') === 0) {
|
||||
$ignore_year = true;
|
||||
$dob = substr($dob,5);
|
||||
}
|
||||
$dob = datetime_convert('UTC','UTC',(($ignore_year) ? '1900-' . $dob : $dob),(($ignore_year) ? 'm-d' : 'Y-m-d'));
|
||||
if ($ignore_year)
|
||||
if($ignore_year)
|
||||
$dob = '0000-' . $dob;
|
||||
}
|
||||
|
||||
$name = notags(trim($_POST['name']));
|
||||
|
||||
if (! strlen($name)) {
|
||||
if(! strlen($name)) {
|
||||
$name = '[No Name]';
|
||||
}
|
||||
|
||||
if ($orig[0]['name'] != $name)
|
||||
if($orig[0]['name'] != $name)
|
||||
$namechanged = true;
|
||||
|
||||
|
||||
|
|
@ -234,7 +233,7 @@ function profiles_post(App $a) {
|
|||
|
||||
$with = ((x($_POST,'with')) ? notags(trim($_POST['with'])) : '');
|
||||
|
||||
if (! strlen($howlong)) {
|
||||
if(! strlen($howlong)) {
|
||||
$howlong = NULL_DATE;
|
||||
} else {
|
||||
$howlong = datetime_convert(date_default_timezone_get(),'UTC',$howlong);
|
||||
|
|
@ -243,34 +242,34 @@ function profiles_post(App $a) {
|
|||
|
||||
$withchanged = false;
|
||||
|
||||
if (strlen($with)) {
|
||||
if ($with != strip_tags($orig[0]['with'])) {
|
||||
if(strlen($with)) {
|
||||
if($with != strip_tags($orig[0]['with'])) {
|
||||
$withchanged = true;
|
||||
$prf = '';
|
||||
$lookup = $with;
|
||||
if (strpos($lookup,'@') === 0) {
|
||||
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;
|
||||
/// @TODO Maybe kill those error/debugging-surpressing @ characters
|
||||
$links = @Probe::lrdd($lookup);
|
||||
if (count($links)) {
|
||||
foreach ($links as $link) {
|
||||
if ($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page') {
|
||||
if(count($links)) {
|
||||
foreach($links as $link) {
|
||||
if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page') {
|
||||
$prf = $link['@attributes']['href'];
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
$newname = $lookup;
|
||||
/* if (strstr($lookup,' ')) {
|
||||
/* if(strstr($lookup,' ')) {
|
||||
$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
|
||||
dbesc($newname),
|
||||
intval(local_user())
|
||||
);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
$r = q("SELECT * FROM `contact` WHERE `nick` = '%s' AND `uid` = %d LIMIT 1",
|
||||
dbesc($lookup),
|
||||
intval(local_user())
|
||||
|
|
@ -281,7 +280,7 @@ function profiles_post(App $a) {
|
|||
dbesc($newname),
|
||||
intval(local_user())
|
||||
);
|
||||
if (! $r) {
|
||||
if(! $r) {
|
||||
$r = q("SELECT * FROM `contact` WHERE `nick` = '%s' AND `uid` = %d LIMIT 1",
|
||||
dbesc($lookup),
|
||||
intval(local_user())
|
||||
|
|
@ -293,9 +292,9 @@ function profiles_post(App $a) {
|
|||
}
|
||||
}
|
||||
|
||||
if ($prf) {
|
||||
if($prf) {
|
||||
$with = str_replace($lookup,'<a href="' . $prf . '">' . $newname . '</a>', $with);
|
||||
if (strpos($with,'@') === 0)
|
||||
if(strpos($with,'@') === 0)
|
||||
$with = substr($with,1);
|
||||
}
|
||||
}
|
||||
|
|
@ -334,61 +333,61 @@ function profiles_post(App $a) {
|
|||
|
||||
$changes = array();
|
||||
$value = '';
|
||||
if ($is_default) {
|
||||
if ($marital != $orig[0]['marital']) {
|
||||
if($is_default) {
|
||||
if($marital != $orig[0]['marital']) {
|
||||
$changes[] = '[color=#ff0000]♥[/color] ' . t('Marital Status');
|
||||
$value = $marital;
|
||||
}
|
||||
if ($withchanged) {
|
||||
if($withchanged) {
|
||||
$changes[] = '[color=#ff0000]♥[/color] ' . t('Romantic Partner');
|
||||
$value = strip_tags($with);
|
||||
}
|
||||
if ($likes != $orig[0]['likes']) {
|
||||
if($likes != $orig[0]['likes']) {
|
||||
$changes[] = t('Likes');
|
||||
$value = $likes;
|
||||
}
|
||||
if ($dislikes != $orig[0]['dislikes']) {
|
||||
if($dislikes != $orig[0]['dislikes']) {
|
||||
$changes[] = t('Dislikes');
|
||||
$value = $dislikes;
|
||||
}
|
||||
if ($work != $orig[0]['work']) {
|
||||
if($work != $orig[0]['work']) {
|
||||
$changes[] = t('Work/Employment');
|
||||
}
|
||||
if ($religion != $orig[0]['religion']) {
|
||||
if($religion != $orig[0]['religion']) {
|
||||
$changes[] = t('Religion');
|
||||
$value = $religion;
|
||||
}
|
||||
if ($politic != $orig[0]['politic']) {
|
||||
if($politic != $orig[0]['politic']) {
|
||||
$changes[] = t('Political Views');
|
||||
$value = $politic;
|
||||
}
|
||||
if ($gender != $orig[0]['gender']) {
|
||||
if($gender != $orig[0]['gender']) {
|
||||
$changes[] = t('Gender');
|
||||
$value = $gender;
|
||||
}
|
||||
if ($sexual != $orig[0]['sexual']) {
|
||||
if($sexual != $orig[0]['sexual']) {
|
||||
$changes[] = t('Sexual Preference');
|
||||
$value = $sexual;
|
||||
}
|
||||
if ($xmpp != $orig[0]['xmpp']) {
|
||||
if($xmpp != $orig[0]['xmpp']) {
|
||||
$changes[] = t('XMPP');
|
||||
$value = $xmpp;
|
||||
}
|
||||
if ($homepage != $orig[0]['homepage']) {
|
||||
if($homepage != $orig[0]['homepage']) {
|
||||
$changes[] = t('Homepage');
|
||||
$value = $homepage;
|
||||
}
|
||||
if ($interest != $orig[0]['interest']) {
|
||||
if($interest != $orig[0]['interest']) {
|
||||
$changes[] = t('Interests');
|
||||
$value = $interest;
|
||||
}
|
||||
if ($address != $orig[0]['address']) {
|
||||
if($address != $orig[0]['address']) {
|
||||
$changes[] = t('Address');
|
||||
// New address not sent in notifications, potential privacy issues
|
||||
// in case this leaks to unintended recipients. Yes, it's in the public
|
||||
// profile but that doesn't mean we have to broadcast it to everybody.
|
||||
}
|
||||
if ($locality != $orig[0]['locality'] || $region != $orig[0]['region']
|
||||
if($locality != $orig[0]['locality'] || $region != $orig[0]['region']
|
||||
|| $country_name != $orig[0]['country-name']) {
|
||||
$changes[] = t('Location');
|
||||
$comma1 = ((($locality) && ($region || $country_name)) ? ', ' : ' ');
|
||||
|
|
@ -474,12 +473,11 @@ function profiles_post(App $a) {
|
|||
intval(local_user())
|
||||
);
|
||||
|
||||
if ($r) {
|
||||
if($r)
|
||||
info( t('Profile updated.') . EOL);
|
||||
}
|
||||
|
||||
|
||||
if ($namechanged && $is_default) {
|
||||
if($namechanged && $is_default) {
|
||||
$r = q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `self` = 1 AND `uid` = %d",
|
||||
dbesc($name),
|
||||
dbesc(datetime_convert()),
|
||||
|
|
@ -491,7 +489,7 @@ function profiles_post(App $a) {
|
|||
);
|
||||
}
|
||||
|
||||
if ($is_default) {
|
||||
if($is_default) {
|
||||
$location = formatted_location(array("locality" => $locality, "region" => $region, "country-name" => $country_name));
|
||||
|
||||
q("UPDATE `contact` SET `about` = '%s', `location` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `self` AND `uid` = %d",
|
||||
|
|
@ -521,13 +519,13 @@ 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');
|
||||
|
|
@ -536,7 +534,7 @@ function profile_activity($changed, $value) {
|
|||
intval(local_user())
|
||||
);
|
||||
|
||||
if (! count($self))
|
||||
if(! count($self))
|
||||
return;
|
||||
|
||||
$arr = array();
|
||||
|
|
@ -561,8 +559,8 @@ function profile_activity($changed, $value) {
|
|||
$changes = '';
|
||||
$t = count($changed);
|
||||
$z = 0;
|
||||
foreach ($changed as $ch) {
|
||||
if (strlen($changes)) {
|
||||
foreach($changed as $ch) {
|
||||
if(strlen($changes)) {
|
||||
if ($z == ($t - 1))
|
||||
$changes .= t(' and ');
|
||||
else
|
||||
|
|
@ -574,7 +572,7 @@ function profile_activity($changed, $value) {
|
|||
|
||||
$prof = '[url=' . $self[0]['url'] . '?tab=profile' . ']' . t('public profile') . '[/url]';
|
||||
|
||||
if ($t == 1 && strlen($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);
|
||||
}
|
||||
|
|
@ -612,7 +610,7 @@ function profiles_content(App $a) {
|
|||
|
||||
$o = '';
|
||||
|
||||
if (($a->argc > 1) && (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(local_user())
|
||||
|
|
@ -654,7 +652,7 @@ function profiles_content(App $a) {
|
|||
$detailled_profile = (get_pconfig(local_user(),'system','detailled_profile') AND $personal_account);
|
||||
|
||||
$f = get_config('system','birthday_input_format');
|
||||
if (! $f)
|
||||
if(! $f)
|
||||
$f = 'ymd';
|
||||
|
||||
$is_default = (($r[0]['is-default']) ? 1 : 0);
|
||||
|
|
@ -756,7 +754,7 @@ function profiles_content(App $a) {
|
|||
else {
|
||||
|
||||
//If we don't support multi profiles, don't display this list.
|
||||
if (!feature_enabled(local_user(),'multi_profiles')){
|
||||
if(!feature_enabled(local_user(),'multi_profiles')){
|
||||
$r = q(
|
||||
"SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`=1",
|
||||
local_user()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue