X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofiles.php;h=ccd7d54741af192aed688c4449182d6d158aaf42;hb=a1a07e7287e9e764912bbd08383cf43503deb9e8;hp=b64c1294e31ee1b42bd4ddb3580ba118ec561c82;hpb=c0f529cf38af78b513f93e8e58d298bb21bcc8ef;p=friendica.git

diff --git a/mod/profiles.php b/mod/profiles.php
index b64c1294e3..ccd7d54741 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'])
 		);
@@ -214,6 +210,9 @@ function profiles_post(&$a) {
 			$url = $_SESSION['my_url'];
 			if($url && strlen(get_config('system','directory_submit_url')))
 				proc_run('php',"include/directory.php","$url");
+
+			require_once('include/profile_update.php');
+			profile_change();
 		}
 	}
 }
@@ -224,7 +223,7 @@ function profiles_post(&$a) {
 function profiles_content(&$a) {
 
 	$o = '';
-	$o .= '<script>	$(document).ready(function() { $(\'#nav-profiles-link\').addClass(\'nav-selected\'); });</script>';
+	nav_set_selected('profiles');
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
@@ -361,20 +360,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'] .= "<script type=\"text/javascript\" src=\"include/country.js\" ></script>";
+		$a->page['htmlhead'] .= "<script type=\"text/javascript\" src=\"js/country.js\" ></script>";
 
+		$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 +381,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 +418,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'],
@@ -467,7 +458,7 @@ function profiles_content(&$a) {
 
 			$tpl_header = get_markup_template('profile_listing_header.tpl');
 			$o .= replace_macros($tpl_header,array(
-				'$header' => t('Profiles'),
+				'$header' => t('Edit/Manage Profiles'),
 				'$chg_photo' => t('Change profile photo'),
 				'$cr_new' => t('Create New Profile')
 			));
@@ -481,7 +472,7 @@ function profiles_content(&$a) {
 					'$id' => $rr['id'],
 					'$alt' => t('Profile Image'),
 					'$profile_name' => $rr['profile-name'],
-					'$visible' => (($rr['is-default']) ?  '<strong>' . t('Visible to everybody') . '</strong>' 
+					'$visible' => (($rr['is-default']) ? '<strong>' . t('visible to everybody') . '</strong>' 
 						: '<a href="' . $a->get_baseurl() . '/profperm/' . $rr['id'] . '" />' . t('Edit visibility') . '</a>')
 				));
 			}