harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix vcard truncation and escaping

Browse Source
This commit is contained in:
friendica 2014-04-20 18:48:21 -07:00
parent 7e52d8554b
commit d0dab3fcae
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
mod/profiles.php
View File

@ -198,27 +198,27 @@ function profiles_post(&$a) {
$dob = sprintf('%04d-%02d-%02d',$year,$month,$day); $dob = sprintf('%04d-%02d-%02d',$year,$month,$day);
$name = notags(trim($_POST['name'])); $name = escape_tags(trim($_POST['name']));
if($orig[0]['name'] != $name) if($orig[0]['name'] != $name)
$namechanged = true; $namechanged = true;
$pdesc = notags(trim($_POST['pdesc'])); $pdesc = escape_tags(trim($_POST['pdesc']));
$gender = notags(trim($_POST['gender'])); $gender = escape_tags(trim($_POST['gender']));
$address = notags(trim($_POST['address'])); $address = escape_tags(trim($_POST['address']));
$locality = notags(trim($_POST['locality'])); $locality = escape_tags(trim($_POST['locality']));
$region = notags(trim($_POST['region'])); $region = escape_tags(trim($_POST['region']));
$postal_code = notags(trim($_POST['postal_code'])); $postal_code = escape_tags(trim($_POST['postal_code']));
$country_name = notags(trim($_POST['country_name'])); $country_name = escape_tags(trim($_POST['country_name']));
$keywords = notags(trim($_POST['keywords'])); $keywords = escape_tags(trim($_POST['keywords']));
$marital = notags(trim($_POST['marital'])); $marital = escape_tags(trim($_POST['marital']));
$howlong = notags(trim($_POST['howlong'])); $howlong = escape_tags(trim($_POST['howlong']));
$sexual = notags(trim($_POST['sexual'])); $sexual = escape_tags(trim($_POST['sexual']));
$homepage = notags(trim($_POST['homepage'])); $homepage = escape_tags(trim($_POST['homepage']));
$hometown = notags(trim($_POST['hometown'])); $hometown = escape_tags(trim($_POST['hometown']));
$politic = notags(trim($_POST['politic'])); $politic = escape_tags(trim($_POST['politic']));
$religion = notags(trim($_POST['religion'])); $religion = escape_tags(trim($_POST['religion']));
$likes = fix_mce_lf(escape_tags(trim($_POST['likes']))); $likes = fix_mce_lf(escape_tags(trim($_POST['likes'])));
$dislikes = fix_mce_lf(escape_tags(trim($_POST['dislikes']))); $dislikes = fix_mce_lf(escape_tags(trim($_POST['dislikes'])));
@ -237,7 +237,7 @@ function profiles_post(&$a) {
$hide_friends = (($_POST['hide_friends'] == 1) ? 1: 0); $hide_friends = (($_POST['hide_friends'] == 1) ? 1: 0);
$with = ((x($_POST,'with')) ? notags(trim($_POST['with'])) : ''); $with = ((x($_POST,'with')) ? escape_tags(trim($_POST['with'])) : '');
if(! strlen($howlong)) if(! strlen($howlong))
$howlong = '0000-00-00 00:00:00'; $howlong = '0000-00-00 00:00:00';
@ -561,7 +561,7 @@ function profiles_content(&$a) {
'$age' => ((intval($r[0]['dob'])) ? '(' . t('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']), '$gender' => gender_selector($r[0]['gender']),
'$marital' => marital_selector($r[0]['marital']), '$marital' => marital_selector($r[0]['marital']),
'$with' => strip_tags($r[0]['with']), '$with' => $r[0]['with'],
'$howlong' => ($r[0]['howlong'] === '0000-00-00 00:00:00' ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong'])), '$howlong' => ($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']), '$sexual' => sexpref_selector($r[0]['sexual']),
'$about' => $r[0]['about'], '$about' => $r[0]['about'],

2
view/theme/redbasic/css/style.css
View File

@ -836,8 +836,6 @@ aside li {
float: left; float: left;
display: block; display: block;
width: 130px; width: 130px;
height: 18px;
overflow: hidden;
} }
.profile-clear { .profile-clear {