xpressengine / xe-core

classes/file/FileHandler.class.php

Doc Comments +9 added lines, -9 removed lines

@@ -34,7 +34,7 @@ 
 	 * @param string $target_dir Path of target dir
 	 * @param string $filter Regex to filter files. If file matches this regex, the file is not copied.
 	 * @param string $type If set as 'force'. Even if the file exists in target, the file is copied.
-	 * @return void
+	 * @return false|null
 	 */
 	function copyDir($source_dir, $target_dir, $filter = null, $type = null)
 	{
@@ -275,7 +275,7 @@ 
 	 * This function creates directories recursively, which means that if ancestors of the target directory does not exist, they will be created too.
 	 *
 	 * @param string $path_string Path of target directory
-	 * @return bool TRUE if success. It might return nothing when ftp is used and connection to the ftp address failed.
+	 * @return boolean|null TRUE if success. It might return nothing when ftp is used and connection to the ftp address failed.
 	 */
 	function makeDir($path_string)
 	{
@@ -615,7 +615,7 @@ 
 	 * @param string $url The address of the target file
 	 * @param string $target_filename The location to store
 	 * @param string $body HTTP request body
-	 * @param string $timeout Connection timeout
+	 * @param integer $timeout Connection timeout
 	 * @param string $method GET/POST
 	 * @param string $content_type Content type header of HTTP request
 	 * @param string[] $headers Headers key value array.
@@ -636,8 +636,8 @@ 
 	 * Convert size in string into numeric value
 	 *
 	 * @see self::filesize()
-	 * @param $val Size in string (ex., 10, 10K, 10M, 10G )
-	 * @return int converted size
+	 * @param string $val Size in string (ex., 10, 10K, 10M, 10G )
+	 * @return double converted size
 	 */
 	function returnBytes($val)
 	{
@@ -687,7 +687,7 @@ 
 	 * @param int $resize_height Height to resize
 	 * @param string $target_type If $target_type is set (gif, jpg, png, bmp), result image will be saved as target type
 	 * @param string $thumbnail_type Thumbnail type(crop, ratio)
-	 * @return bool TRUE: success, FALSE: failed
+	 * @return null|boolean TRUE: success, FALSE: failed
 	 */
 	function createImageFile($source_file, $target_file, $resize_width = 0, $resize_height = 0, $target_type = '', $thumbnail_type = 'crop')
 	{
@@ -1000,7 +1000,7 @@ 
 	 * Check file exists.
 	 *
 	 * @param string $filename Target file name
-	 * @return bool Returns FALSE if the file does not exists, or Returns full path file(string).
+	 * @return string|false Returns FALSE if the file does not exists, or Returns full path file(string).
 	 */
 	function exists($filename)
 	{
@@ -1011,8 +1011,8 @@ 
 	/**
 	 * Check it is dir
 	 *
-	 * @param string $dir Target dir path
-	 * @return bool Returns FALSE if the dir is not dir, or Returns full path of dir(string).
+	 * @param string $path
+	 * @return string|false Returns FALSE if the dir is not dir, or Returns full path of dir(string).
 	 */
 	function isDir($path)
 	{

Spacing +138 added lines, -138 removed lines

@@ -17,9 +17,9 @@ 
 	 */
 	function getRealPath($source)
 	{
-		if(strlen($source) >= 2 && substr_compare($source, './', 0, 2) === 0)
+		if (strlen($source) >= 2 && substr_compare($source, './', 0, 2) === 0)
 		{
-			return _XE_PATH_ . substr($source, 2);
+			return _XE_PATH_.substr($source, 2);
 		}
 
 		return $source;
@@ -40,7 +40,7 @@ 
 	{
 		$source_dir = self::getRealPath($source_dir);
 		$target_dir = self::getRealPath($target_dir);
-		if(!is_dir($source_dir))
+		if (!is_dir($source_dir))
 		{
 			return FALSE;
 		}
@@ -48,44 +48,44 @@ 
 		// generate when no target exists
 		self::makeDir($target_dir);
 
-		if(substr($source_dir, -1) != DIRECTORY_SEPARATOR)
+		if (substr($source_dir, -1) != DIRECTORY_SEPARATOR)
 		{
 			$source_dir .= DIRECTORY_SEPARATOR;
 		}
 
-		if(substr($target_dir, -1) != DIRECTORY_SEPARATOR)
+		if (substr($target_dir, -1) != DIRECTORY_SEPARATOR)
 		{
 			$target_dir .= DIRECTORY_SEPARATOR;
 		}
 
 		$oDir = dir($source_dir);
-		while($file = $oDir->read())
+		while ($file = $oDir->read())
 		{
-			if($file{0} == '.')
+			if ($file{0} == '.')
 			{
 				continue;
 			}
 
-			if($filter && preg_match($filter, $file))
+			if ($filter && preg_match($filter, $file))
 			{
 				continue;
 			}
 
-			if(is_dir($source_dir . $file))
+			if (is_dir($source_dir.$file))
 			{
-				self::copyDir($source_dir . $file, $target_dir . $file, $type);
+				self::copyDir($source_dir.$file, $target_dir.$file, $type);
 			}
 			else
 			{
-				if($type == 'force')
+				if ($type == 'force')
 				{
-					@unlink($target_dir . $file);
+					@unlink($target_dir.$file);
 				}
 				else
 				{
-					if(!file_exists($target_dir . $file))
+					if (!file_exists($target_dir.$file))
 					{
-						@copy($source_dir . $file, $target_dir . $file);
+						@copy($source_dir.$file, $target_dir.$file);
 					}
 				}
 			}
@@ -110,12 +110,12 @@ 
 
 		self::makeDir($target_dir);
 
-		if($force == 'Y')
+		if ($force == 'Y')
 		{
-			@unlink($target_dir . DIRECTORY_SEPARATOR . $target);
+			@unlink($target_dir.DIRECTORY_SEPARATOR.$target);
 		}
 
-		@copy($source, $target_dir . DIRECTORY_SEPARATOR . $target);
+		@copy($source, $target_dir.DIRECTORY_SEPARATOR.$target);
 	}
 
 	/**
@@ -126,7 +126,7 @@ 
 	 */
 	function readFile($filename)
 	{
-		if(($filename = self::exists($filename)) === FALSE || filesize($filename) < 1)
+		if (($filename = self::exists($filename)) === FALSE || filesize($filename) < 1)
 		{
 			return;
 		}
@@ -149,12 +149,12 @@ 
 		self::makeDir($pathinfo['dirname']);
 
 		$flags = 0;
-		if(strtolower($mode) == 'a')
+		if (strtolower($mode) == 'a')
 		{
 			$flags = FILE_APPEND;
 		}
 
-		@file_put_contents($filename, $buff, $flags|LOCK_EX);
+		@file_put_contents($filename, $buff, $flags | LOCK_EX);
 		@chmod($filename, 0644);
 		self::clearStatCache($filename);
 		self::invalidateOpcache($filename);
@@ -194,7 +194,7 @@ 
 	 */
 	function moveFile($source, $target)
 	{
-		if(($source = self::exists($source)) !== FALSE)
+		if (($source = self::exists($source)) !== FALSE)
 		{
 			self::removeFile($target);
 			return self::rename($source, $target);
@@ -232,35 +232,35 @@ 
 		$path = self::getRealPath($path);
 		$output = array();
 
-		if(substr($path, -1) != '/')
+		if (substr($path, -1) != '/')
 		{
 			$path .= '/';
 		}
 
-		if(!is_dir($path))
+		if (!is_dir($path))
 		{
 			return $output;
 		}
 
 		$files = scandir($path);
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
-			if($file{0} == '.' || ($filter && !preg_match($filter, $file)))
+			if ($file{0} == '.' || ($filter && !preg_match($filter, $file)))
 			{
 				continue;
 			}
 
-			if($to_lower)
+			if ($to_lower)
 			{
 				$file = strtolower($file);
 			}
 
-			if($filter)
+			if ($filter)
 			{
 				$file = preg_replace($filter, '$1', $file);
 			}
 
-			if($concat_prefix)
+			if ($concat_prefix)
 			{
 				$file = sprintf('%s%s', str_replace(_XE_PATH_, '', $path), $file);
 			}
@@ -281,12 +281,12 @@ 
 	 */
 	function makeDir($path_string)
 	{
-		if(self::exists($path_string) !== FALSE)
+		if (self::exists($path_string) !== FALSE)
 		{
 			return TRUE;
 		}
 
-		if(!ini_get('safe_mode'))
+		if (!ini_get('safe_mode'))
 		{
 			@mkdir($path_string, 0755, TRUE);
 			@chmod($path_string, 0755);
@@ -297,35 +297,35 @@ 
 			static $oFtp = NULL;
 
 			$ftp_info = Context::getFTPInfo();
-			if($oFtp == NULL)
+			if ($oFtp == NULL)
 			{
-				if(!Context::isFTPRegisted())
+				if (!Context::isFTPRegisted())
 				{
 					return;
 				}
 
-				require_once(_XE_PATH_ . 'libs/ftp.class.php');
+				require_once(_XE_PATH_.'libs/ftp.class.php');
 				$oFtp = new ftp();
-				if(!$ftp_info->ftp_host)
+				if (!$ftp_info->ftp_host)
 				{
 					$ftp_info->ftp_host = "127.0.0.1";
 				}
-				if(!$ftp_info->ftp_port)
+				if (!$ftp_info->ftp_port)
 				{
 					$ftp_info->ftp_port = 21;
 				}
-				if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port))
+				if (!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port))
 				{
 					return;
 				}
-				if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
+				if (!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 				{
 					$oFtp->ftp_quit();
 					return;
 				}
 			}
 
-			if(!($ftp_path = $ftp_info->ftp_root_path))
+			if (!($ftp_path = $ftp_info->ftp_root_path))
 			{
 				$ftp_path = DIRECTORY_SEPARATOR;
 			}
@@ -334,19 +334,19 @@ 
 			$path_list = explode(DIRECTORY_SEPARATOR, $path_string);
 
 			$path = _XE_PATH_;
-			for($i = 0, $c = count($path_list); $i < $c; $i++)
+			for ($i = 0, $c = count($path_list); $i < $c; $i++)
 			{
-				if(!$path_list[$i])
+				if (!$path_list[$i])
 				{
 					continue;
 				}
 
-				$path .= $path_list[$i] . DIRECTORY_SEPARATOR;
-				$ftp_path .= $path_list[$i] . DIRECTORY_SEPARATOR;
-				if(!is_dir($path))
+				$path .= $path_list[$i].DIRECTORY_SEPARATOR;
+				$ftp_path .= $path_list[$i].DIRECTORY_SEPARATOR;
+				if (!is_dir($path))
 				{
 					$oFtp->ftp_mkdir($ftp_path);
-					$oFtp->ftp_site("CHMOD 777 " . $ftp_path);
+					$oFtp->ftp_site("CHMOD 777 ".$ftp_path);
 				}
 			}
 		}
@@ -362,23 +362,23 @@ 
 	 */
 	function removeDir($path)
 	{
-		if(($path = self::isDir($path)) === FALSE)
+		if (($path = self::isDir($path)) === FALSE)
 		{
 			return;
 		}
 
-		if(self::isDir($path))
+		if (self::isDir($path))
 		{
 			$files = array_diff(scandir($path), array('..', '.'));
 
-			foreach($files as $file)
+			foreach ($files as $file)
 			{
-				if(($target = self::getRealPath($path . DIRECTORY_SEPARATOR . $file)) === FALSE)
+				if (($target = self::getRealPath($path.DIRECTORY_SEPARATOR.$file)) === FALSE)
 				{
 					continue;
 				}
 
-				if(is_dir($target))
+				if (is_dir($target))
 				{
 					self::removeDir($target);
 				}
@@ -403,22 +403,22 @@ 
 	 */
 	function removeBlankDir($path)
 	{
-		if(($path = self::isDir($path)) === FALSE)
+		if (($path = self::isDir($path)) === FALSE)
 		{
 			return;
 		}
 
 		$files = array_diff(scandir($path), array('..', '.'));
 
-		if(count($files) < 1)
+		if (count($files) < 1)
 		{
 			rmdir($path);
 			return;
 		}
 
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
-			if(($target = self::isDir($path . DIRECTORY_SEPARATOR . $file)) === FALSE)
+			if (($target = self::isDir($path.DIRECTORY_SEPARATOR.$file)) === FALSE)
 			{
 				continue;
 			}
@@ -437,23 +437,23 @@ 
 	 */
 	function removeFilesInDir($path)
 	{
-		if(($path = self::getRealPath($path)) === FALSE)
+		if (($path = self::getRealPath($path)) === FALSE)
 		{
 			return;
 		}
 
-		if(is_dir($path))
+		if (is_dir($path))
 		{
 			$files = array_diff(scandir($path), array('..', '.'));
 
-			foreach($files as $file)
+			foreach ($files as $file)
 			{
-				if(($target = self::getRealPath($path . DIRECTORY_SEPARATOR . $file)) === FALSE)
+				if (($target = self::getRealPath($path.DIRECTORY_SEPARATOR.$file)) === FALSE)
 				{
 					continue;
 				}
 
-				if(is_dir($target))
+				if (is_dir($target))
 				{
 					self::removeFilesInDir($target);
 				}
@@ -465,7 +465,7 @@ 
 		}
 		else
 		{
-			if(self::exists($path)) unlink($path);
+			if (self::exists($path)) unlink($path);
 		}
 
 	}
@@ -479,22 +479,22 @@ 
 	 */
 	function filesize($size)
 	{
-		if(!$size)
+		if (!$size)
 		{
 			return '0Byte';
 		}
 
-		if($size === 1)
+		if ($size === 1)
 		{
 			return '1Byte';
 		}
 
-		if($size < 1024)
+		if ($size < 1024)
 		{
-			return $size . 'Bytes';
+			return $size.'Bytes';
 		}
 
-		if($size >= 1024 && $size < 1024 * 1024)
+		if ($size >= 1024 && $size < 1024 * 1024)
 		{
 			return sprintf("%0.1fKB", $size / 1024);
 		}
@@ -519,7 +519,7 @@ 
 	 */
 	function getRemoteResource($url, $body = null, $timeout = 3, $method = 'GET', $content_type = null, $headers = array(), $cookies = array(), $post_data = array(), $request_config = array())
 	{
-		require_once(_XE_PATH_ . 'libs/idna_convert/idna_convert.class.php');
+		require_once(_XE_PATH_.'libs/idna_convert/idna_convert.class.php');
 		$IDN = new idna_convert(array('idn_version' => 2008));
 		$url = $IDN->encode($url);
 
@@ -529,7 +529,7 @@ 
 			require_once('HTTP/Request.php');
 
 			$parsed_url = parse_url(__PROXY_SERVER__);
-			if($parsed_url["host"] && $parsed_url["path"])
+			if ($parsed_url["host"] && $parsed_url["path"])
 			{
 				// Old style proxy server support (POST payload to proxy script)
 				$oRequest = new HTTP_Request(__PROXY_SERVER__);
@@ -541,7 +541,7 @@ 
 				$oRequest = new HTTP_Request($url);
 
 				// New style proxy server support (Use HTTP_Request2 native config format)
-				if($parsed_url['host'])
+				if ($parsed_url['host'])
 				{
 					$request_config['proxy_host'] = $parsed_url['host'];
 					$request_config['proxy_port'] = $parsed_url['port'] ? $parsed_url['port'] : '';
@@ -550,13 +550,13 @@ 
 					$request_config['proxy_type'] = $parsed_url['scheme'] ? $parsed_url['scheme'] : 'http';
 				}
 
-				if(count($request_config) && method_exists($oRequest, 'setConfig'))
+				if (count($request_config) && method_exists($oRequest, 'setConfig'))
 				{
-					foreach($request_config as $key=>$val)
+					foreach ($request_config as $key=>$val)
 					{
-						if($key === 'observers')
+						if ($key === 'observers')
 						{
-							foreach($val as $observer)
+							foreach ($val as $observer)
 							{
 								$oRequest->attach($observer);
 							}
@@ -567,58 +567,58 @@ 
 						}
 					}
 				}
-				if(method_exists($oRequest, 'setConfig'))
+				if (method_exists($oRequest, 'setConfig'))
 				{
-					if(extension_loaded('curl'))
+					if (extension_loaded('curl'))
 					{
 						$oRequest->setConfig('adapter', 'curl');
 					}
-					elseif(version_compare(PHP_VERSION, '5.6', '<'))
+					elseif (version_compare(PHP_VERSION, '5.6', '<'))
 					{
 						$oRequest->setConfig('ssl_verify_host', false);
 					}
-					if(file_exists(_XE_PATH_ . 'libs/cacert/cacert.pem'))
+					if (file_exists(_XE_PATH_.'libs/cacert/cacert.pem'))
 					{
-						$oRequest->setConfig('ssl_cafile', _XE_PATH_ . 'libs/cacert/cacert.pem');
+						$oRequest->setConfig('ssl_cafile', _XE_PATH_.'libs/cacert/cacert.pem');
 					}
 				}
 
-				if(count($headers) > 0)
+				if (count($headers) > 0)
 				{
-					foreach($headers as $key => $val)
+					foreach ($headers as $key => $val)
 					{
 						$oRequest->addHeader($key, $val);
 					}
 				}
 				$host = parse_url($url, PHP_URL_HOST);
-				if($cookies[$host])
+				if ($cookies[$host])
 				{
-					foreach($cookies[$host] as $key => $val)
+					foreach ($cookies[$host] as $key => $val)
 					{
 						$oRequest->addCookie($key, $val);
 					}
 				}
-				if(count($post_data) > 0)
+				if (count($post_data) > 0)
 				{
-					foreach($post_data as $key => $val)
+					foreach ($post_data as $key => $val)
 					{
 						$oRequest->addPostData($key, $val);
 					}
 				}
-				if(!$content_type)
+				if (!$content_type)
 					$oRequest->addHeader('Content-Type', 'text/html');
 				else
 					$oRequest->addHeader('Content-Type', $content_type);
 				$oRequest->setMethod($method);
-				if($body)
+				if ($body)
 					$oRequest->setBody($body);
 			}
 			
-			if(method_exists($oRequest, 'setConfig'))
+			if (method_exists($oRequest, 'setConfig'))
 			{
 				$oRequest->setConfig('timeout', $timeout);
 			}
-			elseif(property_exists($oRequest, '_timeout'))
+			elseif (property_exists($oRequest, '_timeout'))
 			{
 				$oRequest->_timeout = $timeout;
 			}
@@ -628,25 +628,25 @@ 
 			$code = $oRequest->getResponseCode();
 			$header = $oRequest->getResponseHeader();
 			$response = $oRequest->getResponseBody();
-			if($c = $oRequest->getResponseCookies())
+			if ($c = $oRequest->getResponseCookies())
 			{
-				foreach($c as $k => $v)
+				foreach ($c as $k => $v)
 				{
 					$cookies[$host][$v['name']] = $v['value'];
 				}
 			}
 
-			if($code > 300 && $code < 399 && $header['location'])
+			if ($code > 300 && $code < 399 && $header['location'])
 			{
 				return self::getRemoteResource($header['location'], $body, $timeout, $method, $content_type, $headers, $cookies, $post_data);
 			}
 
-			if($code != 200)
+			if ($code != 200)
 			{
 				return;
 			}
 
-			if(isset($request_config['store_body']) && !$request_config['store_body'])
+			if (isset($request_config['store_body']) && !$request_config['store_body'])
 			{
 				return TRUE;
 			}
@@ -655,7 +655,7 @@ 
 				return $response;
 			}
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			return NULL;
 		}
@@ -689,7 +689,7 @@ 
 			self::clearStatCache($target_filename);
 			self::invalidateOpcache($target_filename);
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			return FALSE;
 		}
@@ -706,7 +706,7 @@ 
 	function returnBytes($val)
 	{
 		$unit = strtoupper(substr($val, -1));
-		$val = (float)$val;
+		$val = (float) $val;
 
 		switch ($unit)
 		{
@@ -729,13 +729,13 @@ 
 		$K64 = 65536;
 		$TWEAKFACTOR = 2.0;
 		$channels = $imageInfo['channels'];
-		if(!$channels)
+		if (!$channels)
 		{
 			$channels = 6; //for png
 		}
-		$memoryNeeded = round(($imageInfo[0] * $imageInfo[1] * $imageInfo['bits'] * $channels / 8 + $K64 ) * $TWEAKFACTOR);
+		$memoryNeeded = round(($imageInfo[0] * $imageInfo[1] * $imageInfo['bits'] * $channels / 8 + $K64) * $TWEAKFACTOR);
 		$availableMemory = self::returnBytes(ini_get('memory_limit')) - memory_get_usage();
-		if($availableMemory < $memoryNeeded)
+		if ($availableMemory < $memoryNeeded)
 		{
 			return FALSE;
 		}
@@ -762,30 +762,30 @@ 
 		}
 
 		$target_file = self::getRealPath($target_file);
-		if(!$resize_width)
+		if (!$resize_width)
 		{
 			$resize_width = 100;
 		}
 
-		if(!$resize_height)
+		if (!$resize_height)
 		{
 			$resize_height = $resize_width;
 		}
 
 		// retrieve source image's information
 		$imageInfo = getimagesize($source_file);
-		if(!self::checkMemoryLoadImage($imageInfo))
+		if (!self::checkMemoryLoadImage($imageInfo))
 		{
 			return FALSE;
 		}
 
 		list($width, $height, $type, $attrs) = $imageInfo;
-		if($width < 1 || $height < 1)
+		if ($width < 1 || $height < 1)
 		{
 			return;
 		}
 
-		switch($type)
+		switch ($type)
 		{
 			case '1' :
 				$type = 'gif';
@@ -803,7 +803,7 @@ 
 				return;
 		}
 
-		if(!$target_type)
+		if (!$target_type)
 		{
 			$target_type = $type;
 		}
@@ -814,7 +814,7 @@ 
 		$height_per = ($resize_height > 0 && $height >= $resize_height) ? $resize_height / $height : 1;
 
 		$per = NULL;
-		if($thumbnail_type == 'ratio')
+		if ($thumbnail_type == 'ratio')
 		{
 			$per = ($width_per > $height_per) ? $height_per : $width_per;
 			$resize_width = $width * $per;
@@ -827,16 +827,16 @@ 
 
 		// create temporary image with target size
 		$thumb = NULL;
-		if(function_exists('imagecreateTRUEcolor'))
+		if (function_exists('imagecreateTRUEcolor'))
 		{
 			$thumb = imagecreateTRUEcolor($resize_width, $resize_height);
 		}
-		else if(function_exists('imagecreate'))
+		else if (function_exists('imagecreate'))
 		{
 			$thumb = imagecreate($resize_width, $resize_height);
 		}
 
-		if(!$thumb)
+		if (!$thumb)
 		{
 			return FALSE;
 		}
@@ -845,37 +845,37 @@ 
 
 		// create temporary image having original type
 		$source = NULL;
-		switch($type)
+		switch ($type)
 		{
 			case 'gif' :
-				if(function_exists('imagecreatefromgif'))
+				if (function_exists('imagecreatefromgif'))
 				{
 					$source = @imagecreatefromgif($source_file);
 				}
 				break;
 			case 'jpeg' :
 			case 'jpg' :
-				if(function_exists('imagecreatefromjpeg'))
+				if (function_exists('imagecreatefromjpeg'))
 				{
 					$source = @imagecreatefromjpeg($source_file);
 				}
 				break;
 			case 'png' :
-				if(function_exists('imagecreatefrompng'))
+				if (function_exists('imagecreatefrompng'))
 				{
 					$source = @imagecreatefrompng($source_file);
 				}
 				break;
 			case 'wbmp' :
 			case 'bmp' :
-				if(function_exists('imagecreatefromwbmp'))
+				if (function_exists('imagecreatefromwbmp'))
 				{
 					$source = @imagecreatefromwbmp($source_file);
 				}
 				break;
 		}
 
-		if(!$source)
+		if (!$source)
 		{
 			imagedestroy($thumb);
 			return FALSE;
@@ -887,13 +887,13 @@ 
 
 		$x = 0;
 		$y = 0;
-		if($thumbnail_type == 'crop')
+		if ($thumbnail_type == 'crop')
 		{
 			$x = (int) ($resize_width / 2 - $new_width / 2);
 			$y = (int) ($resize_height / 2 - $new_height / 2);
 		}
 
-		if(function_exists('imagecopyresampled'))
+		if (function_exists('imagecopyresampled'))
 		{
 			imagecopyresampled($thumb, $source, $x, $y, 0, 0, $new_width, $new_height, $width, $height);
 		}
@@ -907,30 +907,30 @@ 
 
 		// write into the file
 		$output = NULL;
-		switch($target_type)
+		switch ($target_type)
 		{
 			case 'gif' :
-				if(function_exists('imagegif'))
+				if (function_exists('imagegif'))
 				{
 					$output = imagegif($thumb, $target_file);
 				}
 				break;
 			case 'jpeg' :
 			case 'jpg' :
-				if(function_exists('imagejpeg'))
+				if (function_exists('imagejpeg'))
 				{
 					$output = imagejpeg($thumb, $target_file, 100);
 				}
 				break;
 			case 'png' :
-				if(function_exists('imagepng'))
+				if (function_exists('imagepng'))
 				{
 					$output = imagepng($thumb, $target_file, 9);
 				}
 				break;
 			case 'wbmp' :
 			case 'bmp' :
-				if(function_exists('imagewbmp'))
+				if (function_exists('imagewbmp'))
 				{
 					$output = imagewbmp($thumb, $target_file, 100);
 				}
@@ -940,7 +940,7 @@ 
 		imagedestroy($thumb);
 		imagedestroy($source);
 
-		if(!$output)
+		if (!$output)
 		{
 			return FALSE;
 		}
@@ -958,12 +958,12 @@ 
 	 */
 	function readIniFile($filename)
 	{
-		if(($filename = self::exists($filename)) === FALSE)
+		if (($filename = self::exists($filename)) === FALSE)
 		{
 			return FALSE;
 		}
 		$arr = parse_ini_file($filename, TRUE);
-		if(is_array($arr) && count($arr) > 0)
+		if (is_array($arr) && count($arr) > 0)
 		{
 			return $arr;
 		}
@@ -989,7 +989,7 @@ 
 	 */
 	function writeIniFile($filename, $arr)
 	{
-		if(!is_array($arr) || count($arr) == 0)
+		if (!is_array($arr) || count($arr) == 0)
 		{
 			return FALSE;
 		}
@@ -1006,19 +1006,19 @@ 
 	function _makeIniBuff($arr)
 	{
 		$return = array();
-		foreach($arr as $key => $val)
+		foreach ($arr as $key => $val)
 		{
 			// section
-			if(is_array($val))
+			if (is_array($val))
 			{
 				$return[] = sprintf("[%s]", $key);
-				foreach($val as $k => $v)
+				foreach ($val as $k => $v)
 				{
 					$return[] = sprintf("%s=\"%s\"", $k, $v);
 				}
 				// value
 			}
-			else if(is_object($val))
+			else if (is_object($val))
 			{
 				continue;
 			}
@@ -1093,15 +1093,15 @@ 
 	function isWritableDir($path)
 	{
 		$path = self::getRealPath($path);
-		if(is_dir($path)==FALSE)
+		if (is_dir($path) == FALSE)
 		{
 			return FALSE;
 		}
 
-		$checkFile = $path . '/_CheckWritableDir';
+		$checkFile = $path.'/_CheckWritableDir';
 
 		$fp = fopen($checkFile, 'w');
-		if(!is_resource($fp))
+		if (!is_resource($fp))
 		{
 			return FALSE;
 		}
@@ -1119,7 +1119,7 @@ 
 	 **/
 	static public function clearStatCache($target, $include = false)
 	{
-		if(is_array($target))
+		if (is_array($target))
 		{
 			array_map('self::clearStatCache', $target);
 			return;
@@ -1127,7 +1127,7 @@ 
 
 		$target = self::getRealPath($target);
 
-		if($include && self::isDir($target))
+		if ($include && self::isDir($target))
 		{
 			self::clearStatCache(self::readDir($target, '', false, true), $include);
 		}
@@ -1145,27 +1145,27 @@ 
 	{
 		static $opcache = null;
 
-		if($opcache === null)
+		if ($opcache === null)
 		{
 			$opcache = (function_exists('opcache_get_status') && function_exists('opcache_invalidate'));
 		}
 
-		if($opcache === false)
+		if ($opcache === false)
 		{
 			return;
 		}
 
-		if(is_array($target))
+		if (is_array($target))
 		{
 			array_map('self::invalidateOpcache', $target);
 			return;
 		}
 
-		if(substr($target, -4) === '.php')
+		if (substr($target, -4) === '.php')
 		{
 			opcache_invalidate(self::getRealPath($target), $force);
 		}
-		else if($path = self::isDir($target))
+		else if ($path = self::isDir($target))
 		{
 			self::invalidateOpcache(self::readDir($path, '', false, true));
 		}

Braces +31 added lines, -47 removed lines

@@ -74,14 +74,12 @@ 
 			if(is_dir($source_dir . $file))
 			{
 				self::copyDir($source_dir . $file, $target_dir . $file, $type);
-			}
-			else
+			} else
 			{
 				if($type == 'force')
 				{
 					@unlink($target_dir . $file);
-				}
-				else
+				} else
 				{
 					if(!file_exists($target_dir . $file))
 					{
@@ -381,15 +379,13 @@ 
 				if(is_dir($target))
 				{
 					self::removeDir($target);
-				}
-				else
+				} else
 				{
 					unlink($target);
 				}
 			}
 			rmdir($path);
-		}
-		else
+		} else
 		{
 			unlink($path);
 		}
@@ -456,16 +452,16 @@ 
 				if(is_dir($target))
 				{
 					self::removeFilesInDir($target);
-				}
-				else
+				} else
 				{
 					unlink($target);
 				}
 			}
-		}
-		else
+		} else
 		{
-			if(self::exists($path)) unlink($path);
+			if(self::exists($path)) {
+				unlink($path);
+			}
 		}
 
 	}
@@ -535,8 +531,7 @@ 
 				$oRequest = new HTTP_Request(__PROXY_SERVER__);
 				$oRequest->setMethod('POST');
 				$oRequest->addPostData('arg', serialize(array('Destination' => $url, 'method' => $method, 'body' => $body, 'content_type' => $content_type, "headers" => $headers, "post_data" => $post_data)));
-			}
-			else
+			} else
 			{
 				$oRequest = new HTTP_Request($url);
 
@@ -560,8 +555,7 @@ 
 							{
 								$oRequest->attach($observer);
 							}
-						}
-						else
+						} else
 						{
 							$oRequest->setConfig($key, $val);
 						}
@@ -572,8 +566,7 @@ 
 					if(extension_loaded('curl'))
 					{
 						$oRequest->setConfig('adapter', 'curl');
-					}
-					elseif(version_compare(PHP_VERSION, '5.6', '<'))
+					} elseif(version_compare(PHP_VERSION, '5.6', '<'))
 					{
 						$oRequest->setConfig('ssl_verify_host', false);
 					}
@@ -605,20 +598,21 @@ 
 						$oRequest->addPostData($key, $val);
 					}
 				}
-				if(!$content_type)
-					$oRequest->addHeader('Content-Type', 'text/html');
-				else
-					$oRequest->addHeader('Content-Type', $content_type);
+				if(!$content_type) {
+									$oRequest->addHeader('Content-Type', 'text/html');
+				} else {
+									$oRequest->addHeader('Content-Type', $content_type);
+				}
 				$oRequest->setMethod($method);
-				if($body)
-					$oRequest->setBody($body);
+				if($body) {
+									$oRequest->setBody($body);
+				}
 			}
 			
 			if(method_exists($oRequest, 'setConfig'))
 			{
 				$oRequest->setConfig('timeout', $timeout);
-			}
-			elseif(property_exists($oRequest, '_timeout'))
+			} elseif(property_exists($oRequest, '_timeout'))
 			{
 				$oRequest->_timeout = $timeout;
 			}
@@ -649,13 +643,11 @@ 
 			if(isset($request_config['store_body']) && !$request_config['store_body'])
 			{
 				return TRUE;
-			}
-			else
+			} else
 			{
 				return $response;
 			}
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			return NULL;
 		}
@@ -688,8 +680,7 @@ 
 			$result = self::getRemoteResource($url, $body, $timeout, $method, $content_type, $headers, $cookies, $post_data, $request_config);
 			self::clearStatCache($target_filename);
 			self::invalidateOpcache($target_filename);
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			return FALSE;
 		}
@@ -819,8 +810,7 @@ 
 			$per = ($width_per > $height_per) ? $height_per : $width_per;
 			$resize_width = $width * $per;
 			$resize_height = $height * $per;
-		}
-		else
+		} else
 		{
 			$per = ($width_per < $height_per) ? $height_per : $width_per;
 		}
@@ -830,8 +820,7 @@ 
 		if(function_exists('imagecreateTRUEcolor'))
 		{
 			$thumb = imagecreateTRUEcolor($resize_width, $resize_height);
-		}
-		else if(function_exists('imagecreate'))
+		} else if(function_exists('imagecreate'))
 		{
 			$thumb = imagecreate($resize_width, $resize_height);
 		}
@@ -896,8 +885,7 @@ 
 		if(function_exists('imagecopyresampled'))
 		{
 			imagecopyresampled($thumb, $source, $x, $y, 0, 0, $new_width, $new_height, $width, $height);
-		}
-		else
+		} else
 		{
 			imagecopyresized($thumb, $source, $x, $y, 0, 0, $new_width, $new_height, $width, $height);
 		}
@@ -966,8 +954,7 @@ 
 		if(is_array($arr) && count($arr) > 0)
 		{
 			return $arr;
-		}
-		else
+		} else
 		{
 			return array();
 		}
@@ -1017,12 +1004,10 @@ 
 					$return[] = sprintf("%s=\"%s\"", $k, $v);
 				}
 				// value
-			}
-			else if(is_object($val))
+			} else if(is_object($val))
 			{
 				continue;
-			}
-			else
+			} else
 			{
 				$return[] = sprintf("%s=\"%s\"", $key, $val);
 			}
@@ -1164,8 +1149,7 @@ 
 		if(substr($target, -4) === '.php')
 		{
 			opcache_invalidate(self::getRealPath($target), $force);
-		}
-		else if($path = self::isDir($target))
+		} else if($path = self::isDir($target))
 		{
 			self::invalidateOpcache(self::readDir($path, '', false, true));
 		}

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
 	 */

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);
 			}

Spacing +23 added lines, -23 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,30 +117,30 @@ 
 		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)
+		$sock = @fsockopen($scheme.$this->m_host, $this->m_port, $errno, $errstr, $timeout);
+		if (!$sock)
 		{
 			return new BaseObject(-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) . '&';
+				$post_body .= urlencode($key).'='.urlencode($value).'&';
 			}
 			$post_body = substr($post_body, 0, -1);
 
@@ -149,35 +149,35 @@ 
 		}
 
 		$request = "$method $target HTTP/1.1$crlf";
-		foreach($headers as $equiv => $content)
+		foreach ($headers as $equiv => $content)
 		{
 			$request .= "$equiv: $content$crlf";
 		}
-		$request .= $crlf . $post_body;
+		$request .= $crlf.$post_body;
 		fwrite($sock, $request);
 
 		list($httpver, $code, $status) = preg_split('/ +/', rtrim(fgets($sock)), 3);
 
 		// 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 BaseObject(-1, 'socket_connect_failed');
 		}

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()
 	{

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 '';
 		}

Spacing +79 added lines, -79 removed lines

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

classes/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;

Braces +30 added lines, -45 removed lines

@@ -115,7 +115,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);
+		}
 	}
 
 	public static function xeErrorLog($errnumber, $errormassage, $errorfile, $errorline, $errorcontext)
@@ -257,8 +259,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
@@ -270,8 +271,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);
@@ -322,15 +322,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'));
 				}
@@ -355,8 +353,7 @@ 
 			{
 				$oLayoutAdminModel = getAdminModel('layout');
 				$layoutSrl = $oLayoutAdminModel->getSiteDefaultLayout($viewType, $module_info->site_srl);
-			}
-			else
+			} else
 			{
 				$layoutSrl = $module_info->{$targetSrl};
 			}
@@ -483,8 +480,7 @@ 
 			if(!$allowedMethod)
 			{
 				$allowedMethodList[0] = 'POST';
-			}
-			else
+			} else
 			{
 				$allowedMethodList = explode('|', strtoupper($allowedMethod));
 			}
@@ -542,8 +538,7 @@ 
 				Mobile::setMobile(FALSE);
 				$oModule = $this->getModuleInstance($this->module, $type, $kind);
 			}
-		}
-		else
+		} else
 		{
 			// create a module instance
 			$oModule = $this->getModuleInstance($this->module, $type, $kind);
@@ -596,8 +591,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);
@@ -633,8 +627,7 @@ 
 					if(!$allowedMethod)
 					{
 						$allowedMethodList[0] = 'POST';
-					}
-					else
+					} else
 					{
 						$allowedMethodList = explode('|', strtoupper($allowedMethod));
 					}
@@ -662,8 +655,7 @@ 
 						Mobile::setMobile(FALSE);
 						$oModule = $this->getModuleInstance($forward->module, $type, $kind);
 					}
-				}
-				else
+				} else
 				{
 					$oModule = $this->getModuleInstance($forward->module, $type, $kind);
 				}
@@ -693,8 +685,7 @@ 
 							$oModule->setLayoutPath("./modules/admin/tpl");
 							$oModule->setLayoutFile("layout.html");
 						}
-					}
-					else
+					} else
 					{
 						$this->_setInputErrorToContext();
 
@@ -718,8 +709,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')
 						{
@@ -733,12 +723,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);
@@ -836,7 +824,9 @@ 
 			$message = $oModule->getMessage();
 			$messageType = $oModule->getMessageType();
 			$redirectUrl = $oModule->getRedirectUrl();
-			if($messageType == 'error') debugPrint($message, 'ERROR');
+			if($messageType == 'error') {
+				debugPrint($message, 'ERROR');
+			}
 
 			if(!$procResult)
 			{
@@ -846,8 +836,7 @@ 
 					$redirectUrl = Context::get('error_return_url');
 				}
 				$this->_setInputValueToSession();
-			}
-			else
+			} else
 			{
 
 			}
@@ -995,8 +984,7 @@ 
 					$oModule->setTemplatePath($oMessageObject->getTemplatePath());
 					$oModule->setTemplateFile($oMessageObject->getTemplateFile());
 					// Otherwise, set message instance as the target module
-				}
-				else
+				} else
 				{
 					$oModule = $oMessageObject;
 				}
@@ -1008,8 +996,7 @@ 
 			if(Mobile::isFromMobilePhone())
 			{
 				$layout_srl = $oModule->module_info->mlayout_srl;
-			}
-			else
+			} else
 			{
 				$layout_srl = $oModule->module_info->layout_srl;
 			}
@@ -1068,8 +1055,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);
@@ -1106,8 +1092,7 @@ 
 				if($kind == 'admin')
 				{
 					$oModule->setLayoutFile('popup_layout');
-				}
-				else
+				} else
 				{
 					$oModule->setLayoutPath('common/tpl');
 					$oModule->setLayoutFile('default_layout');
@@ -1241,13 +1226,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';
@@ -1310,7 +1293,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())
 			{

Spacing +179 added lines, -179 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,14 +87,14 @@ 
 			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) {
-					header('location:https://' . $_SERVER['HTTP_HOST'] . ':' . Context::get('_https_port') . $_SERVER['REQUEST_URI']);
+				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']);
+					header('location:https://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
 				}
 				return;
 			}
@@ -102,9 +102,9 @@ 
 
 		// call a trigger before moduleHandler init
 		ModuleHandler::triggerCall('moduleHandler.init', 'before', $this);
-		if(__ERROR_LOG__ == 1 && __DEBUG_OUTPUT__ == 0)
+		if (__ERROR_LOG__ == 1 && __DEBUG_OUTPUT__ == 0)
 		{
-			if(__DEBUG_PROTECT__ === 0 || __DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ == $_SERVER['REMOTE_ADDR'])
+			if (__DEBUG_PROTECT__ === 0 || __DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ == $_SERVER['REMOTE_ADDR'])
 			{
 				set_error_handler(array($this, 'xeErrorLog'), E_WARNING);
 				register_shutdown_function(array($this, 'shutdownHandler'));
@@ -115,40 +115,40 @@ 
 		$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);
 	}
 
 	public static function xeErrorLog($errnumber, $errormassage, $errorfile, $errorline, $errorcontext)
 	{
-		if(($errnumber & 3) == 0 || error_reporting() == 0)
+		if (($errnumber & 3) == 0 || error_reporting() == 0)
 		{
 			return false;
 		}
 
 		set_error_handler(function() { }, ~0);
 
-		$debug_file = _XE_PATH_ . 'files/_debug_message.php';
-		if(!file_exists($debug_file))
+		$debug_file = _XE_PATH_.'files/_debug_message.php';
+		if (!file_exists($debug_file))
 		{
 			$print[] = '<?php exit() ?>';
 		}
 
 		$errorname = self::getErrorType($errnumber);
-		$print[] = '['.date('Y-m-d H:i:s').'] ' . $errorname . ' : ' . $errormassage;
+		$print[] = '['.date('Y-m-d H:i:s').'] '.$errorname.' : '.$errormassage;
 		$backtrace_args = defined('DEBUG_BACKTRACE_IGNORE_ARGS') ? \DEBUG_BACKTRACE_IGNORE_ARGS : 0;
 		$backtrace = debug_backtrace($backtrace_args);
-		if(count($backtrace) > 1 && $backtrace[1]['function'] === 'xeErrorLog' && !$backtrace[1]['class'])
+		if (count($backtrace) > 1 && $backtrace[1]['function'] === 'xeErrorLog' && !$backtrace[1]['class'])
 		{
 			array_shift($backtrace);
 		}
 
-		foreach($backtrace as $key => $value)
+		foreach ($backtrace as $key => $value)
 		{
-			$message = '    - ' . $value['file'] . ' : ' . $value['line'];
+			$message = '    - '.$value['file'].' : '.$value['line'];
 			$print[] = $message;
 		}
 		$print[] = PHP_EOL;
-		@file_put_contents($debug_file, implode(PHP_EOL, $print), FILE_APPEND|LOCK_EX);
+		@file_put_contents($debug_file, implode(PHP_EOL, $print), FILE_APPEND | LOCK_EX);
 		restore_error_handler();
 
 		return true;
@@ -164,21 +164,21 @@ 
 
 		set_error_handler(function() { }, ~0);
 
-		$debug_file = _XE_PATH_ . 'files/_debug_message.php';
-		if(!file_exists($debug_file))
+		$debug_file = _XE_PATH_.'files/_debug_message.php';
+		if (!file_exists($debug_file))
 		{
 			$print[] = '<?php exit() ?>';
 		}
 
 		$errorname = self::getErrorType($errinfo['type']);
 		$print[] = '['.date('Y-m-d H:i:s').']';
-		$print[] = $errorname . ' : ' . $errinfo['message'];
+		$print[] = $errorname.' : '.$errinfo['message'];
 
-		$message = '    - ' . $errinfo['file'] . ' : ' . $errinfo['line'];
+		$message = '    - '.$errinfo['file'].' : '.$errinfo['line'];
 		$print[] = $message;
 
 		$print[] = PHP_EOL;
-		@file_put_contents($debug_file, implode(PHP_EOL, $print), FILE_APPEND|LOCK_EX);
+		@file_put_contents($debug_file, implode(PHP_EOL, $print), FILE_APPEND | LOCK_EX);
 		set_error_handler(array($this, 'dummyHandler'), ~0);
 
 		return true;
@@ -222,9 +222,9 @@ 
 		$defaultUrlInfo = parse_url($dbInfo->default_url);
 		$defaultHost = $defaultUrlInfo['host'];
 
-		foreach($urls as $url)
+		foreach ($urls as $url)
 		{
-			if(empty($url))
+			if (empty($url))
 			{
 				continue;
 			}
@@ -232,29 +232,29 @@ 
 			$urlInfo = parse_url($url);
 			$host = $urlInfo['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);
 			}
@@ -262,13 +262,13 @@ 
 			{
 				// 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));
+						header('location:'.getNotEncodedSiteUrl($site_module_info->domain, 'mid', $this->mid, 'document_srl', $this->document_srl));
 						return FALSE;
 					}
 					else
@@ -279,7 +279,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);
 				}
@@ -288,36 +288,36 @@ 
 		}
 
 		// 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));
+			header("location:".getNotEncodedSiteUrl($site_info->domain, 'mid', $site_module_info->mid));
 			return FALSE;
 		}
 
 		// 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'));
@@ -326,7 +326,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');
 				}
@@ -335,12 +335,12 @@ 
 					$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'));
 				}
 			}
-			header("location:" . $redirect_url);
+			header("location:".$redirect_url);
 			return FALSE;
 		}
 
 		// 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;
@@ -351,7 +351,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);
@@ -369,7 +369,7 @@ 
 		}
 
 		// Set module and mid into module_info
-		if(!isset($this->module_info))
+		if (!isset($this->module_info))
 		{
 			$this->module_info = new stdClass();
 		}
@@ -380,21 +380,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;
@@ -416,14 +416,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);
 			}
@@ -434,22 +434,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';
@@ -459,7 +459,7 @@ 
 			$oMessageObject->setError(-1);
 			$oMessageObject->setMessage($this->error);
 			$oMessageObject->dispMessage();
-			if($this->httpStatusCode)
+			if ($this->httpStatusCode)
 			{
 				$oMessageObject->setHttpStatusCode($this->httpStatusCode);
 			}
@@ -470,17 +470,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';
 			}
@@ -489,7 +489,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);
@@ -500,7 +500,7 @@ 
 			}
 		}
 
-		if($this->module_info->use_mobile != "Y")
+		if ($this->module_info->use_mobile != "Y")
 		{
 			Mobile::setMobile(FALSE);
 		}
@@ -509,7 +509,7 @@ 
 
 		// check CSRF for non-GET actions
 		$use_check_csrf = isset($xml_info->action->{$this->act}) && $xml_info->action->{$this->act}->check_csrf !== 'false';
-		if($use_check_csrf && $_SERVER['REQUEST_METHOD'] !== 'GET' && Context::isInstalled() && !checkCSRF())
+		if ($use_check_csrf && $_SERVER['REQUEST_METHOD'] !== 'GET' && Context::isInstalled() && !checkCSRF())
 		{
 			$this->error = 'msg_invalid_request';
 			$oMessageObject = ModuleHandler::getModuleInstance('message', $display_mode);
@@ -520,7 +520,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";
@@ -532,13 +532,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);
@@ -551,14 +551,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);
 			}
@@ -566,10 +566,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';
@@ -577,7 +577,7 @@ 
 				$oMessageObject->setError(-1);
 				$oMessageObject->setMessage($this->error);
 				$oMessageObject->dispMessage();
-				if($this->httpStatusCode)
+				if ($this->httpStatusCode)
 				{
 					$oMessageObject->setHttpStatusCode($this->httpStatusCode);
 				}
@@ -586,12 +586,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]);
+				$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;
@@ -611,12 +611,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;
@@ -628,7 +628,7 @@ 
 
 				// check CSRF for non-GET actions
 				$use_check_csrf = isset($xml_info->action->{$this->act}) && $xml_info->action->{$this->act}->check_csrf !== 'false';
-				if($use_check_csrf && $_SERVER['REQUEST_METHOD'] !== 'GET' && Context::isInstalled() && !checkCSRF())
+				if ($use_check_csrf && $_SERVER['REQUEST_METHOD'] !== 'GET' && Context::isInstalled() && !checkCSRF())
 				{
 					$this->error = 'msg_invalid_request';
 					$oMessageObject = ModuleHandler::getModuleInstance('message', $display_mode);
@@ -640,11 +640,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';
 					}
@@ -653,7 +653,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);
@@ -664,13 +664,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);
@@ -682,25 +682,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);
@@ -720,10 +720,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';
@@ -735,7 +735,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';
@@ -748,7 +748,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;
 			}
@@ -762,16 +762,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);
 					}
@@ -780,7 +780,7 @@ 
 
 				$Validator = new Validator($rulesetFile);
 				$result = $Validator->validate();
-				if(!$result)
+				if (!$result)
 				{
 					$lastError = $Validator->getLastError();
 					$returnUrl = Context::get('error_return_url');
@@ -812,26 +812,26 @@ 
 				'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>';
-			$footer = '<div class="xe_mobile"><p class="xe_mobile"><a class="xe_mobile" href="' . getUrl('m', '1') . '">' . $lang->msg_pc_to_mobile . '</a></p></div>';
+			$footer = '<div class="xe_mobile"><p class="xe_mobile"><a class="xe_mobile" href="'.getUrl('m', '1').'">'.$lang->msg_pc_to_mobile.'</a></p></div>';
 			Context::addHtmlHeader($header);
 			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);
 				}
@@ -844,18 +844,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');
 				}
@@ -868,13 +868,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;
 			}
@@ -890,27 +890,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']);
 		}
@@ -940,7 +940,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;
 		}
@@ -954,41 +954,41 @@ 
 	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();
 
-				header('location:' . $_SESSION['XE_VALIDATOR_RETURN_URL']);
+				header('location:'.$_SESSION['XE_VALIDATOR_RETURN_URL']);
 				return;
 			}
 
 			// If error occurred, handle it
-			if($this->error)
+			if ($this->error)
 			{
 				// display content with message module instance
 				$type = Mobile::isFromMobilePhone() ? 'mobile' : 'view';
@@ -997,14 +997,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());
@@ -1019,7 +1019,7 @@ 
 			}
 
 			// Check if layout_srl exists for the module
-			if(Mobile::isFromMobilePhone())
+			if (Mobile::isFromMobilePhone())
 			{
 				$layout_srl = $oModule->module_info->mlayout_srl;
 			}
@@ -1029,58 +1029,58 @@ 
 			}
 
 			// 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);
+									$val->value = Context::getRequestUri().substr($val->value, 2);
 								}
 							}
 							$layout_info->{$var_id} = $val->value;
 						}
 					}
 					// 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);
+									$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
@@ -1091,7 +1091,7 @@ 
 							}
 
 							$php_file = FileHandler::exists($menu->php_file);
-							if($php_file)
+							if ($php_file)
 							{
 								include($php_file);
 							}
@@ -1107,17 +1107,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');
 				}
@@ -1155,7 +1155,7 @@ 
 	function &getModuleInstance($module, $type = 'view', $kind = '')
 	{
 
-		if(__DEBUG__ == 3)
+		if (__DEBUG__ == 3)
 		{
 			$start_time = getMicroTime();
 		}
@@ -1165,51 +1165,51 @@ 
 		$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;
+		$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)
+			Context::loadLang($class_path.'lang');
+			if ($extend_module)
 			{
-				Context::loadLang(ModuleHandler::getModulePath($parent_module) . 'lang');
+				Context::loadLang(ModuleHandler::getModulePath($parent_module).'lang');
 			}
 
 			// Set variables to the instance
@@ -1217,10 +1217,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}();
 				}
@@ -1230,7 +1230,7 @@ 
 			$GLOBALS['_loaded_module'][$module][$type][$kind] = $oModule;
 		}
 
-		if(__DEBUG__ == 3)
+		if (__DEBUG__ == 3)
 		{
 			$GLOBALS['__elapsed_class_load__'] += getMicroTime() - $start_time;
 		}
@@ -1246,17 +1246,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';
@@ -1281,26 +1281,26 @@ 
 	function triggerCall($trigger_name, $called_position, &$obj)
 	{
 		// skip if not installed
-		if(!Context::isInstalled())
+		if (!Context::isInstalled())
 		{
 			return new BaseObject();
 		}
 
 		$oModuleModel = getModel('module');
 		$triggers = $oModuleModel->getTriggers($trigger_name, $called_position);
-		if(!$triggers || count($triggers) < 1)
+		if (!$triggers || count($triggers) < 1)
 		{
 			return new BaseObject();
 		}
 
 		//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;
@@ -1308,7 +1308,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;
 			}
@@ -1321,12 +1321,12 @@ 
 			$elapsed_time_trigger = $after_each_trigger_time - $before_each_trigger_time;
 
 			$slowlog = new stdClass;
-			$slowlog->caller = $trigger_name . '.' . $called_position;
-			$slowlog->called = $module . '.' . $called_method;
+			$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;
 			}
@@ -1411,9 +1411,9 @@ 
 			'511' => 'Network Authentication Required',
 		);
 		$statusMessage = $statusMessageList[$code];
-		if(!$statusMessage)
+		if (!$statusMessage)
 		{
-			$statusMessage = 'HTTP ' . $code;
+			$statusMessage = 'HTTP '.$code;
 		}
 
 		Context::set('http_status_code', $code);

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 +41 added lines, -41 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;
+			$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;
+			$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, 'BaseObject') || is_subclass_of($output, 'BaseObject'))
+		if (is_a($output, 'BaseObject') || is_subclass_of($output, 'BaseObject'))
 		{
 			$this->setError($output->getError());
 			$this->setMessage($output->getMessage());
 
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return FALSE;
 			}
 		}
 		// execute api methods of the module if view action is and result is XMLRPC or JSON
-		if($this->module_info->module_type == 'view' || $this->module_info->module_type == 'mobile')
+		if ($this->module_info->module_type == 'view' || $this->module_info->module_type == 'mobile')
 		{
-			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, 'BaseObject') || is_subclass_of($output, 'BaseObject'))
 		{

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)

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;
 					}

Spacing +65 added lines, -65 removed lines

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

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;
+
+	}
 
 }
 

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]);
         }

Spacing +9 added lines, -9 removed lines

@@ -16,15 +16,15 @@ 
         $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
+        $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))
+                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,12 +34,12 @@ 
         }
 
         //      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];
+                $aIP .= $ip[0].$ip[1].':'.$ip[2].$ip[3];
                 unset($find, $ip);
         }
 
@@ -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
         {

classes/security/htmlpurifier/library/HTMLPurifier/Config.php

Doc Comments +8 added lines, -7 removed lines

@@ -89,6 +89,7 @@ 
     /**
      * @param $definition HTMLPurifier_ConfigSchema that defines what directives
      *                    are allowed.
+     * @param HTMLPurifier_PropertyList $parent
      */
     public function __construct($definition, $parent = null) {
         $parent = $parent ? $parent : $definition->defaultPlist;
@@ -104,7 +105,7 @@ 
      *                      an array of directives based on loadArray(),
      *                      or a string filename of an ini file.
      * @param HTMLPurifier_ConfigSchema Schema object
-     * @return Configured HTMLPurifier_Config object
+     * @return HTMLPurifier_Config HTMLPurifier_Config object
      */
     public static function create($config, $schema = null) {
         if ($config instanceof HTMLPurifier_Config) {
@@ -133,7 +134,7 @@ 
 
     /**
      * Convenience constructor that creates a default configuration object.
-     * @return Default HTMLPurifier_Config object.
+     * @return HTMLPurifier_Config HTMLPurifier_Config object.
      */
     public static function createDefault() {
         $definition = HTMLPurifier_ConfigSchema::instance();
@@ -143,7 +144,7 @@ 
 
     /**
      * Retreives a value from the configuration.
-     * @param $key String key
+     * @param string $key String key
      */
     public function get($key, $a = null) {
         if ($a !== null) {
@@ -231,7 +232,7 @@ 
 
     /**
      * Sets a value to configuration.
-     * @param $key String key
+     * @param string $key String key
      * @param $value Mixed value
      */
     public function set($key, $value, $a = null) {
@@ -543,7 +544,7 @@ 
      * Returns a list of array(namespace, directive) for all directives
      * that are allowed in a web-form context as per an allowed
      * namespaces/directives list.
-     * @param $allowed List of allowed namespaces/directives
+     * @param boolean $allowed List of allowed namespaces/directives
      */
     public static function getAllowedDirectivesForForm($allowed, $schema = null) {
         if (!$schema) {
@@ -585,7 +586,6 @@ 
     /**
      * Loads configuration values from $_GET/$_POST that were posted
      * via ConfigForm
-     * @param $array $_GET or $_POST array to import
      * @param $index Index/name that the config variables are in
      * @param $allowed List of allowed namespaces/directives
      * @param $mq_fix Boolean whether or not to enable magic quotes fix
@@ -632,7 +632,7 @@ 
 
     /**
      * Loads configuration values from an ini file
-     * @param $filename Name of ini file
+     * @param string $filename Name of ini file
      */
     public function loadIni($filename) {
         if ($this->isFinalized('Cannot load directives after finalization')) return;
@@ -674,6 +674,7 @@ 
     /**
      * Produces a nicely formatted error message by supplying the
      * stack frame information OUTSIDE of HTMLPurifier_Config.
+     * @param integer $no
      */
     protected function triggerError($msg, $no) {
         // determine previous stack frame

Indentation +686 added lines, -686 removed lines

@@ -17,692 +17,692 @@
 class HTMLPurifier_Config
 {
 
-    /**
-     * HTML Purifier's version
-     */
-    public $version = '4.4.0';
-
-    /**
-     * Bool indicator whether or not to automatically finalize
-     * the object if a read operation is done
-     */
-    public $autoFinalize = true;
-
-    // protected member variables
-
-    /**
-     * Namespace indexed array of serials for specific namespaces (see
-     * getSerial() for more info).
-     */
-    protected $serials = array();
-
-    /**
-     * Serial for entire configuration object
-     */
-    protected $serial;
-
-    /**
-     * Parser for variables
-     */
-    protected $parser = null;
-
-    /**
-     * Reference HTMLPurifier_ConfigSchema for value checking
-     * @note This is public for introspective purposes. Please don't
-     *       abuse!
-     */
-    public $def;
-
-    /**
-     * Indexed array of definitions
-     */
-    protected $definitions;
-
-    /**
-     * Bool indicator whether or not config is finalized
-     */
-    protected $finalized = false;
-
-    /**
-     * Property list containing configuration directives.
-     */
-    protected $plist;
-
-    /**
-     * Whether or not a set is taking place due to an
-     * alias lookup.
-     */
-    private $aliasMode;
-
-    /**
-     * Set to false if you do not want line and file numbers in errors
-     * (useful when unit testing).  This will also compress some errors
-     * and exceptions.
-     */
-    public $chatty = true;
-
-    /**
-     * Current lock; only gets to this namespace are allowed.
-     */
-    private $lock;
-
-    /**
-     * @param $definition HTMLPurifier_ConfigSchema that defines what directives
-     *                    are allowed.
-     */
-    public function __construct($definition, $parent = null) {
-        $parent = $parent ? $parent : $definition->defaultPlist;
-        $this->plist = new HTMLPurifier_PropertyList($parent);
-        $this->def = $definition; // keep a copy around for checking
-        $this->parser = new HTMLPurifier_VarParser_Flexible();
-    }
-
-    /**
-     * Convenience constructor that creates a config object based on a mixed var
-     * @param mixed $config Variable that defines the state of the config
-     *                      object. Can be: a HTMLPurifier_Config() object,
-     *                      an array of directives based on loadArray(),
-     *                      or a string filename of an ini file.
-     * @param HTMLPurifier_ConfigSchema Schema object
-     * @return Configured HTMLPurifier_Config object
-     */
-    public static function create($config, $schema = null) {
-        if ($config instanceof HTMLPurifier_Config) {
-            // pass-through
-            return $config;
-        }
-        if (!$schema) {
-            $ret = HTMLPurifier_Config::createDefault();
-        } else {
-            $ret = new HTMLPurifier_Config($schema);
-        }
-        if (is_string($config)) $ret->loadIni($config);
-        elseif (is_array($config)) $ret->loadArray($config);
-        return $ret;
-    }
-
-    /**
-     * Creates a new config object that inherits from a previous one.
-     * @param HTMLPurifier_Config $config Configuration object to inherit
-     *        from.
-     * @return HTMLPurifier_Config object with $config as its parent.
-     */
-    public static function inherit(HTMLPurifier_Config $config) {
-        return new HTMLPurifier_Config($config->def, $config->plist);
-    }
-
-    /**
-     * Convenience constructor that creates a default configuration object.
-     * @return Default HTMLPurifier_Config object.
-     */
-    public static function createDefault() {
-        $definition = HTMLPurifier_ConfigSchema::instance();
-        $config = new HTMLPurifier_Config($definition);
-        return $config;
-    }
-
-    /**
-     * Retreives a value from the configuration.
-     * @param $key String key
-     */
-    public function get($key, $a = null) {
-        if ($a !== null) {
-            $this->triggerError("Using deprecated API: use \$config->get('$key.$a') instead", E_USER_WARNING);
-            $key = "$key.$a";
-        }
-        if (!$this->finalized) $this->autoFinalize();
-        if (!isset($this->def->info[$key])) {
-            // can't add % due to SimpleTest bug
-            $this->triggerError('Cannot retrieve value of undefined directive ' . htmlspecialchars($key, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),
-                E_USER_WARNING);
-            return;
-        }
-        if (isset($this->def->info[$key]->isAlias)) {
-            $d = $this->def->info[$key];
-            $this->triggerError('Cannot get value from aliased directive, use real name ' . $d->key,
-                E_USER_ERROR);
-            return;
-        }
-        if ($this->lock) {
-            list($ns) = explode('.', $key);
-            if ($ns !== $this->lock) {
-                $this->triggerError('Cannot get value of namespace ' . $ns . ' when lock for ' . $this->lock . ' is active, this probably indicates a Definition setup method is accessing directives that are not within its namespace', E_USER_ERROR);
-                return;
-            }
-        }
-        return $this->plist->get($key);
-    }
-
-    /**
-     * Retreives an array of directives to values from a given namespace
-     * @param $namespace String namespace
-     */
-    public function getBatch($namespace) {
-        if (!$this->finalized) $this->autoFinalize();
-        $full = $this->getAll();
-        if (!isset($full[$namespace])) {
-            $this->triggerError('Cannot retrieve undefined namespace ' . htmlspecialchars($namespace, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),
-                E_USER_WARNING);
-            return;
-        }
-        return $full[$namespace];
-    }
-
-    /**
-     * Returns a md5 signature of a segment of the configuration object
-     * that uniquely identifies that particular configuration
-     * @note Revision is handled specially and is removed from the batch
-     *       before processing!
-     * @param $namespace Namespace to get serial for
-     */
-    public function getBatchSerial($namespace) {
-        if (empty($this->serials[$namespace])) {
-            $batch = $this->getBatch($namespace);
-            unset($batch['DefinitionRev']);
-            $this->serials[$namespace] = md5(serialize($batch));
-        }
-        return $this->serials[$namespace];
-    }
-
-    /**
-     * Returns a md5 signature for the entire configuration object
-     * that uniquely identifies that particular configuration
-     */
-    public function getSerial() {
-        if (empty($this->serial)) {
-            $this->serial = md5(serialize($this->getAll()));
-        }
-        return $this->serial;
-    }
-
-    /**
-     * Retrieves all directives, organized by namespace
-     * @warning This is a pretty inefficient function, avoid if you can
-     */
-    public function getAll() {
-        if (!$this->finalized) $this->autoFinalize();
-        $ret = array();
-        foreach ($this->plist->squash() as $name => $value) {
-            list($ns, $key) = explode('.', $name, 2);
-            $ret[$ns][$key] = $value;
-        }
-        return $ret;
-    }
-
-    /**
-     * Sets a value to configuration.
-     * @param $key String key
-     * @param $value Mixed value
-     */
-    public function set($key, $value, $a = null) {
-        if (strpos($key, '.') === false) {
-            $namespace = $key;
-            $directive = $value;
-            $value = $a;
-            $key = "$key.$directive";
-            $this->triggerError("Using deprecated API: use \$config->set('$key', ...) instead", E_USER_NOTICE);
-        } else {
-            list($namespace) = explode('.', $key);
-        }
-        if ($this->isFinalized('Cannot set directive after finalization')) return;
-        if (!isset($this->def->info[$key])) {
-            $this->triggerError('Cannot set undefined directive ' . htmlspecialchars($key, ENT_COMPAT | ENT_HTML401, 'UTF-8', false) . ' to value',
-                E_USER_WARNING);
-            return;
-        }
-        $def = $this->def->info[$key];
-
-        if (isset($def->isAlias)) {
-            if ($this->aliasMode) {
-                $this->triggerError('Double-aliases not allowed, please fix '.
-                    'ConfigSchema bug with' . $key, E_USER_ERROR);
-                return;
-            }
-            $this->aliasMode = true;
-            $this->set($def->key, $value);
-            $this->aliasMode = false;
-            $this->triggerError("$key is an alias, preferred directive name is {$def->key}", E_USER_NOTICE);
-            return;
-        }
-
-        // Raw type might be negative when using the fully optimized form
-        // of stdclass, which indicates allow_null == true
-        $rtype = is_int($def) ? $def : $def->type;
-        if ($rtype < 0) {
-            $type = -$rtype;
-            $allow_null = true;
-        } else {
-            $type = $rtype;
-            $allow_null = isset($def->allow_null);
-        }
-
-        try {
-            $value = $this->parser->parse($value, $type, $allow_null);
-        } catch (HTMLPurifier_VarParserException $e) {
-            $this->triggerError('Value for ' . $key . ' is of invalid type, should be ' . HTMLPurifier_VarParser::getTypeName($type), E_USER_WARNING);
-            return;
-        }
-        if (is_string($value) && is_object($def)) {
-            // resolve value alias if defined
-            if (isset($def->aliases[$value])) {
-                $value = $def->aliases[$value];
-            }
-            // check to see if the value is allowed
-            if (isset($def->allowed) && !isset($def->allowed[$value])) {
-                $this->triggerError('Value not supported, valid values are: ' .
-                    $this->_listify($def->allowed), E_USER_WARNING);
-                return;
-            }
-        }
-        $this->plist->set($key, $value);
-
-        // reset definitions if the directives they depend on changed
-        // this is a very costly process, so it's discouraged
-        // with finalization
-        if ($namespace == 'HTML' || $namespace == 'CSS' || $namespace == 'URI') {
-            $this->definitions[$namespace] = null;
-        }
-
-        $this->serials[$namespace] = false;
-    }
-
-    /**
-     * Convenience function for error reporting
-     */
-    private function _listify($lookup) {
-        $list = array();
-        foreach ($lookup as $name => $b) $list[] = $name;
-        return implode(', ', $list);
-    }
-
-    /**
-     * Retrieves object reference to the HTML definition.
-     * @param $raw Return a copy that has not been setup yet. Must be
-     *             called before it's been setup, otherwise won't work.
-     * @param $optimized If true, this method may return null, to
-     *             indicate that a cached version of the modified
-     *             definition object is available and no further edits
-     *             are necessary.  Consider using
-     *             maybeGetRawHTMLDefinition, which is more explicitly
-     *             named, instead.
-     */
-    public function getHTMLDefinition($raw = false, $optimized = false) {
-        return $this->getDefinition('HTML', $raw, $optimized);
-    }
-
-    /**
-     * Retrieves object reference to the CSS definition
-     * @param $raw Return a copy that has not been setup yet. Must be
-     *             called before it's been setup, otherwise won't work.
-     * @param $optimized If true, this method may return null, to
-     *             indicate that a cached version of the modified
-     *             definition object is available and no further edits
-     *             are necessary.  Consider using
-     *             maybeGetRawCSSDefinition, which is more explicitly
-     *             named, instead.
-     */
-    public function getCSSDefinition($raw = false, $optimized = false) {
-        return $this->getDefinition('CSS', $raw, $optimized);
-    }
-
-    /**
-     * Retrieves object reference to the URI definition
-     * @param $raw Return a copy that has not been setup yet. Must be
-     *             called before it's been setup, otherwise won't work.
-     * @param $optimized If true, this method may return null, to
-     *             indicate that a cached version of the modified
-     *             definition object is available and no further edits
-     *             are necessary.  Consider using
-     *             maybeGetRawURIDefinition, which is more explicitly
-     *             named, instead.
-     */
-    public function getURIDefinition($raw = false, $optimized = false) {
-        return $this->getDefinition('URI', $raw, $optimized);
-    }
-
-    /**
-     * Retrieves a definition
-     * @param $type Type of definition: HTML, CSS, etc
-     * @param $raw  Whether or not definition should be returned raw
-     * @param $optimized Only has an effect when $raw is true.  Whether
-     *        or not to return null if the result is already present in
-     *        the cache.  This is off by default for backwards
-     *        compatibility reasons, but you need to do things this
-     *        way in order to ensure that caching is done properly.
-     *        Check out enduser-customize.html for more details.
-     *        We probably won't ever change this default, as much as the
-     *        maybe semantics is the "right thing to do."
-     */
-    public function getDefinition($type, $raw = false, $optimized = false) {
-        if ($optimized && !$raw) {
-            throw new HTMLPurifier_Exception("Cannot set optimized = true when raw = false");
-        }
-        if (!$this->finalized) $this->autoFinalize();
-        // temporarily suspend locks, so we can handle recursive definition calls
-        $lock = $this->lock;
-        $this->lock = null;
-        $factory = HTMLPurifier_DefinitionCacheFactory::instance();
-        $cache = $factory->create($type, $this);
-        $this->lock = $lock;
-        if (!$raw) {
-            // full definition
-            // ---------------
-            // check if definition is in memory
-            if (!empty($this->definitions[$type])) {
-                $def = $this->definitions[$type];
-                // check if the definition is setup
-                if ($def->setup) {
-                    return $def;
-                } else {
-                    $def->setup($this);
-                    if ($def->optimized) $cache->add($def, $this);
-                    return $def;
-                }
-            }
-            // check if definition is in cache
-            $def = $cache->get($this);
-            if ($def) {
-                // definition in cache, save to memory and return it
-                $this->definitions[$type] = $def;
-                return $def;
-            }
-            // initialize it
-            $def = $this->initDefinition($type);
-            // set it up
-            $this->lock = $type;
-            $def->setup($this);
-            $this->lock = null;
-            // save in cache
-            $cache->add($def, $this);
-            // return it
-            return $def;
-        } else {
-            // raw definition
-            // --------------
-            // check preconditions
-            $def = null;
-            if ($optimized) {
-                if (is_null($this->get($type . '.DefinitionID'))) {
-                    // fatally error out if definition ID not set
-                    throw new HTMLPurifier_Exception("Cannot retrieve raw version without specifying %$type.DefinitionID");
-                }
-            }
-            if (!empty($this->definitions[$type])) {
-                $def = $this->definitions[$type];
-                if ($def->setup && !$optimized) {
-                    $extra = $this->chatty ? " (try moving this code block earlier in your initialization)" : "";
-                    throw new HTMLPurifier_Exception("Cannot retrieve raw definition after it has already been setup" . $extra);
-                }
-                if ($def->optimized === null) {
-                    $extra = $this->chatty ? " (try flushing your cache)" : "";
-                    throw new HTMLPurifier_Exception("Optimization status of definition is unknown" . $extra);
-                }
-                if ($def->optimized !== $optimized) {
-                    $msg = $optimized ? "optimized" : "unoptimized";
-                    $extra = $this->chatty ? " (this backtrace is for the first inconsistent call, which was for a $msg raw definition)" : "";
-                    throw new HTMLPurifier_Exception("Inconsistent use of optimized and unoptimized raw definition retrievals" . $extra);
-                }
-            }
-            // check if definition was in memory
-            if ($def) {
-                if ($def->setup) {
-                    // invariant: $optimized === true (checked above)
-                    return null;
-                } else {
-                    return $def;
-                }
-            }
-            // if optimized, check if definition was in cache
-            // (because we do the memory check first, this formulation
-            // is prone to cache slamming, but I think
-            // guaranteeing that either /all/ of the raw
-            // setup code or /none/ of it is run is more important.)
-            if ($optimized) {
-                // This code path only gets run once; once we put
-                // something in $definitions (which is guaranteed by the
-                // trailing code), we always short-circuit above.
-                $def = $cache->get($this);
-                if ($def) {
-                    // save the full definition for later, but don't
-                    // return it yet
-                    $this->definitions[$type] = $def;
-                    return null;
-                }
-            }
-            // check invariants for creation
-            if (!$optimized) {
-                if (!is_null($this->get($type . '.DefinitionID'))) {
-                    if ($this->chatty) {
-                        $this->triggerError("Due to a documentation error in previous version of HTML Purifier, your definitions are not being cached.  If this is OK, you can remove the %$type.DefinitionRev and %$type.DefinitionID declaration.  Otherwise, modify your code to use maybeGetRawDefinition, and test if the returned value is null before making any edits (if it is null, that means that a cached version is available, and no raw operations are necessary).  See <a href='http://htmlpurifier.org/docs/enduser-customize.html#optimized'>Customize</a> for more details", E_USER_WARNING);
-                    } else {
-                        $this->triggerError("Useless DefinitionID declaration", E_USER_WARNING);
-                    }
-                }
-            }
-            // initialize it
-            $def = $this->initDefinition($type);
-            $def->optimized = $optimized;
-            return $def;
-        }
-        throw new HTMLPurifier_Exception("The impossible happened!");
-    }
-
-    private function initDefinition($type) {
-        // quick checks failed, let's create the object
-        if ($type == 'HTML') {
-            $def = new HTMLPurifier_HTMLDefinition();
-        } elseif ($type == 'CSS') {
-            $def = new HTMLPurifier_CSSDefinition();
-        } elseif ($type == 'URI') {
-            $def = new HTMLPurifier_URIDefinition();
-        } else {
-            throw new HTMLPurifier_Exception("Definition of $type type not supported");
-        }
-        $this->definitions[$type] = $def;
-        return $def;
-    }
-
-    public function maybeGetRawDefinition($name) {
-        return $this->getDefinition($name, true, true);
-    }
-
-    public function maybeGetRawHTMLDefinition() {
-        return $this->getDefinition('HTML', true, true);
-    }
-
-    public function maybeGetRawCSSDefinition() {
-        return $this->getDefinition('CSS', true, true);
-    }
-
-    public function maybeGetRawURIDefinition() {
-        return $this->getDefinition('URI', true, true);
-    }
-
-    /**
-     * Loads configuration values from an array with the following structure:
-     * Namespace.Directive => Value
-     * @param $config_array Configuration associative array
-     */
-    public function loadArray($config_array) {
-        if ($this->isFinalized('Cannot load directives after finalization')) return;
-        foreach ($config_array as $key => $value) {
-            $key = str_replace('_', '.', $key);
-            if (strpos($key, '.') !== false) {
-                $this->set($key, $value);
-            } else {
-                $namespace = $key;
-                $namespace_values = $value;
-                foreach ($namespace_values as $directive => $value) {
-                    $this->set($namespace .'.'. $directive, $value);
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns a list of array(namespace, directive) for all directives
-     * that are allowed in a web-form context as per an allowed
-     * namespaces/directives list.
-     * @param $allowed List of allowed namespaces/directives
-     */
-    public static function getAllowedDirectivesForForm($allowed, $schema = null) {
-        if (!$schema) {
-            $schema = HTMLPurifier_ConfigSchema::instance();
-        }
-        if ($allowed !== true) {
-             if (is_string($allowed)) $allowed = array($allowed);
-             $allowed_ns = array();
-             $allowed_directives = array();
-             $blacklisted_directives = array();
-             foreach ($allowed as $ns_or_directive) {
-                 if (strpos($ns_or_directive, '.') !== false) {
-                     // directive
-                     if ($ns_or_directive[0] == '-') {
-                         $blacklisted_directives[substr($ns_or_directive, 1)] = true;
-                     } else {
-                         $allowed_directives[$ns_or_directive] = true;
-                     }
-                 } else {
-                     // namespace
-                     $allowed_ns[$ns_or_directive] = true;
-                 }
-             }
-        }
-        $ret = array();
-        foreach ($schema->info as $key => $def) {
-            list($ns, $directive) = explode('.', $key, 2);
-            if ($allowed !== true) {
-                if (isset($blacklisted_directives["$ns.$directive"])) continue;
-                if (!isset($allowed_directives["$ns.$directive"]) && !isset($allowed_ns[$ns])) continue;
-            }
-            if (isset($def->isAlias)) continue;
-            if ($directive == 'DefinitionID' || $directive == 'DefinitionRev') continue;
-            $ret[] = array($ns, $directive);
-        }
-        return $ret;
-    }
-
-    /**
-     * Loads configuration values from $_GET/$_POST that were posted
-     * via ConfigForm
-     * @param $array $_GET or $_POST array to import
-     * @param $index Index/name that the config variables are in
-     * @param $allowed List of allowed namespaces/directives
-     * @param $mq_fix Boolean whether or not to enable magic quotes fix
-     * @param $schema Instance of HTMLPurifier_ConfigSchema to use, if not global copy
-     */
-    public static function loadArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true, $schema = null) {
-        $ret = HTMLPurifier_Config::prepareArrayFromForm($array, $index, $allowed, $mq_fix, $schema);
-        $config = HTMLPurifier_Config::create($ret, $schema);
-        return $config;
-    }
-
-    /**
-     * Merges in configuration values from $_GET/$_POST to object. NOT STATIC.
-     * @note Same parameters as loadArrayFromForm
-     */
-    public function mergeArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true) {
-         $ret = HTMLPurifier_Config::prepareArrayFromForm($array, $index, $allowed, $mq_fix, $this->def);
-         $this->loadArray($ret);
-    }
-
-    /**
-     * Prepares an array from a form into something usable for the more
-     * strict parts of HTMLPurifier_Config
-     */
-    public static function prepareArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true, $schema = null) {
-        if ($index !== false) $array = (isset($array[$index]) && is_array($array[$index])) ? $array[$index] : array();
-        $mq = $mq_fix && function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc();
-
-        $allowed = HTMLPurifier_Config::getAllowedDirectivesForForm($allowed, $schema);
-        $ret = array();
-        foreach ($allowed as $key) {
-            list($ns, $directive) = $key;
-            $skey = "$ns.$directive";
-            if (!empty($array["Null_$skey"])) {
-                $ret[$ns][$directive] = null;
-                continue;
-            }
-            if (!isset($array[$skey])) continue;
-            $value = $mq ? stripslashes($array[$skey]) : $array[$skey];
-            $ret[$ns][$directive] = $value;
-        }
-        return $ret;
-    }
-
-    /**
-     * Loads configuration values from an ini file
-     * @param $filename Name of ini file
-     */
-    public function loadIni($filename) {
-        if ($this->isFinalized('Cannot load directives after finalization')) return;
-        $array = parse_ini_file($filename, true);
-        $this->loadArray($array);
-    }
-
-    /**
-     * Checks whether or not the configuration object is finalized.
-     * @param $error String error message, or false for no error
-     */
-    public function isFinalized($error = false) {
-        if ($this->finalized && $error) {
-            $this->triggerError($error, E_USER_ERROR);
-        }
-        return $this->finalized;
-    }
-
-    /**
-     * Finalizes configuration only if auto finalize is on and not
-     * already finalized
-     */
-    public function autoFinalize() {
-        if ($this->autoFinalize) {
-            $this->finalize();
-        } else {
-            $this->plist->squash(true);
-        }
-    }
-
-    /**
-     * Finalizes a configuration object, prohibiting further change
-     */
-    public function finalize() {
-        $this->finalized = true;
-        $this->parser = null;
-    }
-
-    /**
-     * Produces a nicely formatted error message by supplying the
-     * stack frame information OUTSIDE of HTMLPurifier_Config.
-     */
-    protected function triggerError($msg, $no) {
-        // determine previous stack frame
-        $extra = '';
-        if ($this->chatty) {
-            $trace = debug_backtrace();
-            // zip(tail(trace), trace) -- but PHP is not Haskell har har
-            for ($i = 0, $c = count($trace); $i < $c - 1; $i++) {
-                if ($trace[$i + 1]['class'] === 'HTMLPurifier_Config') {
-                    continue;
-                }
-                $frame = $trace[$i];
-                $extra = " invoked on line {$frame['line']} in file {$frame['file']}";
-                break;
-            }
-        }
-        trigger_error($msg . $extra, $no);
-    }
-
-    /**
-     * Returns a serialized form of the configuration object that can
-     * be reconstituted.
-     */
-    public function serialize() {
-        $this->getDefinition('HTML');
-        $this->getDefinition('CSS');
-        $this->getDefinition('URI');
-        return serialize($this);
-    }
+	/**
+	 * HTML Purifier's version
+	 */
+	public $version = '4.4.0';
+
+	/**
+	 * Bool indicator whether or not to automatically finalize
+	 * the object if a read operation is done
+	 */
+	public $autoFinalize = true;
+
+	// protected member variables
+
+	/**
+	 * Namespace indexed array of serials for specific namespaces (see
+	 * getSerial() for more info).
+	 */
+	protected $serials = array();
+
+	/**
+	 * Serial for entire configuration object
+	 */
+	protected $serial;
+
+	/**
+	 * Parser for variables
+	 */
+	protected $parser = null;
+
+	/**
+	 * Reference HTMLPurifier_ConfigSchema for value checking
+	 * @note This is public for introspective purposes. Please don't
+	 *       abuse!
+	 */
+	public $def;
+
+	/**
+	 * Indexed array of definitions
+	 */
+	protected $definitions;
+
+	/**
+	 * Bool indicator whether or not config is finalized
+	 */
+	protected $finalized = false;
+
+	/**
+	 * Property list containing configuration directives.
+	 */
+	protected $plist;
+
+	/**
+	 * Whether or not a set is taking place due to an
+	 * alias lookup.
+	 */
+	private $aliasMode;
+
+	/**
+	 * Set to false if you do not want line and file numbers in errors
+	 * (useful when unit testing).  This will also compress some errors
+	 * and exceptions.
+	 */
+	public $chatty = true;
+
+	/**
+	 * Current lock; only gets to this namespace are allowed.
+	 */
+	private $lock;
+
+	/**
+	 * @param $definition HTMLPurifier_ConfigSchema that defines what directives
+	 *                    are allowed.
+	 */
+	public function __construct($definition, $parent = null) {
+		$parent = $parent ? $parent : $definition->defaultPlist;
+		$this->plist = new HTMLPurifier_PropertyList($parent);
+		$this->def = $definition; // keep a copy around for checking
+		$this->parser = new HTMLPurifier_VarParser_Flexible();
+	}
+
+	/**
+	 * Convenience constructor that creates a config object based on a mixed var
+	 * @param mixed $config Variable that defines the state of the config
+	 *                      object. Can be: a HTMLPurifier_Config() object,
+	 *                      an array of directives based on loadArray(),
+	 *                      or a string filename of an ini file.
+	 * @param HTMLPurifier_ConfigSchema Schema object
+	 * @return Configured HTMLPurifier_Config object
+	 */
+	public static function create($config, $schema = null) {
+		if ($config instanceof HTMLPurifier_Config) {
+			// pass-through
+			return $config;
+		}
+		if (!$schema) {
+			$ret = HTMLPurifier_Config::createDefault();
+		} else {
+			$ret = new HTMLPurifier_Config($schema);
+		}
+		if (is_string($config)) $ret->loadIni($config);
+		elseif (is_array($config)) $ret->loadArray($config);
+		return $ret;
+	}
+
+	/**
+	 * Creates a new config object that inherits from a previous one.
+	 * @param HTMLPurifier_Config $config Configuration object to inherit
+	 *        from.
+	 * @return HTMLPurifier_Config object with $config as its parent.
+	 */
+	public static function inherit(HTMLPurifier_Config $config) {
+		return new HTMLPurifier_Config($config->def, $config->plist);
+	}
+
+	/**
+	 * Convenience constructor that creates a default configuration object.
+	 * @return Default HTMLPurifier_Config object.
+	 */
+	public static function createDefault() {
+		$definition = HTMLPurifier_ConfigSchema::instance();
+		$config = new HTMLPurifier_Config($definition);
+		return $config;
+	}
+
+	/**
+	 * Retreives a value from the configuration.
+	 * @param $key String key
+	 */
+	public function get($key, $a = null) {
+		if ($a !== null) {
+			$this->triggerError("Using deprecated API: use \$config->get('$key.$a') instead", E_USER_WARNING);
+			$key = "$key.$a";
+		}
+		if (!$this->finalized) $this->autoFinalize();
+		if (!isset($this->def->info[$key])) {
+			// can't add % due to SimpleTest bug
+			$this->triggerError('Cannot retrieve value of undefined directive ' . htmlspecialchars($key, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),
+				E_USER_WARNING);
+			return;
+		}
+		if (isset($this->def->info[$key]->isAlias)) {
+			$d = $this->def->info[$key];
+			$this->triggerError('Cannot get value from aliased directive, use real name ' . $d->key,
+				E_USER_ERROR);
+			return;
+		}
+		if ($this->lock) {
+			list($ns) = explode('.', $key);
+			if ($ns !== $this->lock) {
+				$this->triggerError('Cannot get value of namespace ' . $ns . ' when lock for ' . $this->lock . ' is active, this probably indicates a Definition setup method is accessing directives that are not within its namespace', E_USER_ERROR);
+				return;
+			}
+		}
+		return $this->plist->get($key);
+	}
+
+	/**
+	 * Retreives an array of directives to values from a given namespace
+	 * @param $namespace String namespace
+	 */
+	public function getBatch($namespace) {
+		if (!$this->finalized) $this->autoFinalize();
+		$full = $this->getAll();
+		if (!isset($full[$namespace])) {
+			$this->triggerError('Cannot retrieve undefined namespace ' . htmlspecialchars($namespace, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),
+				E_USER_WARNING);
+			return;
+		}
+		return $full[$namespace];
+	}
+
+	/**
+	 * Returns a md5 signature of a segment of the configuration object
+	 * that uniquely identifies that particular configuration
+	 * @note Revision is handled specially and is removed from the batch
+	 *       before processing!
+	 * @param $namespace Namespace to get serial for
+	 */
+	public function getBatchSerial($namespace) {
+		if (empty($this->serials[$namespace])) {
+			$batch = $this->getBatch($namespace);
+			unset($batch['DefinitionRev']);
+			$this->serials[$namespace] = md5(serialize($batch));
+		}
+		return $this->serials[$namespace];
+	}
+
+	/**
+	 * Returns a md5 signature for the entire configuration object
+	 * that uniquely identifies that particular configuration
+	 */
+	public function getSerial() {
+		if (empty($this->serial)) {
+			$this->serial = md5(serialize($this->getAll()));
+		}
+		return $this->serial;
+	}
+
+	/**
+	 * Retrieves all directives, organized by namespace
+	 * @warning This is a pretty inefficient function, avoid if you can
+	 */
+	public function getAll() {
+		if (!$this->finalized) $this->autoFinalize();
+		$ret = array();
+		foreach ($this->plist->squash() as $name => $value) {
+			list($ns, $key) = explode('.', $name, 2);
+			$ret[$ns][$key] = $value;
+		}
+		return $ret;
+	}
+
+	/**
+	 * Sets a value to configuration.
+	 * @param $key String key
+	 * @param $value Mixed value
+	 */
+	public function set($key, $value, $a = null) {
+		if (strpos($key, '.') === false) {
+			$namespace = $key;
+			$directive = $value;
+			$value = $a;
+			$key = "$key.$directive";
+			$this->triggerError("Using deprecated API: use \$config->set('$key', ...) instead", E_USER_NOTICE);
+		} else {
+			list($namespace) = explode('.', $key);
+		}
+		if ($this->isFinalized('Cannot set directive after finalization')) return;
+		if (!isset($this->def->info[$key])) {
+			$this->triggerError('Cannot set undefined directive ' . htmlspecialchars($key, ENT_COMPAT | ENT_HTML401, 'UTF-8', false) . ' to value',
+				E_USER_WARNING);
+			return;
+		}
+		$def = $this->def->info[$key];
+
+		if (isset($def->isAlias)) {
+			if ($this->aliasMode) {
+				$this->triggerError('Double-aliases not allowed, please fix '.
+					'ConfigSchema bug with' . $key, E_USER_ERROR);
+				return;
+			}
+			$this->aliasMode = true;
+			$this->set($def->key, $value);
+			$this->aliasMode = false;
+			$this->triggerError("$key is an alias, preferred directive name is {$def->key}", E_USER_NOTICE);
+			return;
+		}
+
+		// Raw type might be negative when using the fully optimized form
+		// of stdclass, which indicates allow_null == true
+		$rtype = is_int($def) ? $def : $def->type;
+		if ($rtype < 0) {
+			$type = -$rtype;
+			$allow_null = true;
+		} else {
+			$type = $rtype;
+			$allow_null = isset($def->allow_null);
+		}
+
+		try {
+			$value = $this->parser->parse($value, $type, $allow_null);
+		} catch (HTMLPurifier_VarParserException $e) {
+			$this->triggerError('Value for ' . $key . ' is of invalid type, should be ' . HTMLPurifier_VarParser::getTypeName($type), E_USER_WARNING);
+			return;
+		}
+		if (is_string($value) && is_object($def)) {
+			// resolve value alias if defined
+			if (isset($def->aliases[$value])) {
+				$value = $def->aliases[$value];
+			}
+			// check to see if the value is allowed
+			if (isset($def->allowed) && !isset($def->allowed[$value])) {
+				$this->triggerError('Value not supported, valid values are: ' .
+					$this->_listify($def->allowed), E_USER_WARNING);
+				return;
+			}
+		}
+		$this->plist->set($key, $value);
+
+		// reset definitions if the directives they depend on changed
+		// this is a very costly process, so it's discouraged
+		// with finalization
+		if ($namespace == 'HTML' || $namespace == 'CSS' || $namespace == 'URI') {
+			$this->definitions[$namespace] = null;
+		}
+
+		$this->serials[$namespace] = false;
+	}
+
+	/**
+	 * Convenience function for error reporting
+	 */
+	private function _listify($lookup) {
+		$list = array();
+		foreach ($lookup as $name => $b) $list[] = $name;
+		return implode(', ', $list);
+	}
+
+	/**
+	 * Retrieves object reference to the HTML definition.
+	 * @param $raw Return a copy that has not been setup yet. Must be
+	 *             called before it's been setup, otherwise won't work.
+	 * @param $optimized If true, this method may return null, to
+	 *             indicate that a cached version of the modified
+	 *             definition object is available and no further edits
+	 *             are necessary.  Consider using
+	 *             maybeGetRawHTMLDefinition, which is more explicitly
+	 *             named, instead.
+	 */
+	public function getHTMLDefinition($raw = false, $optimized = false) {
+		return $this->getDefinition('HTML', $raw, $optimized);
+	}
+
+	/**
+	 * Retrieves object reference to the CSS definition
+	 * @param $raw Return a copy that has not been setup yet. Must be
+	 *             called before it's been setup, otherwise won't work.
+	 * @param $optimized If true, this method may return null, to
+	 *             indicate that a cached version of the modified
+	 *             definition object is available and no further edits
+	 *             are necessary.  Consider using
+	 *             maybeGetRawCSSDefinition, which is more explicitly
+	 *             named, instead.
+	 */
+	public function getCSSDefinition($raw = false, $optimized = false) {
+		return $this->getDefinition('CSS', $raw, $optimized);
+	}
+
+	/**
+	 * Retrieves object reference to the URI definition
+	 * @param $raw Return a copy that has not been setup yet. Must be
+	 *             called before it's been setup, otherwise won't work.
+	 * @param $optimized If true, this method may return null, to
+	 *             indicate that a cached version of the modified
+	 *             definition object is available and no further edits
+	 *             are necessary.  Consider using
+	 *             maybeGetRawURIDefinition, which is more explicitly
+	 *             named, instead.
+	 */
+	public function getURIDefinition($raw = false, $optimized = false) {
+		return $this->getDefinition('URI', $raw, $optimized);
+	}
+
+	/**
+	 * Retrieves a definition
+	 * @param $type Type of definition: HTML, CSS, etc
+	 * @param $raw  Whether or not definition should be returned raw
+	 * @param $optimized Only has an effect when $raw is true.  Whether
+	 *        or not to return null if the result is already present in
+	 *        the cache.  This is off by default for backwards
+	 *        compatibility reasons, but you need to do things this
+	 *        way in order to ensure that caching is done properly.
+	 *        Check out enduser-customize.html for more details.
+	 *        We probably won't ever change this default, as much as the
+	 *        maybe semantics is the "right thing to do."
+	 */
+	public function getDefinition($type, $raw = false, $optimized = false) {
+		if ($optimized && !$raw) {
+			throw new HTMLPurifier_Exception("Cannot set optimized = true when raw = false");
+		}
+		if (!$this->finalized) $this->autoFinalize();
+		// temporarily suspend locks, so we can handle recursive definition calls
+		$lock = $this->lock;
+		$this->lock = null;
+		$factory = HTMLPurifier_DefinitionCacheFactory::instance();
+		$cache = $factory->create($type, $this);
+		$this->lock = $lock;
+		if (!$raw) {
+			// full definition
+			// ---------------
+			// check if definition is in memory
+			if (!empty($this->definitions[$type])) {
+				$def = $this->definitions[$type];
+				// check if the definition is setup
+				if ($def->setup) {
+					return $def;
+				} else {
+					$def->setup($this);
+					if ($def->optimized) $cache->add($def, $this);
+					return $def;
+				}
+			}
+			// check if definition is in cache
+			$def = $cache->get($this);
+			if ($def) {
+				// definition in cache, save to memory and return it
+				$this->definitions[$type] = $def;
+				return $def;
+			}
+			// initialize it
+			$def = $this->initDefinition($type);
+			// set it up
+			$this->lock = $type;
+			$def->setup($this);
+			$this->lock = null;
+			// save in cache
+			$cache->add($def, $this);
+			// return it
+			return $def;
+		} else {
+			// raw definition
+			// --------------
+			// check preconditions
+			$def = null;
+			if ($optimized) {
+				if (is_null($this->get($type . '.DefinitionID'))) {
+					// fatally error out if definition ID not set
+					throw new HTMLPurifier_Exception("Cannot retrieve raw version without specifying %$type.DefinitionID");
+				}
+			}
+			if (!empty($this->definitions[$type])) {
+				$def = $this->definitions[$type];
+				if ($def->setup && !$optimized) {
+					$extra = $this->chatty ? " (try moving this code block earlier in your initialization)" : "";
+					throw new HTMLPurifier_Exception("Cannot retrieve raw definition after it has already been setup" . $extra);
+				}
+				if ($def->optimized === null) {
+					$extra = $this->chatty ? " (try flushing your cache)" : "";
+					throw new HTMLPurifier_Exception("Optimization status of definition is unknown" . $extra);
+				}
+				if ($def->optimized !== $optimized) {
+					$msg = $optimized ? "optimized" : "unoptimized";
+					$extra = $this->chatty ? " (this backtrace is for the first inconsistent call, which was for a $msg raw definition)" : "";
+					throw new HTMLPurifier_Exception("Inconsistent use of optimized and unoptimized raw definition retrievals" . $extra);
+				}
+			}
+			// check if definition was in memory
+			if ($def) {
+				if ($def->setup) {
+					// invariant: $optimized === true (checked above)
+					return null;
+				} else {
+					return $def;
+				}
+			}
+			// if optimized, check if definition was in cache
+			// (because we do the memory check first, this formulation
+			// is prone to cache slamming, but I think
+			// guaranteeing that either /all/ of the raw
+			// setup code or /none/ of it is run is more important.)
+			if ($optimized) {
+				// This code path only gets run once; once we put
+				// something in $definitions (which is guaranteed by the
+				// trailing code), we always short-circuit above.
+				$def = $cache->get($this);
+				if ($def) {
+					// save the full definition for later, but don't
+					// return it yet
+					$this->definitions[$type] = $def;
+					return null;
+				}
+			}
+			// check invariants for creation
+			if (!$optimized) {
+				if (!is_null($this->get($type . '.DefinitionID'))) {
+					if ($this->chatty) {
+						$this->triggerError("Due to a documentation error in previous version of HTML Purifier, your definitions are not being cached.  If this is OK, you can remove the %$type.DefinitionRev and %$type.DefinitionID declaration.  Otherwise, modify your code to use maybeGetRawDefinition, and test if the returned value is null before making any edits (if it is null, that means that a cached version is available, and no raw operations are necessary).  See <a href='http://htmlpurifier.org/docs/enduser-customize.html#optimized'>Customize</a> for more details", E_USER_WARNING);
+					} else {
+						$this->triggerError("Useless DefinitionID declaration", E_USER_WARNING);
+					}
+				}
+			}
+			// initialize it
+			$def = $this->initDefinition($type);
+			$def->optimized = $optimized;
+			return $def;
+		}
+		throw new HTMLPurifier_Exception("The impossible happened!");
+	}
+
+	private function initDefinition($type) {
+		// quick checks failed, let's create the object
+		if ($type == 'HTML') {
+			$def = new HTMLPurifier_HTMLDefinition();
+		} elseif ($type == 'CSS') {
+			$def = new HTMLPurifier_CSSDefinition();
+		} elseif ($type == 'URI') {
+			$def = new HTMLPurifier_URIDefinition();
+		} else {
+			throw new HTMLPurifier_Exception("Definition of $type type not supported");
+		}
+		$this->definitions[$type] = $def;
+		return $def;
+	}
+
+	public function maybeGetRawDefinition($name) {
+		return $this->getDefinition($name, true, true);
+	}
+
+	public function maybeGetRawHTMLDefinition() {
+		return $this->getDefinition('HTML', true, true);
+	}
+
+	public function maybeGetRawCSSDefinition() {
+		return $this->getDefinition('CSS', true, true);
+	}
+
+	public function maybeGetRawURIDefinition() {
+		return $this->getDefinition('URI', true, true);
+	}
+
+	/**
+	 * Loads configuration values from an array with the following structure:
+	 * Namespace.Directive => Value
+	 * @param $config_array Configuration associative array
+	 */
+	public function loadArray($config_array) {
+		if ($this->isFinalized('Cannot load directives after finalization')) return;
+		foreach ($config_array as $key => $value) {
+			$key = str_replace('_', '.', $key);
+			if (strpos($key, '.') !== false) {
+				$this->set($key, $value);
+			} else {
+				$namespace = $key;
+				$namespace_values = $value;
+				foreach ($namespace_values as $directive => $value) {
+					$this->set($namespace .'.'. $directive, $value);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Returns a list of array(namespace, directive) for all directives
+	 * that are allowed in a web-form context as per an allowed
+	 * namespaces/directives list.
+	 * @param $allowed List of allowed namespaces/directives
+	 */
+	public static function getAllowedDirectivesForForm($allowed, $schema = null) {
+		if (!$schema) {
+			$schema = HTMLPurifier_ConfigSchema::instance();
+		}
+		if ($allowed !== true) {
+			 if (is_string($allowed)) $allowed = array($allowed);
+			 $allowed_ns = array();
+			 $allowed_directives = array();
+			 $blacklisted_directives = array();
+			 foreach ($allowed as $ns_or_directive) {
+				 if (strpos($ns_or_directive, '.') !== false) {
+					 // directive
+					 if ($ns_or_directive[0] == '-') {
+						 $blacklisted_directives[substr($ns_or_directive, 1)] = true;
+					 } else {
+						 $allowed_directives[$ns_or_directive] = true;
+					 }
+				 } else {
+					 // namespace
+					 $allowed_ns[$ns_or_directive] = true;
+				 }
+			 }
+		}
+		$ret = array();
+		foreach ($schema->info as $key => $def) {
+			list($ns, $directive) = explode('.', $key, 2);
+			if ($allowed !== true) {
+				if (isset($blacklisted_directives["$ns.$directive"])) continue;
+				if (!isset($allowed_directives["$ns.$directive"]) && !isset($allowed_ns[$ns])) continue;
+			}
+			if (isset($def->isAlias)) continue;
+			if ($directive == 'DefinitionID' || $directive == 'DefinitionRev') continue;
+			$ret[] = array($ns, $directive);
+		}
+		return $ret;
+	}
+
+	/**
+	 * Loads configuration values from $_GET/$_POST that were posted
+	 * via ConfigForm
+	 * @param $array $_GET or $_POST array to import
+	 * @param $index Index/name that the config variables are in
+	 * @param $allowed List of allowed namespaces/directives
+	 * @param $mq_fix Boolean whether or not to enable magic quotes fix
+	 * @param $schema Instance of HTMLPurifier_ConfigSchema to use, if not global copy
+	 */
+	public static function loadArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true, $schema = null) {
+		$ret = HTMLPurifier_Config::prepareArrayFromForm($array, $index, $allowed, $mq_fix, $schema);
+		$config = HTMLPurifier_Config::create($ret, $schema);
+		return $config;
+	}
+
+	/**
+	 * Merges in configuration values from $_GET/$_POST to object. NOT STATIC.
+	 * @note Same parameters as loadArrayFromForm
+	 */
+	public function mergeArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true) {
+		 $ret = HTMLPurifier_Config::prepareArrayFromForm($array, $index, $allowed, $mq_fix, $this->def);
+		 $this->loadArray($ret);
+	}
+
+	/**
+	 * Prepares an array from a form into something usable for the more
+	 * strict parts of HTMLPurifier_Config
+	 */
+	public static function prepareArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true, $schema = null) {
+		if ($index !== false) $array = (isset($array[$index]) && is_array($array[$index])) ? $array[$index] : array();
+		$mq = $mq_fix && function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc();
+
+		$allowed = HTMLPurifier_Config::getAllowedDirectivesForForm($allowed, $schema);
+		$ret = array();
+		foreach ($allowed as $key) {
+			list($ns, $directive) = $key;
+			$skey = "$ns.$directive";
+			if (!empty($array["Null_$skey"])) {
+				$ret[$ns][$directive] = null;
+				continue;
+			}
+			if (!isset($array[$skey])) continue;
+			$value = $mq ? stripslashes($array[$skey]) : $array[$skey];
+			$ret[$ns][$directive] = $value;
+		}
+		return $ret;
+	}
+
+	/**
+	 * Loads configuration values from an ini file
+	 * @param $filename Name of ini file
+	 */
+	public function loadIni($filename) {
+		if ($this->isFinalized('Cannot load directives after finalization')) return;
+		$array = parse_ini_file($filename, true);
+		$this->loadArray($array);
+	}
+
+	/**
+	 * Checks whether or not the configuration object is finalized.
+	 * @param $error String error message, or false for no error
+	 */
+	public function isFinalized($error = false) {
+		if ($this->finalized && $error) {
+			$this->triggerError($error, E_USER_ERROR);
+		}
+		return $this->finalized;
+	}
+
+	/**
+	 * Finalizes configuration only if auto finalize is on and not
+	 * already finalized
+	 */
+	public function autoFinalize() {
+		if ($this->autoFinalize) {
+			$this->finalize();
+		} else {
+			$this->plist->squash(true);
+		}
+	}
+
+	/**
+	 * Finalizes a configuration object, prohibiting further change
+	 */
+	public function finalize() {
+		$this->finalized = true;
+		$this->parser = null;
+	}
+
+	/**
+	 * Produces a nicely formatted error message by supplying the
+	 * stack frame information OUTSIDE of HTMLPurifier_Config.
+	 */
+	protected function triggerError($msg, $no) {
+		// determine previous stack frame
+		$extra = '';
+		if ($this->chatty) {
+			$trace = debug_backtrace();
+			// zip(tail(trace), trace) -- but PHP is not Haskell har har
+			for ($i = 0, $c = count($trace); $i < $c - 1; $i++) {
+				if ($trace[$i + 1]['class'] === 'HTMLPurifier_Config') {
+					continue;
+				}
+				$frame = $trace[$i];
+				$extra = " invoked on line {$frame['line']} in file {$frame['file']}";
+				break;
+			}
+		}
+		trigger_error($msg . $extra, $no);
+	}
+
+	/**
+	 * Returns a serialized form of the configuration object that can
+	 * be reconstituted.
+	 */
+	public function serialize() {
+		$this->getDefinition('HTML');
+		$this->getDefinition('CSS');
+		$this->getDefinition('URI');
+		return serialize($this);
+	}
 
 }
 

Braces +53 added lines, -18 removed lines

@@ -116,8 +116,11 @@ 
         } else {
             $ret = new HTMLPurifier_Config($schema);
         }
-        if (is_string($config)) $ret->loadIni($config);
-        elseif (is_array($config)) $ret->loadArray($config);
+        if (is_string($config)) {
+        	$ret->loadIni($config);
+        } elseif (is_array($config)) {
+        	$ret->loadArray($config);
+        }
         return $ret;
     }
 
@@ -150,7 +153,9 @@ 
             $this->triggerError("Using deprecated API: use \$config->get('$key.$a') instead", E_USER_WARNING);
             $key = "$key.$a";
         }
-        if (!$this->finalized) $this->autoFinalize();
+        if (!$this->finalized) {
+        	$this->autoFinalize();
+        }
         if (!isset($this->def->info[$key])) {
             // can't add % due to SimpleTest bug
             $this->triggerError('Cannot retrieve value of undefined directive ' . htmlspecialchars($key, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),
@@ -178,7 +183,9 @@ 
      * @param $namespace String namespace
      */
     public function getBatch($namespace) {
-        if (!$this->finalized) $this->autoFinalize();
+        if (!$this->finalized) {
+        	$this->autoFinalize();
+        }
         $full = $this->getAll();
         if (!isset($full[$namespace])) {
             $this->triggerError('Cannot retrieve undefined namespace ' . htmlspecialchars($namespace, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),
@@ -220,7 +227,9 @@ 
      * @warning This is a pretty inefficient function, avoid if you can
      */
     public function getAll() {
-        if (!$this->finalized) $this->autoFinalize();
+        if (!$this->finalized) {
+        	$this->autoFinalize();
+        }
         $ret = array();
         foreach ($this->plist->squash() as $name => $value) {
             list($ns, $key) = explode('.', $name, 2);
@@ -244,7 +253,9 @@ 
         } else {
             list($namespace) = explode('.', $key);
         }
-        if ($this->isFinalized('Cannot set directive after finalization')) return;
+        if ($this->isFinalized('Cannot set directive after finalization')) {
+        	return;
+        }
         if (!isset($this->def->info[$key])) {
             $this->triggerError('Cannot set undefined directive ' . htmlspecialchars($key, ENT_COMPAT | ENT_HTML401, 'UTF-8', false) . ' to value',
                 E_USER_WARNING);
@@ -311,7 +322,9 @@ 
      */
     private function _listify($lookup) {
         $list = array();
-        foreach ($lookup as $name => $b) $list[] = $name;
+        foreach ($lookup as $name => $b) {
+        	$list[] = $name;
+        }
         return implode(', ', $list);
     }
 
@@ -377,7 +390,9 @@ 
         if ($optimized && !$raw) {
             throw new HTMLPurifier_Exception("Cannot set optimized = true when raw = false");
         }
-        if (!$this->finalized) $this->autoFinalize();
+        if (!$this->finalized) {
+        	$this->autoFinalize();
+        }
         // temporarily suspend locks, so we can handle recursive definition calls
         $lock = $this->lock;
         $this->lock = null;
@@ -395,7 +410,9 @@ 
                     return $def;
                 } else {
                     $def->setup($this);
-                    if ($def->optimized) $cache->add($def, $this);
+                    if ($def->optimized) {
+                    	$cache->add($def, $this);
+                    }
                     return $def;
                 }
             }
@@ -524,7 +541,9 @@ 
      * @param $config_array Configuration associative array
      */
     public function loadArray($config_array) {
-        if ($this->isFinalized('Cannot load directives after finalization')) return;
+        if ($this->isFinalized('Cannot load directives after finalization')) {
+        	return;
+        }
         foreach ($config_array as $key => $value) {
             $key = str_replace('_', '.', $key);
             if (strpos($key, '.') !== false) {
@@ -550,7 +569,9 @@ 
             $schema = HTMLPurifier_ConfigSchema::instance();
         }
         if ($allowed !== true) {
-             if (is_string($allowed)) $allowed = array($allowed);
+             if (is_string($allowed)) {
+             	$allowed = array($allowed);
+             }
              $allowed_ns = array();
              $allowed_directives = array();
              $blacklisted_directives = array();
@@ -572,11 +593,19 @@ 
         foreach ($schema->info as $key => $def) {
             list($ns, $directive) = explode('.', $key, 2);
             if ($allowed !== true) {
-                if (isset($blacklisted_directives["$ns.$directive"])) continue;
-                if (!isset($allowed_directives["$ns.$directive"]) && !isset($allowed_ns[$ns])) continue;
+                if (isset($blacklisted_directives["$ns.$directive"])) {
+                	continue;
+                }
+                if (!isset($allowed_directives["$ns.$directive"]) && !isset($allowed_ns[$ns])) {
+                	continue;
+                }
+            }
+            if (isset($def->isAlias)) {
+            	continue;
+            }
+            if ($directive == 'DefinitionID' || $directive == 'DefinitionRev') {
+            	continue;
             }
-            if (isset($def->isAlias)) continue;
-            if ($directive == 'DefinitionID' || $directive == 'DefinitionRev') continue;
             $ret[] = array($ns, $directive);
         }
         return $ret;
@@ -611,7 +640,9 @@ 
      * strict parts of HTMLPurifier_Config
      */
     public static function prepareArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true, $schema = null) {
-        if ($index !== false) $array = (isset($array[$index]) && is_array($array[$index])) ? $array[$index] : array();
+        if ($index !== false) {
+        	$array = (isset($array[$index]) && is_array($array[$index])) ? $array[$index] : array();
+        }
         $mq = $mq_fix && function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc();
 
         $allowed = HTMLPurifier_Config::getAllowedDirectivesForForm($allowed, $schema);
@@ -623,7 +654,9 @@ 
                 $ret[$ns][$directive] = null;
                 continue;
             }
-            if (!isset($array[$skey])) continue;
+            if (!isset($array[$skey])) {
+            	continue;
+            }
             $value = $mq ? stripslashes($array[$skey]) : $array[$skey];
             $ret[$ns][$directive] = $value;
         }
@@ -635,7 +668,9 @@ 
      * @param $filename Name of ini file
      */
     public function loadIni($filename) {
-        if ($this->isFinalized('Cannot load directives after finalization')) return;
+        if ($this->isFinalized('Cannot load directives after finalization')) {
+        	return;
+        }
         $array = parse_ini_file($filename, true);
         $this->loadArray($array);
     }

Spacing +15 added lines, -15 removed lines

@@ -153,20 +153,20 @@ 
         if (!$this->finalized) $this->autoFinalize();
         if (!isset($this->def->info[$key])) {
             // can't add % due to SimpleTest bug
-            $this->triggerError('Cannot retrieve value of undefined directive ' . htmlspecialchars($key, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),
+            $this->triggerError('Cannot retrieve value of undefined directive '.htmlspecialchars($key, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),
                 E_USER_WARNING);
             return;
         }
         if (isset($this->def->info[$key]->isAlias)) {
             $d = $this->def->info[$key];
-            $this->triggerError('Cannot get value from aliased directive, use real name ' . $d->key,
+            $this->triggerError('Cannot get value from aliased directive, use real name '.$d->key,
                 E_USER_ERROR);
             return;
         }
         if ($this->lock) {
             list($ns) = explode('.', $key);
             if ($ns !== $this->lock) {
-                $this->triggerError('Cannot get value of namespace ' . $ns . ' when lock for ' . $this->lock . ' is active, this probably indicates a Definition setup method is accessing directives that are not within its namespace', E_USER_ERROR);
+                $this->triggerError('Cannot get value of namespace '.$ns.' when lock for '.$this->lock.' is active, this probably indicates a Definition setup method is accessing directives that are not within its namespace', E_USER_ERROR);
                 return;
             }
         }
@@ -181,7 +181,7 @@ 
         if (!$this->finalized) $this->autoFinalize();
         $full = $this->getAll();
         if (!isset($full[$namespace])) {
-            $this->triggerError('Cannot retrieve undefined namespace ' . htmlspecialchars($namespace, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),
+            $this->triggerError('Cannot retrieve undefined namespace '.htmlspecialchars($namespace, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),
                 E_USER_WARNING);
             return;
         }
@@ -246,7 +246,7 @@ 
         }
         if ($this->isFinalized('Cannot set directive after finalization')) return;
         if (!isset($this->def->info[$key])) {
-            $this->triggerError('Cannot set undefined directive ' . htmlspecialchars($key, ENT_COMPAT | ENT_HTML401, 'UTF-8', false) . ' to value',
+            $this->triggerError('Cannot set undefined directive '.htmlspecialchars($key, ENT_COMPAT | ENT_HTML401, 'UTF-8', false).' to value',
                 E_USER_WARNING);
             return;
         }
@@ -255,7 +255,7 @@ 
         if (isset($def->isAlias)) {
             if ($this->aliasMode) {
                 $this->triggerError('Double-aliases not allowed, please fix '.
-                    'ConfigSchema bug with' . $key, E_USER_ERROR);
+                    'ConfigSchema bug with'.$key, E_USER_ERROR);
                 return;
             }
             $this->aliasMode = true;
@@ -279,7 +279,7 @@ 
         try {
             $value = $this->parser->parse($value, $type, $allow_null);
         } catch (HTMLPurifier_VarParserException $e) {
-            $this->triggerError('Value for ' . $key . ' is of invalid type, should be ' . HTMLPurifier_VarParser::getTypeName($type), E_USER_WARNING);
+            $this->triggerError('Value for '.$key.' is of invalid type, should be '.HTMLPurifier_VarParser::getTypeName($type), E_USER_WARNING);
             return;
         }
         if (is_string($value) && is_object($def)) {
@@ -289,7 +289,7 @@ 
             }
             // check to see if the value is allowed
             if (isset($def->allowed) && !isset($def->allowed[$value])) {
-                $this->triggerError('Value not supported, valid values are: ' .
+                $this->triggerError('Value not supported, valid values are: '.
                     $this->_listify($def->allowed), E_USER_WARNING);
                 return;
             }
@@ -422,7 +422,7 @@ 
             // check preconditions
             $def = null;
             if ($optimized) {
-                if (is_null($this->get($type . '.DefinitionID'))) {
+                if (is_null($this->get($type.'.DefinitionID'))) {
                     // fatally error out if definition ID not set
                     throw new HTMLPurifier_Exception("Cannot retrieve raw version without specifying %$type.DefinitionID");
                 }
@@ -431,16 +431,16 @@ 
                 $def = $this->definitions[$type];
                 if ($def->setup && !$optimized) {
                     $extra = $this->chatty ? " (try moving this code block earlier in your initialization)" : "";
-                    throw new HTMLPurifier_Exception("Cannot retrieve raw definition after it has already been setup" . $extra);
+                    throw new HTMLPurifier_Exception("Cannot retrieve raw definition after it has already been setup".$extra);
                 }
                 if ($def->optimized === null) {
                     $extra = $this->chatty ? " (try flushing your cache)" : "";
-                    throw new HTMLPurifier_Exception("Optimization status of definition is unknown" . $extra);
+                    throw new HTMLPurifier_Exception("Optimization status of definition is unknown".$extra);
                 }
                 if ($def->optimized !== $optimized) {
                     $msg = $optimized ? "optimized" : "unoptimized";
                     $extra = $this->chatty ? " (this backtrace is for the first inconsistent call, which was for a $msg raw definition)" : "";
-                    throw new HTMLPurifier_Exception("Inconsistent use of optimized and unoptimized raw definition retrievals" . $extra);
+                    throw new HTMLPurifier_Exception("Inconsistent use of optimized and unoptimized raw definition retrievals".$extra);
                 }
             }
             // check if definition was in memory
@@ -471,7 +471,7 @@ 
             }
             // check invariants for creation
             if (!$optimized) {
-                if (!is_null($this->get($type . '.DefinitionID'))) {
+                if (!is_null($this->get($type.'.DefinitionID'))) {
                     if ($this->chatty) {
                         $this->triggerError("Due to a documentation error in previous version of HTML Purifier, your definitions are not being cached.  If this is OK, you can remove the %$type.DefinitionRev and %$type.DefinitionID declaration.  Otherwise, modify your code to use maybeGetRawDefinition, and test if the returned value is null before making any edits (if it is null, that means that a cached version is available, and no raw operations are necessary).  See <a href='http://htmlpurifier.org/docs/enduser-customize.html#optimized'>Customize</a> for more details", E_USER_WARNING);
                     } else {
@@ -533,7 +533,7 @@ 
                 $namespace = $key;
                 $namespace_values = $value;
                 foreach ($namespace_values as $directive => $value) {
-                    $this->set($namespace .'.'. $directive, $value);
+                    $this->set($namespace.'.'.$directive, $value);
                 }
             }
         }
@@ -690,7 +690,7 @@ 
                 break;
             }
         }
-        trigger_error($msg . $extra, $no);
+        trigger_error($msg.$extra, $no);
     }
 
     /**