X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofiles.php;h=4914ae1eff8acff9cc77dc5543440ceabce1debe;hb=94d255707735c5d444096c3e1edad8f972a1906e;hp=f517478a1a381d52ebdd864a0cfd67e773539463;hpb=4e3d0018c69eaaa122f004357c5c68dacef59fc7;p=friendica.git

diff --git a/mod/profiles.php b/mod/profiles.php
index f517478a1a..4914ae1eff 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -19,7 +19,7 @@ function profiles_init(&$a) {
 			goaway($a->get_baseurl(true) . '/profiles');
 			return; // NOTREACHED
 		}
-		
+
 		check_form_security_token_redirectOnErr('/profiles', 'profile_drop', 't');
 
 		// move every contact using this profile as their default to the user default
@@ -29,7 +29,7 @@ function profiles_init(&$a) {
 			intval($a->argv[2]),
 			intval(local_user())
 		);
-		$r = q("DELETE FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+		$r = q("DELETE FROM `profile` WHERE `id` = %d AND `uid` = %d",
 			intval($a->argv[2]),
 			intval(local_user())
 		);
@@ -45,7 +45,7 @@ function profiles_init(&$a) {
 
 
 	if(($a->argc > 1) && ($a->argv[1] === 'new')) {
-		
+
 		check_form_security_token_redirectOnErr('/profiles', 'profile_new', 't');
 
 		$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
@@ -56,7 +56,7 @@ function profiles_init(&$a) {
 
 		$r1 = q("SELECT `name`, `photo`, `thumb` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
 			intval(local_user()));
-		
+
 		$r2 = q("INSERT INTO `profile` (`uid` , `profile-name` , `name`, `photo`, `thumb`)
 			VALUES ( %d, '%s', '%s', '%s', '%s' )",
 			intval(local_user()),
@@ -74,12 +74,12 @@ function profiles_init(&$a) {
 		info( t('New profile created.') . EOL);
 		if(count($r3) == 1)
 			goaway($a->get_baseurl(true) . '/profiles/' . $r3[0]['id']);
-		
+
 		goaway($a->get_baseurl(true) . '/profiles');
-	} 
+	}
 
 	if(($a->argc > 2) && ($a->argv[1] === 'clone')) {
-		
+
 		check_form_security_token_redirectOnErr('/profiles', 'profile_clone', 't');
 
 		$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
@@ -98,16 +98,16 @@ function profiles_init(&$a) {
 		}
 		unset($r1[0]['id']);
 		$r1[0]['is-default'] = 0;
-		$r1[0]['publish'] = 0;	
-		$r1[0]['net-publish'] = 0;	
+		$r1[0]['publish'] = 0;
+		$r1[0]['net-publish'] = 0;
 		$r1[0]['profile-name'] = dbesc($name);
 
 		dbesc_array($r1[0]);
 
-		$r2 = dbq("INSERT INTO `profile` (`" 
-			. implode("`, `", array_keys($r1[0])) 
-			. "`) VALUES ('" 
-			. implode("', '", array_values($r1[0])) 
+		$r2 = dbq("INSERT INTO `profile` (`"
+			. implode("`, `", array_keys($r1[0]))
+			. "`) VALUES ('"
+			. implode("', '", array_values($r1[0]))
 			. "')" );
 
 		$r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1",
@@ -117,9 +117,9 @@ function profiles_init(&$a) {
 		info( t('New profile created.') . EOL);
 		if(count($r3) == 1)
 			goaway($a->get_baseurl(true) . '/profiles/' . $r3[0]['id']);
-		
+
 		goaway($a->get_baseurl(true) . '/profiles');
-		
+
 		return; // NOTREACHED
 	}
 
@@ -160,17 +160,17 @@ function profiles_post(&$a) {
 			notice( t('Profile not found.') . EOL);
 			return;
 		}
-		
+
 		check_form_security_token_redirectOnErr('/profiles', 'profile_edit');
-		
+
 		$is_default = (($orig[0]['is-default']) ? 1 : 0);
 
 		$profile_name = notags(trim($_POST['profile_name']));
 		if(! strlen($profile_name)) {
-			notify( t('Profile Name is required.') . EOL);
+			notice( t('Profile Name is required.') . EOL);
 			return;
 		}
-	
+
 		$year = intval($_POST['year']);
 		if($year < 1900 || $year > 2100 || $year < 0)
 			$year = 0;
@@ -259,7 +259,7 @@ function profiles_post(&$a) {
 							intval(local_user())
 						);
 					}*/
-					
+
 					$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
 						dbesc($newname),
 						intval(local_user())
@@ -288,6 +288,10 @@ function profiles_post(&$a) {
 
 		$sexual = notags(trim($_POST['sexual']));
 		$homepage = notags(trim($_POST['homepage']));
+		if ((strpos($homepage, 'http') !== 0) && (strlen($homepage))) {
+		    // neither http nor https in URL, add them
+		    $homepage = 'http://'.$homepage;
+		}
 		$hometown = notags(trim($_POST['hometown']));
 		$politic = notags(trim($_POST['politic']));
 		$religion = notags(trim($_POST['religion']));
@@ -372,9 +376,9 @@ function profiles_post(&$a) {
 
 			profile_activity($changes,$value);
 
-		}			
-			
-		$r = q("UPDATE `profile` 
+		}
+
+		$r = q("UPDATE `profile`
 			SET `profile-name` = '%s',
 			`name` = '%s',
 			`pdesc` = '%s',
@@ -408,7 +412,7 @@ function profiles_post(&$a) {
 			`work` = '%s',
 			`education` = '%s',
 			`hide-friends` = %d
-			WHERE `id` = %d AND `uid` = %d LIMIT 1",
+			WHERE `id` = %d AND `uid` = %d",
 			dbesc($profile_name),
 			dbesc($name),
 			dbesc($pdesc),
@@ -451,10 +455,14 @@ function profiles_post(&$a) {
 
 
 		if($namechanged && $is_default) {
-			$r = q("UPDATE `contact` SET `name-date` = '%s' WHERE `self` = 1 AND `uid` = %d LIMIT 1",
+			$r = q("UPDATE `contact` SET `name-date` = '%s' WHERE `self` = 1 AND `uid` = %d",
 				dbesc(datetime_convert()),
 				intval(local_user())
 			);
+			$r = q("UPDATE `user` set `username` = '%s' where `uid` = %d",
+				dbesc($name),
+				intval(local_user())
+			);
 		}
 
 		if($is_default) {
@@ -550,10 +558,10 @@ function profile_activity($changed, $value) {
 	if($i) {
 
 		// give it a permanent link
-		q("update item set plink = '%s' where id = %d limit 1",
-			dbesc($a->get_baseurl() . '/display/' . $a->user['nickname'] . '/' . $i),
-			intval($i)
-		);
+		//q("update item set plink = '%s' where id = %d",
+		//	dbesc($a->get_baseurl() . '/display/' . $a->user['nickname'] . '/' . $i),
+		//	intval($i)
+		//);
 
 	   	proc_run('php',"include/notifier.php","activity","$i");
 
@@ -602,6 +610,13 @@ function profiles_content(&$a) {
 
 		$opt_tpl = get_markup_template("profile-hide-friends.tpl");
 		$hide_friends = replace_macros($opt_tpl,array(
+			'$yesno' => array(
+				'hide-friends', //Name
+				t('Hide contacts and friends:'), //Label
+				!!$r[0]['hide-friends'], //Value
+				'', //Help string
+				array(t('No'),t('Yes')) //Off - On strings
+			),
 			'$desc' => t('Hide your contact/friend list from viewers of this profile?'),
 			'$yes_str' => t('Yes'),
 			'$no_str' => t('No'),
@@ -619,6 +634,7 @@ function profiles_content(&$a) {
 		$is_default = (($r[0]['is-default']) ? 1 : 0);
 		$tpl = get_markup_template("profile_edit.tpl");
 		$o .= replace_macros($tpl,array(
+			'$multi_profiles' => feature_enabled(local_user(),'multi_profiles'),
 			'$form_security_token' => get_form_security_token("profile_edit"),
 			'$profile_clone_link' => 'profiles/clone/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_clone"),
 			'$profile_drop_link' => 'profiles/drop/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_drop"),