xpressengine / xe-core

classes/httprequest/XEHttpRequest.class.php

Spacing +23 added lines, -23 removed lines

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

classes/xml/xmlquery/argument/Argument.class.php

Spacing +38 added lines, -38 removed lines

@@ -73,11 +73,11 @@ 
 
 	function getType()
 	{
-		if(isset($this->type))
+		if (isset($this->type))
 		{
 			return $this->type;
 		}
-		if(is_string($this->value))
+		if (is_string($this->value))
 		{
 			return 'column_name';
 		}
@@ -102,7 +102,7 @@ 
 
 	function getValue()
 	{
-		if(!isset($this->_value))
+		if (!isset($this->_value))
 		{
 			$value = $this->getEscapedValue();
 			$this->_value = $this->toString($value);
@@ -127,7 +127,7 @@ 
 
 	function getUnescapedValue()
 	{
-		if($this->value === 'null')
+		if ($this->value === 'null')
 		{
 			return null;
 		}
@@ -141,17 +141,17 @@ 
 	 */
 	function toString($value)
 	{
-		if(is_array($value))
+		if (is_array($value))
 		{
-			if(count($value) === 0)
+			if (count($value) === 0)
 			{
 				return '';
 			}
-			if(count($value) === 1 && $value[0] === '')
+			if (count($value) === 1 && $value[0] === '')
 			{
 				return '';
 			}
-			return '(' . implode(',', $value) . ')';
+			return '('.implode(',', $value).')';
 		}
 		return $value;
 	}
@@ -164,42 +164,42 @@ 
 	function escapeValue($value)
 	{
 		$column_type = $this->getType();
-		if($column_type == 'column_name')
+		if ($column_type == 'column_name')
 		{
 			$dbParser = DB::getParser();
 			return $dbParser->parseExpression($value);
 		}
-		if(!isset($value))
+		if (!isset($value))
 		{
 			return null;
 		}
 
 		$columnTypeList = array('date' => 1, 'varchar' => 1, 'char' => 1, 'text' => 1, 'bigtext' => 1);
-		if(isset($columnTypeList[$column_type]))
+		if (isset($columnTypeList[$column_type]))
 		{
-			if(!is_array($value))
+			if (!is_array($value))
 			{
 				$value = $this->_escapeStringValue($value);
 			}
 			else
 			{
-				foreach($value as $key=>$val)
+				foreach ($value as $key=>$val)
 				{
 					$value[$key] = $this->_escapeStringValue($val);
 				}
 			}
 		}
-		if($this->uses_default_value)
+		if ($this->uses_default_value)
 		{
 			return $value;
 		}
-		if($column_type == 'number')
+		if ($column_type == 'number')
 		{
-			if(is_array($value))
+			if (is_array($value))
 			{
-				foreach($value AS $key => $val)
+				foreach ($value AS $key => $val)
 				{
-					if(isset($val) && $val !== '')
+					if (isset($val) && $val !== '')
 					{
 						$value[$key] = (int) $val;
 					}
@@ -227,20 +227,20 @@ 
 		$value = preg_replace_callback($regex, array($this, 'utf8Replacer'), $value);
 		$db = DB::getInstance();
 		$value = $db->addQuotes($value);
-		return '\'' . $value . '\'';
+		return '\''.$value.'\'';
 	}
 
 	function utf8Replacer($captures)
 	{
-		if(strlen($captures[1]))
+		if (strlen($captures[1]))
 		{
 			// Valid byte sequence. Return unmodified.
 			return $captures[1];
 		}
-		else if(strlen($captures[2]))
+		else if (strlen($captures[2]))
 		{
 			// Remove user defined area
-			if("\xF3\xB0\x80\x80" <= $captures[2])
+			if ("\xF3\xB0\x80\x80" <= $captures[2])
 			{
 				return;
 			}
@@ -262,15 +262,15 @@ 
 	{
 		$type = $this->getType();
 		$value = $this->getUnescapedValue();
-		if($type == 'column_name')
+		if ($type == 'column_name')
 		{
 			return TRUE;
 		}
-		if($type == 'number' && is_null($value))
+		if ($type == 'number' && is_null($value))
 		{
 			return FALSE;
 		}
-		if($type == 'number' && !is_numeric($value) && $this->uses_default_value)
+		if ($type == 'number' && !is_numeric($value) && $this->uses_default_value)
 		{
 			return TRUE;
 		}
@@ -284,7 +284,7 @@ 
 
 	function ensureDefaultValue($default_value)
 	{
-		if($this->value === NULL || $this->value === '')
+		if ($this->value === NULL || $this->value === '')
 		{
 			$this->value = $default_value;
 			$this->uses_default_value = TRUE;
@@ -298,23 +298,23 @@ 
 	 */
 	function checkFilter($filter_type)
 	{
-		if(isset($this->value) && $this->value != '')
+		if (isset($this->value) && $this->value != '')
 		{
 			global $lang;
 			$val = $this->value;
 			$key = $this->name;
-			switch($filter_type)
+			switch ($filter_type)
 			{
 				case 'email' :
 				case 'email_address' :
-					if(!preg_match('/^[\w-]+((?:\.|\+|\~)[\w-]+)*@[\w-]+(\.[\w-]+)+$/is', $val))
+					if (!preg_match('/^[\w-]+((?:\.|\+|\~)[\w-]+)*@[\w-]+(\.[\w-]+)+$/is', $val))
 					{
 						$this->isValid = FALSE;
 						$this->errorMessage = new BaseObject(-1, sprintf($lang->filter->invalid_email, $lang->{$key} ? $lang->{$key} : $key));
 					}
 					break;
 				case 'homepage' :
-					if(!preg_match('/^(http|https)+(:\/\/)+[0-9a-z_-]+\.[^ ]+$/is', $val))
+					if (!preg_match('/^(http|https)+(:\/\/)+[0-9a-z_-]+\.[^ ]+$/is', $val))
 					{
 						$this->isValid = FALSE;
 						$this->errorMessage = new BaseObject(-1, sprintf($lang->filter->invalid_homepage, $lang->{$key} ? $lang->{$key} : $key));
@@ -322,7 +322,7 @@ 
 					break;
 				case 'userid' :
 				case 'user_id' :
-					if(!preg_match('/^[a-zA-Z]+([_0-9a-zA-Z]+)*$/is', $val))
+					if (!preg_match('/^[a-zA-Z]+([_0-9a-zA-Z]+)*$/is', $val))
 					{
 						$this->isValid = FALSE;
 						$this->errorMessage = new BaseObject(-1, sprintf($lang->filter->invalid_userid, $lang->{$key} ? $lang->{$key} : $key));
@@ -330,25 +330,25 @@ 
 					break;
 				case 'number' :
 				case 'numbers' :
-					if(is_array($val))
+					if (is_array($val))
 					{
 						$val = join(',', $val);
 					}
-					if(!preg_match('/^(-?)[0-9]+(,\-?[0-9]+)*$/is', $val))
+					if (!preg_match('/^(-?)[0-9]+(,\-?[0-9]+)*$/is', $val))
 					{
 						$this->isValid = FALSE;
 						$this->errorMessage = new BaseObject(-1, sprintf($lang->filter->invalid_number, $lang->{$key} ? $lang->{$key} : $key));
 					}
 					break;
 				case 'alpha' :
-					if(!preg_match('/^[a-z]+$/is', $val))
+					if (!preg_match('/^[a-z]+$/is', $val))
 					{
 						$this->isValid = FALSE;
 						$this->errorMessage = new BaseObject(-1, sprintf($lang->filter->invalid_alpha, $lang->{$key} ? $lang->{$key} : $key));
 					}
 					break;
 				case 'alpha_number' :
-					if(!preg_match('/^[0-9a-z]+$/is', $val))
+					if (!preg_match('/^[0-9a-z]+$/is', $val))
 					{
 						$this->isValid = FALSE;
 						$this->errorMessage = new BaseObject(-1, sprintf($lang->filter->invalid_alpha_number, $lang->{$key} ? $lang->{$key} : $key));
@@ -360,7 +360,7 @@ 
 
 	function checkMaxLength($length)
 	{
-		if($this->value && (strlen($this->value) > $length))
+		if ($this->value && (strlen($this->value) > $length))
 		{
 			global $lang;
 			$this->isValid = FALSE;
@@ -371,7 +371,7 @@ 
 
 	function checkMinLength($length)
 	{
-		if($this->value && (strlen($this->value) < $length))
+		if ($this->value && (strlen($this->value) < $length))
 		{
 			global $lang;
 			$this->isValid = FALSE;
@@ -382,7 +382,7 @@ 
 
 	function checkNotNull()
 	{
-		if(!isset($this->value))
+		if (!isset($this->value))
 		{
 			global $lang;
 			$this->isValid = FALSE;

modules/integration_search/integration_search.view.php

Spacing +14 added lines, -14 removed lines

@@ -39,11 +39,11 @@ 
 		$logged_info = Context::get('logged_info');
 
 		// Check permissions
-		if(!$this->grant->access) return new BaseObject(-1,'msg_not_permitted');
+		if (!$this->grant->access) return new BaseObject(-1, 'msg_not_permitted');
 
 		$config = $oModuleModel->getModuleConfig('integration_search');
-		if(!$config) $config = new stdClass;
-		if(!$config->skin)
+		if (!$config) $config = new stdClass;
+		if (!$config->skin)
 		{
 			$config->skin = 'default';
 			$template_path = sprintf('%sskins/%s', $this->module_path, $config->skin);
@@ -67,16 +67,16 @@ 
 		Context::set('module_info', $skin_vars);
 
 		$target = $config->target;
-		if(!$target) $target = 'include';
+		if (!$target) $target = 'include';
 
-		if(empty($config->target_module_srl))
+		if (empty($config->target_module_srl))
 			$module_srl_list = array();
 		else
-			$module_srl_list = explode(',',$config->target_module_srl);
+			$module_srl_list = explode(',', $config->target_module_srl);
 
 		// https://github.com/xpressengine/xe-core/issues/1522
 		// 검색 대상을 지정하지 않았을 때 검색 제한
-		if($target === 'include' && !count($module_srl_list))
+		if ($target === 'include' && !count($module_srl_list))
 		{
 			$oMessageObject = ModuleHandler::getModuleInstance('message');
 			$oMessageObject->setError(-1);
@@ -90,19 +90,19 @@ 
 		// Set a variable for search keyword
 		$is_keyword = Context::get('is_keyword');
 		// Set page variables
-		$page = (int)Context::get('page');
-		if(!$page) $page = 1;
+		$page = (int) Context::get('page');
+		if (!$page) $page = 1;
 		// Search by search tab
 		$where = Context::get('where');
 		// Create integration search model object
-		if($is_keyword)
+		if ($is_keyword)
 		{
 			$oIS = getModel('integration_search');
-			switch($where)
+			switch ($where)
 			{
 				case 'document' :
 					$search_target = Context::get('search_target');
-					if(!in_array($search_target, array('title','content','title_content','tag'))) $search_target = 'title';
+					if (!in_array($search_target, array('title', 'content', 'title_content', 'tag'))) $search_target = 'title';
 					Context::set('search_target', $search_target);
 
 					$output = $oIS->getDocuments($target, $module_srl_list, $search_target, $is_keyword, $page, 10);
@@ -116,7 +116,7 @@ 
 					break;
 				case 'trackback' :
 					$search_target = Context::get('search_target');
-					if(!in_array($search_target, array('title','url','blog_name','excerpt'))) $search_target = 'title';
+					if (!in_array($search_target, array('title', 'url', 'blog_name', 'excerpt'))) $search_target = 'title';
 					Context::set('search_target', $search_target);
 
 					$output = $oIS->getTrackbacks($target, $module_srl_list, $search_target, $is_keyword, $page, 10);
@@ -124,7 +124,7 @@ 
 					$this->setTemplateFile("trackback", $page);
 					break;
 				case 'multimedia' :
-					$output = $oIS->getImages($target, $module_srl_list, $is_keyword, $page,20);
+					$output = $oIS->getImages($target, $module_srl_list, $is_keyword, $page, 20);
 					Context::set('output', $output);
 					$this->setTemplateFile("multimedia", $page);
 					break;

Braces +26 added lines, -16 removed lines

@@ -39,24 +39,26 @@ 
 		$logged_info = Context::get('logged_info');
 
 		// Check permissions
-		if(!$this->grant->access) return new BaseObject(-1,'msg_not_permitted');
+		if(!$this->grant->access) {
+			return new BaseObject(-1,'msg_not_permitted');
+		}
 
 		$config = $oModuleModel->getModuleConfig('integration_search');
-		if(!$config) $config = new stdClass;
+		if(!$config) {
+			$config = new stdClass;
+		}
 		if(!$config->skin)
 		{
 			$config->skin = 'default';
 			$template_path = sprintf('%sskins/%s', $this->module_path, $config->skin);
-		}
-		else
+		} else
 		{
 			//check theme
 			$config_parse = explode('|@|', $config->skin);
 			if (count($config_parse) > 1)
 			{
 				$template_path = sprintf('./themes/%s/modules/integration_search/', $config_parse[0]);
-			}
-			else
+			} else
 			{
 				$template_path = sprintf('%sskins/%s', $this->module_path, $config->skin);
 			}
@@ -67,12 +69,15 @@ 
 		Context::set('module_info', $skin_vars);
 
 		$target = $config->target;
-		if(!$target) $target = 'include';
+		if(!$target) {
+			$target = 'include';
+		}
 
-		if(empty($config->target_module_srl))
-			$module_srl_list = array();
-		else
-			$module_srl_list = explode(',',$config->target_module_srl);
+		if(empty($config->target_module_srl)) {
+					$module_srl_list = array();
+		} else {
+					$module_srl_list = explode(',',$config->target_module_srl);
+		}
 
 		// https://github.com/xpressengine/xe-core/issues/1522
 		// 검색 대상을 지정하지 않았을 때 검색 제한
@@ -91,7 +96,9 @@ 
 		$is_keyword = Context::get('is_keyword');
 		// Set page variables
 		$page = (int)Context::get('page');
-		if(!$page) $page = 1;
+		if(!$page) {
+			$page = 1;
+		}
 		// Search by search tab
 		$where = Context::get('where');
 		// Create integration search model object
@@ -102,7 +109,9 @@ 
 			{
 				case 'document' :
 					$search_target = Context::get('search_target');
-					if(!in_array($search_target, array('title','content','title_content','tag'))) $search_target = 'title';
+					if(!in_array($search_target, array('title','content','title_content','tag'))) {
+						$search_target = 'title';
+					}
 					Context::set('search_target', $search_target);
 
 					$output = $oIS->getDocuments($target, $module_srl_list, $search_target, $is_keyword, $page, 10);
@@ -116,7 +125,9 @@ 
 					break;
 				case 'trackback' :
 					$search_target = Context::get('search_target');
-					if(!in_array($search_target, array('title','url','blog_name','excerpt'))) $search_target = 'title';
+					if(!in_array($search_target, array('title','url','blog_name','excerpt'))) {
+						$search_target = 'title';
+					}
 					Context::set('search_target', $search_target);
 
 					$output = $oIS->getTrackbacks($target, $module_srl_list, $search_target, $is_keyword, $page, 10);
@@ -144,8 +155,7 @@ 
 					$this->setTemplateFile("index", $page);
 					break;
 			}
-		}
-		else
+		} else
 		{
 			$this->setTemplateFile("no_keywords");
 		}

modules/integration_search/integration_search.model.php

Spacing +33 added lines, -33 removed lines

@@ -28,12 +28,12 @@ 
 	 *
 	 * @return BaseObject output document list
 	 */
-	function getDocuments($target, $module_srls_list, $search_target, $search_keyword, $page=1, $list_count = 20)
+	function getDocuments($target, $module_srls_list, $search_target, $search_keyword, $page = 1, $list_count = 20)
 	{
-		if(is_array($module_srls_list)) $module_srls_list = implode(',',$module_srls_list);
+		if (is_array($module_srls_list)) $module_srls_list = implode(',', $module_srls_list);
 
 		$args = new stdClass();
-		if($target == 'exclude')
+		if ($target == 'exclude')
 		{
 			$module_srls_list .= ',0'; // exclude 'trash'
 			if ($module_srls_list{0} == ',') $module_srls_list = substr($module_srls_list, 1);
@@ -53,7 +53,7 @@ 
 		$args->sort_index = 'list_order';
 		$args->order_type = 'asc';
 		$args->statusList = array('PUBLIC');
-		if(!$args->module_srl) unset($args->module_srl);
+		if (!$args->module_srl) unset($args->module_srl);
 		// Get a list of documents
 		$oDocumentModel = getModel('document');
 
@@ -71,22 +71,22 @@ 
 	 *
 	 * @return BaseObject output comment list
 	 */
-	function getComments($target, $module_srls_list, $search_keyword, $page=1, $list_count = 20)
+	function getComments($target, $module_srls_list, $search_keyword, $page = 1, $list_count = 20)
 	{
 		$args = new stdClass();
 
-		if(is_array($module_srls_list))
+		if (is_array($module_srls_list))
 		{
-			if (count($module_srls_list) > 0) $module_srls = implode(',',$module_srls_list);
+			if (count($module_srls_list) > 0) $module_srls = implode(',', $module_srls_list);
 		}
 		else
 		{
-			if($module_srls_list)
+			if ($module_srls_list)
 			{
 				$module_srls = $module_srls_list;
 			}
 		}
-		if($target == 'exclude') $args->exclude_module_srl = $module_srls;
+		if ($target == 'exclude') $args->exclude_module_srl = $module_srls;
 		else $args->module_srl = $module_srls;
 
 		$args->page = $page;
@@ -99,7 +99,7 @@ 
 		// Get a list of documents
 		$oCommentModel = getModel('comment');
 		$output = $oCommentModel->getTotalCommentList($args);
-		if(!$output->toBool()|| !$output->data) return $output;
+		if (!$output->toBool() || !$output->data) return $output;
 		return $output;
 	}
 
@@ -115,15 +115,15 @@ 
 	 *
 	 * @return BaseObject output trackback list
 	 */
-	function getTrackbacks($target, $module_srls_list, $search_target = "title", $search_keyword, $page=1, $list_count = 20)
+	function getTrackbacks($target, $module_srls_list, $search_target = "title", $search_keyword, $page = 1, $list_count = 20)
 	{
 		$oTrackbackModel = getAdminModel('trackback');
-		if(!$oTrackbackModel) return new BaseObject();
+		if (!$oTrackbackModel) return new BaseObject();
 		$args = new stdClass();
 
-		if(is_array($module_srls_list)) $module_srls = implode(',',$module_srls_list);
+		if (is_array($module_srls_list)) $module_srls = implode(',', $module_srls_list);
 		else $module_srls = $module_srls_list;
-		if($target == 'exclude') $args->exclude_module_srl = $module_srls;
+		if ($target == 'exclude') $args->exclude_module_srl = $module_srls;
 		else $args->module_srl = $module_srls;
 		$args->page = $page;
 		$args->list_count = $list_count;
@@ -134,7 +134,7 @@ 
 		$args->order_type = 'asc';
 		// Get a list of documents
 		$output = $oTrackbackModel->getTotalTrackbackList($args);
-		if(!$output->toBool()|| !$output->data) return $output;
+		if (!$output->toBool() || !$output->data) return $output;
 		return $output;
 	}
 
@@ -154,9 +154,9 @@ 
 	{
 		$args = new stdClass();
 
-		if(is_array($module_srls_list)) $module_srls = implode(',',$module_srls_list);
+		if (is_array($module_srls_list)) $module_srls = implode(',', $module_srls_list);
 		else $module_srls = $module_srls_list;
-		if($target == 'exclude') $args->exclude_module_srl = $module_srls;
+		if ($target == 'exclude') $args->exclude_module_srl = $module_srls;
 		else $args->module_srl = $module_srls;
 		$args->page = $page;
 		$args->list_count = $list_count;
@@ -166,32 +166,32 @@ 
 		$args->sort_index = 'files.file_srl';
 		$args->order_type = 'desc';
 		$args->isvalid = 'Y';
-		$args->direct_download = $direct_download=='Y'?'Y':'N';
+		$args->direct_download = $direct_download == 'Y' ? 'Y' : 'N';
 		// Get a list of documents
 		$oFileAdminModel = getAdminModel('file');
 		$output = $oFileAdminModel->getFileList($args);
-		if(!$output->toBool() || !$output->data) return $output;
+		if (!$output->toBool() || !$output->data) return $output;
 
 		$list = array();
-		foreach($output->data as $key => $val)
+		foreach ($output->data as $key => $val)
 		{
 			$obj = new stdClass;
 			$obj->filename = $val->source_filename;
 			$obj->download_count = $val->download_count;
-			if(substr($val->download_url,0,2)=='./') $val->download_url = substr($val->download_url,2);
+			if (substr($val->download_url, 0, 2) == './') $val->download_url = substr($val->download_url, 2);
 			$obj->download_url = Context::getRequestUri().$val->download_url;
 			$obj->target_srl = $val->upload_target_srl;
 			$obj->file_size = $val->file_size;
 			// Images
-			if(preg_match('/\.(jpg|jpeg|gif|png)$/i', $val->source_filename))
+			if (preg_match('/\.(jpg|jpeg|gif|png)$/i', $val->source_filename))
 			{
 				$obj->type = 'image';
 
-				$thumbnail_path = sprintf('files/thumbnails/%s',getNumberingPath($val->file_srl, 3));
-				if(!is_dir($thumbnail_path)) FileHandler::makeDir($thumbnail_path);
+				$thumbnail_path = sprintf('files/thumbnails/%s', getNumberingPath($val->file_srl, 3));
+				if (!is_dir($thumbnail_path)) FileHandler::makeDir($thumbnail_path);
 				$thumbnail_file = sprintf('%s%dx%d.%s.jpg', $thumbnail_path, 120, 120, 'crop');
 				$thumbnail_url  = Context::getRequestUri().$thumbnail_file;
-				if(!file_exists($thumbnail_file)) FileHandler::createImageFile($val->uploaded_filename, $thumbnail_file, 120, 120, 'jpg', 'crop');
+				if (!file_exists($thumbnail_file)) FileHandler::createImageFile($val->uploaded_filename, $thumbnail_file, 120, 120, 'jpg', 'crop');
 				$obj->src = sprintf('<img src="%s" alt="%s" width="%d" height="%d" />', $thumbnail_url, htmlspecialchars($obj->filename, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), 120, 120);
 			}
 			else
@@ -207,11 +207,11 @@ 
 
 		$oDocumentModel = getModel('document');
 		$document_list = $oDocumentModel->getDocuments($target_list);
-		if($document_list) foreach($document_list as $key => $val)
+		if ($document_list) foreach ($document_list as $key => $val)
 		{
-			foreach($output->data as $k => $v)
+			foreach ($output->data as $k => $v)
 			{
-				if($v->target_srl== $val->document_srl)
+				if ($v->target_srl == $val->document_srl)
 				{
 					$output->data[$k]->url = $val->getPermanentUrl();
 					$output->data[$k]->regdate = $val->getRegdate("Y-m-d H:i");
@@ -222,11 +222,11 @@ 
 
 		$oCommentModel = getModel('comment');
 		$comment_list = $oCommentModel->getComments($target_list);
-		if($comment_list) foreach($comment_list as $key => $val)
+		if ($comment_list) foreach ($comment_list as $key => $val)
 		{
-			foreach($output->data as $k => $v)
+			foreach ($output->data as $k => $v)
 			{
-				if($v->target_srl== $val->comment_srl)
+				if ($v->target_srl == $val->comment_srl)
 				{
 					$output->data[$k]->url = $val->getPermanentUrl();
 					$output->data[$k]->regdate = $val->getRegdate("Y-m-d H:i");
@@ -249,7 +249,7 @@ 
 	 *
 	 * @return BaseObject
 	 */
-	function getImages($target, $module_srls_list, $search_keyword, $page=1, $list_count = 20)
+	function getImages($target, $module_srls_list, $search_keyword, $page = 1, $list_count = 20)
 	{
 		return $this->_getFiles($target, $module_srls_list, $search_keyword, $page, $list_count);
 	}
@@ -265,7 +265,7 @@ 
 	 *
 	 * @return BaseObject
 	 */
-	function getFiles($target, $module_srls_list, $search_keyword, $page=1, $list_count = 20)
+	function getFiles($target, $module_srls_list, $search_keyword, $page = 1, $list_count = 20)
 	{
 		return $this->_getFiles($target, $module_srls_list, $search_keyword, $page, $list_count, 'N');
 	}

Braces +67 added lines, -29 removed lines

@@ -30,16 +30,19 @@ 
 	 */
 	function getDocuments($target, $module_srls_list, $search_target, $search_keyword, $page=1, $list_count = 20)
 	{
-		if(is_array($module_srls_list)) $module_srls_list = implode(',',$module_srls_list);
+		if(is_array($module_srls_list)) {
+			$module_srls_list = implode(',',$module_srls_list);
+		}
 
 		$args = new stdClass();
 		if($target == 'exclude')
 		{
 			$module_srls_list .= ',0'; // exclude 'trash'
-			if ($module_srls_list{0} == ',') $module_srls_list = substr($module_srls_list, 1);
+			if ($module_srls_list{0} == ',') {
+				$module_srls_list = substr($module_srls_list, 1);
+			}
 			$args->exclude_module_srl = $module_srls_list;
-		}
-		else
+		} else
 		{
 			$args->module_srl = $module_srls_list;
 			$args->exclude_module_srl = '0'; // exclude 'trash'
@@ -53,7 +56,9 @@ 
 		$args->sort_index = 'list_order';
 		$args->order_type = 'asc';
 		$args->statusList = array('PUBLIC');
-		if(!$args->module_srl) unset($args->module_srl);
+		if(!$args->module_srl) {
+			unset($args->module_srl);
+		}
 		// Get a list of documents
 		$oDocumentModel = getModel('document');
 
@@ -77,17 +82,21 @@ 
 
 		if(is_array($module_srls_list))
 		{
-			if (count($module_srls_list) > 0) $module_srls = implode(',',$module_srls_list);
-		}
-		else
+			if (count($module_srls_list) > 0) {
+				$module_srls = implode(',',$module_srls_list);
+			}
+		} else
 		{
 			if($module_srls_list)
 			{
 				$module_srls = $module_srls_list;
 			}
 		}
-		if($target == 'exclude') $args->exclude_module_srl = $module_srls;
-		else $args->module_srl = $module_srls;
+		if($target == 'exclude') {
+			$args->exclude_module_srl = $module_srls;
+		} else {
+			$args->module_srl = $module_srls;
+		}
 
 		$args->page = $page;
 		$args->list_count = $list_count;
@@ -99,7 +108,9 @@ 
 		// Get a list of documents
 		$oCommentModel = getModel('comment');
 		$output = $oCommentModel->getTotalCommentList($args);
-		if(!$output->toBool()|| !$output->data) return $output;
+		if(!$output->toBool()|| !$output->data) {
+			return $output;
+		}
 		return $output;
 	}
 
@@ -118,13 +129,21 @@ 
 	function getTrackbacks($target, $module_srls_list, $search_target = "title", $search_keyword, $page=1, $list_count = 20)
 	{
 		$oTrackbackModel = getAdminModel('trackback');
-		if(!$oTrackbackModel) return new BaseObject();
+		if(!$oTrackbackModel) {
+			return new BaseObject();
+		}
 		$args = new stdClass();
 
-		if(is_array($module_srls_list)) $module_srls = implode(',',$module_srls_list);
-		else $module_srls = $module_srls_list;
-		if($target == 'exclude') $args->exclude_module_srl = $module_srls;
-		else $args->module_srl = $module_srls;
+		if(is_array($module_srls_list)) {
+			$module_srls = implode(',',$module_srls_list);
+		} else {
+			$module_srls = $module_srls_list;
+		}
+		if($target == 'exclude') {
+			$args->exclude_module_srl = $module_srls;
+		} else {
+			$args->module_srl = $module_srls;
+		}
 		$args->page = $page;
 		$args->list_count = $list_count;
 		$args->page_count = 10;
@@ -134,7 +153,9 @@ 
 		$args->order_type = 'asc';
 		// Get a list of documents
 		$output = $oTrackbackModel->getTotalTrackbackList($args);
-		if(!$output->toBool()|| !$output->data) return $output;
+		if(!$output->toBool()|| !$output->data) {
+			return $output;
+		}
 		return $output;
 	}
 
@@ -154,10 +175,16 @@ 
 	{
 		$args = new stdClass();
 
-		if(is_array($module_srls_list)) $module_srls = implode(',',$module_srls_list);
-		else $module_srls = $module_srls_list;
-		if($target == 'exclude') $args->exclude_module_srl = $module_srls;
-		else $args->module_srl = $module_srls;
+		if(is_array($module_srls_list)) {
+			$module_srls = implode(',',$module_srls_list);
+		} else {
+			$module_srls = $module_srls_list;
+		}
+		if($target == 'exclude') {
+			$args->exclude_module_srl = $module_srls;
+		} else {
+			$args->module_srl = $module_srls;
+		}
 		$args->page = $page;
 		$args->list_count = $list_count;
 		$args->page_count = 10;
@@ -170,7 +197,9 @@ 
 		// Get a list of documents
 		$oFileAdminModel = getAdminModel('file');
 		$output = $oFileAdminModel->getFileList($args);
-		if(!$output->toBool() || !$output->data) return $output;
+		if(!$output->toBool() || !$output->data) {
+			return $output;
+		}
 
 		$list = array();
 		foreach($output->data as $key => $val)
@@ -178,7 +207,9 @@ 
 			$obj = new stdClass;
 			$obj->filename = $val->source_filename;
 			$obj->download_count = $val->download_count;
-			if(substr($val->download_url,0,2)=='./') $val->download_url = substr($val->download_url,2);
+			if(substr($val->download_url,0,2)=='./') {
+				$val->download_url = substr($val->download_url,2);
+			}
 			$obj->download_url = Context::getRequestUri().$val->download_url;
 			$obj->target_srl = $val->upload_target_srl;
 			$obj->file_size = $val->file_size;
@@ -188,13 +219,16 @@ 
 				$obj->type = 'image';
 
 				$thumbnail_path = sprintf('files/thumbnails/%s',getNumberingPath($val->file_srl, 3));
-				if(!is_dir($thumbnail_path)) FileHandler::makeDir($thumbnail_path);
+				if(!is_dir($thumbnail_path)) {
+					FileHandler::makeDir($thumbnail_path);
+				}
 				$thumbnail_file = sprintf('%s%dx%d.%s.jpg', $thumbnail_path, 120, 120, 'crop');
 				$thumbnail_url  = Context::getRequestUri().$thumbnail_file;
-				if(!file_exists($thumbnail_file)) FileHandler::createImageFile($val->uploaded_filename, $thumbnail_file, 120, 120, 'jpg', 'crop');
+				if(!file_exists($thumbnail_file)) {
+					FileHandler::createImageFile($val->uploaded_filename, $thumbnail_file, 120, 120, 'jpg', 'crop');
+				}
 				$obj->src = sprintf('<img src="%s" alt="%s" width="%d" height="%d" />', $thumbnail_url, htmlspecialchars($obj->filename, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), 120, 120);
-			}
-			else
+			} else
 			{
 				$obj->type = 'binary';
 				$obj->src = '';
@@ -207,13 +241,15 @@ 
 
 		$oDocumentModel = getModel('document');
 		$document_list = $oDocumentModel->getDocuments($target_list);
-		if($document_list) foreach($document_list as $key => $val)
+		if($document_list) {
+			foreach($document_list as $key => $val)
 		{
 			foreach($output->data as $k => $v)
 			{
 				if($v->target_srl== $val->document_srl)
 				{
 					$output->data[$k]->url = $val->getPermanentUrl();
+		}
 					$output->data[$k]->regdate = $val->getRegdate("Y-m-d H:i");
 					$output->data[$k]->nick_name = $val->getNickName();
 				}
@@ -222,13 +258,15 @@ 
 
 		$oCommentModel = getModel('comment');
 		$comment_list = $oCommentModel->getComments($target_list);
-		if($comment_list) foreach($comment_list as $key => $val)
+		if($comment_list) {
+			foreach($comment_list as $key => $val)
 		{
 			foreach($output->data as $k => $v)
 			{
 				if($v->target_srl== $val->comment_srl)
 				{
 					$output->data[$k]->url = $val->getPermanentUrl();
+		}
 					$output->data[$k]->regdate = $val->getRegdate("Y-m-d H:i");
 					$output->data[$k]->nick_name = $val->getNickName();
 				}

modules/autoinstall/autoinstall.lib.php

Spacing +122 added lines, -122 removed lines

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

Braces +6 added lines, -12 removed lines

@@ -121,8 +121,7 @@ 
 			$this->download_file = $this->temp_dir . "xe.tar";
 			$this->target_path = "";
 			$this->download_path = $this->temp_dir;
-		}
-		else
+		} else
 		{
 			$subpath = trim(substr($this->package->path, 2), '/');
 			$this->download_file = $this->temp_dir . $subpath . ".tar";
@@ -297,8 +296,7 @@ 
 				{
 					return $output;
 				}
-			}
-			else
+			} else
 			{
 				$output = $this->_removeFile($file_path);
 				if(!$output->toBool())
@@ -370,8 +368,7 @@ 
 		if($this->ftp_info->ftp_host)
 		{
 			$ftp_host = $this->ftp_info->ftp_host;
-		}
-		else
+		} else
 		{
 			$ftp_host = "127.0.0.1";
 		}
@@ -523,8 +520,7 @@ 
 		if($this->ftp_info->ftp_host)
 		{
 			$ftp_host = $this->ftp_info->ftp_host;
-		}
-		else
+		} else
 		{
 			$ftp_host = "127.0.0.1";
 		}
@@ -673,8 +669,7 @@ 
 								{
 									return new BaseObject(-1, "msg_permission_adjust_failed");
 								}
-							}
-							else
+							} else
 							{
 								if(!ftp_site($this->connection, "CHMOD 755 " . $ftp_path))
 								{
@@ -736,8 +731,7 @@ 
 		if($this->ftp_info->ftp_host)
 		{
 			$ftp_host = $this->ftp_info->ftp_host;
-		}
-		else
+		} else
 		{
 			$ftp_host = "127.0.0.1";
 		}

modules/autoinstall/autoinstall.admin.model.php

Spacing +43 added lines, -43 removed lines

@@ -19,19 +19,19 @@ 
 	function preProcParam(&$order_target, &$order_type, &$page)
 	{
 		$order_target_array = array('newest' => 1, 'download' => 1, 'popular' => 1);
-		if(!isset($order_target_array[$order_target]))
+		if (!isset($order_target_array[$order_target]))
 		{
 			$order_target = 'newest';
 		}
 
 		$order_type_array = array('asc' => 1, 'desc' => 1);
-		if(!isset($order_type_array[$order_type]))
+		if (!isset($order_type_array[$order_type]))
 		{
 			$order_type = 'desc';
 		}
 
 		$page = (int) $page;
-		if($page < 1)
+		if ($page < 1)
 		{
 			$page = 1;
 		}
@@ -63,12 +63,12 @@ 
 
 		$type_array = array('M' => 1, 'P' => 1);
 		$type = Context::get('type');
-		if(!isset($type_array[$type]))
+		if (!isset($type_array[$type]))
 		{
 			$type = 'P';
 		}
 
-		if($type == 'P')
+		if ($type == 'P')
 		{
 			$category_srl = $this->layout_category_srl;
 		}
@@ -95,12 +95,12 @@ 
 
 		$type_array = array('M' => 1, 'P' => 1);
 		$type = Context::get('type');
-		if(!isset($type_array[$type]))
+		if (!isset($type_array[$type]))
 		{
 			$type = 'P';
 		}
 
-		if($type == 'P')
+		if ($type == 'P')
 		{
 			$category_srl = $this->module_skin_category_srl;
 		}
@@ -118,11 +118,11 @@ 
 	 */
 	function getPackageList($type, $order_target = 'newest', $order_type = 'desc', $page = '1', $search_keyword = NULL, $category_srl = NULL, $parent_program = NULL)
 	{
-		if($type == 'menu')
+		if ($type == 'menu')
 		{
 			$params["act"] = "getResourceapiMenuPackageList";
 		}
-		elseif($type == 'skin')
+		elseif ($type == 'skin')
 		{
 			$params["act"] = "getResourceapiSkinPackageList";
 			$params['parent_program'] = $parent_program;
@@ -137,18 +137,18 @@ 
 		$params["order_type"] = $order_type;
 		$params["page"] = $page;
 
-		if($category_srl)
+		if ($category_srl)
 		{
 			$params["category_srl"] = $category_srl;
 		}
 
-		if($search_keyword)
+		if ($search_keyword)
 		{
 			$params["search_keyword"] = $search_keyword;
 		}
 
 		$xmlDoc = XmlGenerater::getXmlDoc($params);
-		if($xmlDoc && $xmlDoc->response->packagelist->item)
+		if ($xmlDoc && $xmlDoc->response->packagelist->item)
 		{
 			$item_list = $oAdminView->rearranges($xmlDoc->response->packagelist->item);
 			$this->add('item_list', $item_list);
@@ -169,14 +169,14 @@ 
 		
 		$is_authed = 0;
 		$output = $oAdminModel->checkUseDirectModuleInstall($package);
-		if($output->toBool()==TRUE)
+		if ($output->toBool() == TRUE)
 		{
 			$is_authed = 1;
 		}
 		else
 		{
 			$ftp_info = Context::getFTPInfo();
-			if(!$ftp_info->ftp_root_path)
+			if (!$ftp_info->ftp_root_path)
 			{
 				$is_authed = -1;
 			}
@@ -196,14 +196,14 @@ 
 	{
 		$oModel = getModel('autoinstall');
 		$output = executeQueryArray('autoinstall.getNeedUpdate');
-		if(!is_array($output->data))
+		if (!is_array($output->data))
 		{
 			return NULL;
 		}
 
 		$result = array();
 		$xml = new XmlParser();
-		foreach($output->data as $package)
+		foreach ($output->data as $package)
 		{
 			$packageSrl = $package->package_srl;
 
@@ -213,27 +213,27 @@ 
 			$packageInfo->type = $oModel->getTypeFromPath($package->path);
 			$packageInfo->url = $oModel->getUpdateUrlByPackageSrl($package->package_srl);
 
-			if($packageInfo->type == 'core')
+			if ($packageInfo->type == 'core')
 			{
 				$title = 'XpressEngine';
 			}
 			else
 			{
 				$configFile = $oModel->getConfigFilePath($packageInfo->type);
-				$xmlDoc = $xml->loadXmlFile(FileHandler::getRealPath($package->path) . $configFile);
+				$xmlDoc = $xml->loadXmlFile(FileHandler::getRealPath($package->path).$configFile);
 
-				if($xmlDoc)
+				if ($xmlDoc)
 				{
 					$type = $packageInfo->type;
-					if($type == "drcomponent")
+					if ($type == "drcomponent")
 					{
 						$type = "component";
 					}
-					if($type == "style" || $type == "m.skin")
+					if ($type == "style" || $type == "m.skin")
 					{
 						$type = "skin";
 					}
-					if($type == "m.layout")
+					if ($type == "m.layout")
 					{
 						$type = "layout";
 					}
@@ -267,7 +267,7 @@ 
 		$oModel = getModel('autoinstall');
 
 		$targetpackages = array();
-		if($xmlDoc)
+		if ($xmlDoc)
 		{
 			$xmlPackage = $xmlDoc->response->package;
 			$package = new stdClass();
@@ -276,15 +276,15 @@ 
 			$package->package_description = $xmlPackage->package_description->body;
 			$package->version = $xmlPackage->version->body;
 			$package->path = $xmlPackage->path->body;
-			if($xmlPackage->depends)
+			if ($xmlPackage->depends)
 			{
-				if(!is_array($xmlPackage->depends->item))
+				if (!is_array($xmlPackage->depends->item))
 				{
 					$xmlPackage->depends->item = array($xmlPackage->depends->item);
 				}
 
 				$package->depends = array();
-				foreach($xmlPackage->depends->item as $item)
+				foreach ($xmlPackage->depends->item as $item)
 				{
 					$dep_item = new stdClass();
 					$dep_item->package_srl = $item->package_srl->body;
@@ -297,23 +297,23 @@ 
 
 				$packages = $oModel->getInstalledPackages(array_keys($targetpackages));
 				$package->deplist = "";
-				foreach($package->depends as $key => $dep)
+				foreach ($package->depends as $key => $dep)
 				{
-					if(!$packages[$dep->package_srl])
+					if (!$packages[$dep->package_srl])
 					{
 						$package->depends[$key]->installed = FALSE;
-						$package->package_srl .= "," . $dep->package_srl;
+						$package->package_srl .= ",".$dep->package_srl;
 					}
 					else
 					{
 						$package->depends[$key]->installed = TRUE;
 						$package->depends[$key]->cur_version = $packages[$dep->package_srl]->current_version;
-						if(version_compare($dep->version, $packages[$dep->package_srl]->current_version, ">"))
+						if (version_compare($dep->version, $packages[$dep->package_srl]->current_version, ">"))
 						{
 							$package->depends[$key]->need_update = TRUE;
-							$package->package_srl .= "," . $dep->package_srl;
+							$package->package_srl .= ",".$dep->package_srl;
 
-							if($dep->path === '.')
+							if ($dep->path === '.')
 							{
 								$package->contain_core = TRUE;
 								$package->contain_core_version = $dep->version;
@@ -328,14 +328,14 @@ 
 			}
 
 			$installedPackage = $oModel->getInstalledPackage($packageSrl);
-			if($installedPackage)
+			if ($installedPackage)
 			{
 				$package->installed = TRUE;
 				$package->cur_version = $installedPackage->current_version;
 				$package->need_update = version_compare($package->version, $installedPackage->current_version, ">");
 			}
 
-			if($package->path === '.')
+			if ($package->path === '.')
 			{
 				$package->contain_core = TRUE;
 				$package->contain_core_version = $package->version;
@@ -351,7 +351,7 @@ 
 	public function getAutoInstallAdminInstallInfo()
 	{
 		$packageSrl = Context::get('package_srl');
-		if(!$packageSrl)
+		if (!$packageSrl)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
@@ -365,23 +365,23 @@ 
 		$directModuleInstall = TRUE;
 		$arrUnwritableDir = array();
 		$output = $this->isWritableDir($package->path);
-		if($output->toBool()==FALSE)
+		if ($output->toBool() == FALSE)
 		{
 			$directModuleInstall = FALSE;
 			$arrUnwritableDir[] = $output->get('path');
 		}
 
-		foreach($package->depends as $dep)
+		foreach ($package->depends as $dep)
 		{
 			$output = $this->isWritableDir($dep->path);
-			if($output->toBool()==FALSE)
+			if ($output->toBool() == FALSE)
 			{
 				$directModuleInstall = FALSE;
 				$arrUnwritableDir[] = $output->get('path');
 			}
 		}
 
-		if($directModuleInstall==FALSE)
+		if ($directModuleInstall == FALSE)
 		{
 			$output = new BaseObject(-1, 'msg_direct_inall_invalid');
 			$output->add('path', $arrUnwritableDir);
@@ -396,17 +396,17 @@ 
 		$path_list = explode('/', dirname($path));
 		$real_path = './';
 
-		while($path_list)
+		while ($path_list)
 		{
-			$check_path = realpath($real_path . implode('/', $path_list));
-			if(FileHandler::isDir($check_path))
+			$check_path = realpath($real_path.implode('/', $path_list));
+			if (FileHandler::isDir($check_path))
 			{
 				break;
 			}
 			array_pop($path_list);
 		}
 
-		if(FileHandler::isWritableDir($check_path)==FALSE)
+		if (FileHandler::isWritableDir($check_path) == FALSE)
 		{
 			$output = new BaseObject(-1, 'msg_unwritable_directory');
 			$output->add('path', FileHandler::getRealPath($check_path));

modules/session/session.class.php

Spacing +17 added lines, -17 removed lines

@@ -15,7 +15,7 @@ 
 
 	function session()
 	{
-		if(Context::isInstalled()) $this->session_started= true;
+		if (Context::isInstalled()) $this->session_started = true;
 	}
 
 	/**
@@ -24,7 +24,7 @@ 
 	function moduleInstall()
 	{
 		$oDB = &DB::getInstance();
-		$oDB->addIndex("session","idx_session_update_mid", array("member_srl","last_update","cur_mid"));
+		$oDB->addIndex("session", "idx_session_update_mid", array("member_srl", "last_update", "cur_mid"));
 
 		return new BaseObject();
 	}
@@ -38,11 +38,11 @@ 
 		$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))
 		{
-			if(!$oDB->isTableExists('session')) return true;
-			if(!$oDB->isColumnExists("session","cur_mid")) return true;
-			if(!$oDB->isIndexExists("session","idx_session_update_mid")) return true;
+			if (!$oDB->isTableExists('session')) return true;
+			if (!$oDB->isColumnExists("session", "cur_mid")) return true;
+			if (!$oDB->isIndexExists("session", "idx_session_update_mid")) return true;
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -59,19 +59,19 @@ 
 		$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))
 		{
-			if(!$oDB->isTableExists('session'))
+			if (!$oDB->isTableExists('session'))
 			{
 				$oDB->createTableByXmlFile($this->module_path.'schemas/session.xml');
 			}
-			if(!$oDB->isColumnExists("session","cur_mid"))
+			if (!$oDB->isColumnExists("session", "cur_mid"))
 			{
-				$oDB->addColumn('session',"cur_mid","varchar",128);
+				$oDB->addColumn('session', "cur_mid", "varchar", 128);
 			}
-			if(!$oDB->isIndexExists("session","idx_session_update_mid"))
+			if (!$oDB->isIndexExists("session", "idx_session_update_mid"))
 			{
-				$oDB->addIndex("session","idx_session_update_mid", array("member_srl","last_update","cur_mid"));
+				$oDB->addIndex("session", "idx_session_update_mid", array("member_srl", "last_update", "cur_mid"));
 			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
@@ -85,8 +85,8 @@ 
 	 */
 	function unSerializeSession($val)
 	{
-		$vars = preg_split('/([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff^|]*)\|/', $val,-1,PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
-		for($i=0; $vars[$i]; $i++) $result[$vars[$i++]] = unserialize($vars[$i]);
+		$vars = preg_split('/([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff^|]*)\|/', $val, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
+		for ($i = 0; $vars[$i]; $i++) $result[$vars[$i++]] = unserialize($vars[$i]);
 		return $result;
 	}
 
@@ -95,11 +95,11 @@ 
 	 */
 	function serializeSession($data)
 	{
-		if(!count($data)) return;
+		if (!count($data)) return;
 
 		$str = '';
-		foreach($data as $key => $val) $str .= $key.'|'.serialize($val);
-		return substr($str, 0, strlen($str)-1).'}';
+		foreach ($data as $key => $val) $str .= $key.'|'.serialize($val);
+		return substr($str, 0, strlen($str) - 1).'}';
 	}
 
 	/**

modules/importer/extract.class.php

Spacing +39 added lines, -39 removed lines

@@ -99,7 +99,7 @@ 
 		$this->filename = $filename;
 
 		$this->startTag = $startTag;
-		if($endTag) $this->endTag = $endTag;
+		if ($endTag) $this->endTag = $endTag;
 		$this->itemStartTag = $itemTag;
 		$this->itemEndTag = $itemEndTag;
 
@@ -108,7 +108,7 @@ 
 		$this->cache_path = './files/cache/importer/'.$this->key;
 		$this->cache_index_file = $this->cache_path.'/index';
 
-		if(!is_dir($this->cache_path)) FileHandler::makeDir($this->cache_path);
+		if (!is_dir($this->cache_path)) FileHandler::makeDir($this->cache_path);
 
 		return $this->openFile();
 	}
@@ -120,55 +120,55 @@ 
 	function openFile()
 	{
 		FileHandler::removeFile($this->cache_index_file);
-		$this->index_fd = fopen($this->cache_index_file,"a");
+		$this->index_fd = fopen($this->cache_index_file, "a");
 		// If local file
-		if(strncasecmp('http://', $this->filename, 7) !== 0)
+		if (strncasecmp('http://', $this->filename, 7) !== 0)
 		{
-			if(!file_exists($this->filename)) return new BaseObject(-1,'msg_no_xml_file');
-			$this->fd = fopen($this->filename,"r");
+			if (!file_exists($this->filename)) return new BaseObject(-1, 'msg_no_xml_file');
+			$this->fd = fopen($this->filename, "r");
 			// If remote file
 		}
 		else
 		{
 			$url_info = parse_url($this->filename);
-			if(!$url_info['port']) $url_info['port'] = 80;
-			if(!$url_info['path']) $url_info['path'] = '/';
+			if (!$url_info['port']) $url_info['port'] = 80;
+			if (!$url_info['path']) $url_info['path'] = '/';
 
 			$this->fd = @fsockopen($url_info['host'], $url_info['port']);
-			if(!$this->fd) return new BaseObject(-1,'msg_no_xml_file');
+			if (!$this->fd) return new BaseObject(-1, 'msg_no_xml_file');
 			// If the file name contains Korean, do urlencode(iconv required)
 			$path = $url_info['path'];
-			if(preg_match('/[\xEA-\xED][\x80-\xFF]{2}/', $path)&&function_exists('iconv'))
+			if (preg_match('/[\xEA-\xED][\x80-\xFF]{2}/', $path) && function_exists('iconv'))
 			{
-				$path_list = explode('/',$path);
+				$path_list = explode('/', $path);
 				$cnt = count($path_list);
-				$filename = $path_list[$cnt-1];
-				$filename = urlencode(iconv("UTF-8","EUC-KR",$filename));
-				$path_list[$cnt-1] = $filename;
-				$path = implode('/',$path_list);
+				$filename = $path_list[$cnt - 1];
+				$filename = urlencode(iconv("UTF-8", "EUC-KR", $filename));
+				$path_list[$cnt - 1] = $filename;
+				$path = implode('/', $path_list);
 				$url_info['path'] = $path;
 			}
 
 			$header = sprintf("GET %s?%s HTTP/1.0\r\nHost: %s\r\nReferer: %s://%s\r\nConnection: Close\r\n\r\n", $url_info['path'], $url_info['query'], $url_info['host'], $url_info['scheme'], $url_info['host']);
 			@fwrite($this->fd, $header);
 			$buff = '';
-			while(!feof($this->fd))
+			while (!feof($this->fd))
 			{
 				$buff .= $str = fgets($this->fd, 1024);
-				if(!trim($str)) break;
+				if (!trim($str)) break;
 			}
-			if(preg_match('/404 Not Found/i',$buff)) return new BaseObject(-1,'msg_no_xml_file');
+			if (preg_match('/404 Not Found/i', $buff)) return new BaseObject(-1, 'msg_no_xml_file');
 		}
 
-		if($this->startTag)
+		if ($this->startTag)
 		{
-			while(!feof($this->fd))
+			while (!feof($this->fd))
 			{
 				$str = fgets($this->fd, 1024);
 				$pos = strpos($str, $this->startTag);
-				if($pos !== false)
+				if ($pos !== false)
 				{
-					$this->buff = substr($this->buff, $pos+strlen($this->startTag));
+					$this->buff = substr($this->buff, $pos + strlen($this->startTag));
 					$this->isStarted = true;
 					$this->isFinished = false;
 					break;
@@ -208,7 +208,7 @@ 
 	{
 		FileHandler::removeDir($this->cache_path.$this->key);
 		$this->index = 0;
-		while(!$this->isFinished())
+		while (!$this->isFinished())
 		{
 			$this->getItem();
 		}
@@ -224,14 +224,14 @@ 
 
 		$filename = sprintf('%s/%s', $this->cache_path, $filename);
 
-		$index_fd = fopen($this->cache_index_file,"r");
-		$fd = fopen($filename,'w');
+		$index_fd = fopen($this->cache_index_file, "r");
+		$fd = fopen($filename, 'w');
 
 		fwrite($fd, '<items>');
-		while(!feof($index_fd))
+		while (!feof($index_fd))
 		{
-			$target_file = trim(fgets($index_fd,1024));
-			if(!file_exists($target_file)) continue;
+			$target_file = trim(fgets($index_fd, 1024));
+			if (!file_exists($target_file)) continue;
 			$buff = FileHandler::readFile($target_file);
 			fwrite($fd, FileHandler::readFile($target_file));
 
@@ -247,21 +247,21 @@ 
 	 */
 	function getItem()
 	{
-		if($this->isFinished()) return;
+		if ($this->isFinished()) return;
 
-		while(!feof($this->fd))
+		while (!feof($this->fd))
 		{
 			$startPos = strpos($this->buff, $this->itemStartTag);
-			if($startPos !== false)
+			if ($startPos !== false)
 			{
 				$this->buff = substr($this->buff, $startPos);
-				$this->buff = preg_replace("/\>/",">\r\n",$this->buff,1);
+				$this->buff = preg_replace("/\>/", ">\r\n", $this->buff, 1);
 				break;
 			}
-			elseif($this->endTag)
+			elseif ($this->endTag)
 			{
 				$endPos = strpos($this->buff, $this->endTag);
-				if($endPos !== false)
+				if ($endPos !== false)
 				{
 					$this->closeFile();
 					return;
@@ -271,21 +271,21 @@ 
 		}
 
 		$startPos = strpos($this->buff, $this->itemStartTag);
-		if($startPos === false)
+		if ($startPos === false)
 		{
 			$this->closeFile();
 			return;
 		}
 
-		$filename = sprintf('%s/%s.xml',$this->cache_path, $this->index++);
+		$filename = sprintf('%s/%s.xml', $this->cache_path, $this->index++);
 		fwrite($this->index_fd, $filename."\r\n");
 
-		$fd = fopen($filename,'w');
+		$fd = fopen($filename, 'w');
 
-		while(!feof($this->fd))
+		while (!feof($this->fd))
 		{
 			$endPos = strpos($this->buff, $this->itemEndTag);
-			if($endPos !== false)
+			if ($endPos !== false)
 			{
 				$endPos += strlen($this->itemEndTag);
 				$buff = substr($this->buff, 0, $endPos);

Braces +33 added lines, -16 removed lines

@@ -99,7 +99,9 @@ 
 		$this->filename = $filename;
 
 		$this->startTag = $startTag;
-		if($endTag) $this->endTag = $endTag;
+		if($endTag) {
+			$this->endTag = $endTag;
+		}
 		$this->itemStartTag = $itemTag;
 		$this->itemEndTag = $itemEndTag;
 
@@ -108,7 +110,9 @@ 
 		$this->cache_path = './files/cache/importer/'.$this->key;
 		$this->cache_index_file = $this->cache_path.'/index';
 
-		if(!is_dir($this->cache_path)) FileHandler::makeDir($this->cache_path);
+		if(!is_dir($this->cache_path)) {
+			FileHandler::makeDir($this->cache_path);
+		}
 
 		return $this->openFile();
 	}
@@ -124,18 +128,25 @@ 
 		// If local file
 		if(strncasecmp('http://', $this->filename, 7) !== 0)
 		{
-			if(!file_exists($this->filename)) return new BaseObject(-1,'msg_no_xml_file');
+			if(!file_exists($this->filename)) {
+				return new BaseObject(-1,'msg_no_xml_file');
+			}
 			$this->fd = fopen($this->filename,"r");
 			// If remote file
-		}
-		else
+		} else
 		{
 			$url_info = parse_url($this->filename);
-			if(!$url_info['port']) $url_info['port'] = 80;
-			if(!$url_info['path']) $url_info['path'] = '/';
+			if(!$url_info['port']) {
+				$url_info['port'] = 80;
+			}
+			if(!$url_info['path']) {
+				$url_info['path'] = '/';
+			}
 
 			$this->fd = @fsockopen($url_info['host'], $url_info['port']);
-			if(!$this->fd) return new BaseObject(-1,'msg_no_xml_file');
+			if(!$this->fd) {
+				return new BaseObject(-1,'msg_no_xml_file');
+			}
 			// If the file name contains Korean, do urlencode(iconv required)
 			$path = $url_info['path'];
 			if(preg_match('/[\xEA-\xED][\x80-\xFF]{2}/', $path)&&function_exists('iconv'))
@@ -155,9 +166,13 @@ 
 			while(!feof($this->fd))
 			{
 				$buff .= $str = fgets($this->fd, 1024);
-				if(!trim($str)) break;
+				if(!trim($str)) {
+					break;
+				}
+			}
+			if(preg_match('/404 Not Found/i',$buff)) {
+				return new BaseObject(-1,'msg_no_xml_file');
 			}
-			if(preg_match('/404 Not Found/i',$buff)) return new BaseObject(-1,'msg_no_xml_file');
 		}
 
 		if($this->startTag)
@@ -174,8 +189,7 @@ 
 					break;
 				}
 			}
-		}
-		else
+		} else
 		{
 			$this->isStarted = true;
 			$this->isFinished = false;
@@ -231,7 +245,9 @@ 
 		while(!feof($index_fd))
 		{
 			$target_file = trim(fgets($index_fd,1024));
-			if(!file_exists($target_file)) continue;
+			if(!file_exists($target_file)) {
+				continue;
+			}
 			$buff = FileHandler::readFile($target_file);
 			fwrite($fd, FileHandler::readFile($target_file));
 
@@ -247,7 +263,9 @@ 
 	 */
 	function getItem()
 	{
-		if($this->isFinished()) return;
+		if($this->isFinished()) {
+			return;
+		}
 
 		while(!feof($this->fd))
 		{
@@ -257,8 +275,7 @@ 
 				$this->buff = substr($this->buff, $startPos);
 				$this->buff = preg_replace("/\>/",">\r\n",$this->buff,1);
 				break;
-			}
-			elseif($this->endTag)
+			} elseif($this->endTag)
 			{
 				$endPos = strpos($this->buff, $this->endTag);
 				if($endPos !== false)

modules/page/page.admin.view.php

Braces +23 added lines, -21 removed lines

@@ -28,8 +28,7 @@ 
 			{
 				Context::set('module_srl','');
 				$this->act = 'list';
-			}
-			else
+			} else
 			{
 				ModuleModel::syncModuleToSite($module_info);
 				$this->module_info = $module_info;
@@ -62,7 +61,9 @@ 
 		$search_target_list = array('s_mid','s_browser_title');
 		$search_target = Context::get('search_target');
 		$search_keyword = Context::get('search_keyword');
-		if(in_array($search_target,$search_target_list) && $search_keyword) $args->{$search_target} = $search_keyword;
+		if(in_array($search_target,$search_target_list) && $search_keyword) {
+			$args->{$search_target} = $search_keyword;
+		}
 
 		$output = executeQuery('page.getPageList', $args);
 		$oModuleModel = getModel('module');
@@ -101,7 +102,9 @@ 
 		$module_srl = Context::get('module_srl');
 		$module_info = Context::get('module_info');
 		// If you do not value module_srl just showing the index page
-		if(!$module_srl) return $this->dispPageAdminContent();
+		if(!$module_srl) {
+			return $this->dispPageAdminContent();
+		}
 		// If the layout is destined to add layout information haejum (layout_title, layout)
 		if($module_info->layout_srl)
 		{
@@ -183,8 +186,7 @@ 
 				$oPageMobile->module_info->mskin = $oModuleModel->getModuleDefaultSkin('page', 'M');
 			}
 			$page_content = $oPageMobile->{$method}();
-		}
-		else
+		} else
 		{
 			return new BaseObject(-1, sprintf('%s method is not exists', $method));
 		}
@@ -202,8 +204,7 @@ 
 		if ($this->module_info->page_type == 'WIDGET')
 		{
 			$this->_setWidgetTypeContentModify(true);
-		}
-		else if ($this->module_info->page_type == 'ARTICLE')
+		} else if ($this->module_info->page_type == 'ARTICLE')
 		{
 			$this->_setArticleTypeContentModify(true);
 		}
@@ -220,8 +221,7 @@ 
 		if ($this->module_info->page_type == 'WIDGET')
 		{
 			$this->_setWidgetTypeContentModify();
-		}
-		else if ($this->module_info->page_type == 'ARTICLE')
+		} else if ($this->module_info->page_type == 'ARTICLE')
 		{
 			$this->_setArticleTypeContentModify();
 		}
@@ -233,13 +233,16 @@ 
 		if($isMobile)
 		{
 			$content = Context::get('mcontent');
-			if(!$content) $content = $this->module_info->mcontent;
+			if(!$content) {
+				$content = $this->module_info->mcontent;
+			}
 			$templateFile = 'page_mobile_content_modify';
-		}
-		else
+		} else
 		{
 			$content = Context::get('content');
-			if(!$content) $content = $this->module_info->content;
+			if(!$content) {
+				$content = $this->module_info->content;
+			}
 			$templateFile = 'page_content_modify';
 		}
 
@@ -271,8 +274,7 @@ 
 		{
 			Context::set('isMobile', 'Y');
 			$target = 'mdocument_srl';
-		}
-		else
+		} else
 		{
 			Context::set('isMobile', 'N');
 			$target = 'document_srl';
@@ -283,14 +285,12 @@ 
 			$document_srl = $this->module_info->{$target};
 			$oDocument->setDocument($document_srl);
 			Context::set('document_srl', $document_srl);
-		} 
-		else if(Context::get('document_srl'))
+		} else if(Context::get('document_srl'))
 		{
 			$document_srl = Context::get('document_srl');
 			$oDocument->setDocument($document_srl);
 			Context::set('document_srl', $document_srl);
-		}
-		else
+		} else
 		{
 			$oDocument->add('module_srl', $this->module_info->module_srl);
 		}
@@ -307,7 +307,9 @@ 
 	function dispPageAdminDelete()
 	{
 		$module_srl = Context::get('module_srl');
-		if(!$module_srl) return $this->dispContent();
+		if(!$module_srl) {
+			return $this->dispContent();
+		}
 
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'module', 'mid');