Continued a bit:

- added spaces / curly braces
- converted multiple single-line comments into one multi-line comment
- used more dbm::is_result()
- include/require are no functions, let's not abuse them ...

Signed-off-by: Roland Haeder <roland@mxchange.org>

mod/item.php

@@ -1,36 +1,37 @@
 <?php
 
-/**
+/*
- *
  * This is the POST destination for most all locally posted
  * text stuff. This function handles status, wall-to-wall status,
  * local comments, and remote coments that are posted on this site
  * (as opposed to being delivered in a feed).
  * Also processed here are posts and comments coming through the
  * statusnet/twitter API.
+ *
  * All of these become an "item" which is our basic unit of
  * information.
+ *
  * Posts that originate externally or do not fall into the above
  * posting categories go through item_store() instead of this function.
- *
  */
 
-require_once('include/crypto.php');
+require_once 'include/crypto.php';
-require_once('include/enotify.php');
+require_once 'include/enotify.php';
-require_once('include/email.php');
+require_once 'include/email.php';
-require_once('include/tags.php');
+require_once 'include/tags.php';
-require_once('include/files.php');
+require_once 'include/files.php';
-require_once('include/threads.php');
+require_once 'include/threads.php';
-require_once('include/text.php');
+require_once 'include/text.php';
-require_once('include/items.php');
+require_once 'include/items.php';
-require_once('include/Scrape.php');
+require_once 'include/Scrape.php';
-require_once('include/diaspora.php');
+require_once 'include/diaspora.php';
-require_once('include/Contact.php');
+require_once 'include/Contact.php';
 
 function item_post(App $a) {
 
-	if((! local_user()) && (! remote_user()) && (! x($_REQUEST,'commenter')))
+	if ((! local_user()) && (! remote_user()) && (! x($_REQUEST,'commenter'))) {
 		return;
+	}
 
 	require_once('include/security.php');
 
@@ -55,24 +56,21 @@ function item_post(App $a) {
 	$return_path = ((x($_REQUEST, 'return')) ? $_REQUEST['return'] : '');
 	$preview = ((x($_REQUEST, 'preview')) ? intval($_REQUEST['preview']) : 0);
 
-
+	/*
-	// Check for doubly-submitted posts, and reject duplicates
+	 * Check for doubly-submitted posts, and reject duplicates
-	// Note that we have to ignore previews, otherwise nothing will post
+	 * Note that we have to ignore previews, otherwise nothing will post
-	// after it's been previewed
+	 * after it's been previewed
-	if (!$preview && x($_REQUEST['post_id_random'])) {
+	 */
-		if (x($_SESSION['post-random']) && $_SESSION['post-random'] == $_REQUEST['post_id_random']) {
+	if (!$preview && x($_REQUEST, 'post_id_random')) {
+		if (x($_SESSION, 'post-random') && $_SESSION['post-random'] == $_REQUEST['post_id_random']) {
 			logger("item post: duplicate post", LOGGER_DEBUG);
 			item_post_return(App::get_baseurl(), $api_source, $return_path);
-		}
+		} else {
-		else {
 			$_SESSION['post-random'] = $_REQUEST['post_id_random'];
 		}
 	}
 
-	/**
+	// Is this a reply to something?
-	 * Is this a reply to something?
-	 */
-
 	$parent = ((x($_REQUEST,'parent')) ? intval($_REQUEST['parent']) : 0);
 	$parent_uri = ((x($_REQUEST,'parent_uri')) ? trim($_REQUEST['parent_uri']) : '');
 
@@ -133,8 +131,9 @@ function item_post(App $a) {
 				intval($parent_item['contact-id']),
 				intval($uid)
 			);
-			if (dbm::is_result($r))
+			if (dbm::is_result($r)) {
 				$parent_contact = $r[0];
+			}
 
 			// If the contact id doesn't fit with the contact, then set the contact to null
 			$thrparent = q("SELECT `author-link`, `network` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($thr_parent));
@@ -154,15 +153,19 @@ function item_post(App $a) {
 					}
 				}
 				logger('no contact found: ' . print_r($thrparent, true), LOGGER_DEBUG);
-			} else
+			} else {
 				logger('parent contact: ' . print_r($parent_contact, true), LOGGER_DEBUG);
+			}
 
-			if ($parent_contact["nick"] == "")
+			if ($parent_contact["nick"] == "") {
 				$parent_contact["nick"] = $parent_contact["name"];
 			}
 		}
+	}
 
-	if($parent) logger('mod_item: item_post parent=' . $parent);
+	if ($parent) {
+		logger('mod_item: item_post parent=' . $parent);
+	}
 
 	$profile_uid = ((x($_REQUEST,'profile_uid')) ? intval($_REQUEST['profile_uid']) : 0);
 	$post_id     = ((x($_REQUEST,'post_id'))     ? intval($_REQUEST['post_id'])     : 0);
@@ -191,20 +194,21 @@ function item_post(App $a) {
 
 	if ((x($_REQUEST, 'commenter')) && ((! $parent) || (! $parent_item['wall']))) {
 		notice(t('Permission denied.') . EOL) ;
-		if(x($_REQUEST,'return'))
+		if (x($_REQUEST, 'return')) {
 			goaway($return_path);
+		}
 		killme();
 	}
 
-	// Now check that it is a page_type of PAGE_BLOG, and that valid personal details
+	/*
-	// have been provided, and run any anti-spam plugins
+	 * Now check that it is a page_type of PAGE_BLOG, and that valid personal details
-
+	 * have been provided, and run any anti-spam plugins
-
+	 */
-
 	if ((! can_write_wall($a, $profile_uid)) && (! $allow_moderated)) {
 		notice(t('Permission denied.') . EOL) ;
-		if(x($_REQUEST,'return'))
+		if (x($_REQUEST, 'return')) {
 			goaway($return_path);
+		}
 		killme();
 	}
 
@@ -229,8 +233,9 @@ function item_post(App $a) {
 	$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
 		intval($profile_uid)
 	);
-	if (dbm::is_result($r))
+	if (dbm::is_result($r)) {
 		$user = $r[0];
+	}
 
 	if ($orig_post) {
 		$str_group_allow   = $orig_post['allow_gid'];
@@ -254,9 +259,11 @@ function item_post(App $a) {
 
 	} else {
 
-		// if coming from the API and no privacy settings are set,
+		/*
-		// use the user default permissions - as they won't have
+		 * if coming from the API and no privacy settings are set,
-		// been supplied via a form.
+		 * use the user default permissions - as they won't have
+		 * been supplied via a form.
+		 */
 
 		if (($api_source)
 			&& (! array_key_exists('contact_allow',$_REQUEST))
@@ -267,8 +274,7 @@ function item_post(App $a) {
 			$str_contact_allow = $user['allow_cid'];
 			$str_group_deny    = $user['deny_gid'];
 			$str_contact_deny  = $user['deny_cid'];
-		}
+		} else {
-		else {
 
 			// use the posted permissions
 
@@ -287,16 +293,14 @@ function item_post(App $a) {
 		$network           = notags(trim($_REQUEST['network']));
 		$guid              = get_guid(32);
 
-
 		item_add_language_opt($_REQUEST);
 		$postopts = $_REQUEST['postopts'] ? $_REQUEST['postopts'] : "";
 
-
 		$private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0);
 
-
+		if ($user['hidewall']) {
-		if($user['hidewall'])
 			$private = 2;
+		}
 
 		// If this is a comment, set the permissions from the parent.
 
@@ -305,8 +309,9 @@ function item_post(App $a) {
 			// for non native networks use the network of the original post as network of the item
 			if (($parent_item['network'] != NETWORK_DIASPORA)
 				AND ($parent_item['network'] != NETWORK_OSTATUS)
-				AND ($network == ""))
+				AND ($network == "")) {
 				$network = $parent_item['network'];
+			}
 
 			$str_contact_allow = $parent_item['allow_cid'];
 			$str_group_allow   = $parent_item['allow_gid'];
@@ -325,17 +330,20 @@ function item_post(App $a) {
 				$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
 					intval(local_user())
 				);
-				if (dbm::is_result($r) && intval($r[0]['pubmail']))
+				if (dbm::is_result($r) && intval($r[0]['pubmail'])) {
 					$pubmail_enabled = true;
 				}
 			}
+		}
 
 		if (! strlen($body)) {
-			if($preview)
+			if ($preview) {
 				killme();
+			}
 			info(t('Empty post discarded.') . EOL );
-			if(x($_REQUEST,'return'))
+			if (x($_REQUEST, 'return')) {
 				goaway($return_path);
+			}
 			killme();
 		}
 	}
@@ -363,8 +371,7 @@ function item_post(App $a) {
 		$self = true;
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
 			intval($_SESSION['uid']));
-	}
+	} elseif(remote_user()) {
-	elseif(remote_user()) {
 		if (is_array($_SESSION['remote'])) {
 			foreach ($_SESSION['remote'] as $v) {
 				if ($v['uid'] == $profile_uid) {
@@ -389,28 +396,26 @@ function item_post(App $a) {
 
 	if ($profile_uid == local_user()) {
 		$contact_record = $author;
-	}
+	} else {
-	else {
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
 			intval($profile_uid)
 		);
-		if (dbm::is_result($r))
+		if (dbm::is_result($r)) {
 			$contact_record = $r[0];
 		}
+	}
 
 	$post_type = notags(trim($_REQUEST['type']));
 
-	if($post_type === 'net-comment') {
+	if ($post_type === 'net-comment' && $parent_item !== null) {
-		if($parent_item !== null) {
+		if ($parent_item['wall'] == 1) {
-			if($parent_item['wall'] == 1)
 			$post_type = 'wall-comment';
-			else
+		} else {
 			$post_type = 'remote-comment';
 		}
 	}
 
-	/**
+	/*
-	 *
 	 * When a photo was uploaded into the message using the (profile wall) ajax
 	 * uploader, The permissions are initially set to disallow anybody but the
 	 * owner from seeing it. This is because the permissions may not yet have been
@@ -418,7 +423,6 @@ function item_post(App $a) {
 	 * appropriately. But we didn't know the final permissions on the post until
 	 * now. So now we'll look for links of uploaded messages that are in the
 	 * post and set them to the same permissions as the post itself.
-	 *
 	 */
 
 	$match = null;
@@ -466,10 +470,9 @@ function item_post(App $a) {
 	}
 
 
-	/**
+	/*
 	 * Next link in any attachment references we find in the post.
 	 */
-
 	$match = false;
 
 	if ((! $preview) && preg_match_all("/\[attachment\](.*?)\[\/attachment\]/", $body, $match)) {
@@ -507,41 +510,34 @@ function item_post(App $a) {
 	$body = bb_translate_video($body);
 
 
-	/**
+	// Fold multi-line [code] sequences
-	 * Fold multi-line [code] sequences
-	 */
-
 	$body = preg_replace('/\[\/code\]\s*\[code\]/ism', "\n", $body);
 
 	$body = scale_external_images($body,false);
 
-
 	// Setting the object type if not defined before
 	if (!$objecttype) {
 		$objecttype = ACTIVITY_OBJ_NOTE; // Default value
 		require_once("include/plaintext.php");
 		$objectdata = get_attached_data($body);
 
-		if ($post["type"] == "link")
+		if ($post["type"] == "link") {
 			$objecttype = ACTIVITY_OBJ_BOOKMARK;
-		elseif ($post["type"] == "video")
+		} elseif ($post["type"] == "video") {
 			$objecttype = ACTIVITY_OBJ_VIDEO;
-		elseif ($post["type"] == "photo")
+		} elseif ($post["type"] == "photo") {
 			$objecttype = ACTIVITY_OBJ_IMAGE;
+		}
 
 	}
 
-	/**
+	// Look for any tags and linkify them
-	 * Look for any tags and linkify them
-	 */
-
 	$str_tags = '';
 	$inform   = '';
 
-
 	$tags = get_tags($body);
 
-	/**
+	/*
 	 * add a statusnet style reply tag if the original post was from there
 	 * and we are replying, and there isn't one already
 	 */
@@ -557,16 +553,17 @@ function item_post(App $a) {
 		$toplevel_parent = q("SELECT `contact`.* FROM `contact`
 						INNER JOIN `item` ON `item`.`contact-id` = `contact`.`id` AND `contact`.`url` = `item`.`author-link`
 						WHERE `item`.`id` = `item`.`parent` AND `item`.`parent` = %d", intval($parent));
-		if ($toplevel_parent)
+		if (dbm::is_result($toplevel_parent)) {
 			$toplevel_contact = '@' . $toplevel_parent[0]['nick'] . '+' . $toplevel_parent[0]['id'];
-		else {
+		} else {
 			$toplevel_parent = q("SELECT `author-link`, `author-name` FROM `item` WHERE `id` = `parent` AND `parent` = %d", intval($parent));
 			$toplevel_contact = '@[url='.$toplevel_parent[0]['author-link'].']'.$toplevel_parent[0]['author-name'].'[/url]';
 		}
 
-		if (!in_array($toplevel_contact,$tags))
+		if (!in_array($toplevel_contact, $tags)) [
 			$tags[] = $toplevel_contact;
 		}
+	}
 
 	$tagged = array();
 
@@ -575,12 +572,14 @@ function item_post(App $a) {
 	if (count($tags)) {
 		foreach ($tags as $tag) {
 
-			if(strpos($tag,'#') === 0)
+			if (strpos($tag, '#') === 0) {
 				continue;
+			}
 
-			// If we already tagged 'Robert Johnson', don't try and tag 'Robert'.
+			/*
-			// Robert Johnson should be first in the $tags array
+			 * If we already tagged 'Robert Johnson', don't try and tag 'Robert'.
-
+			 * Robert Johnson should be first in the $tags array
+			 */
 			$fullnametagged = false;
 			for ($x = 0; $x < count($tagged); $x ++) {
 				if (stristr($tagged[$x],$tag . ' ')) {
@@ -588,8 +587,9 @@ function item_post(App $a) {
 					break;
 				}
 			}
-			if($fullnametagged)
+			if ($fullnametagged) {
 				continue;
+			}
 
 			$success = handle_tag($a, $body, $inform, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag, $network);
 			if ($success['replaced']) {
@@ -668,11 +668,11 @@ function item_post(App $a) {
 	$datarray['owner-name']    = $contact_record['name'];
 	$datarray['owner-link']    = $contact_record['url'];
 	$datarray['owner-avatar']  = $contact_record['thumb'];
-	$datarray["owner-id"]      = get_contact($datarray["owner-link"], 0);
+	$datarray['owner-id']      = get_contact($datarray['owner-link'], 0);
 	$datarray['author-name']   = $author['name'];
 	$datarray['author-link']   = $author['url'];
 	$datarray['author-avatar'] = $author['thumb'];
-	$datarray["author-id"]     = get_contact($datarray["author-link"], 0);
+	$datarray['author-id']     = get_contact($datarray['author-link'], 0);
 	$datarray['created']       = datetime_convert();
 	$datarray['edited']        = datetime_convert();
 	$datarray['commented']     = datetime_convert();
@@ -707,12 +707,11 @@ function item_post(App $a) {
 							"photo" => $datarray['author-avatar'], "name" => $datarray['author-name']));
 	$datarray['object']        = $object;
 
-	/**
+	/*
 	 * These fields are for the convenience of plugins...
 	 * 'self' if true indicates the owner is posting on their own wall
 	 * If parent is 0 it is a top-level post.
 	 */
-
 	$datarray['parent']        = $parent;
 	$datarray['self']          = $self;
 //	$datarray['prvnets']       = $user['prvnets'];
@@ -722,14 +721,14 @@ function item_post(App $a) {
 	$datarray['last-child'] = 1;
 	$datarray['visible'] = 1;
 
-	if($orig_post)
+	if ($orig_post) {
 		$datarray['edit'] = true;
+	}
 
 	// Search for hashtags
 	item_body_set_hashtags($datarray);
 
 	// preview mode - prepare the body for display and send it via json
-
 	if ($preview) {
 		require_once('include/conversation.php');
 		// We set the datarray ID to -1 because in preview mode the dataray
@@ -741,7 +740,6 @@ function item_post(App $a) {
 		killme();
 	}
 
-
 	call_hooks('post_local',$datarray);
 
 	if (x($datarray, 'cancel')) {
@@ -790,8 +788,9 @@ function item_post(App $a) {
 			goaway($return_path);
 		}
 		killme();
-	} else
+	} else {
 		$post_id = 0;
+	}
 
 	q("COMMIT");
 	q("START TRANSACTION;");
@@ -974,8 +973,9 @@ function item_post(App $a) {
 		if (count($erecips)) {
 			foreach ($erecips as $recip) {
 				$addr = trim($recip);
-				if(! strlen($addr))
+				if (! strlen($addr)) {
 					continue;
+				}
 				$disclaimer = '<hr />' . sprintf( t('This message was sent to you by %s, a member of the Friendica social network.'),$a->user['username'])
 					. '<br />';
 				$disclaimer .= sprintf( t('You may visit them online at %s'), App::get_baseurl() . '/profile/' . $a->user['nickname']) . EOL;
@@ -1032,8 +1032,9 @@ function item_post(App $a) {
 function item_post_return($baseurl, $api_source, $return_path) {
 	// figure out how to return, depending on from whence we came
 
-	if($api_source)
+	if ($api_source) {
 		return;
+	}
 
 	if ($return_path) {
 		goaway($return_path);
@@ -1111,19 +1112,22 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
 
 				$r = q("SELECT `alias`, `name` FROM `contact` WHERE `nurl` = '%s' AND `alias` != '' AND `uid` = 0",
 					normalise_link($matches[1]));
-				if (!$r)
+				if (!dbm::is_result($r)) {
 					$r = q("SELECT `alias`, `name` FROM `gcontact` WHERE `nurl` = '%s' AND `alias` != ''",
 						normalise_link($matches[1]));
-				if ($r)
+				}
+				if (dbm::is_result($r)) {
 					$data = $r[0];
-				else
+				} else {
 					$data = probe_url($matches[1]);
+				}
 
 				if ($data["alias"] != "") {
 					$newtag = '@[url=' . $data["alias"] . ']' . $data["name"] . '[/url]';
 					if (!stristr($str_tags, $newtag)) {
-						if(strlen($str_tags))
+						if (strlen($str_tags)) {
 							$str_tags .= ',';
+						}
 						$str_tags .= $newtag;
 					}
 				}
@@ -1155,7 +1159,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
 			);
 
 			// Then check in the contact table for the url
-			if (!$r)
+			if (!dbm::is_result($r)) {
 				$r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network`, `notify` FROM `contact`
 					WHERE `nurl` = '%s' AND `uid` = %d AND
 						(`network` != '%s' OR (`notify` != '' AND `alias` != ''))
@@ -1164,26 +1168,29 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
 						intval($profile_uid),
 						dbesc(NETWORK_OSTATUS)
 				);
+			}
 
 			// Then check in the global contacts for the address
-			if (!$r)
+			if (!dbm::is_result($r)) {
 				$r = q("SELECT `url`, `nick`, `name`, `alias`, `network`, `notify` FROM `gcontact`
 					WHERE `addr` = '%s' AND (`network` != '%s' OR (`notify` != '' AND `alias` != ''))
 					LIMIT 1",
 						dbesc($name),
 						dbesc(NETWORK_OSTATUS)
 				);
+			}
 
 			// Then check in the global contacts for the url
-			if (!$r)
+			if (!dbm::is_result($r)) {
 				$r = q("SELECT `url`, `nick`, `name`, `alias`, `network`, `notify` FROM `gcontact`
 					WHERE `nurl` = '%s' AND (`network` != '%s' OR (`notify` != '' AND `alias` != ''))
 					LIMIT 1",
 						dbesc(normalise_link($name)),
 						dbesc(NETWORK_OSTATUS)
 				);
+			}
 
-			if (!$r) {
+			if (!dbm::is_result($r)) {
 				$probed = probe_url($name);
 				if ($result['network'] != NETWORK_PHANTOM) {
 					update_gcontact($probed);
@@ -1204,7 +1211,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
 			}
 
 			// select someone by attag or nick and the name passed in the current network
-			if(!$r AND ($network != ""))
+			if(!dbm::is_result($r) AND ($network != ""))
 				$r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `network` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
 						dbesc($name),
 						dbesc($name),
@@ -1213,46 +1220,51 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
 				);
 
 			//select someone from this user's contacts by name in the current network
-			if (!$r AND ($network != ""))
+			if (!dbm::is_result($r) AND ($network != "")) {
 				$r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `name` = '%s' AND `network` = '%s' AND `uid` = %d LIMIT 1",
 						dbesc($name),
 						dbesc($network),
 						intval($profile_uid)
 				);
+			}
 
 			// select someone by attag or nick and the name passed in
-			if(!$r)
+			if(!dbm::is_result($r)) {
 				$r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
 						dbesc($name),
 						dbesc($name),
 						intval($profile_uid)
 				);
-
+			}
 
 			// select someone from this user's contacts by name
-			if(!$r)
+			if(!dbm::is_result($r)) {
 				$r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
 						dbesc($name),
 						intval($profile_uid)
 				);
 			}
+		}
 
-		if ($r) {
+		if (dbm::is_result($r)) {
-			if(strlen($inform) AND (isset($r[0]["notify"]) OR isset($r[0]["id"])))
+			if (strlen($inform) AND (isset($r[0]["notify"]) OR isset($r[0]["id"]))) {
 				$inform .= ',';
+			}
 
-			if (isset($r[0]["id"]))
+			if (isset($r[0]["id"])) {
 				$inform .= 'cid:' . $r[0]["id"];
-			elseif (isset($r[0]["notify"]))
+			} elseif (isset($r[0]["notify"])) {
 				$inform  .= $r[0]["notify"];
+			}
 
 			$profile = $r[0]["url"];
 			$alias   = $r[0]["alias"];
 			$newname = $r[0]["nick"];
 			if (($newname == "") OR (($r[0]["network"] != NETWORK_OSTATUS) AND ($r[0]["network"] != NETWORK_TWITTER)
-				AND ($r[0]["network"] != NETWORK_STATUSNET) AND ($r[0]["network"] != NETWORK_APPNET)))
+				AND ($r[0]["network"] != NETWORK_STATUSNET) AND ($r[0]["network"] != NETWORK_APPNET))) {
 				$newname = $r[0]["name"];
 			}
+		}
 
 		//if there is an url for this persons profile
 		if (isset($profile) AND ($newname != "")) {
@@ -1264,19 +1276,20 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
 			$body = str_replace('@'.$name, $newtag, $body);
 			// append tag to str_tags
 			if (! stristr($str_tags,$newtag)) {
-				if(strlen($str_tags))
+				if (strlen($str_tags)) {
 					$str_tags .= ',';
+				}
 				$str_tags .= $newtag;
 			}
 
 			// Status.Net seems to require the numeric ID URL in a mention if the person isn't
 			// subscribed to you. But the nickname URL is OK if they are. Grrr. We'll tag both.
-
 			if (strlen($alias)) {
 				$newtag = '@[url='.$alias.']'.$newname.'[/url]';
 				if (! stristr($str_tags,$newtag)) {
-					if(strlen($str_tags))
+					if (strlen($str_tags)) {
 						$str_tags .= ',';
+					}
 					$str_tags .= $newtag;
 				}
 			}