X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofiles.php;h=d510e4398a5949fc482e33515c7864c9033ef148;hb=9513f1f1668a33be3fc2b241fe3662e9de42d84b;hp=71e037718e7df5552195ea60c04640fcd2bdb63c;hpb=e0045a43e22082e0a47fd57288105a21311e911a;p=friendica.git

diff --git a/mod/profiles.php b/mod/profiles.php
index 71e037718e..d510e4398a 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -10,10 +10,10 @@ function profiles_post(&$a) {
 
 	$namechanged = false;
 
-	if(($a->argc > 1) && ($a->argv[1] != "new") && intval($a->argv[1])) {
+	if(($a->argc > 1) && ($a->argv[1] !== "new") && intval($a->argv[1])) {
 		$orig = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($a->argv[1]),
-			intval($_SESSION['uid'])
+			intval(local_user())
 		);
 		if(! count($orig)) {
 			notice( t('Profile not found.') . EOL);
@@ -53,7 +53,7 @@ function profiles_post(&$a) {
 		$postal_code = notags(trim($_POST['postal_code']));
 		$country_name = notags(trim($_POST['country_name']));
 
-		$marital = notags(trim(implode(', ',$_POST['marital'])));
+		$marital = notags(trim($_POST['marital']));
 		if($marital != $orig[0]['marital'])
 			$maritalchanged = true;
 
@@ -72,10 +72,7 @@ function profiles_post(&$a) {
 		$romance = escape_tags(trim($_POST['romance']));
 		$work = escape_tags(trim($_POST['work']));
 		$education = escape_tags(trim($_POST['education']));
-		if(x($_POST,'profile_in_directory'))
-			$publish = (($_POST['profile_in_directory'] == 1) ? 1: 0);
-		if(x($_POST,'profile_in_netdirectory'))
-			$net_publish = (($_POST['profile_in_netdirectory'] == 1) ? 1: 0);
+		$hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
 
 
 		$r = q("UPDATE `profile` 
@@ -102,7 +99,8 @@ function profiles_post(&$a) {
 			`film` = '%s',
 			`romance` = '%s',
 			`work` = '%s',
-			`education` = '%s'
+			`education` = '%s',
+			`hide-friends` = %d
 			WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			dbesc($profile_name),
 			dbesc($name),
@@ -128,6 +126,7 @@ function profiles_post(&$a) {
 			dbesc($romance),
 			dbesc($work),
 			dbesc($education),
+			intval($hide_friends),
 			intval($a->argv[1]),
 			intval($_SESSION['uid'])
 		);
@@ -136,23 +135,13 @@ function profiles_post(&$a) {
 			notice( t('Profile updated.') . EOL);
 
 
-		if($is_default) {
-			$r = q("UPDATE `profile` 
-			SET `publish` = %d, `net-publish` = %d
-			WHERE `id` = %d AND `uid` = %d LIMIT 1",
-			intval($publish),
-			intval($net_publish),
-			intval($a->argv[1]),
-			intval($_SESSION['uid'])
-
-			);
-		}
 		if($namechanged && $is_default) {
 			$r = q("UPDATE `contact` SET `name-date` = '%s' WHERE `self` = 1 AND `uid` = %d LIMIT 1",
 				dbesc(datetime_convert()),
-				intval($_SESSION['uid'])
+				intval(local_user())
 			);
 		}
+
 		if($is_default) {
 			// Update global directory in background
 			$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
@@ -168,15 +157,18 @@ function profiles_post(&$a) {
 
 
 function profiles_content(&$a) {
+	$o = '';
+	$o .= '<script>	$(document).ready(function() { $(\'#nav-profiles-link\').addClass(\'nav-selected\'); });</script>';
+
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
 
-	if(($a->argc > 2) && ($a->argv[1] == "drop") && intval($a->argv[2])) {
-		$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is-default` = 0 LIMIT 1",
+	if(($a->argc > 2) && ($a->argv[1] === "drop") && intval($a->argv[2])) {
+		$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is-default` = 0 AND `self` = 0 LIMIT 1",
 			intval($a->argv[2]),
-			intval($_SESSION['uid'])
+			intval(local_user())
 		);
 		if(! count($r)) {
 			notice( t('Profile not found.') . EOL);
@@ -187,9 +179,9 @@ function profiles_content(&$a) {
 		// move every contact using this profile as their default to the user default
 
 		$r = q("UPDATE `contact` SET `profile-id` = (SELECT `profile`.`id` AS `profile-id` FROM `profile` WHERE `profile`.`is-default` = 1 AND `profile`.`uid` = %d LIMIT 1) WHERE `profile-id` = %d AND `uid` = %d ",
-			intval($_SESSION['uid']),
+			intval(local_user()),
 			intval($a->argv[2]),
-			intval($_SESSION['uid'])
+			intval(local_user())
 		);
 		$r = q("DELETE FROM `profile` WHERE `id` = %d LIMIT 1",
 			intval($a->argv[2])
@@ -205,20 +197,20 @@ function profiles_content(&$a) {
 
 
 
-	if(($a->argc > 1) && ($a->argv[1] == 'new')) {
+	if(($a->argc > 1) && ($a->argv[1] === 'new')) {
 
 		$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
-			intval($_SESSION['uid']));
+			intval(local_user()));
 		$num_profiles = count($r0);
 
 		$name = t('Profile-') . ($num_profiles + 1);
 
 		$r1 = q("SELECT `name`, `photo`, `thumb` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
-			intval($_SESSION['uid']));
+			intval(local_user()));
 		
 		$r2 = q("INSERT INTO `profile` (`uid` , `profile-name` , `name`, `photo`, `thumb`)
 			VALUES ( %d, '%s', '%s', '%s', '%s' )",
-			intval($_SESSION['uid']),
+			intval(local_user()),
 			dbesc($name),
 			dbesc($r1[0]['name']),
 			dbesc($r1[0]['photo']),
@@ -226,7 +218,7 @@ function profiles_content(&$a) {
 		);
 
 		$r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1",
-			intval($_SESSION['uid']),
+			intval(local_user()),
 			dbesc($name)
 		);
 		notice( t('New profile created.') . EOL);
@@ -235,15 +227,15 @@ function profiles_content(&$a) {
 		goaway($a->get_baseurl() . '/profiles');
 	}		 
 
-	if(($a->argc > 2) && ($a->argv[1] == 'clone')) {
+	if(($a->argc > 2) && ($a->argv[1] === 'clone')) {
 
 		$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
-			intval($_SESSION['uid']));
+			intval(local_user()));
 		$num_profiles = count($r0);
 
 		$name = t('Profile-') . ($num_profiles + 1);
 		$r1 = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d LIMIT 1",
-			intval($_SESSION['uid']),
+			intval(local_user()),
 			intval($a->argv[2])
 		);
 		if(! count($r1)) {
@@ -253,18 +245,19 @@ function profiles_content(&$a) {
 		unset($r1[0]['id']);
 		$r1[0]['is-default'] = 0;
 		$r1[0]['publish'] = 0;	
+		$r1[0]['net-publish'] = 0;	
 		$r1[0]['profile-name'] = dbesc($name);
 
 		dbesc_array($r1[0]);
 
-		$r2 = q("INSERT INTO `profile` (`" 
+		$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",
-			intval($_SESSION['uid']),
+			intval(local_user()),
 			dbesc($name)
 		);
 		notice( t('New profile created.') . EOL);
@@ -275,10 +268,10 @@ function profiles_content(&$a) {
 	}		 
 
 
-	if(intval($a->argv[1])) {
+	if(($a->argc > 1) && (intval($a->argv[1]))) {
 		$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($a->argv[1]),
-			intval($_SESSION['uid'])
+			intval(local_user())
 		);
 		if(! count($r)) {
 			notice( t('Profile not found.') . EOL);
@@ -288,28 +281,11 @@ function profiles_content(&$a) {
 		require_once('mod/profile.php');
 		profile_load($a,$a->user['nickname'],$r[0]['id']);
 
-		require_once('view/profile_selectors.php');
-
-		$tpl = file_get_contents('view/profed_head.tpl');
-		$opt_tpl = file_get_contents("view/profile-in-directory.tpl");
-		$profile_in_dir = replace_macros($opt_tpl,array(
-			'$yes_selected' => (($r[0]['publish']) ? " checked=\"checked\" " : ""),
-			'$no_selected' => (($r[0]['publish'] == 0) ? " checked=\"checked\" " : "")
-		));
-
-		if(strlen(get_config('system','directory_submit_url'))) {
-			$opt_tpl = file_get_contents("view/profile-in-netdir.tpl");
-
-			$profile_in_net_dir = replace_macros($opt_tpl,array(
-				'$yes_selected' => (($r[0]['net-publish']) ? " checked=\"checked\" " : ""),
-				'$no_selected' => (($r[0]['net-publish'] == 0) ? " checked=\"checked\" " : "")
-			));
-		}
-		else
-			$profile_in_net_dir = '';
+		require_once('include/profile_selectors.php');
 
+		$tpl = load_view_file('view/profed_head.tpl');
 
-		$opt_tpl = file_get_contents("view/profile-hide-friends.tpl");
+		$opt_tpl = load_view_file("view/profile-hide-friends.tpl");
 		$hide_friends = replace_macros($opt_tpl,array(
 			'$yes_selected' => (($r[0]['hide-friends']) ? " checked=\"checked\" " : ""),
 			'$no_selected' => (($r[0]['hide-friends'] == 0) ? " checked=\"checked\" " : "")
@@ -324,7 +300,7 @@ function profiles_content(&$a) {
 	
 
 		$is_default = (($r[0]['is-default']) ? 1 : 0);
-		$tpl = file_get_contents("view/profile_edit.tpl");
+		$tpl = load_view_file("view/profile_edit.tpl");
 		$o .= replace_macros($tpl,array(
 			'$disabled' => (($is_default) ? 'onclick="return false;" style="color: #BBBBFF;"' : ''),
 			'$baseurl' => $a->get_baseurl(),
@@ -355,9 +331,7 @@ function profiles_content(&$a) {
 			'$romance' => $r[0]['romance'],
 			'$work' => $r[0]['work'],
 			'$education' => $r[0]['education'],
-			'$contact' => $r[0]['contact'],
-			'$profile_in_dir' => (($is_default) ? $profile_in_dir : ''),
-			'$profile_in_net_dir' => (($is_default) ? $profile_in_net_dir : '')
+			'$contact' => $r[0]['contact']
 		));
 
 		return $o;
@@ -367,12 +341,12 @@ function profiles_content(&$a) {
 	else {
 
 		$r = q("SELECT * FROM `profile` WHERE `uid` = %d",
-			$_SESSION['uid']);
+			local_user());
 		if(count($r)) {
 
-			$o .= file_get_contents('view/profile_listing_header.tpl');
-			$tpl_default = file_get_contents('view/profile_entry_default.tpl');
-			$tpl = file_get_contents('view/profile_entry.tpl');
+			$o .= load_view_file('view/profile_listing_header.tpl');
+			$tpl_default = load_view_file('view/profile_entry_default.tpl');
+			$tpl = load_view_file('view/profile_entry.tpl');
 
 			foreach($r as $rr) {
 				$template = (($rr['is-default']) ? $tpl_default : $tpl);