X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fprofiles.php;h=ccd7d54741af192aed688c4449182d6d158aaf42;hb=fc7d0360bb059bf87c5c531a2bfd5bcee3aef3f6;hp=984420aa2c7acc2ac032adc6c5b38a227a1daae7;hpb=0c51305c72acd244dc92bb18c393fdf8fba4889b;p=friendica.git

diff --git a/mod/profiles.php b/mod/profiles.php
index 984420aa2c..ccd7d54741 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -130,7 +130,6 @@ function profiles_post(&$a) {
 		$education = escape_tags(trim($_POST['education']));
 		$hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
 
-
 		$r = q("UPDATE `profile` 
 			SET `profile-name` = '%s',
 			`name` = '%s',
@@ -196,7 +195,7 @@ function profiles_post(&$a) {
 		);
 
 		if($r)
-			notice( t('Profile updated.') . EOL);
+			info( t('Profile updated.') . EOL);
 
 
 		if($namechanged && $is_default) {
@@ -211,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();
 		}
 	}
 }
@@ -221,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);
@@ -251,7 +253,7 @@ function profiles_content(&$a) {
 			intval(local_user())
 		);
 		if($r)
-			notice( t('Profile deleted.') . EOL);
+			info( t('Profile deleted.') . EOL);
 
 		goaway($a->get_baseurl() . '/profiles');
 		return; // NOTREACHED
@@ -286,7 +288,7 @@ function profiles_content(&$a) {
 			dbesc($name)
 		);
 
-		notice( t('New profile created.') . EOL);
+		info( t('New profile created.') . EOL);
 		if(count($r3) == 1)
 			goaway($a->get_baseurl() . '/profiles/' . $r3[0]['id']);
 		goaway($a->get_baseurl() . '/profiles');
@@ -325,7 +327,7 @@ function profiles_content(&$a) {
 			intval(local_user()),
 			dbesc($name)
 		);
-		notice( t('New profile created.') . EOL);
+		info( t('New profile created.') . EOL);
 		if(count($r3) == 1)
 			goaway($a->get_baseurl() . '/profiles/' . $r3[0]['id']);
 	goaway($a->get_baseurl() . '/profiles');
@@ -351,7 +353,7 @@ function profiles_content(&$a) {
 
 		$opt_tpl = get_markup_template("profile-hide-friends.tpl");
 		$hide_friends = replace_macros($opt_tpl,array(
-			'$desc' => t('Hide my contact/friend list from viewers of this profile?'),
+			'$desc' => t('Hide your contact/friend list from viewers of this profile?'),
 			'$yes_str' => t('Yes'),
 			'$no_str' => t('No'),
 			'$yes_selected' => (($r[0]['hide-friends']) ? " checked=\"checked\" " : ""),
@@ -360,8 +362,11 @@ function profiles_content(&$a) {
 
 
 		$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");
@@ -376,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:'),
@@ -453,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')
 			));
@@ -467,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>')
 				));
 			}
@@ -475,4 +480,4 @@ function profiles_content(&$a) {
 		return $o;
 	}
 
-}
\ No newline at end of file
+}