xpressengine / xe-core

classes/mail/Mail.class.php

Spacing +79 added lines, -79 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) XEHub <https://www.xehub.io> */
 
-require_once _XE_PATH_ . "libs/phpmailer/phpmailer.php";
+require_once _XE_PATH_."libs/phpmailer/phpmailer.php";
 
 /**
  * Mailing class for XpressEngine
@@ -148,13 +148,13 @@ 
 		$this->SMTPSecure = "tls";
 		$this->Host = 'smtp.gmail.com';
 		$this->Port = '587';
-		if($this->isVaildMailAddress($account_name))
+		if ($this->isVaildMailAddress($account_name))
 		{
 			$this->Username = $account_name;
 		}
 		else
 		{
-			$this->Username = $account_name . '@gmail.com';
+			$this->Username = $account_name.'@gmail.com';
 		}
 		$this->Password = $account_passwd;
 		$this->IsSMTP();
@@ -180,12 +180,12 @@ 
 		$this->Password = $pass;
 		$this->Port = $port;
 
-		if($secure == 'ssl' || $secure == 'tls')
+		if ($secure == 'ssl' || $secure == 'tls')
 		{
 			$this->SMTPSecure = $secure;
 		}
 
-		if(($this->SMTPAuth !== NULL && $this->Host !== NULL && $this->Username !== NULL && $this->Password !== NULL) || ($this->SMTPAuth === NULL && $this->Host !== NULL))
+		if (($this->SMTPAuth !== NULL && $this->Host !== NULL && $this->Username !== NULL && $this->Password !== NULL) || ($this->SMTPAuth === NULL && $this->Host !== NULL))
 		{
 			$this->IsSMTP();
 			$this->AltBody = "To view the message, please use an HTML compatible email viewer!";
@@ -242,7 +242,7 @@ 
 	 */
 	function setSender($name, $email)
 	{
-		if($this->Mailer == "mail")
+		if ($this->Mailer == "mail")
 		{
 			$this->sender_name = $name;
 			$this->sender_email = $email;
@@ -260,9 +260,9 @@ 
 	 */
 	function getSender()
 	{
-		if(!stristr(PHP_OS, 'win') && $this->sender_name)
+		if (!stristr(PHP_OS, 'win') && $this->sender_name)
 		{
-			return sprintf("%s <%s>", '=?utf-8?b?' . base64_encode($this->sender_name) . '?=', $this->sender_email);
+			return sprintf("%s <%s>", '=?utf-8?b?'.base64_encode($this->sender_name).'?=', $this->sender_email);
 		}
 		return $this->sender_email;
 	}
@@ -276,7 +276,7 @@ 
 	 */
 	function setReceiptor($name, $email)
 	{
-		if($this->Mailer == "mail")
+		if ($this->Mailer == "mail")
 		{
 			$this->receiptor_name = $name;
 			$this->receiptor_email = $email;
@@ -294,9 +294,9 @@ 
 	 */
 	function getReceiptor()
 	{
-		if(!stristr(PHP_OS, 'win') && $this->receiptor_name && $this->receiptor_name != $this->receiptor_email)
+		if (!stristr(PHP_OS, 'win') && $this->receiptor_name && $this->receiptor_name != $this->receiptor_email)
 		{
-			return sprintf("%s <%s>", '=?utf-8?b?' . base64_encode($this->receiptor_name) . '?=', $this->receiptor_email);
+			return sprintf("%s <%s>", '=?utf-8?b?'.base64_encode($this->receiptor_name).'?=', $this->receiptor_email);
 		}
 		return $this->receiptor_email;
 	}
@@ -309,7 +309,7 @@ 
 	 */
 	function setTitle($title)
 	{
-		if($this->Mailer == "mail")
+		if ($this->Mailer == "mail")
 		{
 			$this->title = $title;
 		}
@@ -326,7 +326,7 @@ 
 	 */
 	function getTitle()
 	{
-		return '=?utf-8?b?' . base64_encode($this->title) . '?=';
+		return '=?utf-8?b?'.base64_encode($this->title).'?=';
 	}
 
 	/**
@@ -337,7 +337,7 @@ 
 	 */
 	function setBCC($bcc)
 	{
-		if($this->Mailer == "mail")
+		if ($this->Mailer == "mail")
 		{
 			$this->bcc = $bcc;
 		}
@@ -377,7 +377,7 @@ 
 	 */
 	function setReplyTo($replyTo)
 	{
-		if($this->Mailer == "mail")
+		if ($this->Mailer == "mail")
 		{
 			$this->replyTo = $replyTo;
 		}
@@ -396,7 +396,7 @@ 
 	function setContent($content)
 	{
 		$content = preg_replace_callback('/<img([^>]+)>/i', array($this, 'replaceResourceRealPath'), $content);
-		if($this->Mailer == "mail")
+		if ($this->Mailer == "mail")
 		{
 			$this->content = $content;
 		}
@@ -415,7 +415,7 @@ 
 	 */
 	function replaceResourceRealPath($matches)
 	{
-		return preg_replace('/src=(["\']?)files/i', 'src=$1' . Context::getRequestUri() . 'files', $matches[0]);
+		return preg_replace('/src=(["\']?)files/i', 'src=$1'.Context::getRequestUri().'files', $matches[0]);
 	}
 
 	/**
@@ -456,42 +456,42 @@ 
 	 */
 	function procAttachments()
 	{
-		if($this->Mailer == "mail")
+		if ($this->Mailer == "mail")
 		{
-			if(count($this->attachments) > 0)
+			if (count($this->attachments) > 0)
 			{
-				$this->body = $this->header . $this->body;
-				$boundary = '----==' . uniqid(rand(), TRUE);
-				$this->header = "Content-Type: multipart/mixed;" . $this->eol . "\tboundary=\"" . $boundary . "\"" . $this->eol . $this->eol;
-				$this->body = "--" . $boundary . $this->eol . $this->body . $this->eol . $this->eol;
+				$this->body = $this->header.$this->body;
+				$boundary = '----=='.uniqid(rand(), TRUE);
+				$this->header = "Content-Type: multipart/mixed;".$this->eol."\tboundary=\"".$boundary."\"".$this->eol.$this->eol;
+				$this->body = "--".$boundary.$this->eol.$this->body.$this->eol.$this->eol;
 				$res = array();
 				$res[] = $this->body;
-				foreach($this->attachments as $filename => $attachment)
+				foreach ($this->attachments as $filename => $attachment)
 				{
 					$type = $this->returnMIMEType($filename);
 					$file_handler = new FileHandler();
 					$file_str = $file_handler->readFile($attachment);
 					$chunks = chunk_split(base64_encode($file_str));
 					$tempBody = sprintf(
-							"--" . $boundary . $this->eol .
-							"Content-Type: %s;" . $this->eol .
-							"\tname=\"%s\"" . $this->eol .
-							"Content-Transfer-Encoding: base64" . $this->eol .
-							"Content-Description: %s" . $this->eol .
-							"Content-Disposition: attachment;" . $this->eol .
-							"\tfilename=\"%s\"" . $this->eol . $this->eol .
-							"%s" . $this->eol . $this->eol, $type, $filename, $filename, $filename, $chunks);
+							"--".$boundary.$this->eol.
+							"Content-Type: %s;".$this->eol.
+							"\tname=\"%s\"".$this->eol.
+							"Content-Transfer-Encoding: base64".$this->eol.
+							"Content-Description: %s".$this->eol.
+							"Content-Disposition: attachment;".$this->eol.
+							"\tfilename=\"%s\"".$this->eol.$this->eol.
+							"%s".$this->eol.$this->eol, $type, $filename, $filename, $filename, $chunks);
 					$res[] = $tempBody;
 				}
 				$this->body = implode("", $res);
-				$this->body .= "--" . $boundary . "--";
+				$this->body .= "--".$boundary."--";
 			}
 		}
 		else
 		{
-			if(count($this->attachments) > 0)
+			if (count($this->attachments) > 0)
 			{
-				foreach($this->attachments as $filename => $attachment)
+				foreach ($this->attachments as $filename => $attachment)
 				{
 					parent::AddAttachment($attachment);
 				}
@@ -506,33 +506,33 @@ 
 	 */
 	function procCidAttachments()
 	{
-		if(count($this->cidAttachments) > 0)
+		if (count($this->cidAttachments) > 0)
 		{
-			$this->body = $this->header . $this->body;
-			$boundary = '----==' . uniqid(rand(), TRUE);
-			$this->header = "Content-Type: multipart/relative;" . $this->eol . "\ttype=\"multipart/alternative\";" . $this->eol . "\tboundary=\"" . $boundary . "\"" . $this->eol . $this->eol;
-			$this->body = "--" . $boundary . $this->eol . $this->body . $this->eol . $this->eol;
+			$this->body = $this->header.$this->body;
+			$boundary = '----=='.uniqid(rand(), TRUE);
+			$this->header = "Content-Type: multipart/relative;".$this->eol."\ttype=\"multipart/alternative\";".$this->eol."\tboundary=\"".$boundary."\"".$this->eol.$this->eol;
+			$this->body = "--".$boundary.$this->eol.$this->body.$this->eol.$this->eol;
 			$res = array();
 			$res[] = $this->body;
-			foreach($this->cidAttachments as $cid => $attachment)
+			foreach ($this->cidAttachments as $cid => $attachment)
 			{
 				$filename = basename($attachment);
 				$type = $this->returnMIMEType(FileHandler::getRealPath($attachment));
 				$file_str = FileHandler::readFile($attachment);
 				$chunks = chunk_split(base64_encode($file_str));
 				$tempBody = sprintf(
-						"--" . $boundary . $this->eol .
-						"Content-Type: %s;" . $this->eol .
-						"\tname=\"%s\"" . $this->eol .
-						"Content-Transfer-Encoding: base64" . $this->eol .
-						"Content-ID: <%s>" . $this->eol .
-						"Content-Description: %s" . $this->eol .
-						"Content-Location: %s" . $this->eol . $this->eol .
-						"%s" . $this->eol . $this->eol, $type, $filename, $cid, $filename, $filename, $chunks);
+						"--".$boundary.$this->eol.
+						"Content-Type: %s;".$this->eol.
+						"\tname=\"%s\"".$this->eol.
+						"Content-Transfer-Encoding: base64".$this->eol.
+						"Content-ID: <%s>".$this->eol.
+						"Content-Description: %s".$this->eol.
+						"Content-Location: %s".$this->eol.$this->eol.
+						"%s".$this->eol.$this->eol, $type, $filename, $cid, $filename, $filename, $chunks);
 				$res[] = $tempBody;
 			}
 			$this->body = implode("", $res);
-			$this->body .= "--" . $boundary . "--";
+			$this->body .= "--".$boundary."--";
 		}
 	}
 
@@ -543,37 +543,37 @@ 
 	 */
 	function send()
 	{
-		if($this->Mailer == "mail")
+		if ($this->Mailer == "mail")
 		{
-			$boundary = '----==' . uniqid(rand(), TRUE);
+			$boundary = '----=='.uniqid(rand(), TRUE);
 			$this->eol = $GLOBALS['_qmail_compatibility'] == "Y" ? "\n" : "\r\n";
-			$this->header = "Content-Type: multipart/alternative;" . $this->eol . "\tboundary=\"" . $boundary . "\"" . $this->eol . $this->eol;
+			$this->header = "Content-Type: multipart/alternative;".$this->eol."\tboundary=\"".$boundary."\"".$this->eol.$this->eol;
 			$this->body = sprintf(
-					"--%s" . $this->eol .
-					"Content-Type: text/plain; charset=utf-8; format=flowed" . $this->eol .
-					"Content-Transfer-Encoding: base64" . $this->eol .
-					"Content-Disposition: inline" . $this->eol . $this->eol .
-					"%s" .
-					"--%s" . $this->eol .
-					"Content-Type: text/html; charset=utf-8" . $this->eol .
-					"Content-Transfer-Encoding: base64" . $this->eol .
-					"Content-Disposition: inline" . $this->eol . $this->eol .
-					"%s" .
-					"--%s--" .
+					"--%s".$this->eol.
+					"Content-Type: text/plain; charset=utf-8; format=flowed".$this->eol.
+					"Content-Transfer-Encoding: base64".$this->eol.
+					"Content-Disposition: inline".$this->eol.$this->eol.
+					"%s".
+					"--%s".$this->eol.
+					"Content-Type: text/html; charset=utf-8".$this->eol.
+					"Content-Transfer-Encoding: base64".$this->eol.
+					"Content-Disposition: inline".$this->eol.$this->eol.
+					"%s".
+					"--%s--".
 					"", $boundary, $this->getPlainContent(), $boundary, $this->getHTMLContent(), $boundary
 			);
 			$this->procCidAttachments();
 			$this->procAttachments();
 			$headers = sprintf(
-					"From: %s" . $this->eol .
-					"%s" .
-					"%s" .
-					"%s" .
-					"%s" .
-					"MIME-Version: 1.0" . $this->eol . "", $this->getSender(), $this->messageId ? ("Message-ID: <" . $this->messageId . ">" . $this->eol) : "", $this->replyTo ? ("Reply-To: <" . $this->replyTo . ">" . $this->eol) : "", $this->bcc ? ("Bcc: " . $this->bcc . $this->eol) : "", $this->references ? ("References: <" . $this->references . ">" . $this->eol . "In-Reply-To: <" . $this->references . ">" . $this->eol) : ""
+					"From: %s".$this->eol.
+					"%s".
+					"%s".
+					"%s".
+					"%s".
+					"MIME-Version: 1.0".$this->eol."", $this->getSender(), $this->messageId ? ("Message-ID: <".$this->messageId.">".$this->eol) : "", $this->replyTo ? ("Reply-To: <".$this->replyTo.">".$this->eol) : "", $this->bcc ? ("Bcc: ".$this->bcc.$this->eol) : "", $this->references ? ("References: <".$this->references.">".$this->eol."In-Reply-To: <".$this->references.">".$this->eol) : ""
 			);
 			$headers .= $this->header;
-			if($this->additional_params)
+			if ($this->additional_params)
 			{
 				return mail($this->getReceiptor(), $this->getTitle(), $this->body, $headers, $this->additional_params);
 			}
@@ -594,14 +594,14 @@ 
 	 */
 	function checkMailMX($email_address)
 	{
-		if(!Mail::isVaildMailAddress($email_address))
+		if (!Mail::isVaildMailAddress($email_address))
 		{
 			return FALSE;
 		}
 		list($user, $host) = explode("@", $email_address);
-		if(function_exists('checkdnsrr'))
+		if (function_exists('checkdnsrr'))
 		{
-			if(checkdnsrr($host, "MX") || checkdnsrr($host, "A"))
+			if (checkdnsrr($host, "MX") || checkdnsrr($host, "A"))
 			{
 				return TRUE;
 			}
@@ -621,7 +621,7 @@ 
 	 */
 	function isVaildMailAddress($email_address)
 	{
-		if(preg_match("/([a-z0-9\_\-\.]+)@([a-z0-9\_\-\.]+)/i", $email_address))
+		if (preg_match("/([a-z0-9\_\-\.]+)@([a-z0-9\_\-\.]+)/i", $email_address))
 		{
 			return $email_address;
 		}
@@ -640,7 +640,7 @@ 
 	function returnMIMEType($filename)
 	{
 		preg_match("|\.([a-z0-9]{2,4})$|i", $filename, $fileSuffix);
-		switch(strtolower($fileSuffix[1]))
+		switch (strtolower($fileSuffix[1]))
 		{
 			case "js" :
 				return "application/x-javascript";
@@ -654,7 +654,7 @@ 
 			case "gif" :
 			case "bmp" :
 			case "tiff" :
-				return "image/" . strtolower($fileSuffix[1]);
+				return "image/".strtolower($fileSuffix[1]);
 			case "css" :
 				return "text/css";
 			case "xml" :
@@ -708,11 +708,11 @@ 
 			case "swf" :
 				return "application/x-shockwave-flash";
 			default :
-				if(function_exists("mime_content_type"))
+				if (function_exists("mime_content_type"))
 				{
 					$fileSuffix = mime_content_type($filename);
 				}
-				return "unknown/" . trim($fileSuffix[0], ".");
+				return "unknown/".trim($fileSuffix[0], ".");
 		}
 	}
 

classes/security/EmbedFilter.class.php

Spacing +65 added lines, -65 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) XEHub <https://www.xehub.io> */
 
-include _XE_PATH_ . 'classes/security/phphtmlparser/src/htmlparser.inc';
+include _XE_PATH_.'classes/security/phphtmlparser/src/htmlparser.inc';
 
 class EmbedFilter
 {
@@ -276,7 +276,7 @@ 
 	 */
 	function getInstance()
 	{
-		if(!isset($GLOBALS['__EMBEDFILTER_INSTANCE__']))
+		if (!isset($GLOBALS['__EMBEDFILTER_INSTANCE__']))
 		{
 			$GLOBALS['__EMBEDFILTER_INSTANCE__'] = new EmbedFilter();
 		}
@@ -316,9 +316,9 @@ 
 	{
 		preg_match_all('/<\s*object\s*[^>]+(?:\/?>?)/is', $content, $m);
 		$objectTagList = $m[0];
-		if($objectTagList)
+		if ($objectTagList)
 		{
-			foreach($objectTagList AS $key => $objectTag)
+			foreach ($objectTagList AS $key => $objectTag)
 			{
 				$isWhiteDomain = true;
 				$isWhiteMimetype = true;
@@ -326,21 +326,21 @@ 
 				$ext = '';
 
 				$parser = new HtmlParser($objectTag);
-				while($parser->parse())
+				while ($parser->parse())
 				{
-					if(is_array($parser->iNodeAttributes))
+					if (is_array($parser->iNodeAttributes))
 					{
-						foreach($parser->iNodeAttributes AS $attrName => $attrValue)
+						foreach ($parser->iNodeAttributes AS $attrName => $attrValue)
 						{
 							// data url check
-							if($attrValue && strtolower($attrName) == 'data')
+							if ($attrValue && strtolower($attrName) == 'data')
 							{
 								$ext = strtolower(substr(strrchr($attrValue, "."), 1));
 								$isWhiteDomain = $this->isWhiteDomain($attrValue);
 							}
 
 							// mime type check
-							if(strtolower($attrName) == 'type' && $attrValue)
+							if (strtolower($attrName) == 'type' && $attrValue)
 							{
 								$isWhiteMimetype = $this->isWhiteMimetype($attrValue);
 							}
@@ -348,7 +348,7 @@ 
 					}
 				}
 
-				if(!$isWhiteDomain || !$isWhiteMimetype)
+				if (!$isWhiteDomain || !$isWhiteMimetype)
 				{
 					$content = str_replace($objectTag, htmlspecialchars($objectTag, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), $content);
 				}
@@ -364,9 +364,9 @@ 
 	{
 		preg_match_all('/<\s*embed\s*[^>]+(?:\/?>?)/is', $content, $m);
 		$embedTagList = $m[0];
-		if($embedTagList)
+		if ($embedTagList)
 		{
-			foreach($embedTagList AS $key => $embedTag)
+			foreach ($embedTagList AS $key => $embedTag)
 			{
 				$isWhiteDomain = TRUE;
 				$isWhiteMimetype = TRUE;
@@ -374,21 +374,21 @@ 
 				$ext = '';
 
 				$parser = new HtmlParser($embedTag);
-				while($parser->parse())
+				while ($parser->parse())
 				{
-					if(is_array($parser->iNodeAttributes))
+					if (is_array($parser->iNodeAttributes))
 					{
-						foreach($parser->iNodeAttributes AS $attrName => $attrValue)
+						foreach ($parser->iNodeAttributes AS $attrName => $attrValue)
 						{
 							// src url check
-							if($attrValue && strtolower($attrName) == 'src')
+							if ($attrValue && strtolower($attrName) == 'src')
 							{
 								$ext = strtolower(substr(strrchr($attrValue, "."), 1));
 								$isWhiteDomain = $this->isWhiteDomain($attrValue);
 							}
 
 							// mime type check
-							if(strtolower($attrName) == 'type' && $attrValue)
+							if (strtolower($attrName) == 'type' && $attrValue)
 							{
 								$isWhiteMimetype = $this->isWhiteMimetype($attrValue);
 							}
@@ -396,7 +396,7 @@ 
 					}
 				}
 
-				if(!$isWhiteDomain || !$isWhiteMimetype)
+				if (!$isWhiteDomain || !$isWhiteMimetype)
 				{
 					$content = str_replace($embedTag, htmlspecialchars($embedTag, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), $content);
 				}
@@ -415,22 +415,22 @@ 
 
 		preg_match_all('/<\s*iframe\s*[^>]+(?:\/?>?)/is', $content, $m);
 		$iframeTagList = $m[0];
-		if($iframeTagList)
+		if ($iframeTagList)
 		{
-			foreach($iframeTagList AS $key => $iframeTag)
+			foreach ($iframeTagList AS $key => $iframeTag)
 			{
 				$isWhiteDomain = TRUE;
 				$ext = '';
 
 				$parser = new HtmlParser($iframeTag);
-				while($parser->parse())
+				while ($parser->parse())
 				{
-					if(is_array($parser->iNodeAttributes))
+					if (is_array($parser->iNodeAttributes))
 					{
-						foreach($parser->iNodeAttributes AS $attrName => $attrValue)
+						foreach ($parser->iNodeAttributes AS $attrName => $attrValue)
 						{
 							// src url check
-							if(strtolower($attrName) == 'src' && $attrValue)
+							if (strtolower($attrName) == 'src' && $attrValue)
 							{
 								$ext = strtolower(substr(strrchr($attrValue, "."), 1));
 								$isWhiteDomain = $this->isWhiteIframeDomain($attrValue);
@@ -439,7 +439,7 @@ 
 					}
 				}
 
-				if(!$isWhiteDomain)
+				if (!$isWhiteDomain)
 				{
 					$content = str_replace($iframeTag, htmlspecialchars($iframeTag, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), $content);
 				}
@@ -455,26 +455,26 @@ 
 	{
 		preg_match_all('/<\s*param\s*[^>]+(?:\/?>?)/is', $content, $m);
 		$paramTagList = $m[0];
-		if($paramTagList)
+		if ($paramTagList)
 		{
-			foreach($paramTagList AS $key => $paramTag)
+			foreach ($paramTagList AS $key => $paramTag)
 			{
 				$isWhiteDomain = TRUE;
 				$isWhiteExt = TRUE;
 				$ext = '';
 
 				$parser = new HtmlParser($paramTag);
-				while($parser->parse())
+				while ($parser->parse())
 				{
-					if($parser->iNodeAttributes['name'] && $parser->iNodeAttributes['value'])
+					if ($parser->iNodeAttributes['name'] && $parser->iNodeAttributes['value'])
 					{
 						$name = strtolower($parser->iNodeAttributes['name']);
-						if($name == 'movie' || $name == 'src' || $name == 'href' || $name == 'url' || $name == 'source')
+						if ($name == 'movie' || $name == 'src' || $name == 'href' || $name == 'url' || $name == 'source')
 						{
 							$ext = strtolower(substr(strrchr($parser->iNodeAttributes['value'], "."), 1));
 							$isWhiteDomain = $this->isWhiteDomain($parser->iNodeAttributes['value']);
 
-							if(!$isWhiteDomain)
+							if (!$isWhiteDomain)
 							{
 								$content = str_replace($paramTag, htmlspecialchars($paramTag, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), $content);
 							}
@@ -491,11 +491,11 @@ 
 	 */
 	function isWhiteDomain($urlAttribute)
 	{
-		if(is_array($this->whiteUrlList))
+		if (is_array($this->whiteUrlList))
 		{
-			foreach($this->whiteUrlList AS $key => $value)
+			foreach ($this->whiteUrlList AS $key => $value)
 			{
-				if(preg_match('@^' . preg_quote($value) . '@i', $urlAttribute))
+				if (preg_match('@^'.preg_quote($value).'@i', $urlAttribute))
 				{
 					return TRUE;
 				}
@@ -510,11 +510,11 @@ 
 	 */
 	function isWhiteIframeDomain($urlAttribute)
 	{
-		if(is_array($this->whiteIframeUrlList))
+		if (is_array($this->whiteIframeUrlList))
 		{
-			foreach($this->whiteIframeUrlList AS $key => $value)
+			foreach ($this->whiteIframeUrlList AS $key => $value)
 			{
-				if(preg_match('@^' . preg_quote($value) . '@i', $urlAttribute))
+				if (preg_match('@^'.preg_quote($value).'@i', $urlAttribute))
 				{
 					return TRUE;
 				}
@@ -529,7 +529,7 @@ 
 	 */
 	function isWhiteMimetype($mimeType)
 	{
-		if(isset($this->mimeTypeList[$mimeType]))
+		if (isset($this->mimeTypeList[$mimeType]))
 		{
 			return TRUE;
 		}
@@ -538,7 +538,7 @@ 
 
 	function isWhiteExt($ext)
 	{
-		if(isset($this->extList[$ext]))
+		if (isset($this->extList[$ext]))
 		{
 			return TRUE;
 		}
@@ -547,26 +547,26 @@ 
 
 	function _checkAllowScriptAccess($m)
 	{
-		if($m[1] == 'object')
+		if ($m[1] == 'object')
 		{
 			$this->allowscriptaccessList[] = 1;
 		}
 
-		if($m[1] == 'param')
+		if ($m[1] == 'param')
 		{
-			if(stripos($m[0], 'allowscriptaccess'))
+			if (stripos($m[0], 'allowscriptaccess'))
 			{
 				$m[0] = '<param name="allowscriptaccess" value="never"';
-				if(substr($m[0], -1) == '/')
+				if (substr($m[0], -1) == '/')
 				{
 					$m[0] .= '/';
 				}
 				$this->allowscriptaccessList[count($this->allowscriptaccessList) - 1]--;
 			}
 		}
-		else if($m[1] == 'embed')
+		else if ($m[1] == 'embed')
 		{
-			if(stripos($m[0], 'allowscriptaccess'))
+			if (stripos($m[0], 'allowscriptaccess'))
 			{
 				$m[0] = preg_replace('/always|samedomain/i', 'never', $m[0]);
 			}
@@ -580,9 +580,9 @@ 
 
 	function _addAllowScriptAccess($m)
 	{
-		if($this->allowscriptaccessList[$this->allowscriptaccessKey] == 1)
+		if ($this->allowscriptaccessList[$this->allowscriptaccessKey] == 1)
 		{
-			$m[0] = $m[0] . '<param name="allowscriptaccess" value="never"></param>';
+			$m[0] = $m[0].'<param name="allowscriptaccess" value="never"></param>';
 		}
 		$this->allowscriptaccessKey++;
 		return $m[0];
@@ -599,31 +599,31 @@ 
 		$whiteUrlCacheFile = FileHandler::getRealPath($this->whiteUrlCacheFile);
 
 		$isMake = FALSE;
-		if(!file_exists($whiteUrlCacheFile))
+		if (!file_exists($whiteUrlCacheFile))
 		{
 			$isMake = TRUE;
 		}
-		if(file_exists($whiteUrlCacheFile) && filemtime($whiteUrlCacheFile) < filemtime($whiteUrlXmlFile))
+		if (file_exists($whiteUrlCacheFile) && filemtime($whiteUrlCacheFile) < filemtime($whiteUrlXmlFile))
 		{
 			$isMake = TRUE;
 		}
 
-		if(gettype($whitelist) == 'array' && gettype($whitelist['object']) == 'array' && gettype($whitelist['iframe']) == 'array')
+		if (gettype($whitelist) == 'array' && gettype($whitelist['object']) == 'array' && gettype($whitelist['iframe']) == 'array')
 		{
 			$isMake = FALSE;
 		}
 
-		if(isset($whitelist) && gettype($whitelist) == 'object')
+		if (isset($whitelist) && gettype($whitelist) == 'object')
 		{
 			$isMake = TRUE;
 		}
 
-		if($isMake)
+		if ($isMake)
 		{
 			$whiteUrlList = array();
 			$whiteIframeUrlList = array();
 
-			if(gettype($whitelist->object) == 'array' && gettype($whitelist->iframe) == 'array')
+			if (gettype($whitelist->object) == 'array' && gettype($whitelist->iframe) == 'array')
 			{
 				$whiteUrlList = $whitelist->object;
 				$whiteIframeUrlList = $whitelist->iframe;
@@ -636,15 +636,15 @@ 
 				$domainListObj = $xmlParser->parse($xmlBuff);
 				$embedDomainList = $domainListObj->whiteurl->embed->domain;
 				$iframeDomainList = $domainListObj->whiteurl->iframe->domain;
-				if(!is_array($embedDomainList)) $embedDomainList = array();
-				if(!is_array($iframeDomainList)) $iframeDomainList = array();
+				if (!is_array($embedDomainList)) $embedDomainList = array();
+				if (!is_array($iframeDomainList)) $iframeDomainList = array();
 
-				foreach($embedDomainList AS $key => $value)
+				foreach ($embedDomainList AS $key => $value)
 				{
 					$patternList = $value->pattern;
-					if(is_array($patternList))
+					if (is_array($patternList))
 					{
-						foreach($patternList AS $key => $value)
+						foreach ($patternList AS $key => $value)
 						{
 							$whiteUrlList[] = $value->body;
 						}
@@ -655,12 +655,12 @@ 
 					}
 				}
 
-				foreach($iframeDomainList AS $key => $value)
+				foreach ($iframeDomainList AS $key => $value)
 				{
 					$patternList = $value->pattern;
-					if(is_array($patternList))
+					if (is_array($patternList))
 					{
-						foreach($patternList AS $key => $value)
+						foreach ($patternList AS $key => $value)
 						{
 							$whiteIframeUrlList[] = $value->body;
 						}
@@ -674,12 +674,12 @@ 
 
 			$db_info = Context::getDBInfo();
 
-			if($db_info->embed_white_object)
+			if ($db_info->embed_white_object)
 			{
 				$whiteUrlList = array_merge($whiteUrlList, $db_info->embed_white_object);
 			}
 
-			if($db_info->embed_white_iframe)
+			if ($db_info->embed_white_iframe)
 			{
 				$whiteIframeUrlList = array_merge($whiteIframeUrlList, $db_info->embed_white_iframe);
 			}
@@ -691,8 +691,8 @@ 
 
 			$buff = array();
 			$buff[] = '<?php if(!defined("__XE__")) exit();';
-			$buff[] = '$whiteUrlList = ' . var_export($whiteUrlList, TRUE) . ';';
-			$buff[] = '$whiteIframeUrlList = ' . var_export($whiteIframeUrlList, TRUE) . ';';
+			$buff[] = '$whiteUrlList = '.var_export($whiteUrlList, TRUE).';';
+			$buff[] = '$whiteIframeUrlList = '.var_export($whiteIframeUrlList, TRUE).';';
 
 			FileHandler::writeFile($this->whiteUrlCacheFile, implode(PHP_EOL, $buff));
 		}

modules/addon/addon.admin.controller.php

Spacing +28 added lines, -28 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) XEHub <https://www.xehub.io> */
 
-require_once(_XE_PATH_ . 'modules/addon/addon.controller.php');
+require_once(_XE_PATH_.'modules/addon/addon.controller.php');
 
 /**
  * Admin controller class of addon modules
@@ -33,7 +33,7 @@ 
 
 		$site_module_info = Context::get('site_module_info');
 
-		if($site_module_info->site_srl)
+		if ($site_module_info->site_srl)
 		{
 			$site_srl = $site_module_info->site_srl;
 		}
@@ -42,28 +42,28 @@ 
 			$site_srl = 0;
 		}
 
-		if(!$pcOnList)
+		if (!$pcOnList)
 		{
 			$pcOnList = array();
 		}
-		if(!$mobileOnList)
+		if (!$mobileOnList)
 		{
 			$mobileOnList = array();
 		}
-		if(!$fixed)
+		if (!$fixed)
 		{
 			$fixed = array();
 		}
 
-		if(!is_array($pcOnList))
+		if (!is_array($pcOnList))
 		{
 			$pcOnList = array($pcOnList);
 		}
-		if(!is_array($mobileOnList))
+		if (!is_array($mobileOnList))
 		{
 			$pcOnList = array($mobileOnList);
 		}
-		if(!is_array($fixed))
+		if (!is_array($fixed))
 		{
 			$pcOnList = array($fixed);
 		}
@@ -74,21 +74,21 @@ 
 
 		// get need update addon list
 		$updateList = array();
-		foreach($currentAddonList as $addon)
+		foreach ($currentAddonList as $addon)
 		{
-			if($addon->activated !== in_array($addon->addon_name, $pcOnList))
+			if ($addon->activated !== in_array($addon->addon_name, $pcOnList))
 			{
 				$updateList[] = $addon->addon_name;
 				continue;
 			}
 
-			if($addon->mactivated !== in_array($addon->addon_name, $mobileOnList))
+			if ($addon->mactivated !== in_array($addon->addon_name, $mobileOnList))
 			{
 				$updateList[] = $addon->addon_name;
 				continue;
 			}
 
-			if($addon->fixed !== in_array($addon->addon_name, $fixed))
+			if ($addon->fixed !== in_array($addon->addon_name, $fixed))
 			{
 				$updateList[] = $addon->addon_name;
 				continue;
@@ -96,11 +96,11 @@ 
 		}
 
 		// update
-		foreach($updateList as $targetAddon)
+		foreach ($updateList as $targetAddon)
 		{
 			$args = new stdClass();
 
-			if(in_array($targetAddon, $pcOnList))
+			if (in_array($targetAddon, $pcOnList))
 			{
 				$args->is_used = 'Y';
 			}
@@ -109,7 +109,7 @@ 
 				$args->is_used = 'N';
 			}
 
-			if(in_array($targetAddon, $mobileOnList))
+			if (in_array($targetAddon, $mobileOnList))
 			{
 				$args->is_used_m = 'Y';
 			}
@@ -118,7 +118,7 @@ 
 				$args->is_used_m = 'N';
 			}
 
-			if(in_array($targetAddon, $fixed))
+			if (in_array($targetAddon, $fixed))
 			{
 				$args->fixed = 'Y';
 			}
@@ -131,20 +131,20 @@ 
 			$args->site_srl = $site_srl;
 
 			$output = executeQuery('addon.updateSiteAddon', $args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return $output;
 			}
 		}
 
-		if(count($updateList))
+		if (count($updateList))
 		{
 			$this->makeCacheFile($site_srl, 'pc', 'site');
 			$this->makeCacheFile($site_srl, 'mobile', 'site');
 		}
 
 		$this->setMessage('success_updated', 'info');
-		if(Context::get('success_return_url'))
+		if (Context::get('success_return_url'))
 		{
 			$this->setRedirectUrl(Context::get('success_return_url'));
 		}
@@ -167,14 +167,14 @@ 
 		// batahom addon values
 		$addon = Context::get('addon');
 		$type = Context::get('type');
-		if(!$type)
+		if (!$type)
 		{
 			$type = "pc";
 		}
-		if($addon)
+		if ($addon)
 		{
 			// If enabled Disables
-			if($oAddonModel->isActivatedAddon($addon, $site_module_info->site_srl, $type))
+			if ($oAddonModel->isActivatedAddon($addon, $site_module_info->site_srl, $type))
 			{
 				$this->doDeactivate($addon, $site_module_info->site_srl, $type);
 			}
@@ -207,7 +207,7 @@ 
 		$site_module_info = Context::get('site_module_info');
 
 		$output = $this->doSetup($addon_name, $args, $site_module_info->site_srl, 'site');
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -232,7 +232,7 @@ 
 		$args = new stdClass;
 		$args->addon = $addon;
 		$args->is_used = $isUsed;
-		if($gtype == 'global')
+		if ($gtype == 'global')
 		{
 			return executeQuery('addon.insertAddon', $args);
 		}
@@ -253,7 +253,7 @@ 
 	{
 		$args = new stdClass();
 		$args->addon = $addon;
-		if($type == "pc")
+		if ($type == "pc")
 		{
 			$args->is_used = 'Y';
 		}
@@ -261,7 +261,7 @@ 
 		{
 			$args->is_used_m = "Y";
 		}
-		if($gtype == 'global')
+		if ($gtype == 'global')
 		{
 			return executeQuery('addon.updateAddon', $args);
 		}
@@ -281,7 +281,7 @@ 
 	{
 		$args = new stdClass();
 		$args->addon = $addon;
-		if($type == "pc")
+		if ($type == "pc")
 		{
 			$args->is_used = 'N';
 		}
@@ -289,7 +289,7 @@ 
 		{
 			$args->is_used_m = 'N';
 		}
-		if($gtype == 'global')
+		if ($gtype == 'global')
 		{
 			return executeQuery('addon.updateAddon', $args);
 		}

modules/autoinstall/autoinstall.admin.controller.php

Spacing +32 added lines, -32 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) XEHub <https://www.xehub.io> */
 
-require_once(_XE_PATH_ . 'modules/autoinstall/autoinstall.lib.php');
+require_once(_XE_PATH_.'modules/autoinstall/autoinstall.lib.php');
 
 /**
  * autoinstall module admin controller class
@@ -64,7 +64,7 @@ 
 	{
 		$oModel = getModel('autoinstall');
 		$item = $oModel->getLatestPackage();
-		if($item)
+		if ($item)
 		{
 			$params["updatedate"] = $item->updatedate;
 		}
@@ -92,23 +92,23 @@ 
 		executeQuery("autoinstall.deleteInstalledPackage");
 		$oModel = getModel('autoinstall');
 		$packages = $oModel->getPackages();
-		foreach($packages as $package)
+		foreach ($packages as $package)
 		{
 			$real_path = FileHandler::getRealPath($package->path);
-			if(!file_exists($real_path))
+			if (!file_exists($real_path))
 			{
 				continue;
 			}
 
 			$type = $oModel->getTypeFromPath($package->path);
-			if($type == "core")
+			if ($type == "core")
 			{
 				$version = __XE_VERSION__;
 			}
 			else
 			{
 				$config_file = NULL;
-				switch($type)
+				switch ($type)
 				{
 					case "m.layout":
 						$type = "layout";
@@ -138,15 +138,15 @@ 
 						break;
 				}
 
-				if(!$config_file)
+				if (!$config_file)
 				{
 					continue;
 				}
 
 				$xml = new XmlParser();
-				$xmlDoc = $xml->loadXmlFile($real_path . $config_file);
+				$xmlDoc = $xml->loadXmlFile($real_path.$config_file);
 
-				if(!$xmlDoc)
+				if (!$xmlDoc)
 				{
 					continue;
 				}
@@ -158,7 +158,7 @@ 
 			$args->package_srl = $package->package_srl;
 			$args->version = $package->version;
 			$args->current_version = $version;
-			if(version_compare($args->version, $args->current_version, ">"))
+			if (version_compare($args->version, $args->current_version, ">"))
 			{
 				$args->need_update = "Y";
 			}
@@ -184,7 +184,7 @@ 
 		$oAdminModel = getAdminModel('autoinstall');
 		$packages = explode(',', $package_srls);
 		$ftp_info = Context::getFTPInfo();
-		if(!$_SESSION['ftp_password'])
+		if (!$_SESSION['ftp_password'])
 		{
 			$ftp_password = Context::get('ftp_password');
 		}
@@ -194,18 +194,18 @@ 
 		}
 
 		$isSftpSupported = function_exists(ssh2_sftp);
-		foreach($packages as $package_srl)
+		foreach ($packages as $package_srl)
 		{
 			$package = $oModel->getPackage($package_srl);
-			if($oAdminModel->checkUseDirectModuleInstall($package)->toBool())
+			if ($oAdminModel->checkUseDirectModuleInstall($package)->toBool())
 			{
 				$oModuleInstaller = new DirectModuleInstaller($package);
 			}
-			else if($ftp_info->sftp && $ftp_info->sftp == 'Y' && $isSftpSupported)
+			else if ($ftp_info->sftp && $ftp_info->sftp == 'Y' && $isSftpSupported)
 			{
 				$oModuleInstaller = new SFTPModuleInstaller($package);
 			}
-			else if(function_exists(ftp_connect))
+			else if (function_exists(ftp_connect))
 			{
 				$oModuleInstaller = new PHPFTPModuleInstaller($package);
 			}
@@ -217,7 +217,7 @@ 
 			$oModuleInstaller->setServerUrl(_XE_DOWNLOAD_SERVER_);
 			$oModuleInstaller->setPassword($ftp_password);
 			$output = $oModuleInstaller->install();
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return $output;
 			}
@@ -227,7 +227,7 @@ 
 
 		$this->setMessage('success_installed', 'update');
 
-		if(Context::get('return_url'))
+		if (Context::get('return_url'))
 		{
 			$this->setRedirectUrl(Context::get('return_url'));
 		}
@@ -246,30 +246,30 @@ 
 	function updatePackages(&$xmlDoc)
 	{
 		$oModel = getModel('autoinstall');
-		if(!$xmlDoc->response->packages->item)
+		if (!$xmlDoc->response->packages->item)
 		{
 			return;
 		}
-		if(!is_array($xmlDoc->response->packages->item))
+		if (!is_array($xmlDoc->response->packages->item))
 		{
 			$xmlDoc->response->packages->item = array($xmlDoc->response->packages->item);
 		}
 		$targets = array('package_srl', 'updatedate', 'latest_item_srl', 'path', 'version', 'category_srl', 'have_instance');
-		foreach($xmlDoc->response->packages->item as $item)
+		foreach ($xmlDoc->response->packages->item as $item)
 		{
 			$args = new stdClass();
-			foreach($targets as $target)
+			foreach ($targets as $target)
 			{
 				$args->{$target} = $item->{$target}->body;
 			}
-			if($oModel->getPackage($args->package_srl))
+			if ($oModel->getPackage($args->package_srl))
 			{
 				$output = executeQuery("autoinstall.updatePackage", $args);
 			}
 			else
 			{
 				$output = executeQuery("autoinstall.insertPackage", $args);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					$output = executeQuery("autoinstall.deletePackage", $args);
 					$output = executeQuery("autoinstall.insertPackage", $args);
@@ -288,12 +288,12 @@ 
 	{
 		executeQuery("autoinstall.deleteCategory");
 		$oModel = getModel('autoinstall');
-		if(!is_array($xmlDoc->response->categorylist->item))
+		if (!is_array($xmlDoc->response->categorylist->item))
 		{
 			$xmlDoc->response->categorylist->item = array($xmlDoc->response->categorylist->item);
 		}
 		$list_order = 0;
-		foreach($xmlDoc->response->categorylist->item as $item)
+		foreach ($xmlDoc->response->categorylist->item as $item)
 		{
 			$args = new stdClass();
 			$args->category_srl = $item->category_srl->body;
@@ -314,12 +314,12 @@ 
 		$package_srl = Context::get('package_srl');
 
 		$output = $this->uninstallPackageByPackageSrl($package_srl);
-		if($output->toBool()==FALSE)
+		if ($output->toBool() == FALSE)
 		{
 			return $output;
 		}
 
-		if(Context::get('return_url'))
+		if (Context::get('return_url'))
 		{
 			$this->setRedirectUrl(Context::get('return_url'));
 		}
@@ -359,7 +359,7 @@ 
 
 		$oAdminModel = getAdminModel('autoinstall');
 
-		if(!$_SESSION['ftp_password'])
+		if (!$_SESSION['ftp_password'])
 		{
 			$ftp_password = Context::get('ftp_password');
 		}
@@ -370,15 +370,15 @@ 
 		$ftp_info = Context::getFTPInfo();
 
 		$isSftpSupported = function_exists(ssh2_sftp);
-		if($oAdminModel->checkUseDirectModuleInstall($package)->toBool())
+		if ($oAdminModel->checkUseDirectModuleInstall($package)->toBool())
 		{
 			$oModuleInstaller = new DirectModuleInstaller($package);
 		}
-		else if($ftp_info->sftp && $ftp_info->sftp == 'Y' && $isSftpSupported)
+		else if ($ftp_info->sftp && $ftp_info->sftp == 'Y' && $isSftpSupported)
 		{
 			$oModuleInstaller = new SFTPModuleInstaller($package);
 		}
-		else if(function_exists('ftp_connect'))
+		else if (function_exists('ftp_connect'))
 		{
 			$oModuleInstaller = new PHPFTPModuleInstaller($package);
 		}
@@ -391,7 +391,7 @@ 
 
 		$oModuleInstaller->setPassword($ftp_password);
 		$output = $oModuleInstaller->uninstall();
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}

modules/autoinstall/autoinstall.lib.php

Spacing +122 added lines, -122 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) XEHub <https://www.xehub.io> */
 
-require_once(_XE_PATH_ . 'libs/ftp.class.php');
+require_once(_XE_PATH_.'libs/ftp.class.php');
 
 /**
  * Module installer
@@ -78,17 +78,17 @@ 
 	{
 		$oModel = getModel('autoinstall');
 		$type = $oModel->getTypeFromPath($this->package->path);
-		if($type == "module")
+		if ($type == "module")
 		{
 			$output = $this->uninstallModule();
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return $output;
 			}
 		}
 
 		$output = $this->_connect();
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -116,19 +116,19 @@ 
 	 */
 	function _download()
 	{
-		if($this->package->path == ".")
+		if ($this->package->path == ".")
 		{
-			$this->download_file = $this->temp_dir . "xe.tar";
+			$this->download_file = $this->temp_dir."xe.tar";
 			$this->target_path = "";
 			$this->download_path = $this->temp_dir;
 		}
 		else
 		{
 			$subpath = trim(substr($this->package->path, 2), '/');
-			$this->download_file = $this->temp_dir . $subpath . ".tar";
+			$this->download_file = $this->temp_dir.$subpath.".tar";
 			$subpatharr = explode("/", $subpath);
 			array_pop($subpatharr);
-			$this->download_path = $this->temp_dir . implode("/", $subpatharr);
+			$this->download_path = $this->temp_dir.implode("/", $subpatharr);
 			$this->target_path = implode("/", $subpatharr);
 		}
 
@@ -152,17 +152,17 @@ 
 		$path_array = explode("/", $this->package->path);
 		$target_name = array_pop($path_array);
 		$oModule = getModule($target_name, "class");
-		if(!$oModule)
+		if (!$oModule)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
-		if(!method_exists($oModule, "moduleUninstall"))
+		if (!method_exists($oModule, "moduleUninstall"))
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
 		$output = $oModule->moduleUninstall();
-		if(is_subclass_of($output, 'BaseObject') && !$output->toBool())
+		if (is_subclass_of($output, 'BaseObject') && !$output->toBool())
 		{
 			return $output;
 		}
@@ -170,9 +170,9 @@ 
 		$schema_dir = sprintf('%s/schemas/', $this->package->path);
 		$schema_files = FileHandler::readDir($schema_dir);
 		$oDB = DB::getInstance();
-		if(is_array($schema_files))
+		if (is_array($schema_files))
 		{
-			foreach($schema_files as $file)
+			foreach ($schema_files as $file)
 			{
 				$filename_arr = explode(".", $file);
 				$filename = array_shift($filename_arr);
@@ -192,26 +192,26 @@ 
 	function installModule()
 	{
 		$path = $this->package->path;
-		if($path != ".")
+		if ($path != ".")
 		{
 			$path_array = explode("/", $path);
 			$target_name = array_pop($path_array);
 			$type = substr(array_pop($path_array), 0, -1);
 		}
 
-		if($type == "module")
+		if ($type == "module")
 		{
 			$oModuleModel = getModel('module');
 			$oInstallController = getController('install');
 			$module_path = ModuleHandler::getModulePath($target_name);
-			if($oModuleModel->checkNeedInstall($target_name))
+			if ($oModuleModel->checkNeedInstall($target_name))
 			{
 				$oInstallController->installModule($target_name, $module_path);
 			}
-			if($oModuleModel->checkNeedUpdate($target_name))
+			if ($oModuleModel->checkNeedUpdate($target_name))
 			{
 				$oModule = getModule($target_name, 'class');
-				if(method_exists($oModule, 'moduleUpdate'))
+				if (method_exists($oModule, 'moduleUpdate'))
 				{
 					$oModule->moduleUpdate();
 				}
@@ -231,7 +231,7 @@ 
 		$this->_download();
 		$file_list = $this->_unPack();
 		$output = $this->_copyDir($file_list);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			FileHandler::removeDir($this->temp_dir);
 			return $output;
@@ -249,18 +249,18 @@ 
 	 */
 	function _unPack()
 	{
-		require_once(_XE_PATH_ . 'libs/tar.class.php');
+		require_once(_XE_PATH_.'libs/tar.class.php');
 
 		$oTar = new tar();
 		$oTar->openTAR($this->download_file);
 
 		$_files = $oTar->files;
 		$file_list = array();
-		if(is_array($_files))
+		if (is_array($_files))
 		{
-			foreach($_files as $key => $info)
+			foreach ($_files as $key => $info)
 			{
-				FileHandler::writeFile($this->download_path . "/" . $info['name'], $info['file']);
+				FileHandler::writeFile($this->download_path."/".$info['name'], $info['file']);
 				$file_list[] = $info['name'];
 			}
 		}
@@ -278,22 +278,22 @@ 
 		$real_path = FileHandler::getRealPath($path);
 		$oDir = dir($path);
 		$files = array();
-		while($file = $oDir->read())
+		while ($file = $oDir->read())
 		{
-			if($file == "." || $file == "..")
+			if ($file == "." || $file == "..")
 			{
 				continue;
 			}
 			$files[] = $file;
 		}
 
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
-			$file_path = $path . "/" . $file;
-			if(is_dir(FileHandler::getRealPath($file_path)))
+			$file_path = $path."/".$file;
+			if (is_dir(FileHandler::getRealPath($file_path)))
 			{
 				$output = $this->_removeDir($file_path);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					return $output;
 				}
@@ -301,7 +301,7 @@ 
 			else
 			{
 				$output = $this->_removeFile($file_path);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					return $output;
 				}
@@ -357,17 +357,17 @@ 
 	 */
 	function _connect()
 	{
-		if(!function_exists('ssh2_connect'))
+		if (!function_exists('ssh2_connect'))
 		{
 			return new BaseObject(-1, 'msg_sftp_not_supported');
 		}
 
-		if(!$this->ftp_info->ftp_user || !$this->ftp_info->sftp || $this->ftp_info->sftp != 'Y')
+		if (!$this->ftp_info->ftp_user || !$this->ftp_info->sftp || $this->ftp_info->sftp != 'Y')
 		{
 			return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 		}
 
-		if($this->ftp_info->ftp_host)
+		if ($this->ftp_info->ftp_host)
 		{
 			$ftp_host = $this->ftp_info->ftp_host;
 		}
@@ -376,7 +376,7 @@ 
 			$ftp_host = "127.0.0.1";
 		}
 		$this->connection = ssh2_connect($ftp_host, $this->ftp_info->ftp_port);
-		if(!@ssh2_auth_password($this->connection, $this->ftp_info->ftp_user, $this->ftp_password))
+		if (!@ssh2_auth_password($this->connection, $this->ftp_info->ftp_user, $this->ftp_password))
 		{
 			return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 		}
@@ -403,13 +403,13 @@ 
 	 */
 	function _removeFile($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
-		$target_path = $this->ftp_info->ftp_root_path . $path;
+		$target_path = $this->ftp_info->ftp_root_path.$path;
 
-		if(!@ssh2_sftp_unlink($this->sftp, $target_path))
+		if (!@ssh2_sftp_unlink($this->sftp, $target_path))
 		{
 			return new BaseObject(-1, sprintf(Context::getLang('msg_delete_file_failed'), $path));
 		}
@@ -424,13 +424,13 @@ 
 	 */
 	function _removeDir_real($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
-		$target_path = $this->ftp_info->ftp_root_path . $path;
+		$target_path = $this->ftp_info->ftp_root_path.$path;
 
-		if(!@ssh2_sftp_rmdir($this->sftp, $target_path))
+		if (!@ssh2_sftp_rmdir($this->sftp, $target_path))
 		{
 			return new BaseObject(-1, sprintf(Context::getLang('msg_delete_dir_failed'), $path));
 		}
@@ -445,37 +445,37 @@ 
 	 */
 	function _copyDir(&$file_list)
 	{
-		if(!$this->ftp_password)
+		if (!$this->ftp_password)
 		{
 			return new BaseObject(-1, 'msg_ftp_password_input');
 		}
 
 		$output = $this->_connect();
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
-		$target_dir = $this->ftp_info->ftp_root_path . $this->target_path;
+		$target_dir = $this->ftp_info->ftp_root_path.$this->target_path;
 		$copied = array();
 
-		if(is_array($file_list))
+		if (is_array($file_list))
 		{
-			foreach($file_list as $k => $file)
+			foreach ($file_list as $k => $file)
 			{
 				$org_file = $file;
-				if($this->package->path == ".")
+				if ($this->package->path == ".")
 				{
 					$file = substr($file, 3);
 				}
-				$path = FileHandler::getRealPath("./" . $this->target_path . "/" . $file);
-				$pathname = dirname($target_dir . "/" . $file);
+				$path = FileHandler::getRealPath("./".$this->target_path."/".$file);
+				$pathname = dirname($target_dir."/".$file);
 
-				if(!file_exists(FileHandler::getRealPath($real_path)))
+				if (!file_exists(FileHandler::getRealPath($real_path)))
 				{
 					ssh2_sftp_mkdir($this->sftp, $pathname, 0755, TRUE);
 				}
 
-				ssh2_scp_send($this->connection, FileHandler::getRealPath($this->download_path . "/" . $org_file), $target_dir . "/" . $file);
+				ssh2_scp_send($this->connection, FileHandler::getRealPath($this->download_path."/".$org_file), $target_dir."/".$file);
 				$copied[] = $path;
 			}
 		}
@@ -526,7 +526,7 @@ 
 	 */
 	function _connect()
 	{
-		if($this->ftp_info->ftp_host)
+		if ($this->ftp_info->ftp_host)
 		{
 			$ftp_host = $this->ftp_info->ftp_host;
 		}
@@ -536,20 +536,20 @@ 
 		}
 
 		$this->connection = ftp_connect($ftp_host, $this->ftp_info->ftp_port);
-		if(!$this->connection)
+		if (!$this->connection)
 		{
 			return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
 		}
 
 		$login_result = @ftp_login($this->connection, $this->ftp_info->ftp_user, $this->ftp_password);
-		if(!$login_result)
+		if (!$login_result)
 		{
 			$this->_close();
 			return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 		}
 
 		$_SESSION['ftp_password'] = $this->ftp_password;
-		if($this->ftp_info->ftp_pasv != "N")
+		if ($this->ftp_info->ftp_pasv != "N")
 		{
 			ftp_pasv($this->connection, TRUE);
 		}
@@ -564,15 +564,15 @@ 
 	 */
 	function _removeFile($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
-		$target_path = $this->ftp_info->ftp_root_path . $path;
+		$target_path = $this->ftp_info->ftp_root_path.$path;
 
-		if(!@ftp_delete($this->connection, $target_path))
+		if (!@ftp_delete($this->connection, $target_path))
 		{
-			return new BaseObject(-1, "failed to delete file " . $path);
+			return new BaseObject(-1, "failed to delete file ".$path);
 		}
 		return new BaseObject();
 	}
@@ -585,15 +585,15 @@ 
 	 */
 	function _removeDir_real($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
-		$target_path = $this->ftp_info->ftp_root_path . $path;
+		$target_path = $this->ftp_info->ftp_root_path.$path;
 
-		if(!@ftp_rmdir($this->connection, $target_path))
+		if (!@ftp_rmdir($this->connection, $target_path))
 		{
-			return new BaseObject(-1, "failed to delete directory " . $path);
+			return new BaseObject(-1, "failed to delete directory ".$path);
 		}
 		return new BaseObject();
 	}
@@ -616,74 +616,74 @@ 
 	 */
 	function _copyDir(&$file_list)
 	{
-		if(!$this->ftp_password)
+		if (!$this->ftp_password)
 		{
 			return new BaseObject(-1, 'msg_ftp_password_input');
 		}
 
 		$output = $this->_connect();
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
-		if(!$this->target_path)
+		if (!$this->target_path)
 		{
 			$this->target_path = '.';
 		}
-		if(substr($this->download_path, -1) == '/')
+		if (substr($this->download_path, -1) == '/')
 		{
 			$this->download_path = substr($this->download_path, 0, -1);
 		}
-		$target_dir = $this->ftp_info->ftp_root_path . $this->target_path;
+		$target_dir = $this->ftp_info->ftp_root_path.$this->target_path;
 		$copied = array();
 
-		if(is_array($file_list))
+		if (is_array($file_list))
 		{
-			foreach($file_list as $k => $file)
+			foreach ($file_list as $k => $file)
 			{
-				if(!$file)
+				if (!$file)
 				{
 					continue;
 				}
 				$org_file = $file;
-				if($this->package->path == ".")
+				if ($this->package->path == ".")
 				{
 					$file = substr($file, 3);
 				}
-				$path = FileHandler::getRealPath("./" . $this->target_path . "/" . $file);
-				$path_list = explode('/', dirname($this->target_path . "/" . $file));
+				$path = FileHandler::getRealPath("./".$this->target_path."/".$file);
+				$path_list = explode('/', dirname($this->target_path."/".$file));
 
 				$real_path = "./";
 				$ftp_path = $this->ftp_info->ftp_root_path;
 
-				for($i = 0; $i < count($path_list); $i++)
+				for ($i = 0; $i < count($path_list); $i++)
 				{
-					if($path_list == "")
+					if ($path_list == "")
 					{
 						continue;
 					}
-					$real_path .= $path_list[$i] . "/";
-					$ftp_path .= $path_list[$i] . "/";
-					if(!file_exists(FileHandler::getRealPath($real_path)))
+					$real_path .= $path_list[$i]."/";
+					$ftp_path .= $path_list[$i]."/";
+					if (!file_exists(FileHandler::getRealPath($real_path)))
 					{
-						if(!@ftp_mkdir($this->connection, $ftp_path))
+						if (!@ftp_mkdir($this->connection, $ftp_path))
 						{
 							return new BaseObject(-1, "msg_make_directory_failed");
 						}
 
-						if(strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')
+						if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')
 						{
-							if(function_exists('ftp_chmod'))
+							if (function_exists('ftp_chmod'))
 							{
-								if(!ftp_chmod($this->connection, 0755, $ftp_path))
+								if (!ftp_chmod($this->connection, 0755, $ftp_path))
 								{
 									return new BaseObject(-1, "msg_permission_adjust_failed");
 								}
 							}
 							else
 							{
-								if(!ftp_site($this->connection, "CHMOD 755 " . $ftp_path))
+								if (!ftp_site($this->connection, "CHMOD 755 ".$ftp_path))
 								{
 									return new BaseObject(-1, "msg_permission_adjust_failed");
 								}
@@ -691,7 +691,7 @@ 
 						}
 					}
 				}
-				if(!ftp_put($this->connection, $target_dir . '/' . $file, FileHandler::getRealPath($this->download_path . "/" . $org_file), FTP_BINARY))
+				if (!ftp_put($this->connection, $target_dir.'/'.$file, FileHandler::getRealPath($this->download_path."/".$org_file), FTP_BINARY))
 				{
 					return new BaseObject(-1, "msg_ftp_upload_failed");
 				}
@@ -745,7 +745,7 @@ 
 	 */
 	function _connect()
 	{
-		if($this->ftp_info->ftp_host)
+		if ($this->ftp_info->ftp_host)
 		{
 			$ftp_host = $this->ftp_info->ftp_host;
 		}
@@ -755,11 +755,11 @@ 
 		}
 
 		$this->oFtp = new ftp();
-		if(!$this->oFtp->ftp_connect($ftp_host, $this->ftp_info->ftp_port))
+		if (!$this->oFtp->ftp_connect($ftp_host, $this->ftp_info->ftp_port))
 		{
 			return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
 		}
-		if(!$this->oFtp->ftp_login($this->ftp_info->ftp_user, $this->ftp_password))
+		if (!$this->oFtp->ftp_login($this->ftp_info->ftp_user, $this->ftp_password))
 		{
 			$this->_close();
 			return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
@@ -776,13 +776,13 @@ 
 	 */
 	function _removeFile($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
-		$target_path = $this->ftp_info->ftp_root_path . $path;
+		$target_path = $this->ftp_info->ftp_root_path.$path;
 
-		if(!$this->oFtp->ftp_delete($target_path))
+		if (!$this->oFtp->ftp_delete($target_path))
 		{
 			return new BaseObject(-1, sprintf(Context::getLang('msg_delete_file_failed'), $path));
 		}
@@ -796,13 +796,13 @@ 
 	 */
 	function _removeDir_real($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
-		$target_path = $this->ftp_info->ftp_root_path . $path;
+		$target_path = $this->ftp_info->ftp_root_path.$path;
 
-		if(!$this->oFtp->ftp_rmdir($target_path))
+		if (!$this->oFtp->ftp_rmdir($target_path))
 		{
 			return new BaseObject(-1, sprintf(Context::getLang('msg_delete_dir_failed'), $path));
 		}
@@ -827,52 +827,52 @@ 
 	 */
 	function _copyDir(&$file_list)
 	{
-		if(!$this->ftp_password)
+		if (!$this->ftp_password)
 		{
 			return new BaseObject(-1, 'msg_ftp_password_input');
 		}
 
 		$output = $this->_connect();
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
 		$oFtp = &$this->oFtp;
-		$target_dir = $this->ftp_info->ftp_root_path . $this->target_path;
+		$target_dir = $this->ftp_info->ftp_root_path.$this->target_path;
 
 		$copied = array();
 
-		if(is_array($file_list))
+		if (is_array($file_list))
 		{
-			foreach($file_list as $k => $file)
+			foreach ($file_list as $k => $file)
 			{
 				$org_file = $file;
-				if($this->package->path == ".")
+				if ($this->package->path == ".")
 				{
 					$file = substr($file, 3);
 				}
-				$path = FileHandler::getRealPath("./" . $this->target_path . "/" . $file);
-				$path_list = explode('/', dirname($this->target_path . "/" . $file));
+				$path = FileHandler::getRealPath("./".$this->target_path."/".$file);
+				$path_list = explode('/', dirname($this->target_path."/".$file));
 
 				$real_path = "./";
 				$ftp_path = $this->ftp_info->ftp_root_path;
 
-				for($i = 0; $i < count($path_list); $i++)
+				for ($i = 0; $i < count($path_list); $i++)
 				{
-					if($path_list == "")
+					if ($path_list == "")
 					{
 						continue;
 					}
-					$real_path .= $path_list[$i] . "/";
-					$ftp_path .= $path_list[$i] . "/";
-					if(!file_exists(FileHandler::getRealPath($real_path)))
+					$real_path .= $path_list[$i]."/";
+					$ftp_path .= $path_list[$i]."/";
+					if (!file_exists(FileHandler::getRealPath($real_path)))
 					{
 						$oFtp->ftp_mkdir($ftp_path);
-						$oFtp->ftp_site("CHMOD 755 " . $ftp_path);
+						$oFtp->ftp_site("CHMOD 755 ".$ftp_path);
 					}
 				}
-				$oFtp->ftp_put($target_dir . '/' . $file, FileHandler::getRealPath($this->download_path . "/" . $org_file));
+				$oFtp->ftp_put($target_dir.'/'.$file, FileHandler::getRealPath($this->download_path."/".$org_file));
 				$copied[] = $path;
 			}
 		}
@@ -921,13 +921,13 @@ 
 	 */
 	function _removeFile($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
 		$target_path = FileHandler::getRealPath($path);
 
-		if(!FileHandler::removeFile($target_path))
+		if (!FileHandler::removeFile($target_path))
 		{
 			return new BaseObject(-1, sprintf(Context::getLang('msg_delete_file_failed'), $path));
 		}
@@ -941,7 +941,7 @@ 
 	 */
 	function _removeDir_real($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
@@ -970,39 +970,39 @@ 
 	function _copyDir(&$file_list)
 	{
 		$output = $this->_connect();
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 		$target_dir = $this->target_path;
 		$copied = array();
 
-		if(is_array($file_list))
+		if (is_array($file_list))
 		{
-			foreach($file_list as $k => $file)
+			foreach ($file_list as $k => $file)
 			{
 				$org_file = $file;
-				if($this->package->path == ".")
+				if ($this->package->path == ".")
 				{
 					$file = substr($file, 3);
 				}
-				$path = FileHandler::getRealPath("./" . $this->target_path . "/" . $file);
-				$path_list = explode('/', dirname($this->target_path . "/" . $file));
+				$path = FileHandler::getRealPath("./".$this->target_path."/".$file);
+				$path_list = explode('/', dirname($this->target_path."/".$file));
 				$real_path = "./";
 
-				for($i = 0; $i < count($path_list); $i++)
+				for ($i = 0; $i < count($path_list); $i++)
 				{
-					if($path_list == "")
+					if ($path_list == "")
 					{
 						continue;
 					}
-					$real_path .= $path_list[$i] . "/";
-					if(!file_exists(FileHandler::getRealPath($real_path)))
+					$real_path .= $path_list[$i]."/";
+					if (!file_exists(FileHandler::getRealPath($real_path)))
 					{
 						FileHandler::makeDir($real_path);
 					}
 				}
-				FileHandler::copyFile( FileHandler::getRealPath($this->download_path . "/" . $org_file), FileHandler::getRealPath("./" . $target_dir . '/' . $file));
+				FileHandler::copyFile(FileHandler::getRealPath($this->download_path."/".$org_file), FileHandler::getRealPath("./".$target_dir.'/'.$file));
 				$copied[] = $path;
 			}
 		}

modules/communication/communication.mobile.php

Spacing +19 added lines, -19 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) XEHub <https://www.xehub.io> */
 
-require_once(_XE_PATH_ . 'modules/communication/communication.view.php');
+require_once(_XE_PATH_.'modules/communication/communication.view.php');
 
 /**
  * @class  communicationMobile
@@ -25,7 +25,7 @@ 
 
 		$oLayoutModel = getModel('layout');
 		$layout_info = $oLayoutModel->getLayout($this->communication_config->mlayout_srl);
-		if($layout_info)
+		if ($layout_info)
 		{
 			$this->module_info->mlayout_srl = $this->communication_config->mlayout_srl;
 			$this->setLayoutPath($layout_info->path);
@@ -39,13 +39,13 @@ 
 	function dispCommunicationMessages()
 	{
 		// Error appears if not logged-in
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return $this->stop('msg_not_logged');
 		}
 
 		$logged_info = Context::get('logged_info');
-		if(!array_key_exists('dispCommunicationMessages', $logged_info->menu_list))
+		if (!array_key_exists('dispCommunicationMessages', $logged_info->menu_list))
 		{
 			return $this->stop('msg_invalid_request');
 		}
@@ -53,7 +53,7 @@ 
 		// Set the variables
 		$message_srl = Context::get('message_srl');
 		$message_type = Context::get('message_type');
-		if(!in_array($message_type, array('R', 'S', 'T')))
+		if (!in_array($message_type, array('R', 'S', 'T')))
 		{
 			$message_type = 'R';
 			Context::set('message_type', $message_type);
@@ -61,37 +61,37 @@ 
 		$oCommunicationModel = getModel('communication');
 
 		// extract contents if message_srl exists
-		if($message_srl)
+		if ($message_srl)
 		{
 			$templateFile = 'read_message';
 			$columnList = array('message_srl', 'sender_srl', 'receiver_srl', 'message_type', 'title', 'content', 'readed', 'regdate');
 			$message = $oCommunicationModel->getSelectedMessage($message_srl, $columnList);
 
-			switch($message->message_type)
+			switch ($message->message_type)
 			{
 				case 'R':
-					if($message->receiver_srl != $logged_info->member_srl)
+					if ($message->receiver_srl != $logged_info->member_srl)
 					{
 						return $this->stop('msg_invalid_request');
 					}
 					break;
 
 				case 'S':
-					if($message->sender_srl != $logged_info->member_srl)
+					if ($message->sender_srl != $logged_info->member_srl)
 					{
 						return $this->stop('msg_invalid_request');
 					}
 					break;
 
 				case 'T':
-					if($message->receiver_srl != $logged_info->member_srl && $message->sender_srl != $logged_info->member_srl)
+					if ($message->receiver_srl != $logged_info->member_srl && $message->sender_srl != $logged_info->member_srl)
 					{
 						return $this->stop('msg_invalid_request');
 					}
 					break;
 			}
 
-			if($message->message_srl == $message_srl && ($message->receiver_srl == $logged_info->member_srl || $message->sender_srl == $logged_info->member_srl))
+			if ($message->message_srl == $message_srl && ($message->receiver_srl == $logged_info->member_srl || $message->sender_srl == $logged_info->member_srl))
 			{
 				stripEmbedTagForAdmin($message->content, $message->sender_srl);
 				Context::set('message', $message);
@@ -138,7 +138,7 @@ 
 		$oMemberModel = getModel('member');
 
 		// Error appears if not logged-in
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return $this->stop('msg_not_logged');
 		}
@@ -148,32 +148,32 @@ 
 		// get receipient's information
 		// check inalid request
 		$receiver_srl = Context::get('receiver_srl');
-		if(!$receiver_srl)
+		if (!$receiver_srl)
 		{
 			return $this->stop('msg_invalid_request');
 		}
 
 		// check receiver and sender are same
-		if($logged_info->member_srl == $receiver_srl)
+		if ($logged_info->member_srl == $receiver_srl)
 		{
 			return $this->stop('msg_cannot_send_to_yourself');
 		}
 
 		// get message_srl of the original message if it is a reply
 		$message_srl = Context::get('message_srl');
-		if($message_srl)
+		if ($message_srl)
 		{
 			$source_message = $oCommunicationModel->getSelectedMessage($message_srl);
-			if($source_message->message_srl == $message_srl && $source_message->sender_srl == $receiver_srl)
+			if ($source_message->message_srl == $message_srl && $source_message->sender_srl == $receiver_srl)
 			{
-				$source_message->title = "[re] " . $source_message->title;
-				$source_message->content = "\r\n<br />\r\n<br /><div style=\"padding-left:5px; border-left:5px solid #DDDDDD;\">" . trim($source_message->content) . "</div>";
+				$source_message->title = "[re] ".$source_message->title;
+				$source_message->content = "\r\n<br />\r\n<br /><div style=\"padding-left:5px; border-left:5px solid #DDDDDD;\">".trim($source_message->content)."</div>";
 				Context::set('source_message', $source_message);
 			}
 		}
 
 		$receiver_info = $oMemberModel->getMemberInfoByMemberSrl($receiver_srl);
-		if(!$receiver_info)
+		if (!$receiver_info)
 		{
 			return $this->stop('msg_invalid_request');
 		}

modules/comment/comment.class.php

Spacing +29 added lines, -29 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) XEHub <https://www.xehub.io> */
 
-require_once(_XE_PATH_ . 'modules/comment/comment.item.php');
+require_once(_XE_PATH_.'modules/comment/comment.item.php');
 
 /**
  * comment
@@ -36,7 +36,7 @@ 
 		// 2008. 02. 22 add comment setting when a new module added
 		$oModuleController->insertTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before');
 
-		if(!is_dir('./files/cache/tmp'))
+		if (!is_dir('./files/cache/tmp'))
 		{
 			FileHandler::makeDir('./files/cache/tmp');
 		}
@@ -54,63 +54,63 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2007. 10. 17 add a trigger to delete comments together with posting deleted
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after'))
+			if (!$oModuleModel->getTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after'))
 			{
 				return TRUE;
 			}
 			// 2007. 10. 17 add a trigger to delete all of comments together with module deleted
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after'))
+			if (!$oModuleModel->getTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after'))
 			{
 				return TRUE;
 			}
 			// 2007. 10. 23 add a column for recommendation votes or notification of the comments
-			if(!$oDB->isColumnExists("comments", "voted_count"))
+			if (!$oDB->isColumnExists("comments", "voted_count"))
 			{
 				return TRUE;
 			}
-			if(!$oDB->isColumnExists("comments", "notify_message"))
+			if (!$oDB->isColumnExists("comments", "notify_message"))
 			{
 				return TRUE;
 			}
 			// 2008. 02. 22 add comment setting when a new module added
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before'))
+			if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before'))
 			{
 				return TRUE;
 			}
 			// 2008. 05. 14 add a column for blamed count
-			if(!$oDB->isColumnExists("comments", "blamed_count"))
+			if (!$oDB->isColumnExists("comments", "blamed_count"))
 			{
 				return TRUE;
 			}
-			if(!$oDB->isColumnExists("comment_voted_log", "point"))
+			if (!$oDB->isColumnExists("comment_voted_log", "point"))
 			{
 				return TRUE;
 			}
 
-			if(!$oDB->isIndexExists("comments", "idx_module_list_order"))
+			if (!$oDB->isIndexExists("comments", "idx_module_list_order"))
 			{
 				return TRUE;
 			}
 			//2012. 02. 24 add comment published status column and index
-			if(!$oDB->isColumnExists("comments", "status"))
+			if (!$oDB->isColumnExists("comments", "status"))
 			{
 				return TRUE;
 			}
-			if(!$oDB->isIndexExists("comments", "idx_status"))
+			if (!$oDB->isIndexExists("comments", "idx_status"))
 			{
 				return TRUE;
 			}
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'comment', 'controller', 'triggerCopyModule', 'after'))
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'comment', 'controller', 'triggerCopyModule', 'after'))
 			{
 				return TRUE;
 			}
 
-			if(!$oDB->isIndexExists("comments", "idx_parent_srl"))
+			if (!$oDB->isIndexExists("comments", "idx_parent_srl"))
 			{
 				return TRUE;
 			}
@@ -131,46 +131,46 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2007. 10. 17 add a trigger to delete comments together with posting deleted
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after'))
+			if (!$oModuleModel->getTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after'))
 			{
 				$oModuleController->insertTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after');
 			}
 			// 2007. 10. 17 add a trigger to delete all of comments together with module deleted
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after'))
+			if (!$oModuleModel->getTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after'))
 			{
 				$oModuleController->insertTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after');
 			}
 			// 2007. 10. 23 add a column for recommendation votes or notification of the comments
-			if(!$oDB->isColumnExists("comments", "voted_count"))
+			if (!$oDB->isColumnExists("comments", "voted_count"))
 			{
 				$oDB->addColumn("comments", "voted_count", "number", "11");
 				$oDB->addIndex("comments", "idx_voted_count", array("voted_count"));
 			}
 
-			if(!$oDB->isColumnExists("comments", "notify_message"))
+			if (!$oDB->isColumnExists("comments", "notify_message"))
 			{
 				$oDB->addColumn("comments", "notify_message", "char", "1");
 			}
 			// 2008. 02. 22 add comment setting when a new module added
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before'))
+			if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before'))
 			{
 				$oModuleController->insertTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before');
 			}
 			// 2008. 05. 14 add a column for blamed count
-			if(!$oDB->isColumnExists("comments", "blamed_count"))
+			if (!$oDB->isColumnExists("comments", "blamed_count"))
 			{
 				$oDB->addColumn('comments', 'blamed_count', 'number', 11, 0, TRUE);
 				$oDB->addIndex('comments', 'idx_blamed_count', array('blamed_count'));
 			}
-			if(!$oDB->isColumnExists("comment_voted_log", "point"))
+			if (!$oDB->isColumnExists("comment_voted_log", "point"))
 			{
 				$oDB->addColumn('comment_voted_log', 'point', 'number', 11, 0, TRUE);
 			}
 
-			if(!$oDB->isIndexExists("comments", "idx_module_list_order"))
+			if (!$oDB->isIndexExists("comments", "idx_module_list_order"))
 			{
 				$oDB->addIndex(
 						"comments", "idx_module_list_order", array("module_srl", "list_order"), TRUE
@@ -178,11 +178,11 @@ 
 			}
 
 			//2012. 02. 24 add comment published status column and index
-			if(!$oDB->isColumnExists("comments", "status"))
+			if (!$oDB->isColumnExists("comments", "status"))
 			{
 				$oDB->addColumn("comments", "status", "number", 1, 1, TRUE);
 			}
-			if(!$oDB->isIndexExists("comments", "idx_status"))
+			if (!$oDB->isIndexExists("comments", "idx_status"))
 			{
 				$oDB->addIndex(
 						"comments", "idx_status", array("status", "comment_srl", "module_srl", "document_srl"), TRUE
@@ -190,12 +190,12 @@ 
 			}
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'comment', 'controller', 'triggerCopyModule', 'after'))
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'comment', 'controller', 'triggerCopyModule', 'after'))
 			{
 				$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'comment', 'controller', 'triggerCopyModule', 'after');
 			}
 
-			if(!$oDB->isIndexExists("comments", "idx_parent_srl"))
+			if (!$oDB->isIndexExists("comments", "idx_parent_srl"))
 			{
 				$oDB->addIndex('comments', 'idx_parent_srl', array('parent_srl'));
 			}
@@ -212,7 +212,7 @@ 
 	 */
 	function recompileCache()
 	{
-		if(!is_dir('./files/cache/tmp'))
+		if (!is_dir('./files/cache/tmp'))
 		{
 			FileHandler::makeDir('./files/cache/tmp');
 		}

modules/message/message.admin.model.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 /* Copyright (C) XEHub <https://www.xehub.io> */
-class messageAdminModel extends message{
+class messageAdminModel extends message {
 	public function getMessageAdminColorset()
 	{
 		$skin = Context::get('skin');
@@ -8,7 +8,7 @@ 
 		Context::set('type', $type);
 		$dir = $type == 'P' ? 'skins' : 'm.skins';
 
-		if(!$skin)
+		if (!$skin)
 		{
 			$tpl = '';
 		}

tools/dbxml_validator/tests/xmlQueriesTest.php

Indentation +101 added lines, -101 removed lines

@@ -2,33 +2,33 @@ 
 /* Copyright (C) XEHub <https://www.xehub.io> */
 
 if (!defined('__DIR__'))
-    define('__DIR__', realpath(dirname(__FILE__))); 
+	define('__DIR__', realpath(dirname(__FILE__))); 
 
 /** The tests here are meant only for the built-in checks in validator.php, 
     and not for the entire syntax expressed by the .xsd files. */
 class XmlQueriesTest extends PHPUnit_Framework_TestCase
 {
-    // taken from validator.php
+	// taken from validator.php
 
-    const RETCODE_VALIDATOR_INTERNAL = 60;
-    const RETCODE_GENERIC_XML_SYNTAX = 50;
-    const RETCODE_QUERY_ELEMENT = 40;
-    const RETCODE_XSD_VALIDATION = 30;
-    const RETCODE_BUILTIN_CHECKS =    20;
-    const RETCODE_DB_SCHEMA_MATCH =10;	// no schema match is currently implemented.
-    const RETCODE_SUCCESS = 0;
+	const RETCODE_VALIDATOR_INTERNAL = 60;
+	const RETCODE_GENERIC_XML_SYNTAX = 50;
+	const RETCODE_QUERY_ELEMENT = 40;
+	const RETCODE_XSD_VALIDATION = 30;
+	const RETCODE_BUILTIN_CHECKS =    20;
+	const RETCODE_DB_SCHEMA_MATCH =10;	// no schema match is currently implemented.
+	const RETCODE_SUCCESS = 0;
 
-    public $validator_cmd;
+	public $validator_cmd;
 
-    public function setUp()
-    {
+	public function setUp()
+	{
 	 $this->validator_cmd = "php " . escapeshellarg(__DIR__ . '/../validate.php') . " ";
-    }
+	}
  
-    // recursive glob
-    // On Windows glob() is case-sensitive.
-    public function globr($sDir, $sPattern, $nFlags = NULL) 
-    { 
+	// recursive glob
+	// On Windows glob() is case-sensitive.
+	public function globr($sDir, $sPattern, $nFlags = NULL) 
+	{ 
 	// Get the list of all matching files currently in the 
 	// directory. 
 
@@ -41,25 +41,25 @@ 
 
 	foreach ($aDirs as $sSubDir) 
 	{ 
-	    if ($sSubDir != '.' && $sSubDir != '..')
-	    {
+		if ($sSubDir != '.' && $sSubDir != '..')
+		{
 		$aSubFiles = $this->globr($sSubDir, $sPattern, $nFlags); 
 		$aFiles = array_merge($aFiles, $aSubFiles); 
-	    }
+		}
 	} 
 
 	// return merged array with all (recursive) files
 	return $aFiles; 
-    } 
+	} 
 
-    /** Tests all XML Query and Schema Language files (in all modules/addons/widgets) in XE */
-    public function invoke_testReleasedXMLLangFiles
+	/** Tests all XML Query and Schema Language files (in all modules/addons/widgets) in XE */
+	public function invoke_testReleasedXMLLangFiles
 	(
-	    $released_files,
-	    $expected_return_code,
-	    $validator_args = ''
+		$released_files,
+		$expected_return_code,
+		$validator_args = ''
 	)
-    {
+	{
 	// this file is in tools/dbxml_validator/tests
 	$xe_dir = __DIR__ . '/../../..';
 
@@ -70,67 +70,67 @@ 
 	$xml_files = array();
 
 	foreach ($released_files as $released_file_mask)
-	    $xml_files =
+		$xml_files =
 		array_merge
 		(
-		    $xml_files,
-		    $this->globr
+			$xml_files,
+			$this->globr
 			(
-			    $xe_dir,
-			    $released_file_mask,
-			    GLOB_NOSORT | GLOB_NOESCAPE | GLOB_ERR
+				$xe_dir,
+				$released_file_mask,
+				GLOB_NOSORT | GLOB_NOESCAPE | GLOB_ERR
 			)
 		);
 
 	while ($cnt < count($xml_files))
 	{
-	    $cmd = $this->validator_cmd . $validator_args;
+		$cmd = $this->validator_cmd . $validator_args;
 
-	    // Validate 50 files at once
-	    foreach (array_slice($xml_files, $cnt, 50) as $xml_file)
+		// Validate 50 files at once
+		foreach (array_slice($xml_files, $cnt, 50) as $xml_file)
 		$cmd .= " " . escapeshellarg($xml_file);
 
-	    exec($cmd . ' 2>&1', $validator_output, $return_code);
+		exec($cmd . ' 2>&1', $validator_output, $return_code);
 
-	    $output_text = trim(trim(implode("\n", $validator_output)), "\n");
+		$output_text = trim(trim(implode("\n", $validator_output)), "\n");
 
-	    // Validator should not crash/exit-with-an-error.
-	    $this->assertLessThanOrEqual
+		// Validator should not crash/exit-with-an-error.
+		$this->assertLessThanOrEqual
 		(
-		    $expected_return_code,
-		    $return_code,
-		    "{$cmd}\n\n{$output_text}\nValidator returned code {$return_code}."
+			$expected_return_code,
+			$return_code,
+			"{$cmd}\n\n{$output_text}\nValidator returned code {$return_code}."
 		);
 
-	    $cnt += 50;
+		$cnt += 50;
+	}
 	}
-    }
 
-    public function testReleasedXMLQueryLangFiles()
-    {
+	public function testReleasedXMLQueryLangFiles()
+	{
 	$this->invoke_testReleasedXMLLangFiles
-	    (
+		(
 		array('queries/*.xml', 'xml_query/*.xml'),
 		self::RETCODE_QUERY_ELEMENT
-	    );
+		);
 
 	$this->markTestIncomplete('XML Query Language files should be fixed first.');
-    }
+	}
 
-    public function testReleasedXMLSchemaLangFiles()
-    {
+	public function testReleasedXMLSchemaLangFiles()
+	{
 	$this->invoke_testReleasedXMLLangFiles
-	    (
+		(
 		array('schemas/*.xml'),
 		self::RETCODE_BUILTIN_CHECKS,
 		' --schema-language'
-	    );
+		);
 
 	$this->markTestIncomplete('XML Schema Language files should be fixed first.');
-    }
+	}
 
-    public function invoke_testInvalidXmlFiles($filename, $err_code, $args = '')
-    {
+	public function invoke_testInvalidXmlFiles($filename, $err_code, $args = '')
+	{
 	$cmd = $this->validator_cmd . ' '. $args . ' ' . escapeshellarg($filename);
 	$validator_output = array();
 	$return_code = 0;
@@ -141,88 +141,88 @@ 
 
 	// Validator should not crash/exit-with-an-error.
 	$this->assertEquals
-	    (
+		(
 		$err_code,
 		$return_code,
 		"{$cmd}\n{$output_text}\nValidator returned code {$return_code}."
-	    );
+		);
 
 	// Validator should output some error on the test files
 	$basefilename = basename($filename);
 	$this->assertNotEmpty($output_text, "Error reporting failed for {$basefilename} validation.");
 
-    }
+	}
 
-    public function testInvalidQueryId()
-    {
+	public function testInvalidQueryId()
+	{
 	return $this->invoke_testInvalidXmlFiles(__DIR__.'/data/wrongQueryId.xml', self::RETCODE_QUERY_ELEMENT);
-    }
+	}
 
-    /**
-     * @dataProvider getFilesList
-     */
-    public function testInvalidXMLQueryFiles($filename)
-    {
+	/**
+	 * @dataProvider getFilesList
+	 */
+	public function testInvalidXMLQueryFiles($filename)
+	{
 	return $this->invoke_testInvalidXmlFiles($filename, self::RETCODE_BUILTIN_CHECKS);
-    }
+	}
 
-    public function getDirFilesList($dir_name)
-    {
+	public function getDirFilesList($dir_name)
+	{
 	$output = array();
 
 	$dir = opendir(__DIR__ . '/' . $dir_name);
 
 	if ($dir)
 	{
-	    $entry = readdir($dir);
+		$entry = readdir($dir);
 
-	    while ($entry !== FALSE)
-	    {
+		while ($entry !== FALSE)
+		{
 		$fname = __DIR__ . '/' . $dir_name .'/' . $entry;
 
 		if (!is_dir($fname)&& $entry != 'wrongQueryId.xml')
-		    $output[] = array($fname);
+			$output[] = array($fname);
 
 		$entry = readdir($dir);
-	    }
+		}
 
-	    closedir($dir);
+		closedir($dir);
 	}
 	else
-	    $this->assertFalse(TRUE);
+		$this->assertFalse(TRUE);
 
-        return $output;
-    }
+		return $output;
+	}
 
-    public function getFilesList()
-    {
+	public function getFilesList()
+	{
 	return $this->getDirFilesList('data');
-    }
+	}
 
-    public function getSchemaFilesList()
-    {
+	public function getSchemaFilesList()
+	{
 	return $this->getDirFilesList('data/schema');
-    }
+	}
 
-    public function getSchemaWarningFilesList()
-    {
+	public function getSchemaWarningFilesList()
+	{
 	return $this->getDirFilesList('data/schema/warnings');
-    }
+	}
 
-    /**
-     * @dataProvider getSchemaFilesList
-     */
-    public function testInvalidXMLSchemaFiles($filename)
-    {
+	/**
+	 * @dataProvider getSchemaFilesList
+	 */
+	public function testInvalidXMLSchemaFiles($filename)
+	{
 	return $this->invoke_testInvalidXmlFiles($filename, self::RETCODE_BUILTIN_CHECKS, '--schema-language');
-    }
+	}
 
-    /**
-     * @dataProvider getSchemaWarningFilesList
-     */
-    public function testWarningXMLSchemaFiles($filename)
-    {
+	/**
+	 * @dataProvider getSchemaWarningFilesList
+	 */
+	public function testWarningXMLSchemaFiles($filename)
+	{
 	return $this->invoke_testInvalidXmlFiles($filename, self::RETCODE_SUCCESS, '--schema-language');
-    }
+	}
 }
 

Braces +14 added lines, -10 removed lines

@@ -1,8 +1,9 @@ 
 <?php
 /* Copyright (C) XEHub <https://www.xehub.io> */
 
-if (!defined('__DIR__'))
-    define('__DIR__', realpath(dirname(__FILE__))); 
+if (!defined('__DIR__')) {
+    define('__DIR__', realpath(dirname(__FILE__)));
+}
 
 /** The tests here are meant only for the built-in checks in validator.php, 
     and not for the entire syntax expressed by the .xsd files. */
@@ -69,8 +70,8 @@ 
 	$cmd = $this->validator_cmd;
 	$xml_files = array();
 
-	foreach ($released_files as $released_file_mask)
-	    $xml_files =
+	foreach ($released_files as $released_file_mask) {
+		    $xml_files =
 		array_merge
 		(
 		    $xml_files,
@@ -81,14 +82,16 @@ 
 			    GLOB_NOSORT | GLOB_NOESCAPE | GLOB_ERR
 			)
 		);
+	}
 
 	while ($cnt < count($xml_files))
 	{
 	    $cmd = $this->validator_cmd . $validator_args;
 
 	    // Validate 50 files at once
-	    foreach (array_slice($xml_files, $cnt, 50) as $xml_file)
-		$cmd .= " " . escapeshellarg($xml_file);
+	    foreach (array_slice($xml_files, $cnt, 50) as $xml_file) {
+	    		$cmd .= " " . escapeshellarg($xml_file);
+	    }
 
 	    exec($cmd . ' 2>&1', $validator_output, $return_code);
 
@@ -180,16 +183,17 @@ 
 	    {
 		$fname = __DIR__ . '/' . $dir_name .'/' . $entry;
 
-		if (!is_dir($fname)&& $entry != 'wrongQueryId.xml')
-		    $output[] = array($fname);
+		if (!is_dir($fname)&& $entry != 'wrongQueryId.xml') {
+				    $output[] = array($fname);
+		}
 
 		$entry = readdir($dir);
 	    }
 
 	    closedir($dir);
+	} else {
+		    $this->assertFalse(TRUE);
 	}
-	else
-	    $this->assertFalse(TRUE);
 
         return $output;
     }