X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofiles.php;h=5cc9fa38c4728e31c0473d339701dc9d68e1efb7;hb=71d44d78ec5b16a53b82f4e631b86cd8247a9b0f;hp=b64c1294e31ee1b42bd4ddb3580ba118ec561c82;hpb=e3d1ef8ef7c1be2a8588ec1709304f766b0c7607;p=friendica.git
diff --git a/mod/profiles.php b/mod/profiles.php
index b64c1294e3..5cc9fa38c4 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -129,8 +129,6 @@ function profiles_post(&$a) {
$work = escape_tags(trim($_POST['work']));
$education = escape_tags(trim($_POST['education']));
$hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
- $hidewall = (($_POST['hidewall'] == 1) ? 1: 0);
-
$r = q("UPDATE `profile`
SET `profile-name` = '%s',
@@ -161,8 +159,7 @@ function profiles_post(&$a) {
`romance` = '%s',
`work` = '%s',
`education` = '%s',
- `hide-friends` = %d,
- `hidewall` = %d
+ `hide-friends` = %d
WHERE `id` = %d AND `uid` = %d LIMIT 1",
dbesc($profile_name),
dbesc($name),
@@ -193,7 +190,6 @@ function profiles_post(&$a) {
dbesc($work),
dbesc($education),
intval($hide_friends),
- intval($hidewall),
intval($a->argv[1]),
intval($_SESSION['uid'])
);
@@ -224,7 +220,7 @@ function profiles_post(&$a) {
function profiles_content(&$a) {
$o = '';
- $o .= '';
+ nav_set_selected('profiles');
if(! local_user()) {
notice( t('Permission denied.') . EOL);
@@ -361,20 +357,13 @@ function profiles_content(&$a) {
'$no_selected' => (($r[0]['hide-friends'] == 0) ? " checked=\"checked\" " : "")
));
- $opt_tpl = get_markup_template("profile-hide-wall.tpl");
- $hide_wall = replace_macros($opt_tpl,array(
- '$desc' => t('Hide your messages from unknown viewers of this profile?'),
- '$yes_str' => t('Yes'),
- '$no_str' => t('No'),
- '$yes_selected' => (($r[0]['hidewall']) ? " checked=\"checked\" " : ""),
- '$no_selected' => (($r[0]['hidewall'] == 0) ? " checked=\"checked\" " : "")
- ));
-
-
$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
$a->page['htmlhead'] .= "";
+ $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");
@@ -389,7 +378,7 @@ function profiles_content(&$a) {
'$lbl_fullname' => t('Your Full Name:'),
'$lbl_title' => t('Title/Description:'),
'$lbl_gender' => t('Your Gender:'),
- '$lbl_bd' => t("Birthday \x28y/m/d\x29:"),
+ '$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:'),
@@ -426,7 +415,6 @@ function profiles_content(&$a) {
'$pdesc' => $r[0]['pdesc'],
'$dob' => dob($r[0]['dob']),
'$hide_friends' => $hide_friends,
- '$hide_wall' => $hide_wall,
'$address' => $r[0]['address'],
'$locality' => $r[0]['locality'],
'$region' => $r[0]['region'],
@@ -481,7 +469,7 @@ function profiles_content(&$a) {
'$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') . '')
));
}