X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofile.php;h=608971d08d38dd1dce47516b4d1ca2ae5dbd6d88;hb=efbdb57f926dc840a162ac960f5a1f3b0fdf0353;hp=bb45d1fec8591a0ab46bfc097e443a4a5354e384;hpb=caa21e6021dc2623aba8294f55279a31c94aab02;p=friendica.git

diff --git a/mod/profile.php b/mod/profile.php
index bb45d1fec8..608971d08d 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -44,7 +44,7 @@ function profile_init(&$a) {
 	if(x($a->profile,'openidserver'))
 		$a->page['htmlhead'] .= '<link rel="openid.server" href="' . $a->profile['openidserver'] . '" />' . "\r\n";
 	if(x($a->profile,'openid')) {
-		$delegate = ((strstr($a->profile['openid'],'://')) ? $a->profile['openid'] : 'http://' . $a->profile['openid']);
+		$delegate = ((strstr($a->profile['openid'],'://')) ? $a->profile['openid'] : 'https://' . $a->profile['openid']);
 		$a->page['htmlhead'] .= '<link rel="openid.delegate" href="' . $delegate . '" />' . "\r\n";
 	}
 	// site block
@@ -166,7 +166,6 @@ function profile_content(&$a, $update = 0) {
 
 
 		if($tab === 'profile') {
-			require_once('include/profile_advanced.php');
 			$o .= advanced_profile($a);
 			call_hooks('profile_advanced',$o);
 			return $o;
@@ -182,27 +181,27 @@ function profile_content(&$a, $update = 0) {
 		$commpage = (($a->profile['page-flags'] == PAGE_COMMUNITY) ? true : false);
 		$commvisitor = (($commpage && $remote_contact == true) ? true : false);
 
-		$celeb = ((($a->profile['page-flags'] == PAGE_SOAPBOX) || ($a->profile['page-flags'] == PAGE_COMMUNITY)) ? true : false);
-
-		$a->page['aside'] .= posted_date_widget($a->get_baseurl(true) . '/profile/' . $a->profile['nickname'],$a->profile['profile_uid'],true);	
+		$a->page['aside'] .= posted_date_widget($a->get_baseurl(true) . '/profile/' . $a->profile['nickname'],$a->profile['profile_uid'],true);
 		$a->page['aside'] .= categories_widget($a->get_baseurl(true) . '/profile/' . $a->profile['nickname'],(x($category) ? xmlify($category) : ''));
 
 		if(can_write_wall($a,$a->profile['profile_uid'])) {
 
 			$x = array(
 				'is_owner' => $is_owner,
-            	'allow_location' => ((($is_owner || $commvisitor) && $a->profile['allow_location']) ? true : false),
-	            'default_location' => (($is_owner) ? $a->user['default-location'] : ''),
-    	        'nickname' => $a->profile['nickname'],
-        	    'lockstate' => (((is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
-            	'acl' => (($is_owner) ? populate_acl($a->user, $celeb) : ''),
-	            'bang' => '',
-    	        'visitor' => (($is_owner || $commvisitor) ? 'block' : 'none'),
-        	    'profile_uid' => $a->profile['profile_uid'],
+				'allow_location' => ((($is_owner || $commvisitor) && $a->profile['allow_location']) ? true : false),
+				'default_location' => (($is_owner) ? $a->user['default-location'] : ''),
+				'nickname' => $a->profile['nickname'],
+				'lockstate' => (((is_array($a->user) && ((strlen($a->user['allow_cid'])) ||
+						(strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) ||
+						(strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
+				'acl' => (($is_owner) ? populate_acl($a->user, true) : ''),
+				'bang' => '',
+				'visitor' => (($is_owner || $commvisitor) ? 'block' : 'none'),
+				'profile_uid' => $a->profile['profile_uid'],
 				'acl_data' => ( $is_owner ? construct_acl_data($a, $a->user) : '' ), // For non-Javascript ACL selector
-        	);
+		);
 
-        	$o .= status_editor($a,$x);
+		$o .= status_editor($a,$x);
 		}
 
 	}
@@ -303,9 +302,9 @@ function profile_content(&$a, $update = 0) {
 		foreach($r as $rr)
 			$parents_arr[] = $rr['item_id'];
 		$parents_str = implode(', ', $parents_arr);
- 
+
 		$items = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
-			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`network`, `contact`.`rel`, 
+			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`network`, `contact`.`rel`,
 			`contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
 			`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
 			FROM `item`, `contact`