Merge pull request #3287 from Quix0r/rewrites/coding-convention-split2-1-2

Coding convention applied split 2-1-2 (of 2-14-2)

include/acl_selectors.php

@@ -4,11 +4,11 @@
  * @file include/acl_selectors.php
  */
 
-require_once("include/contact_selectors.php");
+require_once "include/contact_selectors.php";
-require_once("include/contact_widgets.php");
+require_once "include/contact_widgets.php";
-require_once("include/DirSearch.php");
+require_once "include/DirSearch.php";
-require_once("include/features.php");
+require_once "include/features.php";
-require_once("mod/proxy.php");
+require_once "mod/proxy.php";
 
 
 /**
@@ -35,10 +35,11 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
 
 	if (dbm::is_result($r)) {
 		foreach ($r as $rr) {
-			if((is_array($preselected)) && in_array($rr['id'], $preselected))
+			if ((is_array($preselected)) && in_array($rr['id'], $preselected)) {
 				$selected = " selected=\"selected\" ";
-			else
+			} else {
 				$selected = '';
+			}
 
 			$trimmed = mb_substr($rr['name'],0,12);
 
@@ -54,7 +55,8 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
 	return $o;
 }
 
-
+/// @TODO after an optional parameter, no mandadory parameter can follow
+/// @TODO find proper type-hints
 function contact_selector($selname, $selclass, $preselected = false, $options) {
 
 	$a = get_app();
@@ -66,40 +68,42 @@ function contact_selector($selname, $selclass, $preselected = false, $options) {
 	$size = 4;
 
 	if (is_array($options)) {
-		if (x($options,'size'))
+		if (x($options, 'size'))
 			$size = $options['size'];
 
-		if (x($options,'mutual_friends')) {
+		if (x($options, 'mutual_friends')) {
 			$mutual = true;
 		}
-		if (x($options,'single')) {
+		if (x($options, 'single')) {
 			$single = true;
 		}
-		if (x($options,'multiple')) {
+		if (x($options, 'multiple')) {
 			$single = false;
 		}
-		if (x($options,'exclude')) {
+		if (x($options, 'exclude')) {
 			$exclude = $options['exclude'];
 		}
 
-		if (x($options,'networks')) {
+		if (x($options, 'networks')) {
-			switch($options['networks']) {
+			switch ($options['networks']) {
 				case 'DFRN_ONLY':
 					$networks = array(NETWORK_DFRN);
 					break;
 				case 'PRIVATE':
-					if(is_array($a->user) && $a->user['prvnets'])
+					if (is_array($a->user) && $a->user['prvnets']) {
-						$networks = array(NETWORK_DFRN,NETWORK_MAIL,NETWORK_DIASPORA);
+						$networks = array(NETWORK_DFRN, NETWORK_MAIL, NETWORK_DIASPORA);
-					else
+					} else {
-						$networks = array(NETWORK_DFRN,NETWORK_FACEBOOK,NETWORK_MAIL, NETWORK_DIASPORA);
+						$networks = array(NETWORK_DFRN, NETWORK_FACEBOOK, NETWORK_MAIL, NETWORK_DIASPORA);
+					}
 					break;
 				case 'TWO_WAY':
-					if(is_array($a->user) && $a->user['prvnets'])
+					if (is_array($a->user) && $a->user['prvnets']) {
-						$networks = array(NETWORK_DFRN,NETWORK_MAIL,NETWORK_DIASPORA);
+						$networks = array(NETWORK_DFRN, NETWORK_MAIL, NETWORK_DIASPORA);
-					else
+					} else {
-						$networks = array(NETWORK_DFRN,NETWORK_FACEBOOK,NETWORK_MAIL,NETWORK_DIASPORA,NETWORK_OSTATUS);
+						$networks = array(NETWORK_DFRN, NETWORK_FACEBOOK, NETWORK_MAIL, NETWORK_DIASPORA, NETWORK_OSTATUS);
+					}
 					break;
-				default:
+				default: /// @TODO Maybe log this call?
 					break;
 			}
 		}
@@ -113,26 +117,30 @@ function contact_selector($selname, $selclass, $preselected = false, $options) {
 
 	$sql_extra = '';
 
-	if($x['mutual']) {
+	if (x($x, 'mutual')) {
 		$sql_extra .= sprintf(" AND `rel` = %d ", intval(CONTACT_IS_FRIEND));
 	}
 
-	if(intval($x['exclude']))
+	if (x($x, 'exclude')) {
 		$sql_extra .= sprintf(" AND `id` != %d ", intval($x['exclude']));
+	}
 
-	if(is_array($x['networks']) && count($x['networks'])) {
+	if (is_array($x['networks']) && count($x['networks'])) {
-		for($y = 0; $y < count($x['networks']) ; $y ++)
+		/// @TODO rewrite to foreach()
+		for ($y = 0; $y < count($x['networks']) ; $y ++) {
 			$x['networks'][$y] = "'" . dbesc($x['networks'][$y]) . "'";
-		$str_nets = implode(',',$x['networks']);
+		}
+		$str_nets = implode(',', $x['networks']);
 		$sql_extra .= " AND `network` IN ( $str_nets ) ";
 	}
 
 	$tabindex = (x($options, 'tabindex') ? "tabindex=\"" . $options["tabindex"] . "\"" : "");
 
-	if($x['single'])
+	if ($x['single']) {
 		$o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"" . $x['size'] . "\" $tabindex >\r\n";
-	else
+	} else {
 		$o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"" . $x['size'] . "$\" $tabindex >\r\n";
+	}
 
 	$r = q("SELECT `id`, `name`, `url`, `network` FROM `contact`
 		WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != ''
@@ -174,7 +182,7 @@ function contact_selector($selname, $selclass, $preselected = false, $options) {
 
 function contact_select($selname, $selclass, $preselected = false, $size = 4, $privmail = false, $celeb = false, $privatenet = false, $tabindex = null) {
 
-	require_once("include/bbcode.php");
+	require_once "include/bbcode.php";
 
 	$a = get_app();
 
@@ -185,29 +193,32 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 
 	$sql_extra = '';
 
-	if($privmail || $celeb) {
+	if ($privmail || $celeb) {
 		$sql_extra .= sprintf(" AND `rel` = %d ", intval(CONTACT_IS_FRIEND));
 	}
 
-	if($privmail)
+	if ($privmail) {
 		$sql_extra .= sprintf(" AND `network` IN ('%s' , '%s') ",
 					NETWORK_DFRN, NETWORK_DIASPORA);
-	elseif($privatenet)
+	} elseif ($privatenet) {
 		$sql_extra .= sprintf(" AND `network` IN ('%s' , '%s', '%s', '%s') ",
 					NETWORK_DFRN, NETWORK_MAIL, NETWORK_FACEBOOK, NETWORK_DIASPORA);
+	}
 
 	$tabindex = ($tabindex > 0 ? "tabindex=\"$tabindex\"" : "");
 
 	if ($privmail AND $preselected) {
 		$sql_extra .= " AND `id` IN (".implode(",", $preselected).")";
 		$hidepreselected = ' style="display: none;"';
-	} else
+	} else {
 		$hidepreselected = "";
+	}
 
-	if($privmail)
+	if ($privmail) {
 		$o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"$size\" $tabindex $hidepreselected>\r\n";
-	else
+	} else {
 		$o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" $tabindex >\r\n";
+	}
 
 	$r = q("SELECT `id`, `name`, `url`, `network` FROM `contact`
 		WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != ''
@@ -229,8 +240,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 		foreach ($r as $rr) {
 			if ((is_array($preselected)) && in_array($rr['id'], $preselected)) {
 				$selected = " selected=\"selected\" ";
-			}
+			} else {
-			else {
 				$selected = '';
 			}
 
@@ -249,8 +259,9 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 
 	$o .= "</select>\r\n";
 
-	if ($privmail AND $preselected)
+	if ($privmail AND $preselected) {
 		$o .= implode(", ", $receiverlist);
+	}
 
 	call_hooks($a->module . '_post_' . $selname, $o);
 
@@ -259,7 +270,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 
 
 function fixacl(&$item) {
-	$item = intval(str_replace(array('<','>'),array('',''),$item));
+	$item = intval(str_replace(array('<', '>'), array('', ''), $item));
 }
 
 function prune_deadguys($arr) {
@@ -268,7 +279,7 @@ function prune_deadguys($arr) {
 		return $arr;
 	}
 
-	$str = dbesc(implode(',',$arr));
+	$str = dbesc(implode(',', $arr));
 
 	$r = q("SELECT `id` FROM `contact` WHERE `id` IN ( " . $str . ") AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 ");
 
@@ -287,7 +298,7 @@ function prune_deadguys($arr) {
 function get_acl_permissions($user = null) {
 	$allow_cid = $allow_gid = $deny_cid = $deny_gid = false;
 
-	if(is_array($user)) {
+	if (is_array($user)) {
 		$allow_cid = ((strlen($user['allow_cid']))
 			? explode('><', $user['allow_cid']) : array() );
 		$allow_gid = ((strlen($user['allow_gid']))
@@ -318,34 +329,36 @@ function populate_acl($user = null, $show_jotnets = false) {
 	$perms = get_acl_permissions($user);
 
 	$jotnets = '';
-	if($show_jotnets) {
+	if ($show_jotnets) {
 		$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
 
 		$mail_enabled = false;
 		$pubmail_enabled = false;
 
-		if(! $mail_disabled) {
+		if (! $mail_disabled) {
 			$r = q("SELECT `pubmail` FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
 				intval(local_user())
 			);
 			if (dbm::is_result($r)) {
 				$mail_enabled = true;
-				if(intval($r[0]['pubmail']))
+				if (intval($r[0]['pubmail'])) {
 					$pubmail_enabled = true;
+				}
 			}
 		}
 
 		if (!$user['hidewall']) {
-			if($mail_enabled) {
+			if ($mail_enabled) {
 				$selected = (($pubmail_enabled) ? ' checked="checked" ' : '');
 				$jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . ' value="1" /> ' . t("Post to Email") . '</div>';
 			}
 
 			call_hooks('jot_networks', $jotnets);
-		} else
+		} else {
 			$jotnets .= sprintf(t('Connectors disabled, since "%s" is enabled.'),
 					    t('Hide your profile details from unknown viewers?'));
 		}
+	}
 
 	$tpl = get_markup_template("acl_selector.tpl");
 	$o = replace_macros($tpl, array(
@@ -363,7 +376,7 @@ function populate_acl($user = null, $show_jotnets = false) {
 		'$aclModalTitle' => t('Permissions'),
 		'$aclModalDismiss' => t('Close'),
 		'$features' => array(
-		"aclautomention"=>(feature_enabled($user['uid'],"aclautomention")?"true":"false")
+		'aclautomention' => (feature_enabled($user['uid'], "aclautomention") ? "true" : "false")
 		),
 	));
 
@@ -379,24 +392,26 @@ function construct_acl_data(App $a, $user) {
 
 	$user_defaults = get_acl_permissions($user);
 
-	if($acl_data['groups']) {
+	if ($acl_data['groups']) {
-		foreach($acl_data['groups'] as $key=>$group) {
+		foreach ($acl_data['groups'] as $key => $group) {
 			// Add a "selected" flag to groups that are posted to by default
-			if($user_defaults['allow_gid'] &&
+			if ($user_defaults['allow_gid'] &&
-			   in_array($group['id'], $user_defaults['allow_gid']) && !in_array($group['id'], $user_defaults['deny_gid']) )
+					in_array($group['id'], $user_defaults['allow_gid']) && !in_array($group['id'], $user_defaults['deny_gid']) ) {
 				$acl_data['groups'][$key]['selected'] = 1;
-			else
+			} else {
 				$acl_data['groups'][$key]['selected'] = 0;
+			}
 		}
 	}
-	if($acl_data['contacts']) {
+	if ($acl_data['contacts']) {
-		foreach($acl_data['contacts'] as $key=>$contact) {
+		foreach ($acl_data['contacts'] as $key => $contact) {
 			// Add a "selected" flag to groups that are posted to by default
-			if($user_defaults['allow_cid'] &&
+			if ($user_defaults['allow_cid'] &&
-			   in_array($contact['id'], $user_defaults['allow_cid']) && !in_array($contact['id'], $user_defaults['deny_cid']) )
+					in_array($contact['id'], $user_defaults['allow_cid']) && !in_array($contact['id'], $user_defaults['deny_cid']) ) {
 				$acl_data['contacts'][$key]['selected'] = 1;
-			else
+			} else {
 				$acl_data['contacts'][$key]['selected'] = 0;
+			}
 		}
 	}
 
@@ -419,23 +434,25 @@ function acl_lookup(App $a, $out_type = 'json') {
 
 	// For use with jquery.textcomplete for private mail completion
 
-	if(x($_REQUEST,'query') && strlen($_REQUEST['query'])) {
+	if (x($_REQUEST, 'query') && strlen($_REQUEST['query'])) {
-		if(! $type)
+		if (! $type) {
 			$type = 'm';
+		}
 		$search = $_REQUEST['query'];
 	}
 
 	logger("Searching for ".$search." - type ".$type, LOGGER_DEBUG);
 
-	if ($search!=""){
+	if ($search != "") {
 		$sql_extra = "AND `name` LIKE '%%".dbesc($search)."%%'";
 		$sql_extra2 = "AND (`attag` LIKE '%%".dbesc($search)."%%' OR `name` LIKE '%%".dbesc($search)."%%' OR `nick` LIKE '%%".dbesc($search)."%%')";
 	} else {
+		/// @TODO Avoid these needless else blocks by putting variable-initialization atop of if()
 		$sql_extra = $sql_extra2 = "";
 	}
 
 	// count groups and contacts
-	if ($type=='' || $type=='g'){
+	if ($type == '' || $type == 'g') {
 		$r = q("SELECT COUNT(*) AS g FROM `group` WHERE `deleted` = 0 AND `uid` = %d $sql_extra",
 			intval(local_user())
 		);
@@ -446,8 +463,8 @@ function acl_lookup(App $a, $out_type = 'json') {
 
 	$sql_extra2 .= " ".unavailable_networks();
 
-	// autocomplete for editor mentions
+	if ($type == '' || $type == 'c') {
-	if ($type=='' || $type=='c'){
+		// autocomplete for editor mentions
 		$r = q("SELECT COUNT(*) AS c FROM `contact`
 				WHERE `uid` = %d AND NOT `self`
 				AND NOT `blocked` AND NOT `pending` AND NOT `archive`
@@ -493,7 +510,7 @@ function acl_lookup(App $a, $out_type = 'json') {
 	$groups = array();
 	$contacts = array();
 
-	if ($type=='' || $type=='g'){
+	if ($type == '' || $type == 'g') {
 
 		/// @todo We should cache this query.
 		// This can be done when we can delete cache entries via wildcard
@@ -510,7 +527,7 @@ function acl_lookup(App $a, $out_type = 'json') {
 			intval($count)
 		);
 
-		foreach($r as $g){
+		foreach ($r as $g) {
 //		logger('acl: group: ' . $g['name'] . ' members: ' . $g['uids']);
 			$groups[] = array(
 				"type"  => "g",
@@ -524,7 +541,7 @@ function acl_lookup(App $a, $out_type = 'json') {
 		}
 	}
 
-	if ($type==''){
+	if ($type == '') {
 
 		$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `forum`, `prv` FROM `contact`
 			WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != ''
@@ -534,9 +551,7 @@ function acl_lookup(App $a, $out_type = 'json') {
 			intval(local_user()),
 			dbesc(NETWORK_OSTATUS), dbesc(NETWORK_STATUSNET)
 		);
-	}
+	} elseif ($type == 'c') {
-	elseif ($type=='c'){
-
 		$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `forum`, `prv` FROM `contact`
 			WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != ''
 			AND NOT (`network` IN ('%s'))
@@ -546,7 +561,7 @@ function acl_lookup(App $a, $out_type = 'json') {
 			dbesc(NETWORK_STATUSNET)
 		);
 	}
-	elseif($type == 'm') {
+	elseif ($type == 'm') {
 		$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag` FROM `contact`
 			WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive`
 			AND `network` IN ('%s','%s','%s')
@@ -593,7 +608,7 @@ function acl_lookup(App $a, $out_type = 'json') {
 
 
 	if (dbm::is_result($r)) {
-		foreach ($r as $g){
+		foreach ($r as $g) {
 			$contacts[] = array(
 				'type'    => 'c',
 				'photo'   => proxy_url($g['micro'], false, PROXY_SIZE_MICRO),
@@ -602,7 +617,7 @@ function acl_lookup(App $a, $out_type = 'json') {
 				'network' => $g['network'],
 				'link'    => $g['url'],
 				'nick'    => htmlentities(($g['attag']) ? $g['attag'] : $g['nick']),
-				'forum'   => ((x($g['forum']) || x($g['prv'])) ? 1 : 0),
+				'forum'   => ((x($g, 'forum') || x($g, 'prv')) ? 1 : 0),
 			);
 		}
 	}
@@ -669,7 +684,7 @@ function acl_lookup(App $a, $out_type = 'json') {
 
 	call_hooks('acl_lookup_end', $results);
 
-	if($out_type === 'html') {
+	if ($out_type === 'html') {
 		$o = array(
 			'tot'      => $results['tot'],
 			'start'    => $results['start'],

include/attach.php

@@ -1060,13 +1060,14 @@ function z_mime_content_type($filename) {
 		'zsh' => 'text/x-script.zsh',
 	);
 
-	$dot = strpos($filename,'.');
+	$dot = strpos($filename, '.');
-	if($dot !== false) {
+	if ($dot !== false) {
-		$ext = strtolower(substr($filename,$dot+1));
+		$ext = strtolower(substr($filename, $dot + 1));
 		if (array_key_exists($ext, $mime_types)) {
 			return $mime_types[$ext];
 		}
 	}
+	/// @TODO Then let's get rid of it?
 // can't use this because we're just passing a name, e.g. not a file that can be opened
 //	elseif (function_exists('finfo_open')) {
 //		$finfo = @finfo_open(FILEINFO_MIME);

include/bb2diaspora.php

@@ -27,14 +27,15 @@ function diaspora_mention2bb($match) {
 		$name = $data['name'];
 	}
 
-	return '@[url='.$data['url'].']'.$name.'[/url]';
+	return '@[url=' . $data['url'] . ']' . $name . '[/url]';
 }
 
-// we don't want to support a bbcode specific markdown interpreter
+/*
-// and the markdown library we have is pretty good, but provides HTML output.
+ * we don't want to support a bbcode specific markdown interpreter
-// So we'll use that to convert to HTML, then convert the HTML back to bbcode,
+ * and the markdown library we have is pretty good, but provides HTML output.
-// and then clean up a few Diaspora specific constructs.
+ * So we'll use that to convert to HTML, then convert the HTML back to bbcode,
-
+ * and then clean up a few Diaspora specific constructs.
+ */
 function diaspora2bb($s) {
 
 	$s = html_entity_decode($s, ENT_COMPAT, 'UTF-8');
@@ -93,15 +94,15 @@ function diaspora_mentions($match) {
 
 	$contact = get_contact_details_by_url($match[3]);
 
-	if (!isset($contact['addr'])) {
+	if (!x($contact, 'addr')) {
 		$contact = Probe::uri($match[3]);
 	}
 
-	if (!isset($contact['addr'])) {
+	if (!x($contact, 'addr')) {
 		return $match[0];
 	}
 
-	$mention = '@{'.$match[2].'; '.$contact['addr'].'}';
+	$mention = '@{' . $match[2] . '; ' . $contact['addr'] . '}';
 	return $mention;
 }
 
@@ -222,9 +223,9 @@ function unescape_underscores_in_links($m) {
 }
 
 function format_event_diaspora($ev) {
-
+	if (! ((is_array($ev)) && count($ev))) {
-	if(! ((is_array($ev)) && count($ev)))
 		return '';
+	}
 
 	$bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM
 
@@ -239,17 +240,19 @@ function format_event_diaspora($ev) {
 			$ev['start'] , $bd_format)))
 		.  '](' . App::get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['start'])) . ")\n";
 
-	if(! $ev['nofinish'])
+	if (! $ev['nofinish']) {
 		$o .= t('Finishes:') . ' ' . '['
 			. (($ev['adjust']) ? day_translate(datetime_convert('UTC', 'UTC',
 				$ev['finish'] , $bd_format ))
 				:  day_translate(datetime_convert('UTC', 'UTC',
 				$ev['finish'] , $bd_format )))
 			. '](' . App::get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['finish'])) . ")\n";
+	}
 
-	if(strlen($ev['location']))
+	if (strlen($ev['location'])) {
 		$o .= t('Location:') . bb2diaspora($ev['location'])
 			. "\n";
+	}
 
 	$o .= "\n";
 	return $o;

include/bbcode.php

@@ -9,35 +9,38 @@ require_once 'include/Contact.php';
 require_once 'include/plaintext.php';
 
 function bb_PictureCacheExt($matches) {
-	if (strpos($matches[3], "data:image/") === 0)
+	if (strpos($matches[3], "data:image/") === 0) {
-		return ($matches[0]);
+		return $matches[0];
+	}
 
 	$matches[3] = proxy_url($matches[3]);
-	return "[img=".$matches[1]."x".$matches[2]."]".$matches[3]."[/img]";
+	return "[img=" . $matches[1] . "x" . $matches[2] . "]" . $matches[3] . "[/img]";
 }
 
 function bb_PictureCache($matches) {
-	if (strpos($matches[1], "data:image/") === 0)
+	if (strpos($matches[1], "data:image/") === 0) {
-		return ($matches[0]);
+		return $matches[0];
+	}
 
 	$matches[1] = proxy_url($matches[1]);
-	return "[img]".$matches[1]."[/img]";
+	return "[img]" . $matches[1] . "[/img]";
 }
 
 function bb_map_coords($match) {
 	// the extra space in the following line is intentional
-	return str_replace($match[0],'<div class="map"  >' . generate_map(str_replace('/',' ',$match[1])) . '</div>', $match[0]);
+	return str_replace($match[0], '<div class="map"  >' . generate_map(str_replace('/', ' ', $match[1])) . '</div>', $match[0]);
 }
 function bb_map_location($match) {
 	// the extra space in the following line is intentional
-	return str_replace($match[0],'<div class="map"  >' . generate_named_map($match[1]) . '</div>', $match[0]);
+	return str_replace($match[0], '<div class="map"  >' . generate_named_map($match[1]) . '</div>', $match[0]);
 }
 
 function bb_attachment($Text, $simplehtml = false, $tryoembed = true) {
 
 	$data = get_attachment_data($Text);
-	if (!$data)
+	if (!$data) {
 		return $Text;
+	}
 
 	if (isset($data["title"])) {
 		$data["title"] = strip_tags($data["title"]);
@@ -57,83 +60,91 @@ function bb_attachment($Text, $simplehtml = false, $tryoembed = true) {
 
 		// If the link description is similar to the text above then don't add the link description
 		if (($data["title"] != "") AND ((strpos($test1,$test2) !== false) OR
-			(similar_text($test1,$test2) / strlen($data["title"])) > 0.9))
+			(similar_text($test1,$test2) / strlen($data["title"])) > 0.9)) {
 			$title2 = $data["url"];
+		}
 		$text = sprintf('<a href="%s" title="%s" class="attachment thumbnail" rel="nofollow external">%s</a><br />',
 				$data["url"], $data["title"], $title2);
-	} elseif (($simplehtml != 4) AND ($simplehtml != 0))
+	} elseif (($simplehtml != 4) AND ($simplehtml != 0)) {
 		$text = sprintf('<a href="%s" target="_blank">%s</a><br>', $data["url"], $data["title"]);
-	else {
+	} else {
 		$text = sprintf('<span class="type-%s">', $data["type"]);
 
 		$bookmark = array(sprintf('[bookmark=%s]%s[/bookmark]', $data["url"], $data["title"]), $data["url"], $data["title"]);
-		if ($tryoembed)
+		if ($tryoembed) {
 			$oembed = tryoembed($bookmark);
-		else
+		} else {
 			$oembed = $bookmark[0];
+		}
 
-		if (strstr(strtolower($oembed), "<iframe "))
+		if (strstr(strtolower($oembed), "<iframe ")) {
 			$text = $oembed;
-		else {
+		} else {
-			if (($data["image"] != "") AND !strstr(strtolower($oembed), "<img "))
+			if (($data["image"] != "") AND !strstr(strtolower($oembed), "<img ")) {
 				$text .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a><br />', $data["url"], proxy_url($data["image"]), $data["title"]);
-			elseif (($data["preview"] != "") AND !strstr(strtolower($oembed), "<img "))
+			} elseif (($data["preview"] != "") AND !strstr(strtolower($oembed), "<img ")) {
 				$text .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-preview" /></a><br />', $data["url"], proxy_url($data["preview"]), $data["title"]);
+			}
 
-			if (($data["type"] == "photo") AND ($data["url"] != "") AND ($data["image"] != ""))
+			if (($data["type"] == "photo") AND ($data["url"] != "") AND ($data["image"] != "")) {
 				$text .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a>', $data["url"], proxy_url($data["image"]), $data["title"]);
-			else
+			} else {
 				$text .= $oembed;
+			}
 
-			if (trim($data["description"]) != "")
+			if (trim($data["description"]) != "") {
 				$text .= sprintf('<blockquote>%s</blockquote></span>', trim(bbcode($data["description"])));
+			}
 		}
 	}
-	return $data["text"].$text.$data["after"];
+	return $data["text"] . $text . $data["after"];
 }
 
 function bb_remove_share_information($Text, $plaintext = false, $nolink = false) {
 
 	$data = get_attachment_data($Text);
 
-	if (!$data)
+	if (!$data) {
 		return $Text;
-
+	} elseif ($nolink) {
-	if ($nolink)
+		return $data["text"] . $data["after"];
-		return $data["text"].$data["after"];
+	}
 
 	$title = htmlentities($data["title"], ENT_QUOTES, 'UTF-8', false);
 	$text = htmlentities($data["text"], ENT_QUOTES, 'UTF-8', false);
-	if ($plaintext OR (($title != "") AND strstr($text, $title)))
+	if ($plaintext OR (($title != "") AND strstr($text, $title))) {
 		$data["title"] = $data["url"];
-	elseif (($text != "") AND strstr($title, $text)) {
+	} elseif (($text != "") AND strstr($title, $text)) {
 		$data["text"] = $data["title"];
 		$data["title"] = $data["url"];
 	}
 
-	if (($data["text"] == "") AND ($data["title"] != "") AND ($data["url"] == ""))
+	if (($data["text"] == "") AND ($data["title"] != "") AND ($data["url"] == "")) {
-		return $data["title"].$data["after"];
+		return $data["title"] . $data["after"];
+	}
 
 	// If the link already is included in the post, don't add it again
-	if (($data["url"] != "") AND strpos($data["text"], $data["url"]))
+	if (($data["url"] != "") AND strpos($data["text"], $data["url"])) {
-		return $data["text"].$data["after"];
+		return $data["text"] . $data["after"];
+	}
 
 	$text = $data["text"];
 
-	if (($data["url"] != "") AND ($data["title"] != ""))
+	if (($data["url"] != "") AND ($data["title"] != "")) {
-		$text .= "\n[url=".$data["url"]."]".$data["title"]."[/url]";
+		$text .= "\n[url=" . $data["url"] . "]" . $data["title"] . "[/url]";
-	elseif (($data["url"] != ""))
+	} elseif (($data["url"] != "")) {
-		$text .= "\n".$data["url"];
+		$text .= "\n" . $data["url"];
+	}
 
-	return $text."\n".$data["after"];
+	return $text . "\n" . $data["after"];
 }
 
 function bb_cleanstyle($st) {
-  return "<span style=\"".cleancss($st[1]).";\">".$st[2]."</span>";
+	return "<span style=\"" . cleancss($st[1]) . ";\">" . $st[2] . "</span>";
 }
 
 function bb_cleanclass($st) {
-  return "<span class=\"".cleancss($st[1])."\">".$st[2]."</span>";
+	return "<span class=\"" . cleancss($st[1]) . "\">" . $st[2] . "</span>";
 }
 
 function cleancss($input) {
@@ -145,14 +156,16 @@ function cleancss($input) {
 	for ($i = 0; $i < strlen($input); $i++) {
 		$char = substr($input, $i, 1);
 
-		if (($char >= "a") and ($char <= "z"))
+		if (($char >= "a") and ($char <= "z")) {
 			$cleaned .= $char;
+		}
 
-		if (!(strpos(" #;:0123456789-_.%", $char) === false))
+		if (!(strpos(" #;:0123456789-_.%", $char) === false)) {
 			$cleaned .= $char;
+		}
 	}
 
-	return($cleaned);
+	return $cleaned;
 }
 
 function stripcode_br_cb($s) {
@@ -166,25 +179,30 @@ function tryoembed($match) {
 	$url = str_replace(array("http://www.youtube.com/", "http://player.vimeo.com/"),
 				array("https://www.youtube.com/", "https://player.vimeo.com/"), $url);
 
-
 	$o = oembed_fetch_url($url);
 
-	if (!is_object($o))
+	if (!is_object($o)) {
 		return $match[0];
+	}
 
-	if (isset($match[2]))
+	if (isset($match[2])) {
 		$o->title = $match[2];
+	}
 
-	if ($o->type=="error") return $match[0];
+	if ($o->type == "error") {
+		return $match[0];
+	}
 
 	$html = oembed_format_object($o);
+
 	return $html;
 }
 
-// [noparse][i]italic[/i][/noparse] turns into
+/*
-// [noparse][ i ]italic[ /i ][/noparse],
+ * [noparse][i]italic[/i][/noparse] turns into
-// to hide them from parser.
+ * [noparse][ i ]italic[ /i ][/noparse],
-
+ * to hide them from parser.
+ */
 function bb_spacefy($st) {
 	$whole_match = $st[0];
 	$captured = $st[1];
@@ -193,10 +211,11 @@ function bb_spacefy($st) {
 	return $new_str;
 }
 
-// The previously spacefied [noparse][ i ]italic[ /i ][/noparse],
+/*
-// now turns back and the [noparse] tags are trimed
+ * The previously spacefied [noparse][ i ]italic[ /i ][/noparse],
-// returning [i]italic[/i]
+ * now turns back and the [noparse] tags are trimed
-
+ * returning [i]italic[/i]
+ */
 function bb_unspacefy_and_trim($st) {
 	$whole_match = $st[0];
 	$captured = $st[1];
@@ -205,23 +224,26 @@ function bb_unspacefy_and_trim($st) {
 }
 
 function bb_find_open_close($s, $open, $close, $occurence = 1) {
-
+	if ($occurence < 1) {
-	if($occurence < 1)
 		$occurence = 1;
-
-	$start_pos = -1;
-	for($i = 1; $i <= $occurence; $i++) {
-		if( $start_pos !== false)
-			$start_pos = strpos($s, $open, $start_pos + 1);
 	}
 
-	if( $start_pos === false)
+	$start_pos = -1;
+	for ($i = 1; $i <= $occurence; $i++) {
+		if ($start_pos !== false) {
+			$start_pos = strpos($s, $open, $start_pos + 1);
+		}
+	}
+
+	if ($start_pos === false) {
 		return false;
+	}
 
 	$end_pos = strpos($s, $close, $start_pos);
 
-	if( $end_pos === false)
+	if ($end_pos === false) {
 		return false;
+	}
 
 	$res = array( 'start' => $start_pos, 'end' => $end_pos );
 
@@ -229,36 +251,50 @@ function bb_find_open_close($s, $open, $close, $occurence = 1) {
 }
 
 function get_bb_tag_pos($s, $name, $occurence = 1) {
-
+	if ($occurence < 1) {
-	if($occurence < 1)
 		$occurence = 1;
-
-	$start_open = -1;
-	for($i = 1; $i <= $occurence; $i++) {
-		if( $start_open !== false)
-			$start_open = strpos($s, '[' . $name, $start_open + 1); // allow [name= type tags
 	}
 
-	if( $start_open === false)
+	$start_open = -1;
+	for ($i = 1; $i <= $occurence; $i++) {
+		if ($start_open !== false) {
+			$start_open = strpos($s, '[' . $name, $start_open + 1); // allow [name= type tags
+		}
+	}
+
+	if ($start_open === false) {
 		return false;
+	}
 
 	$start_equal = strpos($s, '=', $start_open);
 	$start_close = strpos($s, ']', $start_open);
 
-	if( $start_close === false)
+	if ($start_close === false) {
 		return false;
+	}
 
 	$start_close++;
 
 	$end_open = strpos($s, '[/' . $name . ']', $start_close);
 
-	if( $end_open === false)
+	if ($end_open === false) {
 		return false;
+	}
 
-	$res = array( 'start' => array('open' => $start_open, 'close' => $start_close),
+	$res = array(
-		      'end' => array('open' => $end_open, 'close' => $end_open + strlen('[/' . $name . ']')) );
+		'start' => array(
-	if( $start_equal !== false)
+			'open'  => $start_open,
+			'close' => $start_close
+		),
+		'end'   => array(
+			'open'  => $end_open,
+			'close' => $end_open + strlen('[/' . $name . ']')
+		),
+	);
+
+	if ($start_equal !== false) {
 		$res['start']['equal'] = $start_equal + 1;
+	}
 
 	return $res;
 }
@@ -269,13 +305,13 @@ function bb_tag_preg_replace($pattern, $replace, $name, $s) {
 
 	$occurence = 1;
 	$pos = get_bb_tag_pos($string, $name, $occurence);
-	while($pos !== false && $occurence < 1000) {
+	while ($pos !== false && $occurence < 1000) {
-
 		$start = substr($string, 0, $pos['start']['open']);
 		$subject = substr($string, $pos['start']['open'], $pos['end']['close'] - $pos['start']['open']);
 		$end = substr($string, $pos['end']['close']);
-		if($end === false)
+		if ($end === false) {
 			$end = '';
+		}
 
 		$subject = preg_replace($pattern, $replace, $subject);
 		$string = $start . $subject . $end;
@@ -287,7 +323,7 @@ function bb_tag_preg_replace($pattern, $replace, $name, $s) {
 	return $string;
 }
 
-if(! function_exists('bb_extract_images')) {
+if (! function_exists('bb_extract_images')) {
 function bb_extract_images($body) {
 
 	$saved_image = array();
@@ -298,26 +334,28 @@ function bb_extract_images($body) {
 	$img_start = strpos($orig_body, '[img');
 	$img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false);
 	$img_end = ($img_start !== false ? strpos(substr($orig_body, $img_start), '[/img]') : false);
-	while(($img_st_close !== false) && ($img_end !== false)) {
+	while (($img_st_close !== false) && ($img_end !== false)) {
 
 		$img_st_close++; // make it point to AFTER the closing bracket
 		$img_end += $img_start;
 
-		if(! strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) {
+		if (! strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) {
 			// This is an embedded image
 
 			$saved_image[$cnt] = substr($orig_body, $img_start + $img_st_close, $img_end - ($img_start + $img_st_close));
 			$new_body = $new_body . substr($orig_body, 0, $img_start) . '[$#saved_image' . $cnt . '#$]';
 
 			$cnt++;
-		}
+		} else {
-		else
 			$new_body = $new_body . substr($orig_body, 0, $img_end + strlen('[/img]'));
+		}
 
 		$orig_body = substr($orig_body, $img_end + strlen('[/img]'));
 
-		if($orig_body === false) // in case the body ends on a closing image tag
+		if ($orig_body === false) {
+			// in case the body ends on a closing image tag
 			$orig_body = '';
+		}
 
 		$img_start = strpos($orig_body, '[img');
 		$img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false);
@@ -329,7 +367,7 @@ function bb_extract_images($body) {
 	return array('body' => $new_body, 'images' => $saved_image);
 }}
 
-if(! function_exists('bb_replace_images')) {
+if (! function_exists('bb_replace_images')) {
 function bb_replace_images($body, $images) {
 
 	$newbody = $body;
@@ -504,85 +542,94 @@ function bb_ShareAttributes($share, $simplehtml) {
 				);
 			break;
 	}
-	return($text);
+
+	return $text;
 }
 
 function GetProfileUsername($profile, $username, $compact = false, $getnetwork = false) {
 
 	$twitter = preg_replace("=https?://twitter.com/(.*)=ism", "$1@twitter.com", $profile);
 	if ($twitter != $profile) {
-		if ($getnetwork)
+		if ($getnetwork) {
-			return(NETWORK_TWITTER);
+			return NETWORK_TWITTER;
-		elseif ($compact)
+		} elseif ($compact) {
-			return($twitter);
+			return $twitter;
-		else
+		} else {
-			return($username." (".$twitter.")");
+			return ($username . " (" . $twitter . ")");
+		}
 	}
 
 	$appnet = preg_replace("=https?://alpha.app.net/(.*)=ism", "$1@alpha.app.net", $profile);
 	if ($appnet != $profile) {
-		if ($getnetwork)
+		if ($getnetwork) {
-			return(NETWORK_APPNET);
+			return NETWORK_APPNET;
-		elseif ($compact)
+		} elseif ($compact) {
-			return($appnet);
+			return $appnet;
-		else
+		} else {
-			return($username." (".$appnet.")");
+			return ($username . " (" . $appnet . ")");
+		}
 	}
 
 	$gplus = preg_replace("=https?://plus.google.com/(.*)=ism", "$1@plus.google.com", $profile);
 	if ($gplus != $profile) {
-		if ($getnetwork)
+		if ($getnetwork) {
-			return(NETWORK_GPLUS);
+			return NETWORK_GPLUS;
-		elseif ($compact)
+		} elseif ($compact) {
-			return($gplususername." (".$username.")");
+			return ($gplususername . " (" . $username . ")");
-		else
+		} else {
-			return($username." (".$gplus.")");
+			return ($username . " (" . $gplus . ")");
+		}
 	}
 
 	$friendica = preg_replace("=https?://(.*)/profile/(.*)=ism", "$2@$1", $profile);
 	if ($friendica != $profile) {
-		if ($getnetwork)
+		if ($getnetwork) {
-			return(NETWORK_DFRN);
+			return NETWORK_DFRN;
-		elseif ($compact)
+		} elseif ($compact) {
-			return($friendica);
+			return $friendica;
-		else
+		} else {
-			return($username." (".$friendica.")");
+			return ($username . " (" . $friendica . ")");
+		}
 	}
 
 	$diaspora = preg_replace("=https?://(.*)/u/(.*)=ism", "$2@$1", $profile);
 	if ($diaspora != $profile) {
-		if ($getnetwork)
+		if ($getnetwork) {
-			return(NETWORK_DIASPORA);
+			return NETWORK_DIASPORA;
-		elseif ($compact)
+		} elseif ($compact) {
-			return($diaspora);
+			return $diaspora;
-		else
+		} else {
-			return($username." (".$diaspora.")");
+			return ($username . " (" . $diaspora . ")");
+		}
 	}
 
 	$red = preg_replace("=https?://(.*)/channel/(.*)=ism", "$2@$1", $profile);
 	if ($red != $profile) {
-		if ($getnetwork)
+		if ($getnetwork) {
 			// red is identified as Diaspora - friendica can't connect directly to it
-			return(NETWORK_DIASPORA);
+			return NETWORK_DIASPORA;
-		elseif ($compact)
+		} elseif ($compact) {
-			return($red);
+			return $red;
-		else
+		} else {
-			return($username." (".$red.")");
+			return ($username . " (" . $red . ")");
+		}
 	}
 
 	$StatusnetHost = preg_replace("=https?://(.*)/user/(.*)=ism", "$1", $profile);
 	if ($StatusnetHost != $profile) {
 		$StatusnetUser = preg_replace("=https?://(.*)/user/(.*)=ism", "$2", $profile);
 		if ($StatusnetUser != $profile) {
+			/// @TODO Some hosts run on https, not just http and sometimes http is disabled, let's support both here
 			$UserData = fetch_url("http://".$StatusnetHost."/api/users/show.json?user_id=".$StatusnetUser);
 			$user = json_decode($UserData);
 			if ($user) {
-				if ($getnetwork)
+				if ($getnetwork) {
-					return(NETWORK_STATUSNET);
+					return NETWORK_STATUSNET;
-				elseif ($compact)
+				} elseif ($compact) {
-					return($user->screen_name."@".$StatusnetHost);
+					return ($user->screen_name . "@" . $StatusnetHost);
-				else
+				} else {
-					return($username." (".$user->screen_name."@".$StatusnetHost.")");
+					return ($username . " (" . $user->screen_name . "@" . $StatusnetHost . ")");
+				}
 			}
 		}
 	}
@@ -592,16 +639,17 @@ function GetProfileUsername($profile, $username, $compact = false, $getnetwork =
 	if ($rest == "") {
 		$pumpio = preg_replace("=https?://([\.\w]+)/([\.\w]+)(.*)=ism", "$2@$1", $profile);
 		if ($pumpio != $profile) {
-			if ($getnetwork)
+			if ($getnetwork) {
-				return(NETWORK_PUMPIO);
+				return NETWORK_PUMPIO;
-			elseif ($compact)
+			} elseif ($compact) {
-				return($pumpio);
+				return $pumpio;
-			else
+			} else {
-				return($username." (".$pumpio.")");
+				return ($username . " (" . $pumpio . ")");
+			}
 		}
 	}
 
-	return($username);
+	return $username;
 }
 
 function bb_DiasporaLinks($match) {
@@ -611,7 +659,7 @@ function bb_DiasporaLinks($match) {
 function bb_RemovePictureLinks($match) {
 	$text = Cache::get($match[1]);
 
-	if(is_null($text)){
+	if (is_null($text)) {
 		$a = get_app();
 
 		$stamp1 = microtime(true);
@@ -652,20 +700,22 @@ function bb_RemovePictureLinks($match) {
 		}
 		Cache::set($match[1],$text);
 	}
-	return($text);
+
+	return $text;
 }
 
 function bb_expand_links($match) {
-	if (($match[3] == "") OR ($match[2] == $match[3]) OR stristr($match[2], $match[3]))
+	if (($match[3] == "") OR ($match[2] == $match[3]) OR stristr($match[2], $match[3])) {
-		return ($match[1]."[url]".$match[2]."[/url]");
+		return ($match[1] . "[url]" . $match[2] . "[/url]");
-	else
+	} else {
-		return ($match[1].$match[3]." [url]".$match[2]."[/url]");
+		return ($match[1] . $match[3] . " [url]" . $match[2] . "[/url]");
+	}
 }
 
 function bb_CleanPictureLinksSub($match) {
 	$text = Cache::get($match[1]);
 
-	if(is_null($text)){
+	if (is_null($text)) {
 		$a = get_app();
 
 		$stamp1 = microtime(true);
@@ -707,18 +757,20 @@ function bb_CleanPictureLinksSub($match) {
 		}
 		Cache::set($match[1],$text);
 	}
-	return($text);
+
+	return $text;
 }
 
 function bb_CleanPictureLinks($text) {
 	$text = preg_replace_callback("&\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]&Usi", 'bb_CleanPictureLinksSub', $text);
-	return ($text);
+	return $text;
 }
 
 function bb_highlight($match) {
-	if(in_array(strtolower($match[1]),['php','css','mysql','sql','abap','diff','html','perl','ruby',
+	if (in_array(strtolower($match[1]), ['php', 'css', 'mysql', 'sql', 'abap', 'diff', 'html', 'perl', 'ruby',
-		'vbscript','avrc','dtd','java','xml','cpp','python','javascript','js','sh']))
+		'vbscript', 'avrc', 'dtd', 'java', 'xml', 'cpp', 'python', 'javascript', 'js', 'sh'])) {
-		return text_highlight($match[2],strtolower($match[1]));
+		return text_highlight($match[2], strtolower($match[1]));
+	}
 	return $match[0];
 }
 
@@ -827,7 +879,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
 	// Handle attached links or videos
 	$Text = bb_attachment($Text, $simplehtml, $tryoembed);
 
-	$Text = str_replace(array("\r","\n"), array('<br />','<br />'), $Text);
+	$Text = str_replace(array("\r","\n"), array('<br />', '<br />'), $Text);
 
 	if ($preserve_nl) {
 		$Text = str_replace(array("\n", "\r"), array('', ''), $Text);
@@ -1082,15 +1134,14 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
 
 	// Shared content
 	$Text = preg_replace_callback("/(.*?)\[share(.*?)\](.*?)\[\/share\]/ism",
-		function ($match) use ($simplehtml){
+		function ($match) use ($simplehtml) {
-			return(bb_ShareAttributes($match, $simplehtml));
+			return bb_ShareAttributes($match, $simplehtml);
 		}, $Text);
 
 	$Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism", '<br/><img src="' .App::get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . t('Encrypted content') . '" /><br />', $Text);
 	$Text = preg_replace("/\[crypt(.*?)\](.*?)\[\/crypt\]/ism", '<br/><img src="' .App::get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text);
 	//$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism", '<br/><img src="' .App::get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text);
 
-
 	// Try to Oembed
 	if ($tryoembed) {
 		$Text = preg_replace("/\[video\](.*?\.(ogg|ogv|oga|ogm|webm|mp4))\[\/video\]/ism", '<video src="$1" controls="controls" width="' . $a->videowidth . '" height="' . $a->videoheight . '"><a href="$1">$1</a></video>', $Text);
@@ -1160,7 +1211,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
 	// Summary (e.g. title) is required, earlier revisions only required description (in addition to
 	// start which is always required). Allow desc with a missing summary for compatibility.
 
-	if((x($ev, 'desc') || x($ev, 'summary')) && x($ev, 'start')) {
+	if ((x($ev, 'desc') || x($ev, 'summary')) && x($ev, 'start')) {
 		$sub = format_event_html($ev, $simplehtml);
 
 		$Text = preg_replace("/\[event\-summary\](.*?)\[\/event\-summary\]/ism", '', $Text);
@@ -1215,7 +1266,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
 	$regex = '#<([^>]*?)(href)="(?!' . implode('|', $allowed_link_protocols) . ')(.*?)"(.*?)>#ism';
 	$Text = preg_replace($regex, '<$1$2="javascript:void(0)"$4 class="invalid-href" title="' . t('Invalid link protocol') . '">', $Text);
 
-	if($saved_image) {
+	if ($saved_image) {
 		$Text = bb_replace_images($Text, $saved_image);
 	}
 

include/cli_startup.php

@@ -19,7 +19,7 @@ function cli_startup() {
 		require_once("dba.php");
 		$db = new dba($db_host, $db_user, $db_pass, $db_data);
 		unset($db_host, $db_user, $db_pass, $db_data);
-  	};
+	};
 
 	require_once('include/session.php');
 

include/contact_selectors.php

@@ -37,7 +37,7 @@ function contact_reputation($current) {
 		5 => t('Reputable, has my trust')
 	);
 
-	foreach($rep as $k => $v) {
+	foreach ($rep as $k => $v) {
 		$selected = (($k == $current) ? " selected=\"selected\" " : "");
 		$o .= "<option value=\"$k\" $selected >$v</option>\r\n";
 	}
@@ -61,7 +61,7 @@ function contact_poll_interval($current, $disabled = false) {
 		5 => t('Monthly')
 	);
 
-	foreach($rep as $k => $v) {
+	foreach ($rep as $k => $v) {
 		$selected = (($k == $current) ? " selected=\"selected\" " : "");
 		$o .= "<option value=\"$k\" $selected >$v</option>\r\n";
 	}

include/contact_widgets.php

@@ -2,7 +2,7 @@
 
 function follow_widget($value = "") {
 
-	return replace_macros(get_markup_template('follow.tpl'),array(
+	return replace_macros(get_markup_template('follow.tpl'), array(
 		'$connect' => t('Add New Contact'),
 		'$desc' => t('Enter address or web location'),
 		'$hint' => t('Example: bob@example.com, http://example.com/barbara'),
@@ -13,20 +13,20 @@ function follow_widget($value = "") {
 }
 
 function findpeople_widget() {
-	require_once('include/Contact.php');
+	require_once 'include/Contact.php';
 
 	$a = get_app();
 
-	if(get_config('system','invitation_only')) {
+	if (get_config('system', 'invitation_only')) {
-		$x = get_pconfig(local_user(),'system','invites_remaining');
+		$x = get_pconfig(local_user(), 'system', 'invites_remaining');
-		if($x || is_site_admin()) {
+		if ($x || is_site_admin()) {
 			$a->page['aside'] .= '<div class="side-link" id="side-invite-remain">'
-			. sprintf( tt('%d invitation available','%d invitations available',$x), $x)
+			. sprintf( tt('%d invitation available', '%d invitations available', $x), $x)
 			. '</div>' . $inv;
 		}
 	}
 
-	return replace_macros(get_markup_template('peoplefind.tpl'),array(
+	return replace_macros(get_markup_template('peoplefind.tpl'), array(
 		'$findpeople' => t('Find People'),
 		'$desc' => t('Enter name or interest'),
 		'$label' => t('Connect/Follow'),
@@ -45,32 +45,41 @@ function unavailable_networks() {
 
 	$networks = array();
 
-	if (!plugin_enabled("appnet"))
+	if (!plugin_enabled("appnet")) {
 		$networks[] = NETWORK_APPNET;
+	}
 
-	if (!plugin_enabled("fbpost") AND !plugin_enabled("facebook"))
+	if (!plugin_enabled("fbpost") AND !plugin_enabled("facebook")) {
 		$networks[] = NETWORK_FACEBOOK;
+	}
 
-	if (!plugin_enabled("statusnet"))
+	if (!plugin_enabled("statusnet")) {
 		$networks[] = NETWORK_STATUSNET;
+	}
 
-	if (!plugin_enabled("pumpio"))
+	if (!plugin_enabled("pumpio")) {
 		$networks[] = NETWORK_PUMPIO;
+	}
 
-	if (!plugin_enabled("twitter"))
+	if (!plugin_enabled("twitter")) {
 		$networks[] = NETWORK_TWITTER;
+	}
 
-	if (get_config("system","ostatus_disabled"))
+	if (get_config("system", "ostatus_disabled")) {
 		$networks[] = NETWORK_OSTATUS;
+	}
 
-	if (!get_config("system","diaspora_enabled"))
+	if (!get_config("system", "diaspora_enabled")) {
 		$networks[] = NETWORK_DIASPORA;
+	}
 
-	if (!plugin_enabled("pnut"))
+	if (!plugin_enabled("pnut")) {
 		$networks[] = NETWORK_PNUT;
+	}
 
-	if (!sizeof($networks))
+	if (!sizeof($networks)) {
 		return "";
+	}
 
 	$network_filter = implode("','", $networks);
 
@@ -79,7 +88,7 @@ function unavailable_networks() {
 	return $network_filter;
 }
 
-function networks_widget($baseurl,$selected = '') {
+function networks_widget($baseurl, $selected = '') {
 
 	$a = get_app();
 
@@ -87,7 +96,7 @@ function networks_widget($baseurl,$selected = '') {
 		return '';
 	}
 
-	if (!feature_enabled(local_user(),'networks')) {
+	if (!feature_enabled(local_user(), 'networks')) {
 		return '';
 	}
 
@@ -99,7 +108,7 @@ function networks_widget($baseurl,$selected = '') {
 
 	$nets = array();
 	if (dbm::is_result($r)) {
-		require_once('include/contact_selectors.php');
+		require_once 'include/contact_selectors.php';
 		foreach ($r as $rr) {
 			/// @TODO If 'network' is not there, this triggers an E_NOTICE
 			if ($rr['network']) {
@@ -108,10 +117,11 @@ function networks_widget($baseurl,$selected = '') {
 		}
 	}
 
-	if(count($nets) < 2)
+	if (count($nets) < 2) {
 		return '';
+	}
 
-	return replace_macros(get_markup_template('nets.tpl'),array(
+	return replace_macros(get_markup_template('nets.tpl'), array(
 		'$title' => t('Networks'),
 		'$desc' => '',
 		'$sel_all' => (($selected == '') ? 'selected' : ''),
@@ -122,31 +132,31 @@ function networks_widget($baseurl,$selected = '') {
 	));
 }
 
-function fileas_widget($baseurl,$selected = '') {
+function fileas_widget($baseurl, $selected = '') {
 	if (! local_user()) {
 		return '';
 	}
 
-	if (! feature_enabled(local_user(),'filing')) {
+	if (! feature_enabled(local_user(), 'filing')) {
 		return '';
 	}
 
-	$saved = get_pconfig(local_user(),'system','filetags');
+	$saved = get_pconfig(local_user(), 'system', 'filetags');
 	if (! strlen($saved)) {
 		return;
 	}
 
 	$matches = false;
 	$terms = array();
-	$cnt = preg_match_all('/\[(.*?)\]/',$saved,$matches,PREG_SET_ORDER);
+	$cnt = preg_match_all('/\[(.*?)\]/', $saved, $matches, PREG_SET_ORDER);
 	if ($cnt) {
-		foreach($matches as $mtch) {
+		foreach ($matches as $mtch) {
 			$unescaped = xmlify(file_tag_decode($mtch[1]));
-			$terms[] = array('name' => $unescaped,'selected' => (($selected == $unescaped) ? 'selected' : ''));
+			$terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : ''));
 		}
 	}
 
-	return replace_macros(get_markup_template('fileas_widget.tpl'),array(
+	return replace_macros(get_markup_template('fileas_widget.tpl'), array(
 		'$title' => t('Saved Folders'),
 		'$desc' => '',
 		'$sel_all' => (($selected == '') ? 'selected' : ''),
@@ -157,30 +167,31 @@ function fileas_widget($baseurl,$selected = '') {
 	));
 }
 
-function categories_widget($baseurl,$selected = '') {
+function categories_widget($baseurl, $selected = '') {
 
 	$a = get_app();
 
-	if (! feature_enabled($a->profile['profile_uid'],'categories')) {
+	if (! feature_enabled($a->profile['profile_uid'], 'categories')) {
 		return '';
 	}
 
-	$saved = get_pconfig($a->profile['profile_uid'],'system','filetags');
+	$saved = get_pconfig($a->profile['profile_uid'], 'system', 'filetags');
 	if (! strlen($saved)) {
 		return;
 	}
 
 	$matches = false;
 	$terms = array();
-        $cnt = preg_match_all('/<(.*?)>/',$saved,$matches,PREG_SET_ORDER);
+	$cnt = preg_match_all('/<(.*?)>/', $saved, $matches, PREG_SET_ORDER);
-        if($cnt) {
+
-                foreach($matches as $mtch) {
+	if ($cnt) {
-		        $unescaped = xmlify(file_tag_decode($mtch[1]));
+		foreach ($matches as $mtch) {
-			$terms[] = array('name' => $unescaped,'selected' => (($selected == $unescaped) ? 'selected' : ''));
+			$unescaped = xmlify(file_tag_decode($mtch[1]));
+			$terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : ''));
 		}
 	}
 
-	return replace_macros(get_markup_template('categories_widget.tpl'),array(
+	return replace_macros(get_markup_template('categories_widget.tpl'), array(
 		'$title' => t('Categories'),
 		'$desc' => '',
 		'$sel_all' => (($selected == '') ? 'selected' : ''),
@@ -195,29 +206,30 @@ function common_friends_visitor_widget($profile_uid) {
 
 	$a = get_app();
 
-	if(local_user() == $profile_uid)
+	if (local_user() == $profile_uid) {
 		return;
+	}
 
 	$cid = $zcid = 0;
 
-	if(is_array($_SESSION['remote'])) {
+	if (is_array($_SESSION['remote'])) {
-		foreach($_SESSION['remote'] as $visitor) {
+		foreach ($_SESSION['remote'] as $visitor) {
-			if($visitor['uid'] == $profile_uid) {
+			if ($visitor['uid'] == $profile_uid) {
 				$cid = $visitor['cid'];
 				break;
 			}
 		}
 	}
 
-	if(! $cid) {
+	if (! $cid) {
-		if(get_my_url()) {
+		if (get_my_url()) {
 			$r = q("select id from contact where nurl = '%s' and uid = %d limit 1",
 				dbesc(normalise_link(get_my_url())),
 				intval($profile_uid)
 			);
-			if (dbm::is_result($r))
+			if (dbm::is_result($r)) {
 				$cid = $r[0]['id'];
-			else {
+			} else {
 				$r = q("select id from gcontact where nurl = '%s' limit 1",
 					dbesc(normalise_link(get_my_url()))
 				);
@@ -227,22 +239,26 @@ function common_friends_visitor_widget($profile_uid) {
 		}
 	}
 
-	if($cid == 0 && $zcid == 0)
+	if ($cid == 0 && $zcid == 0) {
 		return;
+	}
 
-	require_once('include/socgraph.php');
+	require_once 'include/socgraph.php';
 
-	if($cid)
+	if ($cid) {
-		$t = count_common_friends($profile_uid,$cid);
+		$t = count_common_friends($profile_uid, $cid);
-	else
+	} else {
-		$t = count_common_friends_zcid($profile_uid,$zcid);
+		$t = count_common_friends_zcid($profile_uid, $zcid);
-	if(! $t)
+	}
+	if (! $t) {
 		return;
+	}
 
-	if($cid)
+	if ($cid) {
-		$r = common_friends($profile_uid,$cid,0,5,true);
+		$r = common_friends($profile_uid, $cid, 0, 5, true);
-	else
+	} else {
-		$r = common_friends_zcid($profile_uid,$zcid,0,5,true);
+		$r = common_friends_zcid($profile_uid, $zcid, 0, 5, true);
+	}
 
 	return replace_macros(get_markup_template('remote_friends_common.tpl'), array(
 		'$desc' =>  sprintf( tt("%d contact in common", "%d contacts in common", $t), $t),

include/cron.php

@@ -4,7 +4,7 @@ use \Friendica\Core\Config;
 function cron_run(&$argv, &$argc){
 	global $a;
 
-	require_once('include/datetime.php');
+	require_once 'include/datetime.php';
 
 	// Poll contacts with specific parameters
 	if ($argc > 1) {
@@ -12,15 +12,16 @@ function cron_run(&$argv, &$argc){
 		return;
 	}
 
-	$last = get_config('system','last_cron');
+	$last = get_config('system', 'last_cron');
 
-	$poll_interval = intval(get_config('system','cron_interval'));
+	$poll_interval = intval(get_config('system', 'cron_interval'));
 	if (! $poll_interval) {
 		$poll_interval = 10;
 	}
+
 	if ($last) {
 		$next = $last + ($poll_interval * 60);
-		if($next > time()) {
+		if ($next > time()) {
 			logger('cron intervall not reached');
 			return;
 		}
@@ -62,10 +63,10 @@ function cron_run(&$argv, &$argc){
 	proc_run(PRIORITY_LOW, "include/cronjobs.php", "repair_database");
 
 	// once daily run birthday_updates and then expire in background
-	$d1 = get_config('system','last_expire_day');
+	$d1 = get_config('system', 'last_expire_day');
-	$d2 = intval(datetime_convert('UTC','UTC','now','d'));
+	$d2 = intval(datetime_convert('UTC', 'UTC', 'now', 'd'));
 
-	if($d2 != intval($d1)) {
+	if ($d2 != intval($d1)) {
 
 		proc_run(PRIORITY_LOW, "include/cronjobs.php", "update_contact_birthdays");
 
@@ -73,7 +74,7 @@ function cron_run(&$argv, &$argc){
 
 		proc_run(PRIORITY_LOW, "include/discover_poco.php", "suggestions");
 
-		set_config('system','last_expire_day',$d2);
+		set_config('system', 'last_expire_day', $d2);
 
 		proc_run(PRIORITY_LOW, 'include/expire.php');
 
@@ -87,7 +88,7 @@ function cron_run(&$argv, &$argc){
 
 	logger('cron: end');
 
-	set_config('system','last_cron', time());
+	set_config('system', 'last_cron', time());
 
 	return;
 }
@@ -130,7 +131,7 @@ function cron_poll_contacts($argc, $argv) {
 	// and which have a polling address and ignore Diaspora since
 	// we are unable to match those posts with a Diaspora GUID and prevent duplicates.
 
-	$abandon_days = intval(get_config('system','account_abandon_days'));
+	$abandon_days = intval(get_config('system', 'account_abandon_days'));
 	if ($abandon_days < 1) {
 		$abandon_days = 0;
 	}
@@ -156,7 +157,7 @@ function cron_poll_contacts($argc, $argv) {
 		dbesc(NETWORK_MAIL2)
 	);
 
-	if (!count($contacts)) {
+	if (!dbm::is_result($contacts)) {
 		return;
 	}
 
@@ -170,7 +171,7 @@ function cron_poll_contacts($argc, $argv) {
 			continue;
 		}
 
-		foreach($res as $contact) {
+		foreach ($res as $contact) {
 
 			$xml = false;
 
@@ -183,49 +184,48 @@ function cron_poll_contacts($argc, $argv) {
 			}
 
 			if ($contact['subhub'] AND in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS))) {
-				// We should be getting everything via a hub. But just to be sure, let's check once a day.
+				/*
-				// (You can make this more or less frequent if desired by setting 'pushpoll_frequency' appropriately)
+				 * We should be getting everything via a hub. But just to be sure, let's check once a day.
-				// This also lets us update our subscription to the hub, and add or replace hubs in case it
+				 * (You can make this more or less frequent if desired by setting 'pushpoll_frequency' appropriately)
-				// changed. We will only update hubs once a day, regardless of 'pushpoll_frequency'.
+				 * This also lets us update our subscription to the hub, and add or replace hubs in case it
-
+				 * changed. We will only update hubs once a day, regardless of 'pushpoll_frequency'.
-				$poll_interval = get_config('system','pushpoll_frequency');
+				 */
+				$poll_interval = get_config('system', 'pushpoll_frequency');
 				$contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3);
 			}
 
-			if($contact['priority'] AND !$force) {
+			if ($contact['priority'] AND !$force) {
-
+				$update = false;
-				$update     = false;
 
 				$t = $contact['last-update'];
 
-				/**
+				/*
 				 * Based on $contact['priority'], should we poll this site now? Or later?
 				 */
-
 				switch ($contact['priority']) {
 					case 5:
-						if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 month")) {
+						if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 month")) {
 							$update = true;
 						}
 						break;
 					case 4:
-						if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 week")) {
+						if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 week")) {
 							$update = true;
 						}
 						break;
 					case 3:
-						if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day")) {
+						if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 day")) {
 							$update = true;
 						}
 						break;
 					case 2:
-						if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 12 hour")) {
+						if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 12 hour")) {
 							$update = true;
 						}
 						break;
 					case 1:
 					default:
-						if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 hour")) {
+						if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 hour")) {
 							$update = true;
 						}
 						break;
@@ -235,7 +235,7 @@ function cron_poll_contacts($argc, $argv) {
 				}
 			}
 
-			logger("Polling ".$contact["network"]." ".$contact["id"]." ".$contact["nick"]." ".$contact["name"]);
+			logger("Polling " . $contact["network"] . " " . $contact["id"] . " " . $contact["nick"] . " " . $contact["name"]);
 
 			if (($contact['network'] == NETWORK_FEED) AND ($contact['priority'] <= 3)) {
 				proc_run(PRIORITY_MEDIUM, 'include/onepoll.php', intval($contact['id']));

include/cronhooks.php

@@ -2,43 +2,45 @@
 
 use \Friendica\Core\Config;
 
-function cronhooks_run(&$argv, &$argc){
+function cronhooks_run(&$argv, &$argc) {
 	global $a;
 
-	require_once('include/datetime.php');
+	require_once 'include/datetime.php';
 
 	if (($argc == 2) AND is_array($a->hooks) AND array_key_exists("cron", $a->hooks)) {
-                foreach ($a->hooks["cron"] as $hook)
+		foreach ($a->hooks["cron"] as $hook) {
 			if ($hook[1] == $argv[1]) {
-				logger("Calling cron hook '".$hook[1]."'", LOGGER_DEBUG);
+				logger("Calling cron hook '" . $hook[1] . "'", LOGGER_DEBUG);
 				call_single_hook($a, $name, $hook, $data);
 			}
+		}
 		return;
 	}
 
 	$last = get_config('system', 'last_cronhook');
 
-	$poll_interval = intval(get_config('system','cronhook_interval'));
+	$poll_interval = intval(get_config('system', 'cronhook_interval'));
-	if(! $poll_interval)
+	if (! $poll_interval) {
 		$poll_interval = 9;
+	}
 
-	if($last) {
+	if ($last) {
 		$next = $last + ($poll_interval * 60);
-		if($next > time()) {
+		if ($next > time()) {
 			logger('cronhook intervall not reached');
 			return;
 		}
 	}
 
-	$a->set_baseurl(get_config('system','url'));
+	$a->set_baseurl(get_config('system', 'url'));
 
 	logger('cronhooks: start');
 
 	$d = datetime_convert();
 
 	if (is_array($a->hooks) AND array_key_exists("cron", $a->hooks)) {
-                foreach ($a->hooks["cron"] as $hook) {
+		foreach ($a->hooks["cron"] as $hook) {
-			logger("Calling cronhooks for '".$hook[1]."'", LOGGER_DEBUG);
+			logger("Calling cronhooks for '" . $hook[1] . "'", LOGGER_DEBUG);
 			proc_run(PRIORITY_MEDIUM, "include/cronhooks.php", $hook[1]);
 		}
 	}

include/dfrn.php

@@ -554,8 +554,9 @@ class dfrn {
 			xml::add_element($doc, $author, "poco:displayName", $profile["name"]);
 			xml::add_element($doc, $author, "poco:updated", $namdate);
 
-			if (trim($profile["dob"]) > '0001-01-01')
+			if (trim($profile["dob"]) > '0001-01-01') {
 				xml::add_element($doc, $author, "poco:birthday", "0000-".date("m-d", strtotime($profile["dob"])));
+			}
 
 			xml::add_element($doc, $author, "poco:note", $profile["about"]);
 			xml::add_element($doc, $author, "poco:preferredUsername", $profile["nickname"]);