xpressengine / xe-core

classes/frontendfile/FrontEndFileHandler.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -393,7 +393,7 @@
 	 * Arrage css index

 	 *

 	 * @param string $dirName First directory  name of css path

-	 * @param array $file file info.

+	 * @param stdClass $file file info.

 	 * @return void

 	 */

 	function _arrangeCssIndex($dirName, &$file)

Indentation +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 	 * Check SSL

 	 *

 	 * @return bool If using ssl returns true, otherwise returns false.

-     * @deprecated

+	 * @deprecated

 	 */

 	function isSsl()

 	{

Spacing +33 added lines, -33 removed lines

@@ -54,7 +54,7 @@ 
 	 */

 	function isSsl()

 	{

-		if(!is_null(self::$isSSL))

+		if (!is_null(self::$isSSL))

 		{

 			return self::$isSSL;

 		}

@@ -88,30 +88,30 @@ 
 	 * */

 	function loadFile($args)

 	{

-		if(!is_array($args))

+		if (!is_array($args))

 		{

 			$args = array($args);

 		}

 		$file = $this->getFileInfo($args[0], $args[2], $args[1]);

 

 		$availableExtension = array('css' => 1, 'js' => 1);

-		if(!isset($availableExtension[$file->fileExtension]))

+		if (!isset($availableExtension[$file->fileExtension]))

 		{

 			return;

 		}

 

 		$file->index = (int) $args[3];

 

-		if($file->fileExtension == 'css')

+		if ($file->fileExtension == 'css')

 		{

 			$map = &$this->cssMap;

 			$mapIndex = &$this->cssMapIndex;

 

 			$this->_arrangeCssIndex($pathInfo['dirname'], $file);

 		}

-		else if($file->fileExtension == 'js')

+		else if ($file->fileExtension == 'js')

 		{

-			if($args[1] == 'body')

+			if ($args[1] == 'body')

 			{

 				$map = &$this->jsBodyMap;

 				$mapIndex = &$this->jsBodyMapIndex;

@@ -124,7 +124,7 @@ 
 		}

 

 		(is_null($file->index)) ? $file->index = 0 : $file->index = $file->index;

-		if(!isset($mapIndex[$file->key]) || $mapIndex[$file->key] > $file->index)

+		if (!isset($mapIndex[$file->key]) || $mapIndex[$file->key] > $file->index)

 		{

 			$this->unloadFile($args[0], $args[2], $args[1]);

 			$map[$file->index][$file->key] = $file;

@@ -144,7 +144,7 @@ 
 	{

 		static $existsInfo = array();

 

-		if(isset($existsInfo[$existsKey]))

+		if (isset($existsInfo[$existsKey]))

 		{

 			return $existsInfo[$existsKey];

 		}

@@ -159,14 +159,14 @@ 
 		$file->keyName = implode('.', array($file->fileNameNoExt, $file->fileExtension));

 		$file->cdnPath = $this->_normalizeFilePath($pathInfo['dirname']);

 

-		if(strpos($file->filePath, '://') === FALSE)

+		if (strpos($file->filePath, '://') === FALSE)

 		{

-			if(!__DEBUG__ && __XE_VERSION_STABLE__)

+			if (!__DEBUG__ && __XE_VERSION_STABLE__)

 			{

 				// if no debug mode, load minifed file

 				$minifiedFileName = implode('.', array($file->fileNameNoExt, 'min', $file->fileExtension));

 				$minifiedRealPath = implode('/', array($file->fileRealPath, $minifiedFileName));

-				if(file_exists($minifiedRealPath))

+				if (file_exists($minifiedRealPath))

 				{

 					$file->fileName = $minifiedFileName;

 				}

@@ -174,7 +174,7 @@ 
 			else

 			{

 				// Remove .min

-				if(file_exists(implode('/', array($file->fileRealPath, $file->keyName))))

+				if (file_exists(implode('/', array($file->fileRealPath, $file->keyName))))

 				{

 					$file->fileName = $file->keyName;

 				}

@@ -183,16 +183,16 @@ 
 

 		$file->targetIe = $targetIe;

 

-		if($file->fileExtension == 'css')

+		if ($file->fileExtension == 'css')

 		{

 			$file->media = $media;

-			if(!$file->media)

+			if (!$file->media)

 			{

 				$file->media = 'all';

 			}

 			$file->key = $file->filePath . $file->keyName . "\t" . $file->targetIe . "\t" . $file->media;

 		}

-		else if($file->fileExtension == 'js')

+		else if ($file->fileExtension == 'js')

 		{

 			$file->key = $file->filePath . $file->keyName . "\t" . $file->targetIe;

 		}

@@ -212,9 +212,9 @@ 
 	{

 		$file = $this->getFileInfo($fileName, $targetIe, $media);

 

-		if($file->fileExtension == 'css')

+		if ($file->fileExtension == 'css')

 		{

-			if(isset($this->cssMapIndex[$file->key]))

+			if (isset($this->cssMapIndex[$file->key]))

 			{

 				$index = $this->cssMapIndex[$file->key];

 				unset($this->cssMap[$index][$file->key], $this->cssMapIndex[$file->key]);

@@ -222,12 +222,12 @@ 
 		}

 		else

 		{

-			if(isset($this->jsHeadMapIndex[$file->key]))

+			if (isset($this->jsHeadMapIndex[$file->key]))

 			{

 				$index = $this->jsHeadMapIndex[$file->key];

 				unset($this->jsHeadMap[$index][$file->key], $this->jsHeadMapIndex[$file->key]);

 			}

-			if(isset($this->jsBodyMapIndex[$file->key]))

+			if (isset($this->jsBodyMapIndex[$file->key]))

 			{

 				$index = $this->jsBodyMapIndex[$file->key];

 				unset($this->jsBodyMap[$index][$file->key], $this->jsBodyMapIndex[$file->key]);

@@ -243,13 +243,13 @@ 
 	 */

 	function unloadAllFiles($type = 'all')

 	{

-		if($type == 'css' || $type == 'all')

+		if ($type == 'css' || $type == 'all')

 		{

 			$this->cssMap = array();

 			$this->cssMapIndex = array();

 		}

 

-		if($type == 'js' || $type == 'all')

+		if ($type == 'js' || $type == 'all')

 		{

 			$this->jsHeadMap = array();

 			$this->jsBodyMap = array();

@@ -271,9 +271,9 @@ 
 		$this->_sortMap($map, $mapIndex);

 

 		$result = array();

-		foreach($map as $indexedMap)

+		foreach ($map as $indexedMap)

 		{

-			foreach($indexedMap as $file)

+			foreach ($indexedMap as $file)

 			{

 				$noneCache = (is_readable($file->cdnPath . '/' . $file->fileName)) ? '?' . date('YmdHis', filemtime($file->cdnPath . '/' . $file->fileName)) : '';

 				$fullFilePath = $file->filePath . '/' . $file->fileName . $noneCache;

@@ -293,7 +293,7 @@ 
 	 */

 	function getJsFileList($type = 'head')

 	{

-		if($type == 'head')

+		if ($type == 'head')

 		{

 			$map = &$this->jsHeadMap;

 			$mapIndex = &$this->jsHeadMapIndex;

@@ -307,9 +307,9 @@ 
 		$this->_sortMap($map, $mapIndex);

 

 		$result = array();

-		foreach($map as $indexedMap)

+		foreach ($map as $indexedMap)

 		{

-			foreach($indexedMap as $file)

+			foreach ($indexedMap as $file)

 			{

 				$noneCache = (is_readable($file->cdnPath . '/' . $file->fileName)) ? '?' . date('YmdHis', filemtime($file->cdnPath . '/' . $file->fileName)) : '';

 				$fullFilePath = $file->filePath . '/' . $file->fileName . $noneCache;

@@ -341,18 +341,18 @@ 
 	 */

 	function _normalizeFilePath($path)

 	{

-		if(strpos($path, '://') === FALSE && $path{0} != '/' && $path{0} != '.')

+		if (strpos($path, '://') === FALSE && $path{0} != '/' && $path{0} != '.')

 		{

 			$path = './' . $path;

 		}

-		elseif(!strncmp($path, '//', 2))

+		elseif (!strncmp($path, '//', 2))

 		{

 			return preg_replace('#^//+#', '//', $path);

 		}

 

 		$path = preg_replace('@/\./|(?<!:)\/\/@', '/', $path);

 

-		while(strpos($path, '/../'))

+		while (strpos($path, '/../'))

 		{

 			$path = preg_replace('/\/([^\/]+)\/\.\.\//s', '/', $path, 1);

 		}

@@ -370,9 +370,9 @@ 
 	{

 		$path = $this->_normalizeFilePath($path);

 

-		if(strpos($path, './') === 0)

+		if (strpos($path, './') === 0)

 		{

-			if(dirname($_SERVER['SCRIPT_NAME']) == '/' || dirname($_SERVER['SCRIPT_NAME']) == '\\')

+			if (dirname($_SERVER['SCRIPT_NAME']) == '/' || dirname($_SERVER['SCRIPT_NAME']) == '\\')

 			{

 				$path = '/' . substr($path, 2);

 			}

@@ -381,7 +381,7 @@ 
 				$path = dirname($_SERVER['SCRIPT_NAME']) . '/' . substr($path, 2);

 			}

 		}

-		else if(strpos($file, '../') === 0)

+		else if (strpos($file, '../') === 0)

 		{

 			$path = $this->_normalizeFilePath(dirname($_SERVER['SCRIPT_NAME']) . "/{$path}");

 		}

@@ -398,7 +398,7 @@ 
 	 */

 	function _arrangeCssIndex($dirName, &$file)

 	{

-		if($file->index !== 0)

+		if ($file->index !== 0)

 		{

 			return;

 		}

Braces +9 added lines, -18 removed lines

@@ -108,15 +108,13 @@ 
 			$mapIndex = &$this->cssMapIndex;

 

 			$this->_arrangeCssIndex($pathInfo['dirname'], $file);

-		}

-		else if($file->fileExtension == 'js')

+		} else if($file->fileExtension == 'js')

 		{

 			if($args[1] == 'body')

 			{

 				$map = &$this->jsBodyMap;

 				$mapIndex = &$this->jsBodyMapIndex;

-			}

-			else

+			} else

 			{

 				$map = &$this->jsHeadMap;

 				$mapIndex = &$this->jsHeadMapIndex;

@@ -170,8 +168,7 @@ 
 				{

 					$file->fileName = $minifiedFileName;

 				}

-			}

-			else

+			} else

 			{

 				// Remove .min

 				if(file_exists(implode('/', array($file->fileRealPath, $file->keyName))))

@@ -191,8 +188,7 @@ 
 				$file->media = 'all';

 			}

 			$file->key = $file->filePath . $file->keyName . "\t" . $file->targetIe . "\t" . $file->media;

-		}

-		else if($file->fileExtension == 'js')

+		} else if($file->fileExtension == 'js')

 		{

 			$file->key = $file->filePath . $file->keyName . "\t" . $file->targetIe;

 		}

@@ -219,8 +215,7 @@ 
 				$index = $this->cssMapIndex[$file->key];

 				unset($this->cssMap[$index][$file->key], $this->cssMapIndex[$file->key]);

 			}

-		}

-		else

+		} else

 		{

 			if(isset($this->jsHeadMapIndex[$file->key]))

 			{

@@ -297,8 +292,7 @@ 
 		{

 			$map = &$this->jsHeadMap;

 			$mapIndex = &$this->jsHeadMapIndex;

-		}

-		else

+		} else

 		{

 			$map = &$this->jsBodyMap;

 			$mapIndex = &$this->jsBodyMapIndex;

@@ -344,8 +338,7 @@ 
 		if(strpos($path, '://') === FALSE && $path{0} != '/' && $path{0} != '.')

 		{

 			$path = './' . $path;

-		}

-		elseif(!strncmp($path, '//', 2))

+		} elseif(!strncmp($path, '//', 2))

 		{

 			return preg_replace('#^//+#', '//', $path);

 		}

@@ -375,13 +368,11 @@ 
 			if(dirname($_SERVER['SCRIPT_NAME']) == '/' || dirname($_SERVER['SCRIPT_NAME']) == '\\')

 			{

 				$path = '/' . substr($path, 2);

-			}

-			else

+			} else

 			{

 				$path = dirname($_SERVER['SCRIPT_NAME']) . '/' . substr($path, 2);

 			}

-		}

-		else if(strpos($file, '../') === 0)

+		} else if(strpos($file, '../') === 0)

 		{

 			$path = $this->_normalizeFilePath(dirname($_SERVER['SCRIPT_NAME']) . "/{$path}");

 		}

classes/httprequest/XEHttpRequest.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 
 	/**
 	 * Mether to add key/value pair to the HTTP request header
-	 * @param int|string $key HTTP header element
+	 * @param string $key HTTP header element
 	 * @param string $value value string for HTTP header element
 	 * @return void
 	 */

Spacing +20 added lines, -20 removed lines

@@ -41,7 +41,7 @@ 
 	 * constructor
 	 * @return void
 	 */
-	function XEHttpRequest($host, $port, $scheme='')
+	function XEHttpRequest($host, $port, $scheme = '')
 	{
 		$this->m_host = $host;
 		$this->m_port = $port;
@@ -76,11 +76,11 @@ 
 		$this->addToHeader('Connection', 'close');
 
 		$method = strtoupper($method);
-		if(!$allow_methods)
+		if (!$allow_methods)
 		{
 			$allow_methods = explode(' ', 'GET POST PUT');
 		}
-		if(!in_array($method, $allow_methods))
+		if (!in_array($method, $allow_methods))
 		{
 			$method = $allow_methods[0];
 		}
@@ -89,12 +89,12 @@ 
 		$timout = max((int) $timeout, 0);
 
 		// list of post variables
-		if(!is_array($post_vars))
+		if (!is_array($post_vars))
 		{
 			$post_vars = array();
 		}
 
-		if(FALSE && is_callable('curl_init'))
+		if (FALSE && is_callable('curl_init'))
 		{
 			return $this->sendWithCurl($target, $method, $timeout, $post_vars);
 		}
@@ -117,28 +117,28 @@ 
 		static $crlf = "\r\n";
 
 		$scheme = '';
-		if($this->m_scheme=='https')
+		if ($this->m_scheme == 'https')
 		{
 			$scheme = 'ssl://';
 		}
 
 		$sock = @fsockopen($scheme . $this->m_host, $this->m_port, $errno, $errstr, $timeout);
-		if(!$sock)
+		if (!$sock)
 		{
 			return new Object(-1, 'socket_connect_failed');
 		}
 
 		$headers = $this->m_headers + array();
-		if(!isset($headers['Accept-Encoding']))
+		if (!isset($headers['Accept-Encoding']))
 		{
 			$headers['Accept-Encoding'] = 'identity';
 		}
 
 		// post body
 		$post_body = '';
-		if($method == 'POST' && count($post_vars))
+		if ($method == 'POST' && count($post_vars))
 		{
-			foreach($post_vars as $key => $value)
+			foreach ($post_vars as $key => $value)
 			{
 				$post_body .= urlencode($key) . '=' . urlencode($value) . '&';
 			}
@@ -149,7 +149,7 @@ 
 		}
 
 		$request = "$method $target HTTP/1.1$crlf";
-		foreach($headers as $equiv => $content)
+		foreach ($headers as $equiv => $content)
 		{
 			$request .= "$equiv: $content$crlf";
 		}
@@ -160,24 +160,24 @@ 
 
 		// read response headers
 		$is_chunked = FALSE;
-		while(strlen(trim($line = fgets($sock))))
+		while (strlen(trim($line = fgets($sock))))
 		{
 			list($equiv, $content) = preg_split('/ *: */', rtrim($line), 2);
-			if(!strcasecmp($equiv, 'Transfer-Encoding') && $content == 'chunked')
+			if (!strcasecmp($equiv, 'Transfer-Encoding') && $content == 'chunked')
 			{
 				$is_chunked = TRUE;
 			}
 		}
 
 		$body = '';
-		while(!feof($sock))
+		while (!feof($sock))
 		{
-			if($is_chunked)
+			if ($is_chunked)
 			{
 				$chunk_size = hexdec(fgets($sock));
-				if($chunk_size)
+				if ($chunk_size)
 				{
-					$body .= fgets($sock, $chunk_size+1);
+					$body .= fgets($sock, $chunk_size + 1);
 				}
 			}
 			else
@@ -219,7 +219,7 @@ 
 		curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
 
-		switch($method)
+		switch ($method)
 		{
 			case 'GET': curl_setopt($ch, CURLOPT_HTTPGET, true);
 				break;
@@ -232,7 +232,7 @@ 
 		}
 
 		$arr_headers = array();
-		foreach($headers as $key => $value)
+		foreach ($headers as $key => $value)
 		{
 			$arr_headers[] = "$key: $value";
 		}
@@ -240,7 +240,7 @@ 
 		curl_setopt($ch, CURLOPT_HTTPHEADER, $arr_headers);
 
 		$body = curl_exec($ch);
-		if(curl_errno($ch))
+		if (curl_errno($ch))
 		{
 			return new Object(-1, 'socket_connect_failed');
 		}

Braces +2 added lines, -4 removed lines

@@ -97,8 +97,7 @@ 
 		if(FALSE && is_callable('curl_init'))
 		{
 			return $this->sendWithCurl($target, $method, $timeout, $post_vars);
-		}
-		else
+		} else
 		{
 			return $this->sendWithSock($target, $method, $timeout, $post_vars);
 		}
@@ -179,8 +178,7 @@ 
 				{
 					$body .= fgets($sock, $chunk_size+1);
 				}
-			}
-			else
+			} else
 			{
 				$body .= fgets($sock, 512);
 			}

classes/mail/Mail.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
 	/**
 	 * Constructor function
 	 *
-	 * @return void
+	 * @return string
 	 */
 	function Mail()
 	{

Spacing +26 added lines, -26 removed lines

@@ -148,7 +148,7 @@ 
 		$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;
 		}
@@ -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,7 +260,7 @@ 
 	 */
 	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);
 		}
@@ -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,7 +294,7 @@ 
 	 */
 	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);
 		}
@@ -309,7 +309,7 @@ 
 	 */
 	function setTitle($title)
 	{
-		if($this->Mailer == "mail")
+		if ($this->Mailer == "mail")
 		{
 			$this->title = $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;
 		}
@@ -456,9 +456,9 @@ 
 	 */
 	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);
@@ -466,7 +466,7 @@ 
 				$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();
@@ -489,9 +489,9 @@ 
 		}
 		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,7 +506,7 @@ 
 	 */
 	function procCidAttachments()
 	{
-		if(count($this->cidAttachments) > 0)
+		if (count($this->cidAttachments) > 0)
 		{
 			$this->body = $this->header . $this->body;
 			$boundary = '----==' . uniqid(rand(), TRUE);
@@ -514,7 +514,7 @@ 
 			$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));
@@ -543,7 +543,7 @@ 
 	 */
 	function send()
 	{
-		if($this->Mailer == "mail")
+		if ($this->Mailer == "mail")
 		{
 			$boundary = '----==' . uniqid(rand(), TRUE);
 			$this->eol = $GLOBALS['_qmail_compatibility'] == "Y" ? "\n" : "\r\n";
@@ -573,7 +573,7 @@ 
 					"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";
@@ -708,7 +708,7 @@ 
 			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);
 				}

Braces +12 added lines, -24 removed lines

@@ -151,8 +151,7 @@ 
 		if($this->isVaildMailAddress($account_name))
 		{
 			$this->Username = $account_name;
-		}
-		else
+		} else
 		{
 			$this->Username = $account_name . '@gmail.com';
 		}
@@ -190,8 +189,7 @@ 
 			$this->IsSMTP();
 			$this->AltBody = "To view the message, please use an HTML compatible email viewer!";
 			return TRUE;
-		}
-		else
+		} else
 		{
 			$this->IsMail();
 			return FALSE;
@@ -246,8 +244,7 @@ 
 		{
 			$this->sender_name = $name;
 			$this->sender_email = $email;
-		}
-		else
+		} else
 		{
 			$this->SetFrom($email, $name);
 		}
@@ -280,8 +277,7 @@ 
 		{
 			$this->receiptor_name = $name;
 			$this->receiptor_email = $email;
-		}
-		else
+		} else
 		{
 			$this->AddAddress($email, $name);
 		}
@@ -312,8 +308,7 @@ 
 		if($this->Mailer == "mail")
 		{
 			$this->title = $title;
-		}
-		else
+		} else
 		{
 			$this->Subject = $title;
 		}
@@ -340,8 +335,7 @@ 
 		if($this->Mailer == "mail")
 		{
 			$this->bcc = $bcc;
-		}
-		else
+		} else
 		{
 			$this->AddBCC($bcc);
 		}
@@ -380,8 +374,7 @@ 
 		if($this->Mailer == "mail")
 		{
 			$this->replyTo = $replyTo;
-		}
-		else
+		} else
 		{
 			$this->AddReplyTo($replyTo);
 		}
@@ -399,8 +392,7 @@ 
 		if($this->Mailer == "mail")
 		{
 			$this->content = $content;
-		}
-		else
+		} else
 		{
 			$this->MsgHTML($content);
 		}
@@ -486,8 +478,7 @@ 
 				$this->body = implode("", $res);
 				$this->body .= "--" . $boundary . "--";
 			}
-		}
-		else
+		} else
 		{
 			if(count($this->attachments) > 0)
 			{
@@ -578,8 +569,7 @@ 
 				return mail($this->getReceiptor(), $this->getTitle(), $this->body, $headers, $this->additional_params);
 			}
 			return mail($this->getReceiptor(), $this->getTitle(), $this->body, $headers);
-		}
-		else
+		} else
 		{
 			$this->procAttachments();
 			return parent::Send();
@@ -604,8 +594,7 @@ 
 			if(checkdnsrr($host, "MX") || checkdnsrr($host, "A"))
 			{
 				return TRUE;
-			}
-			else
+			} else
 			{
 				return FALSE;
 			}
@@ -624,8 +613,7 @@ 
 		if(preg_match("/([a-z0-9\_\-\.]+)@([a-z0-9\_\-\.]+)/i", $email_address))
 		{
 			return $email_address;
-		}
-		else
+		} else
 		{
 			return '';
 		}

classes/module/ModuleHandler.class.php

Doc Comments +5 added lines, -1 removed lines

@@ -112,7 +112,7 @@ 
 
 	/**
 	 * Initialization. It finds the target module based on module, mid, document_srl, and prepares to execute an action
-	 * @return boolean true: OK, false: redirected
+	 * @return string|boolean true: OK, false: redirected
 	 * */
 	function init()
 	{
@@ -1128,6 +1128,10 @@ 
 		return $GLOBALS['_loaded_module'][$module][$type][$kind];
 	}
 
+	/**
+	 * @param string $type
+	 * @param string $kind
+	 */
 	function _getModuleFilePath($module, $type, $kind, &$classPath, &$highClassFile, &$classFile, &$instanceName)
 	{
 		$classPath = ModuleHandler::getModulePath($module);

Indentation +4 added lines, -4 removed lines

@@ -59,10 +59,10 @@
 		$this->mid = $mid ? $mid : Context::get('mid');
 		$this->document_srl = $document_srl ? (int) $document_srl : (int) Context::get('document_srl');
 		$this->module_srl = $module_srl ? (int) $module_srl : (int) Context::get('module_srl');
-        if($entry = Context::get('entry'))
-        {
-            $this->entry = Context::convertEncodingStr($entry);
-        }
+		if($entry = Context::get('entry'))
+		{
+			$this->entry = Context::convertEncodingStr($entry);
+		}
 
 		// Validate variables to prevent XSS
 		$isInvalid = NULL;

Spacing +146 added lines, -146 removed lines

@@ -35,7 +35,7 @@ 
 	function ModuleHandler($module = '', $act = '', $mid = '', $document_srl = '', $module_srl = '')
 	{
 		// If XE has not installed yet, set module as install
-		if(!Context::isInstalled())
+		if (!Context::isInstalled())
 		{
 			$this->module = 'install';
 			$this->act = Context::get('act');
@@ -43,10 +43,10 @@ 
 		}
 
 		$oContext = Context::getInstance();
-		if($oContext->isSuccessInit == FALSE)
+		if ($oContext->isSuccessInit == FALSE)
 		{
 			$logged_info = Context::get('logged_info');
-			if($logged_info->is_admin != "Y")
+			if ($logged_info->is_admin != "Y")
 			{
 				$this->error = 'msg_invalid_request';
 				return;
@@ -59,26 +59,26 @@ 
 		$this->mid = $mid ? $mid : Context::get('mid');
 		$this->document_srl = $document_srl ? (int) $document_srl : (int) Context::get('document_srl');
 		$this->module_srl = $module_srl ? (int) $module_srl : (int) Context::get('module_srl');
-        if($entry = Context::get('entry'))
+        if ($entry = Context::get('entry'))
         {
             $this->entry = Context::convertEncodingStr($entry);
         }
 
 		// Validate variables to prevent XSS
 		$isInvalid = NULL;
-		if($this->module && !preg_match("/^([a-z0-9\_\-]+)$/i", $this->module))
+		if ($this->module && !preg_match("/^([a-z0-9\_\-]+)$/i", $this->module))
 		{
 			$isInvalid = TRUE;
 		}
-		if($this->mid && !preg_match("/^([a-z0-9\_\-]+)$/i", $this->mid))
+		if ($this->mid && !preg_match("/^([a-z0-9\_\-]+)$/i", $this->mid))
 		{
 			$isInvalid = TRUE;
 		}
-		if($this->act && !preg_match("/^([a-z0-9\_\-]+)$/i", $this->act))
+		if ($this->act && !preg_match("/^([a-z0-9\_\-]+)$/i", $this->act))
 		{
 			$isInvalid = TRUE;
 		}
-		if($isInvalid)
+		if ($isInvalid)
 		{
 			htmlHeader();
 			echo Context::getLang("msg_invalid_request");
@@ -87,11 +87,11 @@ 
 			exit;
 		}
 
-		if(isset($this->act) && (strlen($this->act) >= 4 && substr_compare($this->act, 'disp', 0, 4) === 0))
+		if (isset($this->act) && (strlen($this->act) >= 4 && substr_compare($this->act, 'disp', 0, 4) === 0))
 		{
-			if(Context::get('_use_ssl') == 'optional' && Context::isExistsSSLAction($this->act) && $_SERVER['HTTPS'] != 'on')
+			if (Context::get('_use_ssl') == 'optional' && Context::isExistsSSLAction($this->act) && $_SERVER['HTTPS'] != 'on')
 			{
-				if(Context::get('_https_port')!=null) {
+				if (Context::get('_https_port') != null) {
 					header('location:https://' . $_SERVER['HTTP_HOST'] . ':' . Context::get('_https_port') . $_SERVER['REQUEST_URI']);
 				} else {
 					header('location:https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
@@ -107,7 +107,7 @@ 
 		$called_position = 'before_module_init';
 		$oAddonController = getController('addon');
 		$addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone() ? 'mobile' : 'pc');
-		if(file_exists($addon_file)) include($addon_file);
+		if (file_exists($addon_file)) include($addon_file);
 	}
 
 	/**
@@ -121,9 +121,9 @@ 
 
 		// if success_return_url and error_return_url is incorrect
 		$urls = array(Context::get('success_return_url'), Context::get('error_return_url'));
-		foreach($urls as $url)
+		foreach ($urls as $url)
 		{
-			if(empty($url))
+			if (empty($url))
 			{
 				continue;
 			}
@@ -135,29 +135,29 @@ 
 			$defaultUrlInfo = parse_url($dbInfo->default_url);
 			$defaultHost = $defaultUrlInfo['host'];
 		
-			if($host && ($host != $defaultHost && $host != $site_module_info->domain))
+			if ($host && ($host != $defaultHost && $host != $site_module_info->domain))
 			{
 				throw new Exception('msg_default_url_is_null');
 			}
 		}
 		
-		if(!$this->document_srl && $this->mid && $this->entry)
+		if (!$this->document_srl && $this->mid && $this->entry)
 		{
 			$oDocumentModel = getModel('document');
 			$this->document_srl = $oDocumentModel->getDocumentSrlByAlias($this->mid, $this->entry);
-			if($this->document_srl)
+			if ($this->document_srl)
 			{
 				Context::set('document_srl', $this->document_srl);
 			}
 		}
 
 		// Get module's information based on document_srl, if it's specified
-		if($this->document_srl)
+		if ($this->document_srl)
 		{
 			
 			$module_info = $oModuleModel->getModuleInfoByDocumentSrl($this->document_srl);
 			// If the document does not exist, remove document_srl
-			if(!$module_info)
+			if (!$module_info)
 			{
 				unset($this->document_srl);
 			}
@@ -165,10 +165,10 @@ 
 			{
 				// If it exists, compare mid based on the module information
 				// if mids are not matching, set it as the document's mid
-				if(!$this->mid || ($this->mid != $module_info->mid))
+				if (!$this->mid || ($this->mid != $module_info->mid))
 				{
 					
-					if(Context::getRequestMethod() == 'GET')
+					if (Context::getRequestMethod() == 'GET')
 					{
 						$this->mid = $module_info->mid;
 						header('location:' . getNotEncodedSiteUrl($site_module_info->domain, 'mid', $this->mid, 'document_srl', $this->document_srl));
@@ -182,7 +182,7 @@ 
 					
 				}
 				// if requested module is different from one of the document, remove the module information retrieved based on the document number
-				if($this->module && $module_info->module != $this->module)
+				if ($this->module && $module_info->module != $this->module)
 				{
 					unset($module_info);
 				}
@@ -191,14 +191,14 @@ 
 		}
 
 		// If module_info is not set yet, and there exists mid information, get module information based on the mid
-		if(!$module_info && $this->mid)
+		if (!$module_info && $this->mid)
 		{
 			$module_info = $oModuleModel->getModuleInfoByMid($this->mid, $site_module_info->site_srl);
 			//if($this->module && $module_info->module != $this->module) unset($module_info);
 		}
 
 		// redirect, if module_site_srl and site_srl are different
-		if(!$this->module && !$module_info && $site_module_info->site_srl == 0 && $site_module_info->module_site_srl > 0)
+		if (!$this->module && !$module_info && $site_module_info->site_srl == 0 && $site_module_info->module_site_srl > 0)
 		{
 			$site_info = $oModuleModel->getSiteInfo($site_module_info->module_site_srl);
 			header("location:" . getNotEncodedSiteUrl($site_info->domain, 'mid', $site_module_info->mid));
@@ -206,21 +206,21 @@ 
 		}
 
 		// If module_info is not set still, and $module does not exist, find the default module
-		if(!$module_info && !$this->module && !$this->mid)
+		if (!$module_info && !$this->module && !$this->mid)
 		{
 			$module_info = $site_module_info;
 		}
 
-		if(!$module_info && !$this->module && $site_module_info->module_site_srl)
+		if (!$module_info && !$this->module && $site_module_info->module_site_srl)
 		{
 			$module_info = $site_module_info;
 		}
 
 		// redirect, if site_srl of module_info is different from one of site's module_info
-		if($module_info && $module_info->site_srl != $site_module_info->site_srl && !isCrawler())
+		if ($module_info && $module_info->site_srl != $site_module_info->site_srl && !isCrawler())
 		{
 			// If the module is of virtual site
-			if($module_info->site_srl)
+			if ($module_info->site_srl)
 			{
 				$site_info = $oModuleModel->getSiteInfo($module_info->site_srl);
 				$redirect_url = getNotEncodedSiteUrl($site_info->domain, 'mid', Context::get('mid'), 'document_srl', Context::get('document_srl'), 'module_srl', Context::get('module_srl'), 'entry', Context::get('entry'));
@@ -229,7 +229,7 @@ 
 			else
 			{
 				$db_info = Context::getDBInfo();
-				if(!$db_info->default_url)
+				if (!$db_info->default_url)
 				{
 					return Context::getLang('msg_default_url_is_not_defined');
 				}
@@ -243,7 +243,7 @@ 
 		}
 
 		// If module info was set, retrieve variables from the module information
-		if($module_info)
+		if ($module_info)
 		{
 			$this->module = $module_info->module;
 			$this->mid = $module_info->mid;
@@ -254,7 +254,7 @@ 
 			$targetSrl = (Mobile::isFromMobilePhone()) ? 'mlayout_srl' : 'layout_srl';
 
 			// use the site default layout.
-			if($module_info->{$targetSrl} == -1)
+			if ($module_info->{$targetSrl} == -1)
 			{
 				$oLayoutAdminModel = getAdminModel('layout');
 				$layoutSrl = $oLayoutAdminModel->getSiteDefaultLayout($viewType, $module_info->site_srl);
@@ -272,7 +272,7 @@ 
 		}
 
 		// Set module and mid into module_info
-		if(!isset($this->module_info))
+		if (!isset($this->module_info))
 		{
 			$this->module_info = new stdClass();
 		}
@@ -283,21 +283,21 @@ 
 		$this->module_info->site_srl = $site_module_info->site_srl;
 
 		// Still no module? it's an error
-		if(!$this->module)
+		if (!$this->module)
 		{
 			$this->error = 'msg_module_is_not_exists';
 			$this->httpStatusCode = '404';
 		}
 
 		// If mid exists, set mid into context
-		if($this->mid)
+		if ($this->mid)
 		{
 			Context::set('mid', $this->mid, TRUE);
 		}
 		
 		// Call a trigger after moduleHandler init
 		$output = ModuleHandler::triggerCall('moduleHandler.init', 'after', $this->module_info);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$this->error = $output->getMessage();
 			return TRUE;
@@ -319,14 +319,14 @@ 
 		$display_mode = Mobile::isFromMobilePhone() ? 'mobile' : 'view';
 
 		// If error occurred while preparation, return a message instance
-		if($this->error)
+		if ($this->error)
 		{
 			$this->_setInputErrorToContext();
 			$oMessageObject = ModuleHandler::getModuleInstance('message', $display_mode);
 			$oMessageObject->setError(-1);
 			$oMessageObject->setMessage($this->error);
 			$oMessageObject->dispMessage();
-			if($this->httpStatusCode)
+			if ($this->httpStatusCode)
 			{
 				$oMessageObject->setHttpStatusCode($this->httpStatusCode);
 			}
@@ -337,22 +337,22 @@ 
 		$xml_info = $oModuleModel->getModuleActionXml($this->module);
 
 		// If not installed yet, modify act
-		if($this->module == "install")
+		if ($this->module == "install")
 		{
-			if(!$this->act || !$xml_info->action->{$this->act})
+			if (!$this->act || !$xml_info->action->{$this->act})
 			{
 				$this->act = $xml_info->default_index_act;
 			}
 		}
 
 		// if act exists, find type of the action, if not use default index act
-		if(!$this->act)
+		if (!$this->act)
 		{
 			$this->act = $xml_info->default_index_act;
 		}
 
 		// still no act means error
-		if(!$this->act)
+		if (!$this->act)
 		{
 			$this->error = 'msg_module_is_not_exists';
 			$this->httpStatusCode = '404';
@@ -362,7 +362,7 @@ 
 			$oMessageObject->setError(-1);
 			$oMessageObject->setMessage($this->error);
 			$oMessageObject->dispMessage();
-			if($this->httpStatusCode)
+			if ($this->httpStatusCode)
 			{
 				$oMessageObject->setHttpStatusCode($this->httpStatusCode);
 			}
@@ -373,17 +373,17 @@ 
 		$type = $xml_info->action->{$this->act}->type;
 		$ruleset = $xml_info->action->{$this->act}->ruleset;
 		$kind = stripos($this->act, 'admin') !== FALSE ? 'admin' : '';
-		if(!$kind && $this->module == 'admin')
+		if (!$kind && $this->module == 'admin')
 		{
 			$kind = 'admin';
 		}
 
 		// check REQUEST_METHOD in controller
-		if($type == 'controller')
+		if ($type == 'controller')
 		{
 			$allowedMethod = $xml_info->action->{$this->act}->method;
 
-			if(!$allowedMethod)
+			if (!$allowedMethod)
 			{
 				$allowedMethodList[0] = 'POST';
 			}
@@ -392,7 +392,7 @@ 
 				$allowedMethodList = explode('|', strtoupper($allowedMethod));
 			}
 
-			if(!in_array(strtoupper($_SERVER['REQUEST_METHOD']), $allowedMethodList))
+			if (!in_array(strtoupper($_SERVER['REQUEST_METHOD']), $allowedMethodList))
 			{
 				$this->error = "msg_invalid_request";
 				$oMessageObject = ModuleHandler::getModuleInstance('message', $display_mode);
@@ -403,7 +403,7 @@ 
 			}
 		}
 
-		if($this->module_info->use_mobile != "Y")
+		if ($this->module_info->use_mobile != "Y")
 		{
 			Mobile::setMobile(FALSE);
 		}
@@ -411,7 +411,7 @@ 
 		$logged_info = Context::get('logged_info');
 
 		// check CSRF for POST actions
-		if(Context::getRequestMethod() === 'POST' && Context::isInstalled() && $this->act !== 'procFileUpload' && !checkCSRF()) {
+		if (Context::getRequestMethod() === 'POST' && Context::isInstalled() && $this->act !== 'procFileUpload' && !checkCSRF()) {
 			$this->error = 'msg_invalid_request';
 			$oMessageObject = ModuleHandler::getModuleInstance('message', $display_mode);
 			$oMessageObject->setError(-1);
@@ -421,7 +421,7 @@ 
 		}
 
 		// Admin ip
-		if($kind == 'admin' && $_SESSION['denied_admin'] == 'Y')
+		if ($kind == 'admin' && $_SESSION['denied_admin'] == 'Y')
 		{
 			$this->_setInputErrorToContext();
 			$this->error = "msg_not_permitted_act";
@@ -433,13 +433,13 @@ 
 		}
 
 		// if(type == view, and case for using mobilephone)
-		if($type == "view" && Mobile::isFromMobilePhone() && Context::isInstalled())
+		if ($type == "view" && Mobile::isFromMobilePhone() && Context::isInstalled())
 		{
 			$orig_type = "view";
 			$type = "mobile";
 			// create a module instance
 			$oModule = $this->getModuleInstance($this->module, $type, $kind);
-			if(!is_object($oModule) || !method_exists($oModule, $this->act))
+			if (!is_object($oModule) || !method_exists($oModule, $this->act))
 			{
 				$type = $orig_type;
 				Mobile::setMobile(FALSE);
@@ -452,14 +452,14 @@ 
 			$oModule = $this->getModuleInstance($this->module, $type, $kind);
 		}
 
-		if(!is_object($oModule))
+		if (!is_object($oModule))
 		{
 			$this->_setInputErrorToContext();
 			$oMessageObject = ModuleHandler::getModuleInstance('message', $display_mode);
 			$oMessageObject->setError(-1);
 			$oMessageObject->setMessage($this->error);
 			$oMessageObject->dispMessage();
-			if($this->httpStatusCode)
+			if ($this->httpStatusCode)
 			{
 				$oMessageObject->setHttpStatusCode($this->httpStatusCode);
 			}
@@ -467,10 +467,10 @@ 
 		}
 
 		// If there is no such action in the module object
-		if(!isset($xml_info->action->{$this->act}) || !method_exists($oModule, $this->act))
+		if (!isset($xml_info->action->{$this->act}) || !method_exists($oModule, $this->act))
 		{
 
-			if(!Context::isInstalled())
+			if (!Context::isInstalled())
 			{
 				$this->_setInputErrorToContext();
 				$this->error = 'msg_invalid_request';
@@ -478,7 +478,7 @@ 
 				$oMessageObject->setError(-1);
 				$oMessageObject->setMessage($this->error);
 				$oMessageObject->dispMessage();
-				if($this->httpStatusCode)
+				if ($this->httpStatusCode)
 				{
 					$oMessageObject->setHttpStatusCode($this->httpStatusCode);
 				}
@@ -487,12 +487,12 @@ 
 
 			$forward = NULL;
 			// 1. Look for the module with action name
-			if(preg_match('/^([a-z]+)([A-Z])([a-z0-9\_]+)(.*)$/', $this->act, $matches))
+			if (preg_match('/^([a-z]+)([A-Z])([a-z0-9\_]+)(.*)$/', $this->act, $matches))
 			{
 				$module = strtolower($matches[2] . $matches[3]);
 				$xml_info = $oModuleModel->getModuleActionXml($module);
 
-				if($xml_info->action->{$this->act} && ((stripos($this->act, 'admin') !== FALSE) || $xml_info->action->{$this->act}->standalone != 'false'))
+				if ($xml_info->action->{$this->act} && ((stripos($this->act, 'admin') !== FALSE) || $xml_info->action->{$this->act}->standalone != 'false'))
 				{
 					$forward = new stdClass();
 					$forward->module = $module;
@@ -512,12 +512,12 @@ 
 				}
 			}
 
-			if(!$forward)
+			if (!$forward)
 			{
 				$forward = $oModuleModel->getActionForward($this->act);
 			}
 
-			if($forward->module && $forward->type && $forward->act && $forward->act == $this->act)
+			if ($forward->module && $forward->type && $forward->act && $forward->act == $this->act)
 			{
 				$kind = stripos($forward->act, 'admin') !== FALSE ? 'admin' : '';
 				$type = $forward->type;
@@ -529,11 +529,11 @@ 
 
 				// SECISSUE also check foward act method
 				// check REQUEST_METHOD in controller
-				if($type == 'controller')
+				if ($type == 'controller')
 				{
 					$allowedMethod = $xml_info->action->{$forward->act}->method;
 
-					if(!$allowedMethod)
+					if (!$allowedMethod)
 					{
 						$allowedMethodList[0] = 'POST';
 					}
@@ -542,7 +542,7 @@ 
 						$allowedMethodList = explode('|', strtoupper($allowedMethod));
 					}
 
-					if(!in_array(strtoupper($_SERVER['REQUEST_METHOD']), $allowedMethodList))
+					if (!in_array(strtoupper($_SERVER['REQUEST_METHOD']), $allowedMethodList))
 					{
 						$this->error = "msg_invalid_request";
 						$oMessageObject = ModuleHandler::getModuleInstance('message', $display_mode);
@@ -553,13 +553,13 @@ 
 					}
 				}
 
-				if($type == "view" && Mobile::isFromMobilePhone())
+				if ($type == "view" && Mobile::isFromMobilePhone())
 				{
 					$orig_type = "view";
 					$type = "mobile";
 					// create a module instance
 					$oModule = $this->getModuleInstance($forward->module, $type, $kind);
-					if(!is_object($oModule) || !method_exists($oModule, $this->act))
+					if (!is_object($oModule) || !method_exists($oModule, $this->act))
 					{
 						$type = $orig_type;
 						Mobile::setMobile(FALSE);
@@ -571,25 +571,25 @@ 
 					$oModule = $this->getModuleInstance($forward->module, $type, $kind);
 				}
 
-				if(!is_object($oModule))
+				if (!is_object($oModule))
 				{
 					$this->_setInputErrorToContext();
 					$oMessageObject = ModuleHandler::getModuleInstance('message', $display_mode);
 					$oMessageObject->setError(-1);
 					$oMessageObject->setMessage('msg_module_is_not_exists');
 					$oMessageObject->dispMessage();
-					if($this->httpStatusCode)
+					if ($this->httpStatusCode)
 					{
 						$oMessageObject->setHttpStatusCode($this->httpStatusCode);
 					}
 					return $oMessageObject;
 				}
 
-				if($this->module == "admin" && $type == "view")
+				if ($this->module == "admin" && $type == "view")
 				{
-					if($logged_info->is_admin == 'Y')
+					if ($logged_info->is_admin == 'Y')
 					{
-						if($this->act != 'dispLayoutAdminLayoutModify')
+						if ($this->act != 'dispLayoutAdminLayoutModify')
 						{
 							$oAdminView = getAdminView('admin');
 							$oAdminView->makeGnbUrl($forward->module);
@@ -609,10 +609,10 @@ 
 						return $oMessageObject;
 					}
 				}
-				if($kind == 'admin')
+				if ($kind == 'admin')
 				{
 					$grant = $oModuleModel->getGrant($this->module_info, $logged_info);
-					if(!$grant->manager)
+					if (!$grant->manager)
 					{
 						$this->_setInputErrorToContext();
 						$this->error = 'msg_is_not_manager';
@@ -624,7 +624,7 @@ 
 					}
 					else
 					{
-						if(!$grant->is_admin && $this->module != $this->orig_module->module && $xml_info->permission->{$this->act} != 'manager')
+						if (!$grant->is_admin && $this->module != $this->orig_module->module && $xml_info->permission->{$this->act} != 'manager')
 						{
 							$this->_setInputErrorToContext();
 							$this->error = 'msg_is_not_administrator';
@@ -637,7 +637,7 @@ 
 					}
 				}
 			}
-			else if($xml_info->default_index_act && method_exists($oModule, $xml_info->default_index_act))
+			else if ($xml_info->default_index_act && method_exists($oModule, $xml_info->default_index_act))
 			{
 				$this->act = $xml_info->default_index_act;
 			}
@@ -651,16 +651,16 @@ 
 		}
 
 		// ruleset check...
-		if(!empty($ruleset))
+		if (!empty($ruleset))
 		{
 			$rulesetModule = $forward->module ? $forward->module : $this->module;
 			$rulesetFile = $oModuleModel->getValidatorFilePath($rulesetModule, $ruleset, $this->mid);
-			if(!empty($rulesetFile))
+			if (!empty($rulesetFile))
 			{
-				if($_SESSION['XE_VALIDATOR_ERROR_LANG'])
+				if ($_SESSION['XE_VALIDATOR_ERROR_LANG'])
 				{
 					$errorLang = $_SESSION['XE_VALIDATOR_ERROR_LANG'];
-					foreach($errorLang as $key => $val)
+					foreach ($errorLang as $key => $val)
 					{
 						Context::setLang($key, $val);
 					}
@@ -669,7 +669,7 @@ 
 
 				$Validator = new Validator($rulesetFile);
 				$result = $Validator->validate();
-				if(!$result)
+				if (!$result)
 				{
 					$lastError = $Validator->getLastError();
 					$returnUrl = Context::get('error_return_url');
@@ -701,7 +701,7 @@ 
 				'dispLayoutPreviewWithModule' => 1
 		);
 		$db_use_mobile = Mobile::isMobileEnabled();
-		if($type == "view" && $this->module_info->use_mobile == "Y" && Mobile::isMobileCheckByAgent() && !isset($skipAct[Context::get('act')]) && $db_use_mobile === true)
+		if ($type == "view" && $this->module_info->use_mobile == "Y" && Mobile::isMobileCheckByAgent() && !isset($skipAct[Context::get('act')]) && $db_use_mobile === true)
 		{
 			global $lang;
 			$header = '<style>div.xe_mobile{opacity:0.7;margin:1em 0;padding:.5em;background:#333;border:1px solid #666;border-left:0;border-right:0}p.xe_mobile{text-align:center;margin:1em 0}a.xe_mobile{color:#ff0;font-weight:bold;font-size:24px}@media only screen and (min-width:500px){a.xe_mobile{font-size:15px}}</style>';
@@ -710,17 +710,17 @@ 
 			Context::addHtmlFooter($footer);
 		}
 
-		if($type == "view" && $kind != 'admin')
+		if ($type == "view" && $kind != 'admin')
 		{
 			$module_config = $oModuleModel->getModuleConfig('module');
-			if($module_config->htmlFooter)
+			if ($module_config->htmlFooter)
 			{
 				Context::addHtmlFooter($module_config->htmlFooter);
 			}
-			if($module_config->siteTitle)
+			if ($module_config->siteTitle)
 			{
 				$siteTitle = Context::getBrowserTitle();
-				if(!$siteTitle)
+				if (!$siteTitle)
 				{
 					Context::setBrowserTitle($module_config->siteTitle);
 				}
@@ -733,18 +733,18 @@ 
 		$procResult = $oModule->proc();
 
 		$methodList = array('XMLRPC' => 1, 'JSON' => 1, 'JS_CALLBACK' => 1);
-		if(!$oModule->stop_proc && !isset($methodList[Context::getRequestMethod()]))
+		if (!$oModule->stop_proc && !isset($methodList[Context::getRequestMethod()]))
 		{
 			$error = $oModule->getError();
 			$message = $oModule->getMessage();
 			$messageType = $oModule->getMessageType();
 			$redirectUrl = $oModule->getRedirectUrl();
-			if($messageType == 'error') debugPrint($message, 'ERROR');
+			if ($messageType == 'error') debugPrint($message, 'ERROR');
 
-			if(!$procResult)
+			if (!$procResult)
 			{
 				$this->error = $message;
-				if(!$redirectUrl && Context::get('error_return_url'))
+				if (!$redirectUrl && Context::get('error_return_url'))
 				{
 					$redirectUrl = Context::get('error_return_url');
 				}
@@ -757,13 +757,13 @@ 
 
 			$_SESSION['XE_VALIDATOR_ERROR'] = $error;
 			$_SESSION['XE_VALIDATOR_ID'] = Context::get('xe_validator_id');
-			if($message != 'success')
+			if ($message != 'success')
 			{
 				$_SESSION['XE_VALIDATOR_MESSAGE'] = $message;
 			}
 			$_SESSION['XE_VALIDATOR_MESSAGE_TYPE'] = $messageType;
 
-			if(Context::get('xeVirtualRequestMethod') != 'xml')
+			if (Context::get('xeVirtualRequestMethod') != 'xml')
 			{
 				$_SESSION['XE_VALIDATOR_RETURN_URL'] = $redirectUrl;
 			}
@@ -779,27 +779,27 @@ 
 	 * */
 	function _setInputErrorToContext()
 	{
-		if($_SESSION['XE_VALIDATOR_ERROR'] && !Context::get('XE_VALIDATOR_ERROR'))
+		if ($_SESSION['XE_VALIDATOR_ERROR'] && !Context::get('XE_VALIDATOR_ERROR'))
 		{
 			Context::set('XE_VALIDATOR_ERROR', $_SESSION['XE_VALIDATOR_ERROR']);
 		}
-		if($_SESSION['XE_VALIDATOR_MESSAGE'] && !Context::get('XE_VALIDATOR_MESSAGE'))
+		if ($_SESSION['XE_VALIDATOR_MESSAGE'] && !Context::get('XE_VALIDATOR_MESSAGE'))
 		{
 			Context::set('XE_VALIDATOR_MESSAGE', $_SESSION['XE_VALIDATOR_MESSAGE']);
 		}
-		if($_SESSION['XE_VALIDATOR_MESSAGE_TYPE'] && !Context::get('XE_VALIDATOR_MESSAGE_TYPE'))
+		if ($_SESSION['XE_VALIDATOR_MESSAGE_TYPE'] && !Context::get('XE_VALIDATOR_MESSAGE_TYPE'))
 		{
 			Context::set('XE_VALIDATOR_MESSAGE_TYPE', $_SESSION['XE_VALIDATOR_MESSAGE_TYPE']);
 		}
-		if($_SESSION['XE_VALIDATOR_RETURN_URL'] && !Context::get('XE_VALIDATOR_RETURN_URL'))
+		if ($_SESSION['XE_VALIDATOR_RETURN_URL'] && !Context::get('XE_VALIDATOR_RETURN_URL'))
 		{
 			Context::set('XE_VALIDATOR_RETURN_URL', $_SESSION['XE_VALIDATOR_RETURN_URL']);
 		}
-		if($_SESSION['XE_VALIDATOR_ID'] && !Context::get('XE_VALIDATOR_ID'))
+		if ($_SESSION['XE_VALIDATOR_ID'] && !Context::get('XE_VALIDATOR_ID'))
 		{
 			Context::set('XE_VALIDATOR_ID', $_SESSION['XE_VALIDATOR_ID']);
 		}
-		if(count($_SESSION['INPUT_ERROR']))
+		if (count($_SESSION['INPUT_ERROR']))
 		{
 			Context::set('INPUT_ERROR', $_SESSION['INPUT_ERROR']);
 		}
@@ -829,7 +829,7 @@ 
 	{
 		$requestVars = Context::getRequestVars();
 		unset($requestVars->act, $requestVars->mid, $requestVars->vid, $requestVars->success_return_url, $requestVars->error_return_url);
-		foreach($requestVars AS $key => $value)
+		foreach ($requestVars AS $key => $value)
 		{
 			$_SESSION['INPUT_ERROR'][$key] = $value;
 		}
@@ -843,31 +843,31 @@ 
 	function displayContent($oModule = NULL)
 	{
 		// If the module is not set or not an object, set error
-		if(!$oModule || !is_object($oModule))
+		if (!$oModule || !is_object($oModule))
 		{
 			$this->error = 'msg_module_is_not_exists';
 			$this->httpStatusCode = '404';
 		}
 
 		// If connection to DB has a problem even though it's not install module, set error
-		if($this->module != 'install' && isset($GLOBALS['__DB__']) && $GLOBALS['__DB__'][Context::getDBType()]->isConnected() == FALSE)
+		if ($this->module != 'install' && isset($GLOBALS['__DB__']) && $GLOBALS['__DB__'][Context::getDBType()]->isConnected() == FALSE)
 		{
 			$this->error = 'msg_dbconnect_failed';
 		}
 
 		// Call trigger after moduleHandler proc
 		$output = ModuleHandler::triggerCall('moduleHandler.proc', 'after', $oModule);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$this->error = $output->getMessage();
 		}
 
 		// Use message view object, if HTML call
 		$methodList = array('XMLRPC' => 1, 'JSON' => 1, 'JS_CALLBACK' => 1);
-		if(!isset($methodList[Context::getRequestMethod()]))
+		if (!isset($methodList[Context::getRequestMethod()]))
 		{
 
-			if($_SESSION['XE_VALIDATOR_RETURN_URL'])
+			if ($_SESSION['XE_VALIDATOR_RETURN_URL'])
 			{
 				$display_handler = new DisplayHandler();
 				$display_handler->_debugOutput();
@@ -877,7 +877,7 @@ 
 			}
 
 			// If error occurred, handle it
-			if($this->error)
+			if ($this->error)
 			{
 				// display content with message module instance
 				$type = Mobile::isFromMobilePhone() ? 'mobile' : 'view';
@@ -886,14 +886,14 @@ 
 				$oMessageObject->setMessage($this->error);
 				$oMessageObject->dispMessage();
 
-				if($oMessageObject->getHttpStatusCode() && $oMessageObject->getHttpStatusCode() != '200')
+				if ($oMessageObject->getHttpStatusCode() && $oMessageObject->getHttpStatusCode() != '200')
 				{
 					$this->_setHttpStatusMessage($oMessageObject->getHttpStatusCode());
 					$oMessageObject->setTemplateFile('http_status_code');
 				}
 
 				// If module was called normally, change the templates of the module into ones of the message view module
-				if($oModule)
+				if ($oModule)
 				{
 					$oModule->setTemplatePath($oMessageObject->getTemplatePath());
 					$oModule->setTemplateFile($oMessageObject->getTemplateFile());
@@ -908,7 +908,7 @@ 
 			}
 
 			// Check if layout_srl exists for the module
-			if(Mobile::isFromMobilePhone())
+			if (Mobile::isFromMobilePhone())
 			{
 				$layout_srl = $oModule->module_info->mlayout_srl;
 			}
@@ -918,31 +918,31 @@ 
 			}
 
 			// if layout_srl is rollback by module, set default layout
-			if($layout_srl == -1)
+			if ($layout_srl == -1)
 			{
 				$viewType = (Mobile::isFromMobilePhone()) ? 'M' : 'P';
 				$oLayoutAdminModel = getAdminModel('layout');
 				$layout_srl = $oLayoutAdminModel->getSiteDefaultLayout($viewType, $oModule->module_info->site_srl);
 			}
 
-			if($layout_srl && !$oModule->getLayoutFile())
+			if ($layout_srl && !$oModule->getLayoutFile())
 			{
 
 				// If layout_srl exists, get information of the layout, and set the location of layout_path/ layout_file
 				$oLayoutModel = getModel('layout');
 				$layout_info = $oLayoutModel->getLayout($layout_srl);
-				if($layout_info)
+				if ($layout_info)
 				{
 
 					// Input extra_vars into $layout_info
-					if($layout_info->extra_var_count)
+					if ($layout_info->extra_var_count)
 					{
 
-						foreach($layout_info->extra_var as $var_id => $val)
+						foreach ($layout_info->extra_var as $var_id => $val)
 						{
-							if($val->type == 'image')
+							if ($val->type == 'image')
 							{
-								if(strncmp('./files/attach/images/', $val->value, 22) === 0)
+								if (strncmp('./files/attach/images/', $val->value, 22) === 0)
 								{
 									$val->value = Context::getRequestUri() . substr($val->value, 2);
 								}
@@ -951,22 +951,22 @@ 
 						}
 					}
 					// Set menus into context
-					if($layout_info->menu_count)
+					if ($layout_info->menu_count)
 					{
-						foreach($layout_info->menu as $menu_id => $menu)
+						foreach ($layout_info->menu as $menu_id => $menu)
 						{
 							// set default menu set(included home menu)
-							if(!$menu->menu_srl || $menu->menu_srl == -1)
+							if (!$menu->menu_srl || $menu->menu_srl == -1)
 							{
 								$oMenuAdminController = getAdminController('menu');
 								$homeMenuCacheFile = $oMenuAdminController->getHomeMenuCacheFile();
 
-								if(FileHandler::exists($homeMenuCacheFile))
+								if (FileHandler::exists($homeMenuCacheFile))
 								{
 									include($homeMenuCacheFile);
 								}
 
-								if(!$menu->menu_srl)
+								if (!$menu->menu_srl)
 								{
 									$menu->xml_file = str_replace('.xml.php', $homeMenuSrl . '.xml.php', $menu->xml_file);
 									$menu->php_file = str_replace('.php', $homeMenuSrl . '.php', $menu->php_file);
@@ -980,7 +980,7 @@ 
 							}
 
 							$php_file = FileHandler::exists($menu->php_file);
-							if($php_file)
+							if ($php_file)
 							{
 								include($php_file);
 							}
@@ -996,17 +996,17 @@ 
 
 					// If layout was modified, use the modified version
 					$edited_layout = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl);
-					if(file_exists($edited_layout))
+					if (file_exists($edited_layout))
 					{
 						$oModule->setEditedLayoutFile($edited_layout);
 					}
 				}
 			}
 			$isLayoutDrop = Context::get('isLayoutDrop');
-			if($isLayoutDrop)
+			if ($isLayoutDrop)
 			{
 				$kind = stripos($this->act, 'admin') !== FALSE ? 'admin' : '';
-				if($kind == 'admin')
+				if ($kind == 'admin')
 				{
 					$oModule->setLayoutFile('popup_layout');
 				}
@@ -1044,7 +1044,7 @@ 
 	function &getModuleInstance($module, $type = 'view', $kind = '')
 	{
 
-		if(__DEBUG__ == 3)
+		if (__DEBUG__ == 3)
 		{
 			$start_time = getMicroTime();
 		}
@@ -1054,49 +1054,49 @@ 
 		$type = strtolower($type);
 
 		$kinds = array('svc' => 1, 'admin' => 1);
-		if(!isset($kinds[$kind]))
+		if (!isset($kinds[$kind]))
 		{
 			$kind = 'svc';
 		}
 
 		$key = $module . '.' . ($kind != 'admin' ? '' : 'admin') . '.' . $type;
 
-		if(is_array($GLOBALS['__MODULE_EXTEND__']) && array_key_exists($key, $GLOBALS['__MODULE_EXTEND__']))
+		if (is_array($GLOBALS['__MODULE_EXTEND__']) && array_key_exists($key, $GLOBALS['__MODULE_EXTEND__']))
 		{
 			$module = $extend_module = $GLOBALS['__MODULE_EXTEND__'][$key];
 		}
 
 		// if there is no instance of the module in global variable, create a new one
-		if(!isset($GLOBALS['_loaded_module'][$module][$type][$kind]))
+		if (!isset($GLOBALS['_loaded_module'][$module][$type][$kind]))
 		{
 			ModuleHandler::_getModuleFilePath($module, $type, $kind, $class_path, $high_class_file, $class_file, $instance_name);
 
-			if($extend_module && (!is_readable($high_class_file) || !is_readable($class_file)))
+			if ($extend_module && (!is_readable($high_class_file) || !is_readable($class_file)))
 			{
 				$module = $parent_module;
 				ModuleHandler::_getModuleFilePath($module, $type, $kind, $class_path, $high_class_file, $class_file, $instance_name);
 			}
 
 			// Check if the base class and instance class exist
-			if(!class_exists($module, true))
+			if (!class_exists($module, true))
 			{
 				return NULL;
 			}
-			if(!class_exists($instance_name, true))
+			if (!class_exists($instance_name, true))
 			{
 				return NULL;
 			}
 
 			// Create an instance
 			$oModule = new $instance_name();
-			if(!is_object($oModule))
+			if (!is_object($oModule))
 			{
 				return NULL;
 			}
 
 			// Load language files for the class
 			Context::loadLang($class_path . 'lang');
-			if($extend_module)
+			if ($extend_module)
 			{
 				Context::loadLang(ModuleHandler::getModulePath($parent_module) . 'lang');
 			}
@@ -1106,10 +1106,10 @@ 
 			$oModule->setModulePath($class_path);
 
 			// If the module has a constructor, run it.
-			if(!isset($GLOBALS['_called_constructor'][$instance_name]))
+			if (!isset($GLOBALS['_called_constructor'][$instance_name]))
 			{
 				$GLOBALS['_called_constructor'][$instance_name] = TRUE;
-				if(@method_exists($oModule, $instance_name))
+				if (@method_exists($oModule, $instance_name))
 				{
 					$oModule->{$instance_name}();
 				}
@@ -1119,7 +1119,7 @@ 
 			$GLOBALS['_loaded_module'][$module][$type][$kind] = $oModule;
 		}
 
-		if(__DEBUG__ == 3)
+		if (__DEBUG__ == 3)
 		{
 			$GLOBALS['__elapsed_class_load__'] += getMicroTime() - $start_time;
 		}
@@ -1135,17 +1135,17 @@ 
 		$highClassFile = sprintf('%s%s%s.class.php', _XE_PATH_, $classPath, $module);
 		$highClassFile = FileHandler::getRealPath($highClassFile);
 
-		$types = array('view','controller','model','api','wap','mobile','class');
-		if(!in_array($type, $types))
+		$types = array('view', 'controller', 'model', 'api', 'wap', 'mobile', 'class');
+		if (!in_array($type, $types))
 		{
 			$type = $types[0];
 		}
-		if($type == 'class')
+		if ($type == 'class')
 		{
 			$instanceName = '%s';
 			$classFile = '%s%s.%s.php';
 		}
-		elseif($kind == 'admin' && array_search($type, $types) < 3)
+		elseif ($kind == 'admin' && array_search($type, $types) < 3)
 		{
 			$instanceName = '%sAdmin%s';
 			$classFile = '%s%s.admin.%s.php';
@@ -1170,26 +1170,26 @@ 
 	function triggerCall($trigger_name, $called_position, &$obj)
 	{
 		// skip if not installed
-		if(!Context::isInstalled())
+		if (!Context::isInstalled())
 		{
 			return new Object();
 		}
 
 		$oModuleModel = getModel('module');
 		$triggers = $oModuleModel->getTriggers($trigger_name, $called_position);
-		if(!$triggers || count($triggers) < 1)
+		if (!$triggers || count($triggers) < 1)
 		{
 			return new Object();
 		}
 		
 		//store before trigger call time
 		$before_trigger_time = NULL;
-		if(__LOG_SLOW_TRIGGER__> 0)
+		if (__LOG_SLOW_TRIGGER__ > 0)
 		{
 			$before_trigger_time = microtime(true);
 		}
 
-		foreach($triggers as $item)
+		foreach ($triggers as $item)
 		{
 			$module = $item->module;
 			$type = $item->type;
@@ -1197,7 +1197,7 @@ 
 
 			// todo why don't we call a normal class object ?
 			$oModule = getModule($module, $type);
-			if(!$oModule || !method_exists($oModule, $called_method))
+			if (!$oModule || !method_exists($oModule, $called_method))
 			{
 				continue;
 			}
@@ -1213,9 +1213,9 @@ 
 			$slowlog->caller = $trigger_name . '.' . $called_position;
 			$slowlog->called = $module . '.' . $called_method;
 			$slowlog->called_extension = $module;
-			if($trigger_name != 'XE.writeSlowlog') writeSlowlog('trigger', $elapsed_time_trigger, $slowlog);
+			if ($trigger_name != 'XE.writeSlowlog') writeSlowlog('trigger', $elapsed_time_trigger, $slowlog);
 
-			if(is_object($output) && method_exists($output, 'toBool') && !$output->toBool())
+			if (is_object($output) && method_exists($output, 'toBool') && !$output->toBool())
 			{
 				return $output;
 			}
@@ -1275,7 +1275,7 @@ 
 			'505' => 'HTTP Version Not Supported',
 		);
 		$statusMessage = $statusMessageList[$code];
-		if(!$statusMessage)
+		if (!$statusMessage)
 		{
 			$statusMessage = 'OK';
 		}

Braces +30 added lines, -45 removed lines

@@ -107,7 +107,9 @@ 
 		$called_position = 'before_module_init';
 		$oAddonController = getController('addon');
 		$addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone() ? 'mobile' : 'pc');
-		if(file_exists($addon_file)) include($addon_file);
+		if(file_exists($addon_file)) {
+			include($addon_file);
+		}
 	}
 
 	/**
@@ -160,8 +162,7 @@ 
 			if(!$module_info)
 			{
 				unset($this->document_srl);
-			}
-			else
+			} else
 			{
 				// If it exists, compare mid based on the module information
 				// if mids are not matching, set it as the document's mid
@@ -173,8 +174,7 @@ 
 						$this->mid = $module_info->mid;
 						header('location:' . getNotEncodedSiteUrl($site_module_info->domain, 'mid', $this->mid, 'document_srl', $this->document_srl));
 						return FALSE;
-					}
-					else
+					} else
 					{
 						$this->mid = $module_info->mid;
 						Context::set('mid', $this->mid);
@@ -225,15 +225,13 @@ 
 				$site_info = $oModuleModel->getSiteInfo($module_info->site_srl);
 				$redirect_url = getNotEncodedSiteUrl($site_info->domain, 'mid', Context::get('mid'), 'document_srl', Context::get('document_srl'), 'module_srl', Context::get('module_srl'), 'entry', Context::get('entry'));
 				// If it's called from a virtual site, though it's not a module of the virtual site
-			}
-			else
+			} else
 			{
 				$db_info = Context::getDBInfo();
 				if(!$db_info->default_url)
 				{
 					return Context::getLang('msg_default_url_is_not_defined');
-				}
-				else
+				} else
 				{
 					$redirect_url = getNotEncodedSiteUrl($db_info->default_url, 'mid', Context::get('mid'), 'document_srl', Context::get('document_srl'), 'module_srl', Context::get('module_srl'), 'entry', Context::get('entry'));
 				}
@@ -258,8 +256,7 @@ 
 			{
 				$oLayoutAdminModel = getAdminModel('layout');
 				$layoutSrl = $oLayoutAdminModel->getSiteDefaultLayout($viewType, $module_info->site_srl);
-			}
-			else
+			} else
 			{
 				$layoutSrl = $module_info->{$targetSrl};
 			}
@@ -386,8 +383,7 @@ 
 			if(!$allowedMethod)
 			{
 				$allowedMethodList[0] = 'POST';
-			}
-			else
+			} else
 			{
 				$allowedMethodList = explode('|', strtoupper($allowedMethod));
 			}
@@ -445,8 +441,7 @@ 
 				Mobile::setMobile(FALSE);
 				$oModule = $this->getModuleInstance($this->module, $type, $kind);
 			}
-		}
-		else
+		} else
 		{
 			// create a module instance
 			$oModule = $this->getModuleInstance($this->module, $type, $kind);
@@ -499,8 +494,7 @@ 
 					$forward->type = $xml_info->action->{$this->act}->type;
 					$forward->ruleset = $xml_info->action->{$this->act}->ruleset;
 					$forward->act = $this->act;
-				}
-				else
+				} else
 				{
 					$this->error = 'msg_invalid_request';
 					$oMessageObject = ModuleHandler::getModuleInstance('message', $display_mode);
@@ -536,8 +530,7 @@ 
 					if(!$allowedMethod)
 					{
 						$allowedMethodList[0] = 'POST';
-					}
-					else
+					} else
 					{
 						$allowedMethodList = explode('|', strtoupper($allowedMethod));
 					}
@@ -565,8 +558,7 @@ 
 						Mobile::setMobile(FALSE);
 						$oModule = $this->getModuleInstance($forward->module, $type, $kind);
 					}
-				}
-				else
+				} else
 				{
 					$oModule = $this->getModuleInstance($forward->module, $type, $kind);
 				}
@@ -596,8 +588,7 @@ 
 							$oModule->setLayoutPath("./modules/admin/tpl");
 							$oModule->setLayoutFile("layout.html");
 						}
-					}
-					else
+					} else
 					{
 						$this->_setInputErrorToContext();
 
@@ -621,8 +612,7 @@ 
 						$oMessageObject->setMessage($this->error);
 						$oMessageObject->dispMessage();
 						return $oMessageObject;
-					}
-					else
+					} else
 					{
 						if(!$grant->is_admin && $this->module != $this->orig_module->module && $xml_info->permission->{$this->act} != 'manager')
 						{
@@ -636,12 +626,10 @@ 
 						}
 					}
 				}
-			}
-			else if($xml_info->default_index_act && method_exists($oModule, $xml_info->default_index_act))
+			} else if($xml_info->default_index_act && method_exists($oModule, $xml_info->default_index_act))
 			{
 				$this->act = $xml_info->default_index_act;
-			}
-			else
+			} else
 			{
 				$this->error = 'msg_invalid_request';
 				$oModule->setError(-1);
@@ -739,7 +727,9 @@ 
 			$message = $oModule->getMessage();
 			$messageType = $oModule->getMessageType();
 			$redirectUrl = $oModule->getRedirectUrl();
-			if($messageType == 'error') debugPrint($message, 'ERROR');
+			if($messageType == 'error') {
+				debugPrint($message, 'ERROR');
+			}
 
 			if(!$procResult)
 			{
@@ -749,8 +739,7 @@ 
 					$redirectUrl = Context::get('error_return_url');
 				}
 				$this->_setInputValueToSession();
-			}
-			else
+			} else
 			{
 
 			}
@@ -898,8 +887,7 @@ 
 					$oModule->setTemplatePath($oMessageObject->getTemplatePath());
 					$oModule->setTemplateFile($oMessageObject->getTemplateFile());
 					// Otherwise, set message instance as the target module
-				}
-				else
+				} else
 				{
 					$oModule = $oMessageObject;
 				}
@@ -911,8 +899,7 @@ 
 			if(Mobile::isFromMobilePhone())
 			{
 				$layout_srl = $oModule->module_info->mlayout_srl;
-			}
-			else
+			} else
 			{
 				$layout_srl = $oModule->module_info->layout_srl;
 			}
@@ -971,8 +958,7 @@ 
 									$menu->xml_file = str_replace('.xml.php', $homeMenuSrl . '.xml.php', $menu->xml_file);
 									$menu->php_file = str_replace('.php', $homeMenuSrl . '.php', $menu->php_file);
 									$layout_info->menu->{$menu_id}->menu_srl = $homeMenuSrl;
-								}
-								else
+								} else
 								{
 									$menu->xml_file = str_replace($menu->menu_srl, $homeMenuSrl, $menu->xml_file);
 									$menu->php_file = str_replace($menu->menu_srl, $homeMenuSrl, $menu->php_file);
@@ -1009,8 +995,7 @@ 
 				if($kind == 'admin')
 				{
 					$oModule->setLayoutFile('popup_layout');
-				}
-				else
+				} else
 				{
 					$oModule->setLayoutPath('common/tpl');
 					$oModule->setLayoutFile('default_layout');
@@ -1144,13 +1129,11 @@ 
 		{
 			$instanceName = '%s';
 			$classFile = '%s%s.%s.php';
-		}
-		elseif($kind == 'admin' && array_search($type, $types) < 3)
+		} elseif($kind == 'admin' && array_search($type, $types) < 3)
 		{
 			$instanceName = '%sAdmin%s';
 			$classFile = '%s%s.admin.%s.php';
-		}
-		else
+		} else
 		{
 			$instanceName = '%s%s';
 			$classFile = '%s%s.%s.php';
@@ -1213,7 +1196,9 @@ 
 			$slowlog->caller = $trigger_name . '.' . $called_position;
 			$slowlog->called = $module . '.' . $called_method;
 			$slowlog->called_extension = $module;
-			if($trigger_name != 'XE.writeSlowlog') writeSlowlog('trigger', $elapsed_time_trigger, $slowlog);
+			if($trigger_name != 'XE.writeSlowlog') {
+				writeSlowlog('trigger', $elapsed_time_trigger, $slowlog);
+			}
 
 			if(is_object($output) && method_exists($output, 'toBool') && !$output->toBool())
 			{

classes/module/ModuleObject.class.php

Doc Comments +4 added lines, -1 removed lines

@@ -141,7 +141,7 @@ 
 
 	/**
 	 * sett to set module information
-	 * @param object $module_info object containing module information
+	 * @param stdClass $module_info object containing module information
 	 * @param object $xml_info object containing module description
 	 * @return void
 	 * */
@@ -247,6 +247,7 @@ 
 	/**
 	 * set the file name of the template file
 	 * @param string name of file
+	 * @param string $filename
 	 * @return void
 	 * */
 	function setTemplateFile($filename)
@@ -270,6 +271,7 @@ 
 	/**
 	 * set the directory path of the template directory
 	 * @param string path of template directory.
+	 * @param string $path
 	 * @return void
 	 * */
 	function setTemplatePath($path)
@@ -325,6 +327,7 @@ 
 	/**
 	 * set the file name of the layout file
 	 * @param string name of file
+	 * @param string $filename
 	 * @return void
 	 * */
 	function setLayoutFile($filename)

Spacing +39 added lines, -39 removed lines

@@ -44,9 +44,9 @@ 
 	 * */
 	function setModulePath($path)
 	{
-		if(substr_compare($path, '/', -1) !== 0)
+		if (substr_compare($path, '/', -1) !== 0)
 		{
-			$path.='/';
+			$path .= '/';
 		}
 		$this->module_path = $path;
 	}
@@ -60,12 +60,12 @@ 
 	function setRedirectUrl($url = './', $output = NULL)
 	{
 		$ajaxRequestMethod = array_flip($this->ajaxRequestMethod);
-		if(!isset($ajaxRequestMethod[Context::getRequestMethod()]))
+		if (!isset($ajaxRequestMethod[Context::getRequestMethod()]))
 		{
 			$this->add('redirect_url', $url);
 		}
 
-		if($output !== NULL && is_object($output))
+		if ($output !== NULL && is_object($output))
 		{
 			return $output;
 		}
@@ -110,7 +110,7 @@ 
 	{
 		$type = $this->get('message_type');
 		$typeList = array('error' => 1, 'info' => 1, 'update' => 1);
-		if(!isset($typeList[$type]))
+		if (!isset($typeList[$type]))
 		{
 			$type = $this->getError() ? 'error' : 'info';
 		}
@@ -161,10 +161,10 @@ 
 		$oModuleModel = getModel('module');
 		// permission settings. access, manager(== is_admin) are fixed and privilege name in XE
 		$module_srl = Context::get('module_srl');
-		if(!$module_info->mid && !is_array($module_srl) && preg_match('/^([0-9]+)$/', $module_srl))
+		if (!$module_info->mid && !is_array($module_srl) && preg_match('/^([0-9]+)$/', $module_srl))
 		{
 			$request_module = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-			if($request_module->module_srl == $module_srl)
+			if ($request_module->module_srl == $module_srl)
 			{
 				$grant = $oModuleModel->getGrant($request_module, $logged_info);
 			}
@@ -173,7 +173,7 @@ 
 		{
 			$grant = $oModuleModel->getGrant($module_info, $logged_info, $xml_info);
 			// have at least access grant
-			if(substr_count($this->act, 'Member') || substr_count($this->act, 'Communication'))
+			if (substr_count($this->act, 'Member') || substr_count($this->act, 'Communication'))
 			{
 				$grant->access = 1;
 			}
@@ -181,24 +181,24 @@ 
 		// display no permission if the current module doesn't have an access privilege
 		//if(!$grant->access) return $this->stop("msg_not_permitted");
 		// checks permission and action if you don't have an admin privilege
-		if(!$grant->manager)
+		if (!$grant->manager)
 		{
 			// get permission types(guest, member, manager, root) of the currently requested action
 			$permission_target = $xml_info->permission->{$this->act};
 			// check manager if a permission in module.xml otherwise action if no permission
-			if(!$permission_target && substr_count($this->act, 'Admin'))
+			if (!$permission_target && substr_count($this->act, 'Admin'))
 			{
 				$permission_target = 'manager';
 			}
 			// Check permissions
-			switch($permission_target)
+			switch ($permission_target)
 			{
 				case 'root' :
 				case 'manager' :
 					$this->stop('msg_is_not_administrator');
 					return;
 				case 'member' :
-					if(!$is_logged)
+					if (!$is_logged)
 					{
 						$this->stop('msg_not_permitted_act');
 						return;
@@ -213,7 +213,7 @@ 
 
 		$this->module_config = $oModuleModel->getModuleConfig($this->module, $module_info->site_srl);
 
-		if(method_exists($this, 'init'))
+		if (method_exists($this, 'init'))
 		{
 			$this->init();
 		}
@@ -251,7 +251,7 @@ 
 	 * */
 	function setTemplateFile($filename)
 	{
-		if(isset($filename) && substr_compare($filename, '.html', -5) !== 0)
+		if (isset($filename) && substr_compare($filename, '.html', -5) !== 0)
 		{
 			$filename .= '.html';
 		}
@@ -274,14 +274,14 @@ 
 	 * */
 	function setTemplatePath($path)
 	{
-		if(!$path) return;
+		if (!$path) return;
 
-		if((strlen($path) >= 1 && substr_compare($path, '/', 0, 1) !== 0) && (strlen($path) >= 2 && substr_compare($path, './', 0, 2) !== 0))
+		if ((strlen($path) >= 1 && substr_compare($path, '/', 0, 1) !== 0) && (strlen($path) >= 2 && substr_compare($path, './', 0, 2) !== 0))
 		{
 			$path = './' . $path;
 		}
 
-		if(substr_compare($path, '/', -1) !== 0)
+		if (substr_compare($path, '/', -1) !== 0)
 		{
 			$path .= '/';
 		}
@@ -304,9 +304,9 @@ 
 	 * */
 	function setEditedLayoutFile($filename)
 	{
-		if(!$filename) return;
+		if (!$filename) return;
 
-		if(substr_compare($filename, '.html', -5) !== 0)
+		if (substr_compare($filename, '.html', -5) !== 0)
 		{
 			$filename .= '.html';
 		}
@@ -329,9 +329,9 @@ 
 	 * */
 	function setLayoutFile($filename)
 	{
-		if(!$filename) return;
+		if (!$filename) return;
 
-		if(substr_compare($filename, '.html', -5) !== 0)
+		if (substr_compare($filename, '.html', -5) !== 0)
 		{
 			$filename .= '.html';
 		}
@@ -353,13 +353,13 @@ 
 	 * */
 	function setLayoutPath($path)
 	{
-		if(!$path) return;
+		if (!$path) return;
 
-		if((strlen($path) >= 1 && substr_compare($path, '/', 0, 1) !== 0) && (strlen($path) >= 2 && substr_compare($path, './', 0, 2) !== 0))
+		if ((strlen($path) >= 1 && substr_compare($path, '/', 0, 1) !== 0) && (strlen($path) >= 2 && substr_compare($path, './', 0, 2) !== 0))
 		{
 			$path = './' . $path;
 		}
-		if(substr_compare($path, '/', -1) !== 0)
+		if (substr_compare($path, '/', -1) !== 0)
 		{
 			$path .= '/';
 		}
@@ -382,7 +382,7 @@ 
 	function proc()
 	{
 		// pass if stop_proc is true
-		if($this->stop_proc)
+		if ($this->stop_proc)
 		{
 			debugPrint($this->message, 'ERROR');
 			return FALSE;
@@ -390,7 +390,7 @@ 
 
 		// trigger call
 		$triggerOutput = ModuleHandler::triggerCall('moduleObject.proc', 'before', $this);
-		if(!$triggerOutput->toBool())
+		if (!$triggerOutput->toBool())
 		{
 			$this->setError($triggerOutput->getError());
 			$this->setMessage($triggerOutput->getMessage());
@@ -401,12 +401,12 @@ 
 		$called_position = 'before_module_proc';
 		$oAddonController = getController('addon');
 		$addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone() ? "mobile" : "pc");
-		if(FileHandler::exists($addon_file)) include($addon_file);
+		if (FileHandler::exists($addon_file)) include($addon_file);
 
-		if(isset($this->xml_info->action->{$this->act}) && method_exists($this, $this->act))
+		if (isset($this->xml_info->action->{$this->act}) && method_exists($this, $this->act))
 		{
 			// Check permissions
-			if($this->module_srl && !$this->grant->access)
+			if ($this->module_srl && !$this->grant->access)
 			{
 				$this->stop("msg_not_permitted_act");
 				return FALSE;
@@ -415,21 +415,21 @@ 
 			// integrate skin information of the module(change to sync skin info with the target module only by seperating its table)
 			$is_default_skin = ((!Mobile::isFromMobilePhone() && $this->module_info->is_skin_fix == 'N') || (Mobile::isFromMobilePhone() && $this->module_info->is_mskin_fix == 'N'));
 			$usedSkinModule = !($this->module == 'page' && ($this->module_info->page_type == 'OUTSIDE' || $this->module_info->page_type == 'WIDGET'));
-			if($usedSkinModule && $is_default_skin && $this->module != 'admin' && strpos($this->act, 'Admin') === false && $this->module == $this->module_info->module)
+			if ($usedSkinModule && $is_default_skin && $this->module != 'admin' && strpos($this->act, 'Admin') === false && $this->module == $this->module_info->module)
 			{
 				$dir = (Mobile::isFromMobilePhone()) ? 'm.skins' : 'skins';
 				$valueName = (Mobile::isFromMobilePhone()) ? 'mskin' : 'skin';
 				$oModuleModel = getModel('module');
 				$skinType = (Mobile::isFromMobilePhone()) ? 'M' : 'P';
 				$skinName = $oModuleModel->getModuleDefaultSkin($this->module, $skinType);
-				if($this->module == 'page')
+				if ($this->module == 'page')
 				{
 					$this->module_info->{$valueName} = $skinName;
 				}
 				else
 				{
 					$isTemplatPath = (strpos($this->getTemplatePath(), '/tpl/') !== FALSE);
-					if(!$isTemplatPath)
+					if (!$isTemplatPath)
 					{
 						$this->setTemplatePath(sprintf('%s%s/%s/', $this->module_path, $dir, $skinName));
 					}
@@ -449,7 +449,7 @@ 
 
 		// trigger call
 		$triggerOutput = ModuleHandler::triggerCall('moduleObject.proc', 'after', $this);
-		if(!$triggerOutput->toBool())
+		if (!$triggerOutput->toBool())
 		{
 			$this->setError($triggerOutput->getError());
 			$this->setMessage($triggerOutput->getMessage());
@@ -460,25 +460,25 @@ 
 		$called_position = 'after_module_proc';
 		$oAddonController = getController('addon');
 		$addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone() ? "mobile" : "pc");
-		if(FileHandler::exists($addon_file)) include($addon_file);
+		if (FileHandler::exists($addon_file)) include($addon_file);
 
-		if(is_a($output, 'Object') || is_subclass_of($output, 'Object'))
+		if (is_a($output, 'Object') || is_subclass_of($output, 'Object'))
 		{
 			$this->setError($output->getError());
 			$this->setMessage($output->getMessage());
 
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return FALSE;
 			}
 		}
 		// execute api methos of the module if view action is and result is XMLRPC or JSON
-		if($this->module_info->module_type == 'view')
+		if ($this->module_info->module_type == 'view')
 		{
-			if(Context::getResponseMethod() == 'XMLRPC' || Context::getResponseMethod() == 'JSON')
+			if (Context::getResponseMethod() == 'XMLRPC' || Context::getResponseMethod() == 'JSON')
 			{
 				$oAPI = getAPI($this->module_info->module, 'api');
-				if(method_exists($oAPI, $this->act))
+				if (method_exists($oAPI, $this->act))
 				{
 					$oAPI->{$this->act}($this);
 				}

Braces +21 added lines, -12 removed lines

@@ -168,8 +168,7 @@ 
 			{
 				$grant = $oModuleModel->getGrant($request_module, $logged_info);
 			}
-		}
-		else
+		} else
 		{
 			$grant = $oModuleModel->getGrant($module_info, $logged_info, $xml_info);
 			// have at least access grant
@@ -274,7 +273,9 @@ 
 	 * */
 	function setTemplatePath($path)
 	{
-		if(!$path) return;
+		if(!$path) {
+			return;
+		}
 
 		if((strlen($path) >= 1 && substr_compare($path, '/', 0, 1) !== 0) && (strlen($path) >= 2 && substr_compare($path, './', 0, 2) !== 0))
 		{
@@ -304,7 +305,9 @@ 
 	 * */
 	function setEditedLayoutFile($filename)
 	{
-		if(!$filename) return;
+		if(!$filename) {
+			return;
+		}
 
 		if(substr_compare($filename, '.html', -5) !== 0)
 		{
@@ -329,7 +332,9 @@ 
 	 * */
 	function setLayoutFile($filename)
 	{
-		if(!$filename) return;
+		if(!$filename) {
+			return;
+		}
 
 		if(substr_compare($filename, '.html', -5) !== 0)
 		{
@@ -353,7 +358,9 @@ 
 	 * */
 	function setLayoutPath($path)
 	{
-		if(!$path) return;
+		if(!$path) {
+			return;
+		}
 
 		if((strlen($path) >= 1 && substr_compare($path, '/', 0, 1) !== 0) && (strlen($path) >= 2 && substr_compare($path, './', 0, 2) !== 0))
 		{
@@ -401,7 +408,9 @@ 
 		$called_position = 'before_module_proc';
 		$oAddonController = getController('addon');
 		$addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone() ? "mobile" : "pc");
-		if(FileHandler::exists($addon_file)) include($addon_file);
+		if(FileHandler::exists($addon_file)) {
+			include($addon_file);
+		}
 
 		if(isset($this->xml_info->action->{$this->act}) && method_exists($this, $this->act))
 		{
@@ -425,8 +434,7 @@ 
 				if($this->module == 'page')
 				{
 					$this->module_info->{$valueName} = $skinName;
-				}
-				else
+				} else
 				{
 					$isTemplatPath = (strpos($this->getTemplatePath(), '/tpl/') !== FALSE);
 					if(!$isTemplatPath)
@@ -441,8 +449,7 @@ 
 			Context::set('module_info', $this->module_info);
 			// Run
 			$output = $this->{$this->act}();
-		}
-		else
+		} else
 		{
 			return FALSE;
 		}
@@ -460,7 +467,9 @@ 
 		$called_position = 'after_module_proc';
 		$oAddonController = getController('addon');
 		$addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone() ? "mobile" : "pc");
-		if(FileHandler::exists($addon_file)) include($addon_file);
+		if(FileHandler::exists($addon_file)) {
+			include($addon_file);
+		}
 
 		if(is_a($output, 'Object') || is_subclass_of($output, 'Object'))
 		{

classes/object/Object.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -167,7 +167,7 @@ 
 	/**
 	 * Method to retrieve an object containing a key/value pairs
 	 *
-	 * @return Object Returns an object containing key/value pairs
+	 * @return stdClass Returns an object containing key/value pairs
 	 */
 	function gets()
 	{
@@ -193,7 +193,7 @@ 
 	/**
 	 * Method to retrieve an object of key/value pairs
 	 *
-	 * @return Object
+	 * @return stdClass
 	 */
 	function getObjectVars()
 	{

Spacing +6 added lines, -6 removed lines

@@ -96,7 +96,7 @@ 
 	 */
 	function setMessage($message = 'success')
 	{
-		if($str = Context::getLang($message))
+		if ($str = Context::getLang($message))
 		{
 			$this->message = $str;
 		}
@@ -139,14 +139,14 @@ 
 	 */
 	function adds($object)
 	{
-		if(is_object($object))
+		if (is_object($object))
 		{
 			$object = get_object_vars($object);
 		}
 
-		if(is_array($object))
+		if (is_array($object))
 		{
-			foreach($object as $key => $val)
+			foreach ($object as $key => $val)
 			{
 				$this->variables[$key] = $val;
 			}
@@ -173,7 +173,7 @@ 
 	{
 		$args = func_get_args();
 		$output = new stdClass();
-		foreach($args as $arg)
+		foreach ($args as $arg)
 		{
 			$output->{$arg} = $this->get($arg);
 		}
@@ -198,7 +198,7 @@ 
 	function getObjectVars()
 	{
 		$output = new stdClass();
-		foreach($this->variables as $key => $val)
+		foreach ($this->variables as $key => $val)
 		{
 			$output->{$key} = $val;
 		}

Braces +1 added lines, -2 removed lines

@@ -99,8 +99,7 @@
 		if($str = Context::getLang($message))
 		{
 			$this->message = $str;
-		}
-		else
+		} else
 		{
 			$this->message = $message;
 		}

classes/security/EmbedFilter.class.php

Doc Comments +5 added lines, -4 removed lines

@@ -295,6 +295,7 @@ 
 
 	/**
 	 * Check the content.
+	 * @param string $content
 	 * @return void
 	 */
 	function check(&$content)
@@ -487,7 +488,7 @@ 
 
 	/**
 	 * Check white domain in object data attribute or embed src attribute.
-	 * @return string
+	 * @return boolean
 	 */
 	function isWhiteDomain($urlAttribute)
 	{
@@ -506,7 +507,7 @@ 
 
 	/**
 	 * Check white domain in iframe src attribute.
-	 * @return string
+	 * @return boolean
 	 */
 	function isWhiteIframeDomain($urlAttribute)
 	{
@@ -525,7 +526,7 @@ 
 
 	/**
 	 * Check white mime type in object type attribute or embed type attribute.
-	 * @return string
+	 * @return boolean
 	 */
 	function isWhiteMimetype($mimeType)
 	{
@@ -590,7 +591,7 @@ 
 
 	/**
 	 * Make white domain list cache file from xml config file.
-	 * @param $whitelist array
+	 * @param stdClass $whitelist array
 	 * @return void
 	 */
 	function _makeWhiteDomainList($whitelist = NULL)

Spacing +61 added lines, -61 removed lines

@@ -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,7 +580,7 @@ 
 
 	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>';
 		}
@@ -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);
 			}

Braces +11 added lines, -12 removed lines

@@ -563,14 +563,12 @@ 
 				}
 				$this->allowscriptaccessList[count($this->allowscriptaccessList) - 1]--;
 			}
-		}
-		else if($m[1] == 'embed')
+		} else if($m[1] == 'embed')
 		{
 			if(stripos($m[0], 'allowscriptaccess'))
 			{
 				$m[0] = preg_replace('/always|samedomain/i', 'never', $m[0]);
-			}
-			else
+			} else
 			{
 				$m[0] = preg_replace('/\<embed/i', '<embed allowscriptaccess="never"', $m[0]);
 			}
@@ -627,8 +625,7 @@ 
 			{
 				$whiteUrlList = $whitelist->object;
 				$whiteIframeUrlList = $whitelist->iframe;
-			}
-			else
+			} else
 			{
 				$xmlBuff = FileHandler::readFile($this->whiteUrlXmlFile);
 
@@ -636,8 +633,12 @@ 
 				$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)
 				{
@@ -648,8 +649,7 @@ 
 						{
 							$whiteUrlList[] = $value->body;
 						}
-					}
-					else
+					} else
 					{
 						$whiteUrlList[] = $patternList->body;
 					}
@@ -664,8 +664,7 @@ 
 						{
 							$whiteIframeUrlList[] = $value->body;
 						}
-					}
-					else
+					} else
 					{
 						$whiteIframeUrlList[] = $patternList->body;
 					}

classes/security/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Length.php

Doc Comments +1 added lines

@@ -11,6 +11,7 @@
     /**
      * @param HTMLPurifier_Length $max Minimum length, or null for no bound. String is also acceptable.
      * @param HTMLPurifier_Length $max Maximum length, or null for no bound. String is also acceptable.
+     * @param string $min
      */
     public function __construct($min = null, $max = null) {
         $this->min = $min !== null ? HTMLPurifier_Length::make($min) : null;

Indentation +35 added lines, -35 removed lines

@@ -6,41 +6,41 @@
 class HTMLPurifier_AttrDef_CSS_Length extends HTMLPurifier_AttrDef
 {
 
-    protected $min, $max;
-
-    /**
-     * @param HTMLPurifier_Length $max Minimum length, or null for no bound. String is also acceptable.
-     * @param HTMLPurifier_Length $max Maximum length, or null for no bound. String is also acceptable.
-     */
-    public function __construct($min = null, $max = null) {
-        $this->min = $min !== null ? HTMLPurifier_Length::make($min) : null;
-        $this->max = $max !== null ? HTMLPurifier_Length::make($max) : null;
-    }
-
-    public function validate($string, $config, $context) {
-        $string = $this->parseCDATA($string);
-
-        // Optimizations
-        if ($string === '') return false;
-        if ($string === '0') return '0';
-        if (strlen($string) === 1) return false;
-
-        $length = HTMLPurifier_Length::make($string);
-        if (!$length->isValid()) return false;
-
-        if ($this->min) {
-            $c = $length->compareTo($this->min);
-            if ($c === false) return false;
-            if ($c < 0) return false;
-        }
-        if ($this->max) {
-            $c = $length->compareTo($this->max);
-            if ($c === false) return false;
-            if ($c > 0) return false;
-        }
-
-        return $length->toString();
-    }
+	protected $min, $max;
+
+	/**
+	 * @param HTMLPurifier_Length $max Minimum length, or null for no bound. String is also acceptable.
+	 * @param HTMLPurifier_Length $max Maximum length, or null for no bound. String is also acceptable.
+	 */
+	public function __construct($min = null, $max = null) {
+		$this->min = $min !== null ? HTMLPurifier_Length::make($min) : null;
+		$this->max = $max !== null ? HTMLPurifier_Length::make($max) : null;
+	}
+
+	public function validate($string, $config, $context) {
+		$string = $this->parseCDATA($string);
+
+		// Optimizations
+		if ($string === '') return false;
+		if ($string === '0') return '0';
+		if (strlen($string) === 1) return false;
+
+		$length = HTMLPurifier_Length::make($string);
+		if (!$length->isValid()) return false;
+
+		if ($this->min) {
+			$c = $length->compareTo($this->min);
+			if ($c === false) return false;
+			if ($c < 0) return false;
+		}
+		if ($this->max) {
+			$c = $length->compareTo($this->max);
+			if ($c === false) return false;
+			if ($c > 0) return false;
+		}
+
+		return $length->toString();
+	}
 
 }
 

Braces +24 added lines, -8 removed lines

@@ -21,22 +21,38 @@
         $string = $this->parseCDATA($string);
 
         // Optimizations
-        if ($string === '') return false;
-        if ($string === '0') return '0';
-        if (strlen($string) === 1) return false;
+        if ($string === '') {
+        	return false;
+        }
+        if ($string === '0') {
+        	return '0';
+        }
+        if (strlen($string) === 1) {
+        	return false;
+        }
 
         $length = HTMLPurifier_Length::make($string);
-        if (!$length->isValid()) return false;
+        if (!$length->isValid()) {
+        	return false;
+        }
 
         if ($this->min) {
             $c = $length->compareTo($this->min);
-            if ($c === false) return false;
-            if ($c < 0) return false;
+            if ($c === false) {
+            	return false;
+            }
+            if ($c < 0) {
+            	return false;
+            }
         }
         if ($this->max) {
             $c = $length->compareTo($this->max);
-            if ($c === false) return false;
-            if ($c > 0) return false;
+            if ($c === false) {
+            	return false;
+            }
+            if ($c > 0) {
+            	return false;
+            }
         }
 
         return $length->toString();

classes/security/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv6.php

Doc Comments +3 added lines

@@ -9,6 +9,9 @@
 class HTMLPurifier_AttrDef_URI_IPv6 extends HTMLPurifier_AttrDef_URI_IPv4
 {
 
+    /**
+     * @param string $aIP
+     */
     public function validate($aIP, $config, $context) {
 
         if (!$this->ip4) $this->_loadRegex();

Indentation +84 added lines, -84 removed lines

@@ -9,90 +9,90 @@
 class HTMLPurifier_AttrDef_URI_IPv6 extends HTMLPurifier_AttrDef_URI_IPv4
 {
 
-    public function validate($aIP, $config, $context) {
-
-        if (!$this->ip4) $this->_loadRegex();
-
-        $original = $aIP;
-
-        $hex = '[0-9a-fA-F]';
-        $blk = '(?:' . $hex . '{1,4})';
-        $pre = '(?:/(?:12[0-8]|1[0-1][0-9]|[1-9][0-9]|[0-9]))';   // /0 - /128
-
-        //      prefix check
-        if (strpos($aIP, '/') !== false)
-        {
-                if (preg_match('#' . $pre . '$#s', $aIP, $find))
-                {
-                        $aIP = substr($aIP, 0, 0-strlen($find[0]));
-                        unset($find);
-                }
-                else
-                {
-                        return false;
-                }
-        }
-
-        //      IPv4-compatiblity check
-        if (preg_match('#(?<=:'.')' . $this->ip4 . '$#s', $aIP, $find))
-        {
-                $aIP = substr($aIP, 0, 0-strlen($find[0]));
-                $ip = explode('.', $find[0]);
-                $ip = array_map('dechex', $ip);
-                $aIP .= $ip[0] . $ip[1] . ':' . $ip[2] . $ip[3];
-                unset($find, $ip);
-        }
-
-        //      compression check
-        $aIP = explode('::', $aIP);
-        $c = count($aIP);
-        if ($c > 2)
-        {
-                return false;
-        }
-        elseif ($c == 2)
-        {
-                list($first, $second) = $aIP;
-                $first = explode(':', $first);
-                $second = explode(':', $second);
-
-                if (count($first) + count($second) > 8)
-                {
-                        return false;
-                }
-
-                while(count($first) < 8)
-                {
-                        array_push($first, '0');
-                }
-
-                array_splice($first, 8 - count($second), 8, $second);
-                $aIP = $first;
-                unset($first,$second);
-        }
-        else
-        {
-                $aIP = explode(':', $aIP[0]);
-        }
-        $c = count($aIP);
-
-        if ($c != 8)
-        {
-                return false;
-        }
-
-        //      All the pieces should be 16-bit hex strings. Are they?
-        foreach ($aIP as $piece)
-        {
-                if (!preg_match('#^[0-9a-fA-F]{4}$#s', sprintf('%04s', $piece)))
-                {
-                        return false;
-                }
-        }
-
-        return $original;
-
-    }
+	public function validate($aIP, $config, $context) {
+
+		if (!$this->ip4) $this->_loadRegex();
+
+		$original = $aIP;
+
+		$hex = '[0-9a-fA-F]';
+		$blk = '(?:' . $hex . '{1,4})';
+		$pre = '(?:/(?:12[0-8]|1[0-1][0-9]|[1-9][0-9]|[0-9]))';   // /0 - /128
+
+		//      prefix check
+		if (strpos($aIP, '/') !== false)
+		{
+				if (preg_match('#' . $pre . '$#s', $aIP, $find))
+				{
+						$aIP = substr($aIP, 0, 0-strlen($find[0]));
+						unset($find);
+				}
+				else
+				{
+						return false;
+				}
+		}
+
+		//      IPv4-compatiblity check
+		if (preg_match('#(?<=:'.')' . $this->ip4 . '$#s', $aIP, $find))
+		{
+				$aIP = substr($aIP, 0, 0-strlen($find[0]));
+				$ip = explode('.', $find[0]);
+				$ip = array_map('dechex', $ip);
+				$aIP .= $ip[0] . $ip[1] . ':' . $ip[2] . $ip[3];
+				unset($find, $ip);
+		}
+
+		//      compression check
+		$aIP = explode('::', $aIP);
+		$c = count($aIP);
+		if ($c > 2)
+		{
+				return false;
+		}
+		elseif ($c == 2)
+		{
+				list($first, $second) = $aIP;
+				$first = explode(':', $first);
+				$second = explode(':', $second);
+
+				if (count($first) + count($second) > 8)
+				{
+						return false;
+				}
+
+				while(count($first) < 8)
+				{
+						array_push($first, '0');
+				}
+
+				array_splice($first, 8 - count($second), 8, $second);
+				$aIP = $first;
+				unset($first,$second);
+		}
+		else
+		{
+				$aIP = explode(':', $aIP[0]);
+		}
+		$c = count($aIP);
+
+		if ($c != 8)
+		{
+				return false;
+		}
+
+		//      All the pieces should be 16-bit hex strings. Are they?
+		foreach ($aIP as $piece)
+		{
+				if (!preg_match('#^[0-9a-fA-F]{4}$#s', sprintf('%04s', $piece)))
+				{
+						return false;
+				}
+		}
+
+		return $original;
+
+	}
 
 }
 

Spacing +6 added lines, -6 removed lines

@@ -17,14 +17,14 @@ 
 
         $hex = '[0-9a-fA-F]';
         $blk = '(?:' . $hex . '{1,4})';
-        $pre = '(?:/(?:12[0-8]|1[0-1][0-9]|[1-9][0-9]|[0-9]))';   // /0 - /128
+        $pre = '(?:/(?:12[0-8]|1[0-1][0-9]|[1-9][0-9]|[0-9]))'; // /0 - /128
 
         //      prefix check
         if (strpos($aIP, '/') !== false)
         {
                 if (preg_match('#' . $pre . '$#s', $aIP, $find))
                 {
-                        $aIP = substr($aIP, 0, 0-strlen($find[0]));
+                        $aIP = substr($aIP, 0, 0 - strlen($find[0]));
                         unset($find);
                 }
                 else
@@ -34,9 +34,9 @@ 
         }
 
         //      IPv4-compatiblity check
-        if (preg_match('#(?<=:'.')' . $this->ip4 . '$#s', $aIP, $find))
+        if (preg_match('#(?<=:' . ')' . $this->ip4 . '$#s', $aIP, $find))
         {
-                $aIP = substr($aIP, 0, 0-strlen($find[0]));
+                $aIP = substr($aIP, 0, 0 - strlen($find[0]));
                 $ip = explode('.', $find[0]);
                 $ip = array_map('dechex', $ip);
                 $aIP .= $ip[0] . $ip[1] . ':' . $ip[2] . $ip[3];
@@ -61,14 +61,14 @@ 
                         return false;
                 }
 
-                while(count($first) < 8)
+                while (count($first) < 8)
                 {
                         array_push($first, '0');
                 }
 
                 array_splice($first, 8 - count($second), 8, $second);
                 $aIP = $first;
-                unset($first,$second);
+                unset($first, $second);
         }
         else
         {

Braces +6 added lines, -7 removed lines

@@ -11,7 +11,9 @@ 
 
     public function validate($aIP, $config, $context) {
 
-        if (!$this->ip4) $this->_loadRegex();
+        if (!$this->ip4) {
+        	$this->_loadRegex();
+        }
 
         $original = $aIP;
 
@@ -26,8 +28,7 @@ 
                 {
                         $aIP = substr($aIP, 0, 0-strlen($find[0]));
                         unset($find);
-                }
-                else
+                } else
                 {
                         return false;
                 }
@@ -49,8 +50,7 @@ 
         if ($c > 2)
         {
                 return false;
-        }
-        elseif ($c == 2)
+        } elseif ($c == 2)
         {
                 list($first, $second) = $aIP;
                 $first = explode(':', $first);
@@ -69,8 +69,7 @@ 
                 array_splice($first, 8 - count($second), 8, $second);
                 $aIP = $first;
                 unset($first,$second);
-        }
-        else
+        } else
         {
                 $aIP = explode(':', $aIP[0]);
         }