xpressengine / xe-core

modules/krzip/krzip.admin.controller.php

Spacing +2 added lines, -2 removed lines

@@ -19,13 +19,13 @@
 
 		$oKrzipController = getController('krzip');
 		$output = $oKrzipController->updateConfig($module_config);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
 		$success_return_url = Context::get('success_return_url');
-		if($success_return_url)
+		if ($success_return_url)
 		{
 			$return_url = $success_return_url;
 		}

Braces +1 added lines, -2 removed lines

@@ -28,8 +28,7 @@
 		if($success_return_url)
 		{
 			$return_url = $success_return_url;
-		}
-		else
+		} else
 		{
 			$return_url = getNotEncodedUrl('', 'module', 'krzip', 'act', 'dispKrzipAdminConfig');
 		}

modules/krzip/krzip.view.php

Spacing +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
 {
 	function init()
 	{
-		$this->setTemplatePath($this->module_path . 'tpl');
+		$this->setTemplatePath($this->module_path.'tpl');
 	}
 
 	/**
@@ -23,13 +23,13 @@ 
 		$oKrzipModel = getModel('krzip');
 		$module_config = $oKrzipModel->getConfig();
 		$module_config->sequence_id = ++self::$sequence_id;
-		if(!isset($api_handler) || !isset(self::$api_list[$api_handler]))
+		if (!isset($api_handler) || !isset(self::$api_list[$api_handler]))
 		{
 			$api_handler = $module_config->api_handler;
 		}
 
 		Context::set('template_config', $module_config);
-		$this->setTemplateFile('searchForm.' . self::$api_list[$api_handler]);
+		$this->setTemplateFile('searchForm.'.self::$api_list[$api_handler]);
 		$this->setLayoutPath('./common/tpl/');
 		$this->setLayoutFile('popup_layout');
 	}

classes/xml/xmlquery/tags/table/HintTableTag.class.php

Spacing +4 added lines, -4 removed lines

@@ -39,13 +39,13 @@ 
 		$result = sprintf('new %sTableWithHint(\'%s\'%s, array('

 				, !strncasecmp($dbType, 'Mysql', 5) ? 'Mysql' : $dbType

 				, $dbParser->escape($this->name)

-				, $this->alias ? ', \'' . $dbParser->escape($this->alias) . '\'' : ', null'

+				, $this->alias ? ', \''.$dbParser->escape($this->alias).'\'' : ', null'

 				//, ', \'' . $dbParser->escape($this->index->name) .'\', \'' . $this->index->type .'\''

 		);

-		foreach($this->index as $indx)

+		foreach ($this->index as $indx)

 		{

 			$result .= "new IndexHint(";

-			$result .= '\'' . $dbParser->escape($indx->name) . '\', \'' . $indx->type . '\'' . ') , ';

+			$result .= '\''.$dbParser->escape($indx->name).'\', \''.$indx->type.'\''.') , ';

 		}

 		$result = substr($result, 0, -2);

 		$result .= '))';

@@ -54,7 +54,7 @@ 
 

 	function getArguments()

 	{

-		if(!isset($this->conditionsTag))

+		if (!isset($this->conditionsTag))

 		{

 			return array();

 		}

modules/point/point.admin.view.php

Spacing +8 added lines, -8 removed lines

@@ -20,7 +20,7 @@ 
 
 		//Security
 		$security = new Security();
-		$security->encodeHTML('config.point_name','config.level_icon');
+		$security->encodeHTML('config.point_name', 'config.level_icon');
 		$security->encodeHTML('module_info..');
 
 		// Set the template path
@@ -39,9 +39,9 @@ 
 		$oMemberModel = getModel('member');
 		$group_list = $oMemberModel->getGroups();
 		$selected_group_list = array();
-		if(count($group_list))
+		if (count($group_list))
 		{
-			foreach($group_list as $key => $val)
+			foreach ($group_list as $key => $val)
 			{
 				$selected_group_list[$key] = $val;
 			}
@@ -49,7 +49,7 @@ 
 		Context::set('group_list', $selected_group_list);
 		//Security
 		$security = new Security();
-		$security->encodeHTML('group_list..title','group_list..description');
+		$security->encodeHTML('group_list..title', 'group_list..description');
 
 		// Set the template
 		$this->setTemplateFile('config');
@@ -65,9 +65,9 @@ 
 		$columnList = array('module_srl', 'mid', 'browser_title', 'module');
 		$mid_list = $oModuleModel->getMidList(null, $columnList);
 
-		foreach($mid_list as $mid => $item)
+		foreach ($mid_list as $mid => $item)
 		{
-			if($item->module === 'page')
+			if ($item->module === 'page')
 			{
 				unset($mid_list[$mid]);
 			}
@@ -78,7 +78,7 @@ 
 
 		//Security
 		$security = new Security();
-		$security->encodeHTML('mid_list..browser_title','mid_list..mid');
+		$security->encodeHTML('mid_list..browser_title', 'mid_list..mid');
 
 		// Set the template
 		$this->setTemplateFile('module_config');
@@ -124,7 +124,7 @@ 
 		Context::set('group_list', $this->group_list);
 		//Security
 		$security = new Security();
-		$security->encodeHTML('group_list..title','group_list..description');
+		$security->encodeHTML('group_list..title', 'group_list..description');
 		$security->encodeHTML('member_list..');
 		$security->encodeHTML('search_target', 'search_keyword');
 

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)
 	{
@@ -277,7 +277,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)
 	{
@@ -667,7 +667,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.
@@ -700,8 +700,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)
 	{
@@ -752,7 +752,7 @@ 
 	 * @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)
 	 * @param bool $thumbnail_transparent If $target_type is png, set background set transparent color
-	 * @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', $thumbnail_transparent = FALSE)
 	{
@@ -1082,7 +1082,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)
 	{
@@ -1093,8 +1093,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)
 	{

Braces +32 added lines, -49 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;
 		}
@@ -820,8 +811,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;
 		}
@@ -831,8 +821,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);
 		}
@@ -855,8 +844,7 @@ 
 			{
 				imagealphablending($thumb, TRUE);
 			}
-		}
-		else
+		} else
 		{
 			imagefilledrectangle($thumb, 0, 0, $resize_width - 1, $resize_height - 1, imagecolorallocate($thumb, 255, 255, 255));
 		}
@@ -914,8 +902,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);
 		}
@@ -984,8 +971,7 @@ 
 		if(is_array($arr) && count($arr) > 0)
 		{
 			return $arr;
-		}
-		else
+		} else
 		{
 			return array();
 		}
@@ -1035,12 +1021,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);
 			}
@@ -1182,8 +1166,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));
 		}

Spacing +142 added lines, -142 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)
 		{
@@ -727,7 +727,7 @@ 
 	function checkMemoryLoadImage(&$imageInfo)
 	{
 		$memoryLimit = self::returnBytes(ini_get('memory_limit'));
-		if($memoryLimit == -1)
+		if ($memoryLimit == -1)
 		{
 			return true;
 		}
@@ -735,14 +735,14 @@ 
 		$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;
 		}
@@ -771,30 +771,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';
@@ -812,7 +812,7 @@ 
 				return;
 		}
 
-		if(!$target_type)
+		if (!$target_type)
 		{
 			$target_type = $type;
 		}
@@ -823,7 +823,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;
@@ -836,30 +836,30 @@ 
 
 		// 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;
 		}
 
-		if(function_exists('imagecolorallocatealpha') && $target_type == 'png' && $thumbnail_transparent)
+		if (function_exists('imagecolorallocatealpha') && $target_type == 'png' && $thumbnail_transparent)
 		{
 			imagefill($thumb, 0, 0, imagecolorallocatealpha($thumb, 0, 0, 0, 127));
 			
-			if(function_exists('imagesavealpha'))
+			if (function_exists('imagesavealpha'))
 			{
 				imagesavealpha($thumb, TRUE);
 			}
 
-			if(function_exists('imagealphablending'))
+			if (function_exists('imagealphablending'))
 			{
 				imagealphablending($thumb, TRUE);
 			}
@@ -871,37 +871,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;
@@ -913,13 +913,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);
 		}
@@ -933,30 +933,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);
 				}
@@ -966,7 +966,7 @@ 
 		imagedestroy($thumb);
 		imagedestroy($source);
 
-		if(!$output)
+		if (!$output)
 		{
 			return FALSE;
 		}
@@ -984,12 +984,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;
 		}
@@ -1015,7 +1015,7 @@ 
 	 */
 	function writeIniFile($filename, $arr)
 	{
-		if(!is_array($arr) || count($arr) == 0)
+		if (!is_array($arr) || count($arr) == 0)
 		{
 			return FALSE;
 		}
@@ -1032,19 +1032,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;
 			}
@@ -1119,15 +1119,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;
 		}
@@ -1145,7 +1145,7 @@ 
 	 **/
 	static public function clearStatCache($target, $include = false)
 	{
-		if(is_array($target))
+		if (is_array($target))
 		{
 			array_map('self::clearStatCache', $target);
 			return;
@@ -1153,7 +1153,7 @@ 
 
 		$target = self::getRealPath($target);
 
-		if($include && self::isDir($target))
+		if ($include && self::isDir($target))
 		{
 			self::clearStatCache(self::readDir($target, '', false, true), $include);
 		}
@@ -1171,27 +1171,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));
 		}

modules/editor/editor.class.php

Braces +51 added lines, -23 removed lines

@@ -51,24 +51,44 @@ 
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2009. 06. 15 Save module_srl when auto-saving
-			if(!$oDB->isColumnExists("editor_autosave","module_srl")) return true;
-			if(!$oDB->isIndexExists("editor_autosave","idx_module_srl")) return true;
+			if(!$oDB->isColumnExists("editor_autosave","module_srl")) {
+				return true;
+			}
+			if(!$oDB->isIndexExists("editor_autosave","idx_module_srl")) {
+				return true;
+			}
 
 			// 2007. 10. 17 Add a trigger to delete automatically saved document whenever the document(insert or update) is modified
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) return true;
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) return true;
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) {
+				return true;
+			}
 			// 2007. 10. 23 Add an editor trigger on the module addition setup
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before')) return true;
+			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before')) {
+				return true;
+			}
 			// 2009. 04. 14 Add a trigger from compiled codes of the editor component
-			if(!$oModuleModel->getTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before')) return true;
+			if(!$oModuleModel->getTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before')) {
+				return true;
+			}
 			// 2009. 06. 19 Remove unused trigger
-			if($oModuleModel->getTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before')) return true;
+			if($oModuleModel->getTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before')) {
+				return true;
+			}
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'editor', 'controller', 'triggerCopyModule', 'after')) return true;
+			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'editor', 'controller', 'triggerCopyModule', 'after')) {
+				return true;
+			}
 
-			if(!$oDB->isColumnExists("editor_autosave", "certify_key")) return true;
-			if(!$oDB->isIndexExists('editor_autosave', 'idx_certify_key')) return true;
+			if(!$oDB->isColumnExists("editor_autosave", "certify_key")) {
+				return true;
+			}
+			if(!$oDB->isIndexExists('editor_autosave', 'idx_certify_key')) {
+				return true;
+			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -88,26 +108,34 @@ 
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// Save module_srl when auto-saving 15/06/2009
-			if(!$oDB->isColumnExists("editor_autosave","module_srl")) 
-				$oDB->addColumn("editor_autosave","module_srl","number",11);
+			if(!$oDB->isColumnExists("editor_autosave","module_srl")) {
+							$oDB->addColumn("editor_autosave","module_srl","number",11);
+			}
 
 			// create an index on module_srl
-			if(!$oDB->isIndexExists("editor_autosave","idx_module_srl")) $oDB->addIndex("editor_autosave","idx_module_srl", "module_srl");
+			if(!$oDB->isIndexExists("editor_autosave","idx_module_srl")) {
+				$oDB->addIndex("editor_autosave","idx_module_srl", "module_srl");
+			}
 
 			// 2007. 10. 17 Add a trigger to delete automatically saved document whenever the document(insert or update) is modified
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) 
-				$oModuleController->insertTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after');
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) 
-				$oModuleController->insertTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after');
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) {
+							$oModuleController->insertTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after');
+			}
+			if(!$oModuleModel->getTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) {
+							$oModuleController->insertTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after');
+			}
 			// 2007. 10. Add an editor trigger on the module addition setup
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before')) 
-				$oModuleController->insertTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before');
+			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before')) {
+							$oModuleController->insertTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before');
+			}
 			// 2009. 04. 14 Add a trigger from compiled codes of the editor component
-			if(!$oModuleModel->getTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before')) 
-				$oModuleController->insertTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before');
+			if(!$oModuleModel->getTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before')) {
+							$oModuleController->insertTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before');
+			}
 			// 2009. 06. 19 Remove unused trigger
-			if($oModuleModel->getTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before')) 
-				$oModuleController->deleteTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before');
+			if($oModuleModel->getTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before')) {
+							$oModuleController->deleteTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before');
+			}
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
 			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'editor', 'controller', 'triggerCopyModule', 'after'))

Spacing +34 added lines, -34 removed lines

@@ -16,16 +16,16 @@ 
 		$oModuleController = getController('module');
 		// Add the default editor component
 		$oEditorController = getAdminController('editor');
-		$oEditorController->insertComponent('colorpicker_text',true);
-		$oEditorController->insertComponent('colorpicker_bg',true);
-		$oEditorController->insertComponent('emoticon',true);
-		$oEditorController->insertComponent('url_link',true);
-		$oEditorController->insertComponent('image_link',true);
-		$oEditorController->insertComponent('multimedia_link',true);
-		$oEditorController->insertComponent('quotation',true);
-		$oEditorController->insertComponent('table_maker',true);
-		$oEditorController->insertComponent('poll_maker',true);
-		$oEditorController->insertComponent('image_gallery',true);
+		$oEditorController->insertComponent('colorpicker_text', true);
+		$oEditorController->insertComponent('colorpicker_bg', true);
+		$oEditorController->insertComponent('emoticon', true);
+		$oEditorController->insertComponent('url_link', true);
+		$oEditorController->insertComponent('image_link', true);
+		$oEditorController->insertComponent('multimedia_link', true);
+		$oEditorController->insertComponent('quotation', true);
+		$oEditorController->insertComponent('table_maker', true);
+		$oEditorController->insertComponent('poll_maker', true);
+		$oEditorController->insertComponent('image_gallery', true);
 		// Create a directory to use in the editor module
 		FileHandler::makeDir('./files/cache/editor');
 		// 2007. 10. 17 Add a trigger to delete automatically saved document whenever the document(insert or update) is modified
@@ -48,27 +48,27 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2009. 06. 15 Save module_srl when auto-saving
-			if(!$oDB->isColumnExists("editor_autosave","module_srl")) return true;
-			if(!$oDB->isIndexExists("editor_autosave","idx_module_srl")) return true;
+			if (!$oDB->isColumnExists("editor_autosave", "module_srl")) return true;
+			if (!$oDB->isIndexExists("editor_autosave", "idx_module_srl")) return true;
 
 			// 2007. 10. 17 Add a trigger to delete automatically saved document whenever the document(insert or update) is modified
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) return true;
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) return true;
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) return true;
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) return true;
 			// 2007. 10. 23 Add an editor trigger on the module addition setup
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before')) return true;
+			if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before')) return true;
 			// 2009. 04. 14 Add a trigger from compiled codes of the editor component
-			if(!$oModuleModel->getTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before')) return true;
+			if (!$oModuleModel->getTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before')) return true;
 			// 2009. 06. 19 Remove unused trigger
-			if($oModuleModel->getTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before')) return true;
+			if ($oModuleModel->getTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before')) return true;
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'editor', 'controller', 'triggerCopyModule', 'after')) return true;
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'editor', 'controller', 'triggerCopyModule', 'after')) return true;
 
-			if(!$oDB->isColumnExists("editor_autosave", "certify_key")) return true;
-			if(!$oDB->isIndexExists('editor_autosave', 'idx_certify_key')) return true;
+			if (!$oDB->isColumnExists("editor_autosave", "certify_key")) return true;
+			if (!$oDB->isIndexExists('editor_autosave', 'idx_certify_key')) return true;
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -85,44 +85,44 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// Save module_srl when auto-saving 15/06/2009
-			if(!$oDB->isColumnExists("editor_autosave","module_srl")) 
-				$oDB->addColumn("editor_autosave","module_srl","number",11);
+			if (!$oDB->isColumnExists("editor_autosave", "module_srl")) 
+				$oDB->addColumn("editor_autosave", "module_srl", "number", 11);
 
 			// create an index on module_srl
-			if(!$oDB->isIndexExists("editor_autosave","idx_module_srl")) $oDB->addIndex("editor_autosave","idx_module_srl", "module_srl");
+			if (!$oDB->isIndexExists("editor_autosave", "idx_module_srl")) $oDB->addIndex("editor_autosave", "idx_module_srl", "module_srl");
 
 			// 2007. 10. 17 Add a trigger to delete automatically saved document whenever the document(insert or update) is modified
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) 
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) 
 				$oModuleController->insertTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after');
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) 
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) 
 				$oModuleController->insertTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after');
 			// 2007. 10. Add an editor trigger on the module addition setup
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before')) 
+			if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before')) 
 				$oModuleController->insertTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before');
 			// 2009. 04. 14 Add a trigger from compiled codes of the editor component
-			if(!$oModuleModel->getTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before')) 
+			if (!$oModuleModel->getTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before')) 
 				$oModuleController->insertTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before');
 			// 2009. 06. 19 Remove unused trigger
-			if($oModuleModel->getTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before')) 
+			if ($oModuleModel->getTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before')) 
 				$oModuleController->deleteTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before');
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'editor', 'controller', 'triggerCopyModule', 'after'))
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'editor', 'controller', 'triggerCopyModule', 'after'))
 			{
 				$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'editor', 'controller', 'triggerCopyModule', 'after');
 			}
 
 			// @see https://github.com/xpressengine/xe-core/issues/2229
-			if(!$oDB->isColumnExists('editor_autosave','certify_key'))
+			if (!$oDB->isColumnExists('editor_autosave', 'certify_key'))
 			{
 				$oDB->addColumn('editor_autosave', 'certify_key', 'varchar', 100);
 			}
-			if(!$oDB->isIndexExists("editor_autosave","idx_certify_key"))
+			if (!$oDB->isIndexExists("editor_autosave", "idx_certify_key"))
 			{
-				$oDB->addIndex("editor_autosave","idx_certify_key", "certify_key");
+				$oDB->addIndex("editor_autosave", "idx_certify_key", "certify_key");
 			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);

modules/module/module.class.php

Spacing +113 added lines, -113 removed lines

@@ -16,8 +16,8 @@ 
 		$oModuleController = getController('module');
 
 		$oDB = &DB::getInstance();
-		$oDB->addIndex("modules","idx_site_mid", array("site_srl","mid"), true);
-		$oDB->addIndex('sites','unique_domain',array('domain'),true);
+		$oDB->addIndex("modules", "idx_site_mid", array("site_srl", "mid"), true);
+		$oDB->addIndex('sites', 'unique_domain', array('domain'), true);
 		// Create a directory to use in the module module
 		FileHandler::makeDir('./files/cache/module_info');
 		FileHandler::makeDir('./files/cache/triggers');
@@ -27,21 +27,21 @@ 
 		$args = new stdClass;
 		$args->site_srl = 0;
 		$output = $oDB->executeQuery('module.getSite', $args);
-		if(!$output->data || !$output->data->index_module_srl)
+		if (!$output->data || !$output->data->index_module_srl)
 		{
 			$db_info = Context::getDBInfo();
 			$domain = Context::getDefaultUrl();
 			$url_info = parse_url($domain);
-			$domain = $url_info['host'].( (!empty($url_info['port'])&&$url_info['port']!=80)?':'.$url_info['port']:'').$url_info['path'];
+			$domain = $url_info['host'].((!empty($url_info['port']) && $url_info['port'] != 80) ? ':'.$url_info['port'] : '').$url_info['path'];
 
 			$site_args = new stdClass;
 			$site_args->site_srl = 0;
-			$site_args->index_module_srl  = 0;
+			$site_args->index_module_srl = 0;
 			$site_args->domain = $domain;
 			$site_args->default_language = $db_info->lang_type;
 
 			$output = executeQuery('module.insertSite', $site_args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 
 		return new BaseObject();
@@ -56,68 +56,68 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2008. 10. 27 Add multi-index in the table, the module_part_config
-			if(!$oDB->isIndexExists("module_part_config","idx_module_part_config")) return true;
+			if (!$oDB->isIndexExists("module_part_config", "idx_module_part_config")) return true;
 			// 2008. 11. 13 Delete unique constraint on mid in modules. Add site_srl and then create unique index on site_srl and mid
-			if(!$oDB->isIndexExists('modules',"idx_site_mid")) return true;
+			if (!$oDB->isIndexExists('modules', "idx_site_mid")) return true;
 			// Move permissions/skin information of all modules to the table, grants.
-			if($oDB->isColumnExists('modules', 'grants')) return true;
+			if ($oDB->isColumnExists('modules', 'grants')) return true;
 			// Move permissions/skin information of all modules to the table, grants.
-			if(!$oDB->isColumnExists('sites', 'default_language')) return true;
+			if (!$oDB->isColumnExists('sites', 'default_language')) return true;
 			// Delete extra_vars* column
-			for($i=1;$i<=20;$i++)
+			for ($i = 1; $i <= 20; $i++)
 			{
-				if($oDB->isColumnExists("documents","extra_vars".$i)) return true;
+				if ($oDB->isColumnExists("documents", "extra_vars".$i)) return true;
 			}
 			// Insert site information to the table, sites
 			$args = new stdClass();
 			$args->site_srl = 0;
 			$output = $oDB->executeQuery('module.getSite', $args);
-			if(!$output->data) return true;
+			if (!$output->data) return true;
 
 			// If domain index is defined on the table, sites
-			if($oDB->isIndexExists('sites', 'idx_domain')) return true;
-			if(!$oDB->isIndexExists('sites','unique_domain')) return true;
+			if ($oDB->isIndexExists('sites', 'idx_domain')) return true;
+			if (!$oDB->isIndexExists('sites', 'unique_domain')) return true;
 
-			if(!$oDB->isColumnExists("modules", "use_mobile")) return true;
-			if(!$oDB->isColumnExists("modules", "mlayout_srl")) return true;
-			if(!$oDB->isColumnExists("modules", "mcontent")) return true;
-			if(!$oDB->isColumnExists("modules", "mskin")) return true;
+			if (!$oDB->isColumnExists("modules", "use_mobile")) return true;
+			if (!$oDB->isColumnExists("modules", "mlayout_srl")) return true;
+			if (!$oDB->isColumnExists("modules", "mcontent")) return true;
+			if (!$oDB->isColumnExists("modules", "mskin")) return true;
 
 			// check fix skin
-			if(!$oDB->isColumnExists("modules", "is_skin_fix")) return true;
+			if (!$oDB->isColumnExists("modules", "is_skin_fix")) return true;
 
-			if(!$oDB->isColumnExists("module_config", "site_srl")) return true;
+			if (!$oDB->isColumnExists("module_config", "site_srl")) return true;
 
 			$args->skin = '.';
 			$output = executeQueryArray('module.getModuleSkinDotList', $args);
-			if($output->data && count($output->data) > 0)
+			if ($output->data && count($output->data) > 0)
 			{
-				foreach($output->data as $item)
+				foreach ($output->data as $item)
 				{
 					$skin_path = explode('.', $item->skin);
-					if(count($skin_path) != 2) continue;
-					if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/modules/%s', $skin_path[0], $skin_path[1]))) return true;
+					if (count($skin_path) != 2) continue;
+					if (is_dir(sprintf(_XE_PATH_.'themes/%s/modules/%s', $skin_path[0], $skin_path[1]))) return true;
 				}
 			}
 
 			// XE 1.7
 
 			// check fix mskin
-			if(!$oDB->isColumnExists("modules", "is_mskin_fix")) return true;
+			if (!$oDB->isColumnExists("modules", "is_mskin_fix")) return true;
 
-			if(!$oDB->isIndexExists("module_part_config", "unique_module_part_config")) return true;
+			if (!$oDB->isIndexExists("module_part_config", "unique_module_part_config")) return true;
 
 			$oModuleModel = getModel('module');
 			$moduleConfig = $oModuleModel->getModuleConfig('module');
-			if(!$moduleConfig->isUpdateFixedValue) return true;
+			if (!$moduleConfig->isUpdateFixedValue) return true;
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		if(!is_dir('./files/ruleset')) return true;
+		if (!is_dir('./files/ruleset')) return true;
 
 		return false;
 	}
@@ -131,22 +131,22 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2008. 10. 27 module_part_config Add a multi-index to the table and check all information of module_configg
-			if(!$oDB->isIndexExists("module_part_config","idx_module_part_config"))
+			if (!$oDB->isIndexExists("module_part_config", "idx_module_part_config"))
 			{
 				$oModuleModel = getModel('module');
 				$oModuleController = getController('module');
 				$modules = $oModuleModel->getModuleList();
-				foreach($modules as $key => $module_info)
+				foreach ($modules as $key => $module_info)
 				{
 					$module = $module_info->module;
-					if(!in_array($module, array('point','trackback','layout','rss','file','comment','editor'))) continue;
+					if (!in_array($module, array('point', 'trackback', 'layout', 'rss', 'file', 'comment', 'editor'))) continue;
 					$config = $oModuleModel->getModuleConfig($module);
 
 					$module_config = null;
-					switch($module)
+					switch ($module)
 					{
 						case 'point' :
 							$module_config = $config->module_point;
@@ -159,21 +159,21 @@ 
 						case 'editor' :
 							$module_config = $config->module_config;
 							unset($config->module_config);
-							if(is_array($module_config) && count($module_config))
+							if (is_array($module_config) && count($module_config))
 							{
-								foreach($module_config as $key => $val)
+								foreach ($module_config as $key => $val)
 								{
-									if(isset($module_config[$key]->module_srl)) unset($module_config[$key]->module_srl);
+									if (isset($module_config[$key]->module_srl)) unset($module_config[$key]->module_srl);
 								}
 							}
 							break;
 						case 'layout' :
 							$tmp = $config->header_script;
-							if(is_array($tmp) && count($tmp))
+							if (is_array($tmp) && count($tmp))
 							{
-								foreach($tmp as $k => $v)
+								foreach ($tmp as $k => $v)
 								{
-									if(!$v && !trim($v)) continue;
+									if (!$v && !trim($v)) continue;
 									$module_config[$k]->header_script = $v;
 								}
 							}
@@ -183,29 +183,29 @@ 
 
 					$oModuleController->insertModuleConfig($module, $config);
 
-					if(is_array($module_config) && count($module_config))
+					if (is_array($module_config) && count($module_config))
 					{
-						foreach($module_config as $module_srl => $module_part_config)
+						foreach ($module_config as $module_srl => $module_part_config)
 						{
-							$oModuleController->insertModulePartConfig($module,$module_srl,$module_part_config);
+							$oModuleController->insertModulePartConfig($module, $module_srl, $module_part_config);
 						}
 					}
 				}
-				$oDB->addIndex("module_part_config","idx_module_part_config", array("module","module_srl"));
+				$oDB->addIndex("module_part_config", "idx_module_part_config", array("module", "module_srl"));
 			}
 			// 2008. 11. 13 drop index(unique_mid). Add a column and index on site_srl and mid columns
-			if(!$oDB->isIndexExists('modules',"idx_site_mid"))
+			if (!$oDB->isIndexExists('modules', "idx_site_mid"))
 			{
-				$oDB->dropIndex("modules","unique_mid",true);
-				$oDB->addColumn('modules','site_srl','number',11,0,true);
-				$oDB->addIndex("modules","idx_site_mid", array("site_srl","mid"),true);
+				$oDB->dropIndex("modules", "unique_mid", true);
+				$oDB->addColumn('modules', 'site_srl', 'number', 11, 0, true);
+				$oDB->addIndex("modules", "idx_site_mid", array("site_srl", "mid"), true);
 			}
 			// document extra vars
-			if(!$oDB->isTableExists('document_extra_vars')) $oDB->createTableByXmlFile('./modules/document/schemas/document_extra_vars.xml');
+			if (!$oDB->isTableExists('document_extra_vars')) $oDB->createTableByXmlFile('./modules/document/schemas/document_extra_vars.xml');
 
-			if(!$oDB->isTableExists('document_extra_keys')) $oDB->createTableByXmlFile('./modules/document/schemas/document_extra_keys.xml');
+			if (!$oDB->isTableExists('document_extra_keys')) $oDB->createTableByXmlFile('./modules/document/schemas/document_extra_keys.xml');
 			// Move permission, skin info, extection info, admin ID of all modules to the table, grants
-			if($oDB->isColumnExists('modules', 'grants'))
+			if ($oDB->isColumnExists('modules', 'grants'))
 			{
 				$oModuleController = getController('module');
 				$oDocumentController = getController('document');
@@ -213,26 +213,26 @@ 
 				$lang_code = Context::getLangType();
 				// Get module_info of all modules
 				$output = executeQueryArray('module.getModuleInfos');
-				if(count($output->data))
+				if (count($output->data))
 				{
-					foreach($output->data as $module_info)
+					foreach ($output->data as $module_info)
 					{
 						// Separate information about permission granted to the module, extra vars, skin vars, super-admin's authority
 						$module_srl = trim($module_info->module_srl);
 						// grant an authority
 						$grants = unserialize($module_info->grants);
-						if($grants) $oModuleController->insertModuleGrants($module_srl, $grants);
+						if ($grants) $oModuleController->insertModuleGrants($module_srl, $grants);
 						// Insert skin vars
 						$skin_vars = unserialize($module_info->skin_vars);
-						if($skin_vars) $oModuleController->insertModuleSkinVars($module_srl, $skin_vars);
+						if ($skin_vars) $oModuleController->insertModuleSkinVars($module_srl, $skin_vars);
 						// Insert super admin's ID
 						$admin_id = trim($module_info->admin_id);
-						if($admin_id && $admin_id != 'Array')
+						if ($admin_id && $admin_id != 'Array')
 						{
-							$admin_ids = explode(',',$admin_id);
-							if(count($admin_id))
+							$admin_ids = explode(',', $admin_id);
+							if (count($admin_id))
 							{
-								foreach($admin_ids as $admin_id)
+								foreach ($admin_ids as $admin_id)
 								{
 									$oModuleController->insertAdminId($module_srl, $admin_id);
 								}
@@ -241,20 +241,20 @@ 
 						// Save extra configurations for each module(column data which doesn't exist in the defaut modules)
 						$extra_vars = unserialize($module_info->extra_vars);
 						$document_extra_keys = null;
-						if($extra_vars->extra_vars && count($extra_vars->extra_vars))
+						if ($extra_vars->extra_vars && count($extra_vars->extra_vars))
 						{
 							$document_extra_keys = $extra_vars->extra_vars;
 							unset($extra_vars->extra_vars);
 						}
-						if($extra_vars) $oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
+						if ($extra_vars) $oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
 
 						/**
 						 * Move document extra vars(it should have conducted in the documents module however extra vars in modules table should be listed up in this module)
 						 */
 						// Insert extra vars if planet module is
-						if($module_info->module == 'planet')
+						if ($module_info->module == 'planet')
 						{
-							if(!$document_extra_keys || !is_array($document_extra_keys)) $document_extra_keys = array();
+							if (!$document_extra_keys || !is_array($document_extra_keys)) $document_extra_keys = array();
 							$planet_extra_keys->name = 'postscript';
 							$planet_extra_keys->type = 'text';
 							$planet_extra_keys->is_required = 'N';
@@ -264,9 +264,9 @@ 
 							$document_extra_keys[20] = $planet_extra_keys;
 						}
 						// Register keys for document extra vars
-						if(count($document_extra_keys))
+						if (count($document_extra_keys))
 						{
-							foreach($document_extra_keys as $var_idx => $val)
+							foreach ($document_extra_keys as $var_idx => $val)
 							{
 								$oDocumentController->insertDocumentExtraKey($module_srl, $var_idx, $val->name, $val->type, $val->is_required, $val->search, $val->default, $val->desc, 'extra_vars'.$var_idx);
 							}
@@ -274,7 +274,7 @@ 
 							$oDocumentModel = getModel('document');
 							$total_count = $oDocumentModel->getDocumentCount($module_srl);
 
-							if($total_count > 0)
+							if ($total_count > 0)
 							{
 								$per_page = 100;
 								$total_pages = (int) (($total_count - 1) / $per_page) + 1;
@@ -285,19 +285,19 @@ 
 								$doc_args->sort_index = 'list_order';
 								$doc_args->order_type = 'asc';
 
-								for($doc_args->page = 1; $doc_args->page <= $total_pages; $doc_args->page++)
+								for ($doc_args->page = 1; $doc_args->page <= $total_pages; $doc_args->page++)
 								{
 									$output = executeQueryArray('document.getDocumentList', $doc_args);
 
-									if($output->toBool() && $output->data && count($output->data))
+									if ($output->toBool() && $output->data && count($output->data))
 									{
 										foreach ($output->data as $document)
 										{
-											if(!$document) continue;
+											if (!$document) continue;
 											foreach ($document as $key => $var)
 											{
 												if (strpos($key, 'extra_vars') !== 0 || !trim($var) || $var == 'N;') continue;
-												$var_idx = str_replace('extra_vars','',$key);
+												$var_idx = str_replace('extra_vars', '', $key);
 												$oDocumentController->insertDocumentExtraVar($module_srl, $document->document_srl, $var_idx, $var, 'extra_vars'.$var_idx, $lang_code);
 											}
 										}
@@ -313,96 +313,96 @@ 
 						executeQuery('module.updateModule', $module_info);
 
 						$oCacheHandler = CacheHandler::getInstance('object', null, true);
-						if($oCacheHandler->isSupport())
+						if ($oCacheHandler->isSupport())
 						{
 							$oCacheHandler->invalidateGroupKey('site_and_module');
 						}
 					}
 				}
 				// Various column drop
-				$oDB->dropColumn('modules','grants');
-				$oDB->dropColumn('modules','admin_id');
-				$oDB->dropColumn('modules','skin_vars');
-				$oDB->dropColumn('modules','extra_vars');
+				$oDB->dropColumn('modules', 'grants');
+				$oDB->dropColumn('modules', 'admin_id');
+				$oDB->dropColumn('modules', 'skin_vars');
+				$oDB->dropColumn('modules', 'extra_vars');
 			}
 			// Rights of all modules/skins transferring the information into a table Update grants
-			if(!$oDB->isColumnExists('sites', 'default_language'))
+			if (!$oDB->isColumnExists('sites', 'default_language'))
 			{
-				$oDB->addColumn('sites','default_language','varchar',255,0,false);
+				$oDB->addColumn('sites', 'default_language', 'varchar', 255, 0, false);
 			}
 			// extra_vars * Remove Column
-			for($i=1;$i<=20;$i++)
+			for ($i = 1; $i <= 20; $i++)
 			{
-				if(!$oDB->isColumnExists("documents","extra_vars".$i)) continue;
-				$oDB->dropColumn('documents','extra_vars'.$i);
+				if (!$oDB->isColumnExists("documents", "extra_vars".$i)) continue;
+				$oDB->dropColumn('documents', 'extra_vars'.$i);
 			}
 
 			// Enter the main site information sites on the table
 			$args = new stdClass;
 			$args->site_srl = 0;
 			$output = $oDB->executeQuery('module.getSite', $args);
-			if(!$output->data)
+			if (!$output->data)
 			{
 				// Basic mid, language Wanted
 				$mid_output = $oDB->executeQuery('module.getDefaultMidInfo', $args);
 				$db_info = Context::getDBInfo();
 				$domain = Context::getDefaultUrl();
 				$url_info = parse_url($domain);
-				$domain = $url_info['host'].( (!empty($url_info['port'])&&$url_info['port']!=80)?':'.$url_info['port']:'').$url_info['path'];
+				$domain = $url_info['host'].((!empty($url_info['port']) && $url_info['port'] != 80) ? ':'.$url_info['port'] : '').$url_info['path'];
 				$site_args->site_srl = 0;
-				$site_args->index_module_srl  = $mid_output->data->module_srl;
+				$site_args->index_module_srl = $mid_output->data->module_srl;
 				$site_args->domain = $domain;
 				$site_args->default_language = $db_info->lang_type;
 
 				$output = executeQuery('module.insertSite', $site_args);
-				if(!$output->toBool()) return $output;
+				if (!$output->toBool()) return $output;
 			}
 
-			if($oDB->isIndexExists('sites','idx_domain'))
+			if ($oDB->isIndexExists('sites', 'idx_domain'))
 			{
-				$oDB->dropIndex('sites','idx_domain');
+				$oDB->dropIndex('sites', 'idx_domain');
 			}
-			if(!$oDB->isIndexExists('sites','unique_domain'))
+			if (!$oDB->isIndexExists('sites', 'unique_domain'))
 			{
 				$this->updateForUniqueSiteDomain();
-				$oDB->addIndex('sites','unique_domain',array('domain'),true);
+				$oDB->addIndex('sites', 'unique_domain', array('domain'), true);
 			}
 
-			if(!$oDB->isColumnExists("modules", "use_mobile"))
+			if (!$oDB->isColumnExists("modules", "use_mobile"))
 			{
-				$oDB->addColumn('modules','use_mobile','char',1,'N');
+				$oDB->addColumn('modules', 'use_mobile', 'char', 1, 'N');
 			}
-			if(!$oDB->isColumnExists("modules", "mlayout_srl"))
+			if (!$oDB->isColumnExists("modules", "mlayout_srl"))
 			{
-				$oDB->addColumn('modules','mlayout_srl','number',11, 0);
+				$oDB->addColumn('modules', 'mlayout_srl', 'number', 11, 0);
 			}
-			if(!$oDB->isColumnExists("modules", "mcontent"))
+			if (!$oDB->isColumnExists("modules", "mcontent"))
 			{
-				$oDB->addColumn('modules','mcontent','bigtext');
+				$oDB->addColumn('modules', 'mcontent', 'bigtext');
 			}
-			if(!$oDB->isColumnExists("modules", "mskin"))
+			if (!$oDB->isColumnExists("modules", "mskin"))
 			{
-				$oDB->addColumn('modules','mskin','varchar',250);
+				$oDB->addColumn('modules', 'mskin', 'varchar', 250);
 			}
-			if(!$oDB->isColumnExists("modules", "is_skin_fix"))
+			if (!$oDB->isColumnExists("modules", "is_skin_fix"))
 			{
 				$oDB->addColumn('modules', 'is_skin_fix', 'char', 1, 'N');
 				$output = executeQuery('module.updateSkinFixModules');
 			}
-			if(!$oDB->isColumnExists("module_config", "site_srl"))
+			if (!$oDB->isColumnExists("module_config", "site_srl"))
 			{
 				$oDB->addColumn('module_config', 'site_srl', 'number', 11, 0, true);
 			}
 
 			$args->skin = '.';
 			$output = executeQueryArray('module.getModuleSkinDotList', $args);
-			if($output->data && count($output->data) > 0)
+			if ($output->data && count($output->data) > 0)
 			{
-				foreach($output->data as $item)
+				foreach ($output->data as $item)
 				{
 					$skin_path = explode('.', $item->skin);
-					if(count($skin_path) != 2) continue;
-					if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/modules/%s', $skin_path[0], $skin_path[1])))
+					if (count($skin_path) != 2) continue;
+					if (is_dir(sprintf(_XE_PATH_.'themes/%s/modules/%s', $skin_path[0], $skin_path[1])))
 					{
 						unset($args);
 						$args->skin = $item->skin;
@@ -413,7 +413,7 @@ 
 			}
 
 			// XE 1.7
-			if(!$oDB->isColumnExists("modules", "is_mskin_fix"))
+			if (!$oDB->isColumnExists("modules", "is_mskin_fix"))
 			{
 				$oDB->addColumn('modules', 'is_mskin_fix', 'char', 1, 'N');
 				$output = executeQuery('module.updateMobileSkinFixModules');
@@ -421,18 +421,18 @@ 
 
 			$oModuleModel = getModel('module');
 			$moduleConfig = $oModuleModel->getModuleConfig('module');
-			if(!$moduleConfig->isUpdateFixedValue)
+			if (!$moduleConfig->isUpdateFixedValue)
 			{
 				$output = executeQuery('module.updateSkinFixModules');
 				$output = executeQuery('module.updateMobileSkinFixModules');
 
 				$oModuleController = getController('module');
-				if(!$moduleConfig) $moduleConfig = new stdClass;
+				if (!$moduleConfig) $moduleConfig = new stdClass;
 				$moduleConfig->isUpdateFixedValue = TRUE;
 				$output = $oModuleController->updateModuleConfig('module', $moduleConfig);
 			}
 
-			if(!$oDB->isIndexExists("module_part_config", "unique_module_part_config"))
+			if (!$oDB->isIndexExists("module_part_config", "unique_module_part_config"))
 			{
 				$oDB->addIndex("module_part_config", "unique_module_part_config", array("module", "module_srl"), TRUE);
 			}
@@ -440,7 +440,7 @@ 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		if(!is_dir('./files/ruleset')) FileHandler::makeDir('./files/ruleset');
+		if (!is_dir('./files/ruleset')) FileHandler::makeDir('./files/ruleset');
 
 		return new BaseObject(0, 'success_updated');
 	}
@@ -448,18 +448,18 @@ 
 	function updateForUniqueSiteDomain()
 	{
 		$output = executeQueryArray("module.getNonuniqueDomains");
-		if(!$output->data) return;
-		foreach($output->data as $data)
+		if (!$output->data) return;
+		foreach ($output->data as $data)
 		{
-			if($data->count == 1) continue;
+			if ($data->count == 1) continue;
 			$domain = $data->domain;
 			$args = new stdClass;
 			$args->domain = $domain;
 			$output2 = executeQueryArray("module.getSiteByDomain", $args);
 			$bFirst = true;
-			foreach($output2->data as $site)
+			foreach ($output2->data as $site)
 			{
-				if($bFirst)
+				if ($bFirst)
 				{
 					$bFirst = false;
 					continue;

Braces +117 added lines, -39 removed lines

@@ -41,7 +41,9 @@ 
 			$site_args->default_language = $db_info->lang_type;
 
 			$output = executeQuery('module.insertSite', $site_args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 
 		return new BaseObject();
@@ -59,37 +61,65 @@ 
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2008. 10. 27 Add multi-index in the table, the module_part_config
-			if(!$oDB->isIndexExists("module_part_config","idx_module_part_config")) return true;
+			if(!$oDB->isIndexExists("module_part_config","idx_module_part_config")) {
+				return true;
+			}
 			// 2008. 11. 13 Delete unique constraint on mid in modules. Add site_srl and then create unique index on site_srl and mid
-			if(!$oDB->isIndexExists('modules',"idx_site_mid")) return true;
+			if(!$oDB->isIndexExists('modules',"idx_site_mid")) {
+				return true;
+			}
 			// Move permissions/skin information of all modules to the table, grants.
-			if($oDB->isColumnExists('modules', 'grants')) return true;
+			if($oDB->isColumnExists('modules', 'grants')) {
+				return true;
+			}
 			// Move permissions/skin information of all modules to the table, grants.
-			if(!$oDB->isColumnExists('sites', 'default_language')) return true;
+			if(!$oDB->isColumnExists('sites', 'default_language')) {
+				return true;
+			}
 			// Delete extra_vars* column
 			for($i=1;$i<=20;$i++)
 			{
-				if($oDB->isColumnExists("documents","extra_vars".$i)) return true;
+				if($oDB->isColumnExists("documents","extra_vars".$i)) {
+					return true;
+				}
 			}
 			// Insert site information to the table, sites
 			$args = new stdClass();
 			$args->site_srl = 0;
 			$output = $oDB->executeQuery('module.getSite', $args);
-			if(!$output->data) return true;
+			if(!$output->data) {
+				return true;
+			}
 
 			// If domain index is defined on the table, sites
-			if($oDB->isIndexExists('sites', 'idx_domain')) return true;
-			if(!$oDB->isIndexExists('sites','unique_domain')) return true;
+			if($oDB->isIndexExists('sites', 'idx_domain')) {
+				return true;
+			}
+			if(!$oDB->isIndexExists('sites','unique_domain')) {
+				return true;
+			}
 
-			if(!$oDB->isColumnExists("modules", "use_mobile")) return true;
-			if(!$oDB->isColumnExists("modules", "mlayout_srl")) return true;
-			if(!$oDB->isColumnExists("modules", "mcontent")) return true;
-			if(!$oDB->isColumnExists("modules", "mskin")) return true;
+			if(!$oDB->isColumnExists("modules", "use_mobile")) {
+				return true;
+			}
+			if(!$oDB->isColumnExists("modules", "mlayout_srl")) {
+				return true;
+			}
+			if(!$oDB->isColumnExists("modules", "mcontent")) {
+				return true;
+			}
+			if(!$oDB->isColumnExists("modules", "mskin")) {
+				return true;
+			}
 
 			// check fix skin
-			if(!$oDB->isColumnExists("modules", "is_skin_fix")) return true;
+			if(!$oDB->isColumnExists("modules", "is_skin_fix")) {
+				return true;
+			}
 
-			if(!$oDB->isColumnExists("module_config", "site_srl")) return true;
+			if(!$oDB->isColumnExists("module_config", "site_srl")) {
+				return true;
+			}
 
 			$args->skin = '.';
 			$output = executeQueryArray('module.getModuleSkinDotList', $args);
@@ -98,26 +128,38 @@ 
 				foreach($output->data as $item)
 				{
 					$skin_path = explode('.', $item->skin);
-					if(count($skin_path) != 2) continue;
-					if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/modules/%s', $skin_path[0], $skin_path[1]))) return true;
+					if(count($skin_path) != 2) {
+						continue;
+					}
+					if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/modules/%s', $skin_path[0], $skin_path[1]))) {
+						return true;
+					}
 				}
 			}
 
 			// XE 1.7
 
 			// check fix mskin
-			if(!$oDB->isColumnExists("modules", "is_mskin_fix")) return true;
+			if(!$oDB->isColumnExists("modules", "is_mskin_fix")) {
+				return true;
+			}
 
-			if(!$oDB->isIndexExists("module_part_config", "unique_module_part_config")) return true;
+			if(!$oDB->isIndexExists("module_part_config", "unique_module_part_config")) {
+				return true;
+			}
 
 			$oModuleModel = getModel('module');
 			$moduleConfig = $oModuleModel->getModuleConfig('module');
-			if(!$moduleConfig->isUpdateFixedValue) return true;
+			if(!$moduleConfig->isUpdateFixedValue) {
+				return true;
+			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		if(!is_dir('./files/ruleset')) return true;
+		if(!is_dir('./files/ruleset')) {
+			return true;
+		}
 
 		return false;
 	}
@@ -142,7 +184,9 @@ 
 				foreach($modules as $key => $module_info)
 				{
 					$module = $module_info->module;
-					if(!in_array($module, array('point','trackback','layout','rss','file','comment','editor'))) continue;
+					if(!in_array($module, array('point','trackback','layout','rss','file','comment','editor'))) {
+						continue;
+					}
 					$config = $oModuleModel->getModuleConfig($module);
 
 					$module_config = null;
@@ -163,7 +207,9 @@ 
 							{
 								foreach($module_config as $key => $val)
 								{
-									if(isset($module_config[$key]->module_srl)) unset($module_config[$key]->module_srl);
+									if(isset($module_config[$key]->module_srl)) {
+										unset($module_config[$key]->module_srl);
+									}
 								}
 							}
 							break;
@@ -173,7 +219,9 @@ 
 							{
 								foreach($tmp as $k => $v)
 								{
-									if(!$v && !trim($v)) continue;
+									if(!$v && !trim($v)) {
+										continue;
+									}
 									$module_config[$k]->header_script = $v;
 								}
 							}
@@ -201,9 +249,13 @@ 
 				$oDB->addIndex("modules","idx_site_mid", array("site_srl","mid"),true);
 			}
 			// document extra vars
-			if(!$oDB->isTableExists('document_extra_vars')) $oDB->createTableByXmlFile('./modules/document/schemas/document_extra_vars.xml');
+			if(!$oDB->isTableExists('document_extra_vars')) {
+				$oDB->createTableByXmlFile('./modules/document/schemas/document_extra_vars.xml');
+			}
 
-			if(!$oDB->isTableExists('document_extra_keys')) $oDB->createTableByXmlFile('./modules/document/schemas/document_extra_keys.xml');
+			if(!$oDB->isTableExists('document_extra_keys')) {
+				$oDB->createTableByXmlFile('./modules/document/schemas/document_extra_keys.xml');
+			}
 			// Move permission, skin info, extection info, admin ID of all modules to the table, grants
 			if($oDB->isColumnExists('modules', 'grants'))
 			{
@@ -221,10 +273,14 @@ 
 						$module_srl = trim($module_info->module_srl);
 						// grant an authority
 						$grants = unserialize($module_info->grants);
-						if($grants) $oModuleController->insertModuleGrants($module_srl, $grants);
+						if($grants) {
+							$oModuleController->insertModuleGrants($module_srl, $grants);
+						}
 						// Insert skin vars
 						$skin_vars = unserialize($module_info->skin_vars);
-						if($skin_vars) $oModuleController->insertModuleSkinVars($module_srl, $skin_vars);
+						if($skin_vars) {
+							$oModuleController->insertModuleSkinVars($module_srl, $skin_vars);
+						}
 						// Insert super admin's ID
 						$admin_id = trim($module_info->admin_id);
 						if($admin_id && $admin_id != 'Array')
@@ -246,7 +302,9 @@ 
 							$document_extra_keys = $extra_vars->extra_vars;
 							unset($extra_vars->extra_vars);
 						}
-						if($extra_vars) $oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
+						if($extra_vars) {
+							$oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
+						}
 
 						/**
 						 * Move document extra vars(it should have conducted in the documents module however extra vars in modules table should be listed up in this module)
@@ -254,7 +312,9 @@ 
 						// Insert extra vars if planet module is
 						if($module_info->module == 'planet')
 						{
-							if(!$document_extra_keys || !is_array($document_extra_keys)) $document_extra_keys = array();
+							if(!$document_extra_keys || !is_array($document_extra_keys)) {
+								$document_extra_keys = array();
+							}
 							$planet_extra_keys->name = 'postscript';
 							$planet_extra_keys->type = 'text';
 							$planet_extra_keys->is_required = 'N';
@@ -293,10 +353,14 @@ 
 									{
 										foreach ($output->data as $document)
 										{
-											if(!$document) continue;
+											if(!$document) {
+												continue;
+											}
 											foreach ($document as $key => $var)
 											{
-												if (strpos($key, 'extra_vars') !== 0 || !trim($var) || $var == 'N;') continue;
+												if (strpos($key, 'extra_vars') !== 0 || !trim($var) || $var == 'N;') {
+													continue;
+												}
 												$var_idx = str_replace('extra_vars','',$key);
 												$oDocumentController->insertDocumentExtraVar($module_srl, $document->document_srl, $var_idx, $var, 'extra_vars'.$var_idx, $lang_code);
 											}
@@ -333,7 +397,9 @@ 
 			// extra_vars * Remove Column
 			for($i=1;$i<=20;$i++)
 			{
-				if(!$oDB->isColumnExists("documents","extra_vars".$i)) continue;
+				if(!$oDB->isColumnExists("documents","extra_vars".$i)) {
+					continue;
+				}
 				$oDB->dropColumn('documents','extra_vars'.$i);
 			}
 
@@ -355,7 +421,9 @@ 
 				$site_args->default_language = $db_info->lang_type;
 
 				$output = executeQuery('module.insertSite', $site_args);
-				if(!$output->toBool()) return $output;
+				if(!$output->toBool()) {
+					return $output;
+				}
 			}
 
 			if($oDB->isIndexExists('sites','idx_domain'))
@@ -401,7 +469,9 @@ 
 				foreach($output->data as $item)
 				{
 					$skin_path = explode('.', $item->skin);
-					if(count($skin_path) != 2) continue;
+					if(count($skin_path) != 2) {
+						continue;
+					}
 					if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/modules/%s', $skin_path[0], $skin_path[1])))
 					{
 						unset($args);
@@ -427,7 +497,9 @@ 
 				$output = executeQuery('module.updateMobileSkinFixModules');
 
 				$oModuleController = getController('module');
-				if(!$moduleConfig) $moduleConfig = new stdClass;
+				if(!$moduleConfig) {
+					$moduleConfig = new stdClass;
+				}
 				$moduleConfig->isUpdateFixedValue = TRUE;
 				$output = $oModuleController->updateModuleConfig('module', $moduleConfig);
 			}
@@ -440,7 +512,9 @@ 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		if(!is_dir('./files/ruleset')) FileHandler::makeDir('./files/ruleset');
+		if(!is_dir('./files/ruleset')) {
+			FileHandler::makeDir('./files/ruleset');
+		}
 
 		return new BaseObject(0, 'success_updated');
 	}
@@ -448,10 +522,14 @@ 
 	function updateForUniqueSiteDomain()
 	{
 		$output = executeQueryArray("module.getNonuniqueDomains");
-		if(!$output->data) return;
+		if(!$output->data) {
+			return;
+		}
 		foreach($output->data as $data)
 		{
-			if($data->count == 1) continue;
+			if($data->count == 1) {
+				continue;
+			}
 			$domain = $data->domain;
 			$args = new stdClass;
 			$args->domain = $domain;

modules/syndication/syndication.controller.php

Doc Comments +3 added lines

@@ -162,6 +162,9 @@
 		$output = executeQuery('syndication.deleteLog', $args);
 	}
 
+	/**
+	 * @param string $type
+	 */
 	function ping($id, $type, $page=1) {
 		$this->ping_message = '';
 		$oSyndicationModel = getModel('syndication');

Spacing +26 added lines, -26 removed lines

@@ -12,17 +12,17 @@ 
 	var $ping_message = '';
 
 	function triggerInsertDocument(&$obj) {
-		if($obj->module_srl < 1) return $this->makeObject();
-		if($obj->status !== 'PUBLIC') return $this->makeObject();
+		if ($obj->module_srl < 1) return $this->makeObject();
+		if ($obj->status !== 'PUBLIC') return $this->makeObject();
 
 		$oSyndicationModel = getModel('syndication');
 		$oModuleModel = getModel('module');
 
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if ($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
 
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if($config->syndication_use!='Y') return $this->makeObject();
+		if ($config->syndication_use != 'Y') return $this->makeObject();
 
 		$target_id = sprintf('%s-%s', $obj->module_srl, $obj->document_srl);
 		$id = $oSyndicationModel->getID('article', $target_id);
@@ -32,22 +32,22 @@ 
 	}
 
 	function triggerUpdateDocument(&$obj) {
-		if($obj->module_srl < 1) return $this->makeObject();
+		if ($obj->module_srl < 1) return $this->makeObject();
 
 		$oSyndicationModel = getModel('syndication');
 		$oModuleModel = getModel('module');
 
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if ($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
 
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if($config->syndication_use!='Y') return $this->makeObject();
+		if ($config->syndication_use != 'Y') return $this->makeObject();
 
 		$target_id = sprintf('%s-%s', $obj->module_srl, $obj->document_srl);
 		$id = $oSyndicationModel->getID('article', $target_id);
 
 		// PUBLIC 외 삭제
-		if($obj->status === 'PUBLIC')
+		if ($obj->status === 'PUBLIC')
 		{
 			$this->ping($id, 'article');
 		}
@@ -60,14 +60,14 @@ 
 	}
 
 	function triggerDeleteDocument(&$obj) {
-		if($obj->module_srl < 1) return $this->makeObject();
+		if ($obj->module_srl < 1) return $this->makeObject();
 
 		$oModuleModel = getModel('module');
 		$oSyndicationModel = getModel('syndication');
 
 		$config = $oModuleModel->getModuleConfig('syndication');
-		if($config->syndication_use != 'Y') return $this->makeObject();
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if ($config->syndication_use != 'Y') return $this->makeObject();
+		if ($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
 
 		$this->insertLog($obj->module_srl, $obj->document_srl, $obj->title, $obj->content);
 
@@ -85,25 +85,25 @@ 
 
 	function triggerMoveDocumentModule(&$obj)
 	{
-		if($obj->module_srl < 1) return $this->makeObject();
+		if ($obj->module_srl < 1) return $this->makeObject();
 
 		$oSyndicationModel = getModel('syndication');
 		$oModuleModel = getModel('module');
 
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if ($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
 
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if($config->syndication_use!='Y') return $this->makeObject();
+		if ($config->syndication_use != 'Y') return $this->makeObject();
 
 		$arr_document_srl = explode(',', $obj->document_srls);
-		if(!$arr_document_srl) return $this->makeObject();
+		if (!$arr_document_srl) return $this->makeObject();
 
-		foreach($arr_document_srl as $document_srl)
+		foreach ($arr_document_srl as $document_srl)
 		{
 			// 기존 문서 삭제
 			$source_module_srl = $obj->source_module_srl[$document_srl];
-			if(!!$source_module_srl)
+			if (!!$source_module_srl)
 			{
 				$target_id = sprintf('%s-%s', $source_module_srl, $document_srl);
 				$id = $oSyndicationModel->getID('article', $target_id);
@@ -123,11 +123,11 @@ 
 		$oSyndicationModel = getModel('syndication');
 		$oModuleModel = getModel('module');
 
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if ($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
 
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if($config->syndication_use!='Y') return $this->makeObject();
+		if ($config->syndication_use != 'Y') return $this->makeObject();
 
 		$this->insertLog($obj->module_srl, $obj->document_srl, '', '');
 
@@ -162,21 +162,21 @@ 
 		$output = executeQuery('syndication.deleteLog', $args);
 	}
 
-	function ping($id, $type, $page=1) {
+	function ping($id, $type, $page = 1) {
 		$this->ping_message = '';
 		$oSyndicationModel = getModel('syndication');
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if(!$config->syndication_token)
+		if (!$config->syndication_token)
 		{
 			$this->ping_message = 'Syndication Token empty';
 			$oSyndicationModel->setResentPingLog($this->ping_message);
 			return false;
 		}
 
-		if(!$this->checkOpenSSLSupport())
+		if (!$this->checkOpenSSLSupport())
 		{
 			$lang = Context::get('lang');
 			$this->ping_message = $lang->msg_need_openssl_support;
@@ -184,7 +184,7 @@ 
 			return false;
 		}
 
-		if(substr($config->site_url,-1)!='/')
+		if (substr($config->site_url, -1) != '/')
 		{
 			$config->site_url .= '/';
 		}
@@ -204,11 +204,11 @@ 
 		$buff = FileHandler::getRemoteResource($ping_url, null, 10, 'POST', 'application/x-www-form-urlencoded', $ping_header, array(), array('ping_url'=>$ping_body), $request_config);
 
 		$xml = new XmlParser();
-		$xmlDoc= $xml->parse($buff);
+		$xmlDoc = $xml->parse($buff);
 
-		if($xmlDoc->result->error_code->body != '000')
+		if ($xmlDoc->result->error_code->body != '000')
 		{
-			if(!$buff)
+			if (!$buff)
 			{
 				$this->ping_message = 'Socket connection error. Check your Server Environment.';
 			}

Braces +50 added lines, -20 removed lines

@@ -12,17 +12,25 @@ 
 	var $ping_message = '';
 
 	function triggerInsertDocument(&$obj) {
-		if($obj->module_srl < 1) return $this->makeObject();
-		if($obj->status !== 'PUBLIC') return $this->makeObject();
+		if($obj->module_srl < 1) {
+			return $this->makeObject();
+		}
+		if($obj->status !== 'PUBLIC') {
+			return $this->makeObject();
+		}
 
 		$oSyndicationModel = getModel('syndication');
 		$oModuleModel = getModel('module');
 
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if($oSyndicationModel->isExceptedModules($obj->module_srl)) {
+			return $this->makeObject();
+		}
 
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if($config->syndication_use!='Y') return $this->makeObject();
+		if($config->syndication_use!='Y') {
+			return $this->makeObject();
+		}
 
 		$target_id = sprintf('%s-%s', $obj->module_srl, $obj->document_srl);
 		$id = $oSyndicationModel->getID('article', $target_id);
@@ -32,16 +40,22 @@ 
 	}
 
 	function triggerUpdateDocument(&$obj) {
-		if($obj->module_srl < 1) return $this->makeObject();
+		if($obj->module_srl < 1) {
+			return $this->makeObject();
+		}
 
 		$oSyndicationModel = getModel('syndication');
 		$oModuleModel = getModel('module');
 
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if($oSyndicationModel->isExceptedModules($obj->module_srl)) {
+			return $this->makeObject();
+		}
 
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if($config->syndication_use!='Y') return $this->makeObject();
+		if($config->syndication_use!='Y') {
+			return $this->makeObject();
+		}
 
 		$target_id = sprintf('%s-%s', $obj->module_srl, $obj->document_srl);
 		$id = $oSyndicationModel->getID('article', $target_id);
@@ -50,8 +64,7 @@ 
 		if($obj->status === 'PUBLIC')
 		{
 			$this->ping($id, 'article');
-		}
-		else
+		} else
 		{
 			$this->ping($id, 'deleted');
 		}
@@ -60,14 +73,20 @@ 
 	}
 
 	function triggerDeleteDocument(&$obj) {
-		if($obj->module_srl < 1) return $this->makeObject();
+		if($obj->module_srl < 1) {
+			return $this->makeObject();
+		}
 
 		$oModuleModel = getModel('module');
 		$oSyndicationModel = getModel('syndication');
 
 		$config = $oModuleModel->getModuleConfig('syndication');
-		if($config->syndication_use != 'Y') return $this->makeObject();
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if($config->syndication_use != 'Y') {
+			return $this->makeObject();
+		}
+		if($oSyndicationModel->isExceptedModules($obj->module_srl)) {
+			return $this->makeObject();
+		}
 
 		$this->insertLog($obj->module_srl, $obj->document_srl, $obj->title, $obj->content);
 
@@ -85,19 +104,27 @@ 
 
 	function triggerMoveDocumentModule(&$obj)
 	{
-		if($obj->module_srl < 1) return $this->makeObject();
+		if($obj->module_srl < 1) {
+			return $this->makeObject();
+		}
 
 		$oSyndicationModel = getModel('syndication');
 		$oModuleModel = getModel('module');
 
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if($oSyndicationModel->isExceptedModules($obj->module_srl)) {
+			return $this->makeObject();
+		}
 
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if($config->syndication_use!='Y') return $this->makeObject();
+		if($config->syndication_use!='Y') {
+			return $this->makeObject();
+		}
 
 		$arr_document_srl = explode(',', $obj->document_srls);
-		if(!$arr_document_srl) return $this->makeObject();
+		if(!$arr_document_srl) {
+			return $this->makeObject();
+		}
 
 		foreach($arr_document_srl as $document_srl)
 		{
@@ -123,11 +150,15 @@ 
 		$oSyndicationModel = getModel('syndication');
 		$oModuleModel = getModel('module');
 
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if($oSyndicationModel->isExceptedModules($obj->module_srl)) {
+			return $this->makeObject();
+		}
 
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if($config->syndication_use!='Y') return $this->makeObject();
+		if($config->syndication_use!='Y') {
+			return $this->makeObject();
+		}
 
 		$this->insertLog($obj->module_srl, $obj->document_srl, '', '');
 
@@ -211,8 +242,7 @@ 
 			if(!$buff)
 			{
 				$this->ping_message = 'Socket connection error. Check your Server Environment.';
-			}
-			else
+			} else
 			{
 				$this->ping_message = $xmlDoc->result->message->body;
 			}

modules/syndication/syndication.class.php

Spacing +7 added lines, -7 removed lines

@@ -38,7 +38,7 @@ 
 		$oModuleController->insertTrigger('document.moveDocumentModule', 'syndication', 'controller', 'triggerMoveDocumentModule', 'after');
 
 		$oAddonAdminModel = getAdminModel('addon');
-		if($oAddonAdminModel->getAddonInfoXml('catpcha')){
+		if ($oAddonAdminModel->getAddonInfoXml('catpcha')) {
 			$oAddonAdminController = &addonAdminController::getInstance();
 			$oAddonAdminController->doActivate('catpcha');
 			$oAddonAdminController->makeCacheFile();
@@ -47,9 +47,9 @@ 
 
 	function checkUpdate() {
 		$oModuleModel = getModel('module');
-		if(!$oModuleModel->getTrigger('document.moveDocumentToTrash', 'syndication', 'controller', 'triggerMoveDocumentToTrash', 'after')) return true;
+		if (!$oModuleModel->getTrigger('document.moveDocumentToTrash', 'syndication', 'controller', 'triggerMoveDocumentToTrash', 'after')) return true;
 		// if(!$oModuleModel->getTrigger('document.restoreTrash', 'syndication', 'controller', 'triggerRestoreTrash', 'after')) return true;
-		if(!$oModuleModel->getTrigger('document.moveDocumentModule', 'syndication', 'controller', 'triggerMoveDocumentModule', 'after')) return true;
+		if (!$oModuleModel->getTrigger('document.moveDocumentModule', 'syndication', 'controller', 'triggerMoveDocumentModule', 'after')) return true;
 
 		return false;
 	}
@@ -58,18 +58,18 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 
-		if(!$oModuleModel->getTrigger('document.moveDocumentToTrash', 'syndication', 'controller', 'triggerMoveDocumentToTrash', 'after')){
+		if (!$oModuleModel->getTrigger('document.moveDocumentToTrash', 'syndication', 'controller', 'triggerMoveDocumentToTrash', 'after')) {
 			$oModuleController->insertTrigger('document.moveDocumentToTrash', 'syndication', 'controller', 'triggerMoveDocumentToTrash', 'after');
 		}
 		// if(!$oModuleModel->getTrigger('document.restoreTrash', 'syndication', 'controller', 'triggerRestoreTrash', 'after')){
 		// 	$oModuleController->insertTrigger('document.restoreTrash', 'syndication', 'controller', 'triggerRestoreTrash', 'after');
 		// }
-		if(!$oModuleModel->getTrigger('document.moveDocumentModule', 'syndication', 'controller', 'triggerMoveDocumentModule', 'after')){
+		if (!$oModuleModel->getTrigger('document.moveDocumentModule', 'syndication', 'controller', 'triggerMoveDocumentModule', 'after')) {
 			$oModuleController->insertTrigger('document.moveDocumentModule', 'syndication', 'controller', 'triggerMoveDocumentModule', 'after');
 		}
 
 		$oAddonAdminModel = getAdminModel('addon');
-		if($oAddonAdminModel->getAddonInfoXml('catpcha')){
+		if ($oAddonAdminModel->getAddonInfoXml('catpcha')) {
 			$oAddonAdminController = &addonAdminController::getInstance();
 			$oAddonAdminController->doActivate('catpcha');
 			$oAddonAdminController->makeCacheFile();
@@ -81,7 +81,7 @@ 
 
 	function checkOpenSSLSupport()
 	{
-		if(!in_array('ssl', stream_get_transports())) {
+		if (!in_array('ssl', stream_get_transports())) {
 			return FALSE;
 		}
 		return TRUE;

Braces +6 added lines, -2 removed lines

@@ -47,9 +47,13 @@
 
 	function checkUpdate() {
 		$oModuleModel = getModel('module');
-		if(!$oModuleModel->getTrigger('document.moveDocumentToTrash', 'syndication', 'controller', 'triggerMoveDocumentToTrash', 'after')) return true;
+		if(!$oModuleModel->getTrigger('document.moveDocumentToTrash', 'syndication', 'controller', 'triggerMoveDocumentToTrash', 'after')) {
+			return true;
+		}
 		// if(!$oModuleModel->getTrigger('document.restoreTrash', 'syndication', 'controller', 'triggerRestoreTrash', 'after')) return true;
-		if(!$oModuleModel->getTrigger('document.moveDocumentModule', 'syndication', 'controller', 'triggerMoveDocumentModule', 'after')) return true;
+		if(!$oModuleModel->getTrigger('document.moveDocumentModule', 'syndication', 'controller', 'triggerMoveDocumentModule', 'after')) {
+			return true;
+		}
 
 		return false;
 	}