xpressengine / xe-core

widgets/content/content.class.php

Braces +183 added lines, -81 removed lines

@@ -18,36 +18,62 @@ 
 	function proc($args)
 	{
 		// Targets to sort
-		if(!in_array($args->order_target, array('regdate','update_order'))) $args->order_target = 'regdate';
+		if(!in_array($args->order_target, array('regdate','update_order'))) {
+			$args->order_target = 'regdate';
+		}
 		// Sort order
-		if(!in_array($args->order_type, array('asc','desc'))) $args->order_type = 'asc';
+		if(!in_array($args->order_type, array('asc','desc'))) {
+			$args->order_type = 'asc';
+		}
 		// Pages
 		$args->page_count = (int)$args->page_count;
-		if(!$args->page_count) $args->page_count = 1;
+		if(!$args->page_count) {
+			$args->page_count = 1;
+		}
 		// The number of displayed lists
 		$args->list_count = (int)$args->list_count;
-		if(!$args->list_count) $args->list_count = 5;
+		if(!$args->list_count) {
+			$args->list_count = 5;
+		}
 		// The number of thumbnail columns
 		$args->cols_list_count = (int)$args->cols_list_count;
-		if(!$args->cols_list_count) $args->cols_list_count = 5;
+		if(!$args->cols_list_count) {
+			$args->cols_list_count = 5;
+		}
 		// Cut the length of the title
-		if(!$args->subject_cut_size) $args->subject_cut_size = 0;
+		if(!$args->subject_cut_size) {
+			$args->subject_cut_size = 0;
+		}
 		// Cut the length of contents
-		if(!$args->content_cut_size) $args->content_cut_size = 100;
+		if(!$args->content_cut_size) {
+			$args->content_cut_size = 100;
+		}
 		// Cut the length of nickname
-		if(!$args->nickname_cut_size) $args->nickname_cut_size = 0;
+		if(!$args->nickname_cut_size) {
+			$args->nickname_cut_size = 0;
+		}
 		// Display time of the latest post
-		if(!$args->duration_new) $args->duration_new = 12;
+		if(!$args->duration_new) {
+			$args->duration_new = 12;
+		}
 		// How to create thumbnails
-		if(!$args->thumbnail_type) $args->thumbnail_type = 'crop';
+		if(!$args->thumbnail_type) {
+			$args->thumbnail_type = 'crop';
+		}
 		// Horizontal size of thumbnails
-		if(!$args->thumbnail_width) $args->thumbnail_width = 100;
+		if(!$args->thumbnail_width) {
+			$args->thumbnail_width = 100;
+		}
 		// Vertical size of thumbnails
-		if(!$args->thumbnail_height) $args->thumbnail_height = 75;
+		if(!$args->thumbnail_height) {
+			$args->thumbnail_height = 75;
+		}
 		// Viewing options
 		$args->option_view_arr = explode(',',$args->option_view);
 		// markup options
-		if(!$args->markup_type) $args->markup_type = 'table';
+		if(!$args->markup_type) {
+			$args->markup_type = 'table';
+		}
 		// Set variables used internally
 		$oModuleModel = getModel('module');
 		$module_srls = $args->modules_info = $args->module_srls_info = $args->mid_lists = array();
@@ -59,11 +85,12 @@ 
 			$rss_urls = array_unique(array($args->rss_url0,$args->rss_url1,$args->rss_url2,$args->rss_url3,$args->rss_url4));
 			for($i=0,$c=count($rss_urls);$i<$c;$i++)
 			{
-				if($rss_urls[$i]) $args->rss_urls[] = $rss_urls[$i];
+				if($rss_urls[$i]) {
+					$args->rss_urls[] = $rss_urls[$i];
+				}
 			}
 			// Get module information after listing module_srls if the module is not RSS
-		}
-		else
+		} else
 		{
 			$obj = new stdClass();
 			// Apply to all modules in the site if a target module is not specified
@@ -84,8 +111,7 @@ 
 
 				$args->modules_info = $oModuleModel->getMidList($obj);
 				// Apply to the module only if a target module is specified
-			}
-			else
+			} else
 			{
 				$obj->module_srls = $args->module_srls;
 				$output = executeQueryArray('widgets.content.getMids', $obj);
@@ -101,13 +127,17 @@ 
 					for($i=0,$c=count($idx);$i<$c;$i++)
 					{
 						$srl = $idx[$i];
-						if(!$args->module_srls_info[$srl]) continue;
+						if(!$args->module_srls_info[$srl]) {
+							continue;
+						}
 						$args->mid_lists[$srl] = $args->module_srls_info[$srl]->mid;
 					}
 				}
 			}
 			// Exit if no module is found
-			if(!count($args->modules_info)) return Context::get('msg_not_founded');
+			if(!count($args->modules_info)) {
+				return Context::get('msg_not_founded');
+			}
 			$args->module_srl = implode(',',$module_srls);
 		}
 
@@ -136,8 +166,7 @@ 
 					break;
 			}
 			// If not a tab type
-		}
-		else
+		} else
 		{
 			$content_items = array();
 
@@ -197,7 +226,9 @@ 
 
 		$content_items = array();
 
-		if(!count($output)) return;
+		if(!count($output)) {
+			return;
+		}
 
 		foreach($output as $key => $oComment)
 		{
@@ -244,15 +275,16 @@ 
 		if($args->order_target == 'list_order' || $args->order_target == 'update_order')
 		{
 			$obj->order_type = $args->order_type=="desc"?"asc":"desc";
-		}
-		else
+		} else
 		{
 			$obj->order_type = $args->order_type=="desc"?"desc":"asc";
 		}
 		$obj->list_count = $args->list_count * $args->page_count;
 		$obj->statusList = array('PUBLIC');
 		$output = executeQueryArray('widgets.content.getNewestDocuments', $obj);
-		if(!$output->toBool() || !$output->data) return;
+		if(!$output->toBool() || !$output->data) {
+			return;
+		}
 		// If the result exists, make each document as an object
 		$content_items = array();
 		$first_thumbnail_idx = -1;
@@ -286,7 +318,9 @@ 
 				$content_item->setThumbnail($thumbnail);
 				$content_item->setExtraImages($oDocument->printExtraImages($args->duration_new * 60 * 60));
 				$content_item->add('mid', $args->mid_lists[$module_srl]);
-				if($first_thumbnail_idx==-1 && $thumbnail) $first_thumbnail_idx = $i;
+				if($first_thumbnail_idx==-1 && $thumbnail) {
+					$first_thumbnail_idx = $i;
+				}
 				$content_items[] = $content_item;
 			}
 
@@ -319,15 +353,21 @@ 
 		$obj->list_count = $args->list_count * $args->page_count;
 		$files_output = executeQueryArray("file.getOneFileInDocument", $obj);
 		$files_count = count($files_output->data);
-		if(!$files_count) return;
+		if(!$files_count) {
+			return;
+		}
 
 		$content_items = array();
 
-		for($i=0;$i<$files_count;$i++) $document_srl_list[] = $files_output->data[$i]->document_srl;
+		for($i=0;$i<$files_count;$i++) {
+			$document_srl_list[] = $files_output->data[$i]->document_srl;
+		}
 
 		$tmp_document_list = $oDocumentModel->getDocuments($document_srl_list);
 
-		if(!count($tmp_document_list)) return;
+		if(!count($tmp_document_list)) {
+			return;
+		}
 
 		foreach($tmp_document_list as $oDocument)
 		{
@@ -381,16 +421,20 @@ 
 				{
 					$date = $v->get('regdate');
 					$i=0;
-					while(array_key_exists(sprintf('%s%02d',$date,$i), $items)) $i++;
+					while(array_key_exists(sprintf('%s%02d',$date,$i), $items)) {
+						$i++;
+					}
 					$items[sprintf('%s%02d',$date,$i)] = $v;
 				}
 			}
-			if($args->order_type =='asc') ksort($items);
-			else krsort($items);
+			if($args->order_type =='asc') {
+				ksort($items);
+			} else {
+				krsort($items);
+			}
 			$content_items = array_slice(array_values($items),0,$args->list_count*$args->page_count);
 			// Tab Type
-		}
-		else
+		} else
 		{
 			foreach($content_items as $key=> $content_item_list)
 			{
@@ -399,11 +443,16 @@ 
 				{
 					$date = $content_item->get('regdate');
 					$i=0;
-					while(array_key_exists(sprintf('%s%02d',$date,$i), $items)) $i++;
+					while(array_key_exists(sprintf('%s%02d',$date,$i), $items)) {
+						$i++;
+					}
 					$items[sprintf('%s%02d',$date,$i)] = $content_item;
 				}
-				if($args->order_type =='asc') ksort($items);
-				else krsort($items);
+				if($args->order_type =='asc') {
+					ksort($items);
+				} else {
+					krsort($items);
+				}
 
 				$content_items[$key] = array_values($items);
 			}
@@ -413,10 +462,16 @@ 
 
 	function _getRssBody($value)
 	{
-		if(!$value || is_string($value)) return $value;
-		if(is_object($value)) $value = get_object_vars($value);
+		if(!$value || is_string($value)) {
+			return $value;
+		}
+		if(is_object($value)) {
+			$value = get_object_vars($value);
+		}
 		$body = null;
-		if(!count($value)) return;
+		if(!count($value)) {
+			return;
+		}
 		foreach($value as $key => $val)
 		{
 			if($key == 'body')
@@ -424,8 +479,12 @@ 
 				$body = $val;
 				continue;
 			}
-			if(is_object($val)||is_array($val)) $body = $this->_getRssBody($val);
-			if($body !== null) return $body;
+			if(is_object($val)||is_array($val)) {
+				$body = $this->_getRssBody($val);
+			}
+			if($body !== null) {
+				return $body;
+			}
 		}
 		return $body;
 	}
@@ -468,7 +527,9 @@ 
 		$buff = $this->requestFeedContents($args->rss_url);
 
 		$encoding = preg_match("/<\?xml.*encoding=\"(.+)\".*\?>/i", $buff, $matches);
-		if($encoding && stripos($matches[1], "UTF-8") === FALSE) $buff = Context::convertEncodingStr($buff);
+		if($encoding && stripos($matches[1], "UTF-8") === FALSE) {
+			$buff = Context::convertEncodingStr($buff);
+		}
 
 		$buff = preg_replace("/<\?xml.*\?>/i", "", $buff);
 
@@ -481,19 +542,27 @@ 
 
 			$items = $xml_doc->rss->channel->item;
 
-			if(!$items) return;
-			if($items && !is_array($items)) $items = array($items);
+			if(!$items) {
+				return;
+			}
+			if($items && !is_array($items)) {
+				$items = array($items);
+			}
 
 			$content_items = array();
 
 			foreach ($items as $key => $value)
 			{
-				if($key >= $args->list_count * $args->page_count) break;
+				if($key >= $args->list_count * $args->page_count) {
+					break;
+				}
 				unset($item);
 
 				foreach($value as $key2 => $value2)
 				{
-					if(is_array($value2)) $value2 = array_shift($value2);
+					if(is_array($value2)) {
+						$value2 = array_shift($value2);
+					}
 					$item->{$key2} = $this->_getRssBody($value2);
 				}
 
@@ -511,8 +580,7 @@ 
 
 				$content_items[] = $content_item;
 			}
-		}
-		else if($xml_doc->{'rdf:rdf'})
+		} else if($xml_doc->{'rdf:rdf'})
 		{
 			// rss1.0 supported (XE's XML is case-insensitive because XML parser converts all to small letters. Fixed by misol
 			$rss->title = $xml_doc->{'rdf:rdf'}->channel->title->body;
@@ -520,19 +588,27 @@ 
 
 			$items = $xml_doc->{'rdf:rdf'}->item;
 
-			if(!$items) return;
-			if($items && !is_array($items)) $items = array($items);
+			if(!$items) {
+				return;
+			}
+			if($items && !is_array($items)) {
+				$items = array($items);
+			}
 
 			$content_items = array();
 
 			foreach ($items as $key => $value)
 			{
-				if($key >= $args->list_count * $args->page_count) break;
+				if($key >= $args->list_count * $args->page_count) {
+					break;
+				}
 				unset($item);
 
 				foreach($value as $key2 => $value2)
 				{
-					if(is_array($value2)) $value2 = array_shift($value2);
+					if(is_array($value2)) {
+						$value2 = array_shift($value2);
+					}
 					$item->{$key2} = $this->_getRssBody($value2);
 				}
 
@@ -550,8 +626,7 @@ 
 
 				$content_items[] = $content_item;
 			}
-		}
-		else if($xml_doc->feed && $xml_doc->feed->attrs->xmlns == 'http://www.w3.org/2005/Atom')
+		} else if($xml_doc->feed && $xml_doc->feed->attrs->xmlns == 'http://www.w3.org/2005/Atom')
 		{
 			// Atom 1.0 spec supported by misol
 			$rss->title = $xml_doc->feed->title->body;
@@ -566,24 +641,33 @@ 
 						break;
 					}
 				}
+			} else if($links->attrs->rel == 'alternate') {
+				$rss->link = $links->attrs->href;
 			}
-			else if($links->attrs->rel == 'alternate') $rss->link = $links->attrs->href;
 
 			$items = $xml_doc->feed->entry;
 
-			if(!$items) return;
-			if($items && !is_array($items)) $items = array($items);
+			if(!$items) {
+				return;
+			}
+			if($items && !is_array($items)) {
+				$items = array($items);
+			}
 
 			$content_items = array();
 
 			foreach ($items as $key => $value)
 			{
-				if($key >= $args->list_count * $args->page_count) break;
+				if($key >= $args->list_count * $args->page_count) {
+					break;
+				}
 				unset($item);
 
 				foreach($value as $key2 => $value2)
 				{
-					if(is_array($value2)) $value2 = array_shift($value2);
+					if(is_array($value2)) {
+						$value2 = array_shift($value2);
+					}
 					$item->{$key2} = $this->_getRssBody($value2);
 				}
 
@@ -599,13 +683,16 @@ 
 							break;
 						}
 					}
+				} else if($links->attrs->rel == 'alternate') {
+					$item->link = $links->attrs->href;
 				}
-				else if($links->attrs->rel == 'alternate') $item->link = $links->attrs->href;
 
 				$content_item->setContentsLink($rss->link);
 				if($item->title)
 				{
-					if(stripos($value->title->attrs->type, "html") === FALSE) $item->title = $value->title->body;
+					if(stripos($value->title->attrs->type, "html") === FALSE) {
+						$item->title = $value->title->body;
+					}
 				}
 				$content_item->setTitle($item->title);
 				$content_item->setNickName(max($item->author,$item->{'dc:creator'}));
@@ -640,16 +727,13 @@ 
 		if($matches[1])
 		{
 			return $matches[1];
-		}
-		elseif($matches[2])
+		} elseif($matches[2])
 		{
 			return $matches[2];
-		}
-		elseif($matches[3])
+		} elseif($matches[3])
 		{
 			return $matches[3];
-		}
-		else
+		} else
 		{
 			return NULL;
 		}
@@ -681,7 +765,9 @@ 
 		// Get model object from the trackback module and execute getTrackbackList() method
 		$output = $oTrackbackModel->getNewestTrackbackList($obj);
 		// If an error occurs, just ignore it.
-		if(!$output->toBool() || !$output->data) return;
+		if(!$output->toBool() || !$output->data) {
+			return;
+		}
 		// If the result exists, make each document as an object
 		$content_items = array();
 		foreach($output->data as $key => $item)
@@ -743,7 +829,9 @@ 
 			$tab = array();
 			foreach($args->mid_lists as $module_srl => $mid)
 			{
-				if(!is_array($content_items[$module_srl]) || !count($content_items[$module_srl])) continue;
+				if(!is_array($content_items[$module_srl]) || !count($content_items[$module_srl])) {
+					continue;
+				}
 
 				unset($tab_item);
 				$tab_item = new stdClass();
@@ -751,12 +839,13 @@ 
 				$tab_item->content_items = $content_items[$module_srl];
 				$tab_item->domain = $content_items[$module_srl][0]->getDomain();
 				$tab_item->url = $content_items[$module_srl][0]->getContentsLink();
-				if(!$tab_item->url) $tab_item->url = getSiteUrl($tab_item->domain, '','mid',$mid);
+				if(!$tab_item->url) {
+					$tab_item->url = getSiteUrl($tab_item->domain, '','mid',$mid);
+				}
 				$tab[] = $tab_item;
 			}
 			$widget_info->tab = $tab;
-		}
-		else
+		} else
 		{
 			$widget_info->content_items = $content_items;
 		}
@@ -804,7 +893,9 @@ 
 		static $default_domain = null;
 		if(!$domain)
 		{
-			if(is_null($default_domain)) $default_domain = Context::getDefaultUrl();
+			if(is_null($default_domain)) {
+				$default_domain = Context::getDefaultUrl();
+			}
 			$domain = $default_domain;
 		}
 		$this->domain = $domain;
@@ -872,13 +963,21 @@ 
 	{
 		$title = htmlspecialchars($this->get('title'), ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 
-		if($cut_size) $title = cut_str($title, $cut_size, $tail);
+		if($cut_size) {
+			$title = cut_str($title, $cut_size, $tail);
+		}
 
 		$attrs = array();
-		if($this->get('title_bold') == 'Y') $attrs[] = 'font-weight:bold';
-		if($this->get('title_color') && $this->get('title_color') != 'N') $attrs[] = 'color:#'.$this->get('title_color');
+		if($this->get('title_bold') == 'Y') {
+			$attrs[] = 'font-weight:bold';
+		}
+		if($this->get('title_color') && $this->get('title_color') != 'N') {
+			$attrs[] = 'color:#'.$this->get('title_color');
+		}
 
-		if(count($attrs)) $title = sprintf("<span style=\"%s\">%s</span>", implode(';', $attrs), $title);
+		if(count($attrs)) {
+			$title = sprintf("<span style=\"%s\">%s</span>", implode(';', $attrs), $title);
+		}
 
 		return $title;
 	}
@@ -892,8 +991,11 @@ 
 	}
 	function getNickName($cut_size = 0, $tail='...')
 	{
-		if($cut_size) $nick_name = cut_str($this->get('nick_name'), $cut_size, $tail);
-		else $nick_name = $this->get('nick_name');
+		if($cut_size) {
+			$nick_name = cut_str($this->get('nick_name'), $cut_size, $tail);
+		} else {
+			$nick_name = $this->get('nick_name');
+		}
 
 		return $nick_name;
 	}

Spacing +167 added lines, -167 removed lines

@@ -18,48 +18,48 @@ 
 	function proc($args)
 	{
 		// Targets to sort
-		if(!in_array($args->order_target, array('regdate','update_order'))) $args->order_target = 'regdate';
+		if (!in_array($args->order_target, array('regdate', 'update_order'))) $args->order_target = 'regdate';
 		// Sort order
-		if(!in_array($args->order_type, array('asc','desc'))) $args->order_type = 'asc';
+		if (!in_array($args->order_type, array('asc', 'desc'))) $args->order_type = 'asc';
 		// Pages
-		$args->page_count = (int)$args->page_count;
-		if(!$args->page_count) $args->page_count = 1;
+		$args->page_count = (int) $args->page_count;
+		if (!$args->page_count) $args->page_count = 1;
 		// The number of displayed lists
-		$args->list_count = (int)$args->list_count;
-		if(!$args->list_count) $args->list_count = 5;
+		$args->list_count = (int) $args->list_count;
+		if (!$args->list_count) $args->list_count = 5;
 		// The number of thumbnail columns
-		$args->cols_list_count = (int)$args->cols_list_count;
-		if(!$args->cols_list_count) $args->cols_list_count = 5;
+		$args->cols_list_count = (int) $args->cols_list_count;
+		if (!$args->cols_list_count) $args->cols_list_count = 5;
 		// Cut the length of the title
-		if(!$args->subject_cut_size) $args->subject_cut_size = 0;
+		if (!$args->subject_cut_size) $args->subject_cut_size = 0;
 		// Cut the length of contents
-		if(!$args->content_cut_size) $args->content_cut_size = 100;
+		if (!$args->content_cut_size) $args->content_cut_size = 100;
 		// Cut the length of nickname
-		if(!$args->nickname_cut_size) $args->nickname_cut_size = 0;
+		if (!$args->nickname_cut_size) $args->nickname_cut_size = 0;
 		// Display time of the latest post
-		if(!$args->duration_new) $args->duration_new = 12;
+		if (!$args->duration_new) $args->duration_new = 12;
 		// How to create thumbnails
-		if(!$args->thumbnail_type) $args->thumbnail_type = 'crop';
+		if (!$args->thumbnail_type) $args->thumbnail_type = 'crop';
 		// Horizontal size of thumbnails
-		if(!$args->thumbnail_width) $args->thumbnail_width = 100;
+		if (!$args->thumbnail_width) $args->thumbnail_width = 100;
 		// Vertical size of thumbnails
-		if(!$args->thumbnail_height) $args->thumbnail_height = 75;
+		if (!$args->thumbnail_height) $args->thumbnail_height = 75;
 		// Viewing options
-		$args->option_view_arr = explode(',',$args->option_view);
+		$args->option_view_arr = explode(',', $args->option_view);
 		// markup options
-		if(!$args->markup_type) $args->markup_type = 'table';
+		if (!$args->markup_type) $args->markup_type = 'table';
 		// Set variables used internally
 		$oModuleModel = getModel('module');
 		$module_srls = $args->modules_info = $args->module_srls_info = $args->mid_lists = array();
 		$site_module_info = Context::get('site_module_info');
 		// List URLs if a type is RSS
-		if($args->content_type == 'rss')
+		if ($args->content_type == 'rss')
 		{
 			$args->rss_urls = array();
-			$rss_urls = array_unique(array($args->rss_url0,$args->rss_url1,$args->rss_url2,$args->rss_url3,$args->rss_url4));
-			for($i=0,$c=count($rss_urls);$i<$c;$i++)
+			$rss_urls = array_unique(array($args->rss_url0, $args->rss_url1, $args->rss_url2, $args->rss_url3, $args->rss_url4));
+			for ($i = 0, $c = count($rss_urls); $i < $c; $i++)
 			{
-				if($rss_urls[$i]) $args->rss_urls[] = $rss_urls[$i];
+				if ($rss_urls[$i]) $args->rss_urls[] = $rss_urls[$i];
 			}
 			// Get module information after listing module_srls if the module is not RSS
 		}
@@ -67,13 +67,13 @@ 
 		{
 			$obj = new stdClass();
 			// Apply to all modules in the site if a target module is not specified
-			if(!$args->module_srls)
+			if (!$args->module_srls)
 			{
-				$obj->site_srl = (int)$site_module_info->site_srl;
+				$obj->site_srl = (int) $site_module_info->site_srl;
 				$output = executeQueryArray('widgets.content.getMids', $obj);
-				if($output->data)
+				if ($output->data)
 				{
-					foreach($output->data as $key => $val)
+					foreach ($output->data as $key => $val)
 					{
 						$args->modules_info[$val->mid] = $val;
 						$args->module_srls_info[$val->module_srl] = $val;
@@ -89,35 +89,35 @@ 
 			{
 				$obj->module_srls = $args->module_srls;
 				$output = executeQueryArray('widgets.content.getMids', $obj);
-				if($output->data)
+				if ($output->data)
 				{
-					foreach($output->data as $key => $val)
+					foreach ($output->data as $key => $val)
 					{
 						$args->modules_info[$val->mid] = $val;
 						$args->module_srls_info[$val->module_srl] = $val;
 						$module_srls[] = $val->module_srl;
 					}
-					$idx = explode(',',$args->module_srls);
-					for($i=0,$c=count($idx);$i<$c;$i++)
+					$idx = explode(',', $args->module_srls);
+					for ($i = 0, $c = count($idx); $i < $c; $i++)
 					{
 						$srl = $idx[$i];
-						if(!$args->module_srls_info[$srl]) continue;
+						if (!$args->module_srls_info[$srl]) continue;
 						$args->mid_lists[$srl] = $args->module_srls_info[$srl]->mid;
 					}
 				}
 			}
 			// Exit if no module is found
-			if(!count($args->modules_info)) return Context::get('msg_not_founded');
-			$args->module_srl = implode(',',$module_srls);
+			if (!count($args->modules_info)) return Context::get('msg_not_founded');
+			$args->module_srl = implode(',', $module_srls);
 		}
 
 		/**
 		 * Method is separately made because content extraction, articles, comments, trackbacks, RSS and other elements exist
 		 */
 		// tab type
-		if($args->tab_type == 'none' || $args->tab_type == '')
+		if ($args->tab_type == 'none' || $args->tab_type == '')
 		{
-			switch($args->content_type)
+			switch ($args->content_type)
 			{
 				case 'comment':
 					$content_items = $this->_getCommentItems($args);
@@ -141,17 +141,17 @@ 
 		{
 			$content_items = array();
 
-			switch($args->content_type)
+			switch ($args->content_type)
 			{
 				case 'comment':
-					foreach($args->mid_lists as $module_srl => $mid)
+					foreach ($args->mid_lists as $module_srl => $mid)
 					{
 						$args->module_srl = $module_srl;
 						$content_items[$module_srl] = $this->_getCommentItems($args);
 					}
 					break;
 				case 'image':
-					foreach($args->mid_lists as $module_srl => $mid)
+					foreach ($args->mid_lists as $module_srl => $mid)
 					{
 						$args->module_srl = $module_srl;
 						$content_items[$module_srl] = $this->_getImageItems($args);
@@ -161,14 +161,14 @@ 
 					$content_items = $this->getRssItems($args);
 					break;
 				case 'trackback':
-					foreach($args->mid_lists as $module_srl => $mid)
+					foreach ($args->mid_lists as $module_srl => $mid)
 					{
 						$args->module_srl = $module_srl;
 						$content_items[$module_srl] = $this->_getTrackbackItems($args);
 					}
 					break;
 				default:
-					foreach($args->mid_lists as $module_srl => $mid)
+					foreach ($args->mid_lists as $module_srl => $mid)
 					{
 						$args->module_srl = $module_srl;
 						$content_items[$module_srl] = $this->_getDocumentItems($args);
@@ -177,7 +177,7 @@ 
 			}
 		}
 
-		$output = $this->_compile($args,$content_items);
+		$output = $this->_compile($args, $content_items);
 		return $output;
 	}
 
@@ -197,14 +197,14 @@ 
 
 		$content_items = array();
 
-		if(!count($output)) return;
+		if (!count($output)) return;
 
-		foreach($output as $key => $oComment)
+		foreach ($output as $key => $oComment)
 		{
 			$attribute = $oComment->getObjectVars();
 			$title = $oComment->getSummary($args->content_cut_size);
-			$thumbnail = $oComment->getThumbnail($args->thumbnail_width,$args->thumbnail_height,$args->thumbnail_type);
-			$url = sprintf("%s#comment_%s",getUrl('','mid', $args->mid_lists[$attribute->module_srl], 'document_srl',$oComment->get('document_srl')),$oComment->get('comment_srl'));
+			$thumbnail = $oComment->getThumbnail($args->thumbnail_width, $args->thumbnail_height, $args->thumbnail_type);
+			$url = sprintf("%s#comment_%s", getUrl('', 'mid', $args->mid_lists[$attribute->module_srl], 'document_srl', $oComment->get('document_srl')), $oComment->get('comment_srl'));
 
 			$attribute->mid = $args->mid_lists[$attribute->module_srl];
 			$browser_title = $args->module_srls_info[$attribute->module_srl]->browser_title;
@@ -229,10 +229,10 @@ 
 		// Get categories
 		$obj = new stdClass();
 		$obj->module_srl = $args->module_srl;
-		$output = executeQueryArray('widgets.content.getCategories',$obj);
-		if($output->toBool() && $output->data)
+		$output = executeQueryArray('widgets.content.getCategories', $obj);
+		if ($output->toBool() && $output->data)
 		{
-			foreach($output->data as $key => $val)
+			foreach ($output->data as $key => $val)
 			{
 				$category_lists[$val->module_srl][$val->category_srl] = $val;
 			}
@@ -241,24 +241,24 @@ 
 		$obj->module_srl = $args->module_srl;
 		$obj->category_srl = $args->category_srl;
 		$obj->sort_index = $args->order_target;
-		if($args->order_target == 'list_order' || $args->order_target == 'update_order')
+		if ($args->order_target == 'list_order' || $args->order_target == 'update_order')
 		{
-			$obj->order_type = $args->order_type=="desc"?"asc":"desc";
+			$obj->order_type = $args->order_type == "desc" ? "asc" : "desc";
 		}
 		else
 		{
-			$obj->order_type = $args->order_type=="desc"?"desc":"asc";
+			$obj->order_type = $args->order_type == "desc" ? "desc" : "asc";
 		}
 		$obj->list_count = $args->list_count * $args->page_count;
 		$obj->statusList = array('PUBLIC');
 		$output = executeQueryArray('widgets.content.getNewestDocuments', $obj);
-		if(!$output->toBool() || !$output->data) return;
+		if (!$output->toBool() || !$output->data) return;
 		// If the result exists, make each document as an object
 		$content_items = array();
 		$first_thumbnail_idx = -1;
-		if(count($output->data))
+		if (count($output->data))
 		{
-			foreach($output->data as $key => $attribute)
+			foreach ($output->data as $key => $attribute)
 			{
 				$oDocument = new documentItem();
 				$oDocument->setAttribute($attribute, false);
@@ -267,26 +267,26 @@ 
 			}
 			$oDocumentModel->setToAllDocumentExtraVars();
 
-			for($i=0,$c=count($document_srls);$i<$c;$i++)
+			for ($i = 0, $c = count($document_srls); $i < $c; $i++)
 			{
 				$oDocument = $GLOBALS['XE_DOCUMENT_LIST'][$document_srls[$i]];
 				$document_srl = $oDocument->document_srl;
 				$module_srl = $oDocument->get('module_srl');
 				$category_srl = $oDocument->get('category_srl');
-				$thumbnail = $oDocument->getThumbnail($args->thumbnail_width,$args->thumbnail_height,$args->thumbnail_type);
+				$thumbnail = $oDocument->getThumbnail($args->thumbnail_width, $args->thumbnail_height, $args->thumbnail_type);
 
-				$content_item = new contentItem( $args->module_srls_info[$module_srl]->browser_title );
+				$content_item = new contentItem($args->module_srls_info[$module_srl]->browser_title);
 				$content_item->adds($oDocument->getObjectVars());
 				$content_item->add('original_content', $oDocument->get('content'));
 				$content_item->setTitle($oDocument->getTitleText());
-				$content_item->setCategory( $category_lists[$module_srl][$category_srl]->title );
-				$content_item->setDomain( $args->module_srls_info[$module_srl]->domain );
+				$content_item->setCategory($category_lists[$module_srl][$category_srl]->title);
+				$content_item->setDomain($args->module_srls_info[$module_srl]->domain);
 				$content_item->setContent($oDocument->getSummary($args->content_cut_size));
-				$content_item->setLink( getSiteUrl($domain, '', 'mid', $args->mid_lists[$module_srl],'document_srl',$document_srl) );
+				$content_item->setLink(getSiteUrl($domain, '', 'mid', $args->mid_lists[$module_srl], 'document_srl', $document_srl));
 				$content_item->setThumbnail($thumbnail);
 				$content_item->setExtraImages($oDocument->printExtraImages($args->duration_new * 60 * 60));
 				$content_item->add('mid', $args->mid_lists[$module_srl]);
-				if($first_thumbnail_idx==-1 && $thumbnail) $first_thumbnail_idx = $i;
+				if ($first_thumbnail_idx == -1 && $thumbnail) $first_thumbnail_idx = $i;
 				$content_items[] = $content_item;
 			}
 
@@ -307,10 +307,10 @@ 
 		$obj->direct_download = 'Y';
 		$obj->isvalid = 'Y';
 		// Get categories
-		$output = executeQueryArray('widgets.content.getCategories',$obj);
-		if($output->toBool() && $output->data)
+		$output = executeQueryArray('widgets.content.getCategories', $obj);
+		if ($output->toBool() && $output->data)
 		{
-			foreach($output->data as $key => $val)
+			foreach ($output->data as $key => $val)
 			{
 				$category_lists[$val->module_srl][$val->category_srl] = $val;
 			}
@@ -319,25 +319,25 @@ 
 		$obj->list_count = $args->list_count * $args->page_count;
 		$files_output = executeQueryArray("file.getOneFileInDocument", $obj);
 		$files_count = count($files_output->data);
-		if(!$files_count) return;
+		if (!$files_count) return;
 
 		$content_items = array();
 
-		for($i=0;$i<$files_count;$i++) $document_srl_list[] = $files_output->data[$i]->document_srl;
+		for ($i = 0; $i < $files_count; $i++) $document_srl_list[] = $files_output->data[$i]->document_srl;
 
 		$tmp_document_list = $oDocumentModel->getDocuments($document_srl_list);
 
-		if(!count($tmp_document_list)) return;
+		if (!count($tmp_document_list)) return;
 
-		foreach($tmp_document_list as $oDocument)
+		foreach ($tmp_document_list as $oDocument)
 		{
 			$attribute = $oDocument->getObjectVars();
 			$browser_title = $args->module_srls_info[$attribute->module_srl]->browser_title;
 			$domain = $args->module_srls_info[$attribute->module_srl]->domain;
 			$category = $category_lists[$attribute->module_srl]->text;
 			$content = $oDocument->getSummary($args->content_cut_size);
-			$url = sprintf("%s#%s",$oDocument->getPermanentUrl() ,$oDocument->getCommentCount());
-			$thumbnail = $oDocument->getThumbnail($args->thumbnail_width,$args->thumbnail_height,$args->thumbnail_type);
+			$url = sprintf("%s#%s", $oDocument->getPermanentUrl(), $oDocument->getCommentCount());
+			$thumbnail = $oDocument->getThumbnail($args->thumbnail_width, $args->thumbnail_height, $args->thumbnail_type);
 			$extra_images = $oDocument->printExtraImages($args->duration_new);
 
 			$content_item = new contentItem($browser_title);
@@ -360,11 +360,11 @@ 
 		$content_items = array();
 		$args->mid_lists = array();
 
-		foreach($args->rss_urls as $key => $rss)
+		foreach ($args->rss_urls as $key => $rss)
 		{
 			$args->rss_url = $rss;
 			$content_item = $this->_getRssItems($args);
-			if(count($content_item) > 0)
+			if (count($content_item) > 0)
 			{
 				$browser_title = $content_item[0]->getBrowserTitle();
 				$args->mid_lists[] = $browser_title;
@@ -372,37 +372,37 @@ 
 			}
 		}
 		// If it is not a tab type
-		if($args->tab_type == 'none' || $args->tab_type == '')
+		if ($args->tab_type == 'none' || $args->tab_type == '')
 		{
 			$items = array();
-			foreach($content_items as $key => $val)
+			foreach ($content_items as $key => $val)
 			{
-				foreach($val as $k => $v)
+				foreach ($val as $k => $v)
 				{
 					$date = $v->get('regdate');
-					$i=0;
-					while(array_key_exists(sprintf('%s%02d',$date,$i), $items)) $i++;
-					$items[sprintf('%s%02d',$date,$i)] = $v;
+					$i = 0;
+					while (array_key_exists(sprintf('%s%02d', $date, $i), $items)) $i++;
+					$items[sprintf('%s%02d', $date, $i)] = $v;
 				}
 			}
-			if($args->order_type =='asc') ksort($items);
+			if ($args->order_type == 'asc') ksort($items);
 			else krsort($items);
-			$content_items = array_slice(array_values($items),0,$args->list_count*$args->page_count);
+			$content_items = array_slice(array_values($items), 0, $args->list_count * $args->page_count);
 			// Tab Type
 		}
 		else
 		{
-			foreach($content_items as $key=> $content_item_list)
+			foreach ($content_items as $key=> $content_item_list)
 			{
 				$items = array();
-				foreach($content_item_list as $k => $content_item)
+				foreach ($content_item_list as $k => $content_item)
 				{
 					$date = $content_item->get('regdate');
-					$i=0;
-					while(array_key_exists(sprintf('%s%02d',$date,$i), $items)) $i++;
-					$items[sprintf('%s%02d',$date,$i)] = $content_item;
+					$i = 0;
+					while (array_key_exists(sprintf('%s%02d', $date, $i), $items)) $i++;
+					$items[sprintf('%s%02d', $date, $i)] = $content_item;
 				}
-				if($args->order_type =='asc') ksort($items);
+				if ($args->order_type == 'asc') ksort($items);
 				else krsort($items);
 
 				$content_items[$key] = array_values($items);
@@ -413,19 +413,19 @@ 
 
 	function _getRssBody($value)
 	{
-		if(!$value || is_string($value)) return $value;
-		if(is_object($value)) $value = get_object_vars($value);
+		if (!$value || is_string($value)) return $value;
+		if (is_object($value)) $value = get_object_vars($value);
 		$body = null;
-		if(!count($value)) return;
-		foreach($value as $key => $val)
+		if (!count($value)) return;
+		foreach ($value as $key => $val)
 		{
-			if($key == 'body')
+			if ($key == 'body')
 			{
 				$body = $val;
 				continue;
 			}
-			if(is_object($val)||is_array($val)) $body = $this->_getRssBody($val);
-			if($body !== null) return $body;
+			if (is_object($val) || is_array($val)) $body = $this->_getRssBody($val);
+			if ($body !== null) return $body;
 		}
 		return $body;
 	}
@@ -436,17 +436,17 @@ 
 		// Replace tags such as </p> , </div> , </li> and others to a whitespace
 		$content = str_replace(array('</p>', '</div>', '</li>'), ' ', $content);
 		// Remove Tag
-		$content = preg_replace('!<([^>]*?)>!is','', $content);
+		$content = preg_replace('!<([^>]*?)>!is', '', $content);
 		// Replace tags to <, >, " and whitespace
-		$content = str_replace(array('&lt;','&gt;','&quot;','&nbsp;'), array('<','>','"',' '), $content);
+		$content = str_replace(array('&lt;', '&gt;', '&quot;', '&nbsp;'), array('<', '>', '"', ' '), $content);
 		// Delete  a series of whitespaces
 		$content = preg_replace('/ ( +)/is', ' ', $content);
 		// Truncate string
 		$content = trim(cut_str($content, $str_size, $tail));
 		// Replace back <, >, " to the original tags
-		$content = str_replace(array('<','>','"'),array('&lt;','&gt;','&quot;'), $content);
+		$content = str_replace(array('<', '>', '"'), array('&lt;', '&gt;', '&quot;'), $content);
 		// Fixed to a newline bug for consecutive sets of English letters
-		$content = preg_replace('/([a-z0-9\+:\/\.\~,\|\!\@\#\$\%\^\&\*\(\)\_]){20}/is',"$0-",$content);
+		$content = preg_replace('/([a-z0-9\+:\/\.\~,\|\!\@\#\$\%\^\&\*\(\)\_]){20}/is', "$0-", $content);
 		return $content; 
 	}
 
@@ -456,7 +456,7 @@ 
 	 */
 	function requestFeedContents($rss_url)
 	{
-		$rss_url = str_replace('&amp;','&',Context::convertEncodingStr($rss_url));
+		$rss_url = str_replace('&amp;', '&', Context::convertEncodingStr($rss_url));
 		return FileHandler::getRemoteResource($rss_url, null, 3, 'GET', 'application/xml');
 	}
 
@@ -468,51 +468,51 @@ 
 		$buff = $this->requestFeedContents($args->rss_url);
 
 		$encoding = preg_match("/<\?xml.*encoding=\"(.+)\".*\?>/i", $buff, $matches);
-		if($encoding && stripos($matches[1], "UTF-8") === FALSE) $buff = Context::convertEncodingStr($buff);
+		if ($encoding && stripos($matches[1], "UTF-8") === FALSE) $buff = Context::convertEncodingStr($buff);
 
 		$buff = preg_replace("/<\?xml.*\?>/i", "", $buff);
 
 		$oXmlParser = new XmlParser();
 		$xml_doc = $oXmlParser->parse($buff);
-		if($xml_doc->rss)
+		if ($xml_doc->rss)
 		{
 			$rss->title = $xml_doc->rss->channel->title->body;
 			$rss->link = $xml_doc->rss->channel->link->body;
 
 			$items = $xml_doc->rss->channel->item;
 
-			if(!$items) return;
-			if($items && !is_array($items)) $items = array($items);
+			if (!$items) return;
+			if ($items && !is_array($items)) $items = array($items);
 
 			$content_items = array();
 
 			foreach ($items as $key => $value)
 			{
-				if($key >= $args->list_count * $args->page_count) break;
+				if ($key >= $args->list_count * $args->page_count) break;
 				unset($item);
 
-				foreach($value as $key2 => $value2)
+				foreach ($value as $key2 => $value2)
 				{
-					if(is_array($value2)) $value2 = array_shift($value2);
+					if (is_array($value2)) $value2 = array_shift($value2);
 					$item->{$key2} = $this->_getRssBody($value2);
 				}
 
 				$content_item = new contentItem($rss->title);
 				$content_item->setContentsLink($rss->link);
 				$content_item->setTitle($item->title);
-				$content_item->setNickName(max($item->author,$item->{'dc:creator'}));
+				$content_item->setNickName(max($item->author, $item->{'dc:creator'}));
 				//$content_item->setCategory($item->category);
-				$item->description = preg_replace('!<a href=!is','<a target="_blank" rel="noopener" href=', $item->description);
+				$item->description = preg_replace('!<a href=!is', '<a target="_blank" rel="noopener" href=', $item->description);
 				$content_item->setContent($this->_getSummary($item->description, $args->content_cut_size));
 				$content_item->setThumbnail($this->_getRssThumbnail($item->description));
 				$content_item->setLink($item->link);
-				$date = date('YmdHis', strtotime(max($item->pubdate,$item->pubDate,$item->{'dc:date'})));
+				$date = date('YmdHis', strtotime(max($item->pubdate, $item->pubDate, $item->{'dc:date'})));
 				$content_item->setRegdate($date);
 
 				$content_items[] = $content_item;
 			}
 		}
-		else if($xml_doc->{'rdf:rdf'})
+		else if ($xml_doc->{'rdf:rdf'})
 		{
 			// rss1.0 supported (XE's XML is case-insensitive because XML parser converts all to small letters. Fixed by misol
 			$rss->title = $xml_doc->{'rdf:rdf'}->channel->title->body;
@@ -520,102 +520,102 @@ 
 
 			$items = $xml_doc->{'rdf:rdf'}->item;
 
-			if(!$items) return;
-			if($items && !is_array($items)) $items = array($items);
+			if (!$items) return;
+			if ($items && !is_array($items)) $items = array($items);
 
 			$content_items = array();
 
 			foreach ($items as $key => $value)
 			{
-				if($key >= $args->list_count * $args->page_count) break;
+				if ($key >= $args->list_count * $args->page_count) break;
 				unset($item);
 
-				foreach($value as $key2 => $value2)
+				foreach ($value as $key2 => $value2)
 				{
-					if(is_array($value2)) $value2 = array_shift($value2);
+					if (is_array($value2)) $value2 = array_shift($value2);
 					$item->{$key2} = $this->_getRssBody($value2);
 				}
 
 				$content_item = new contentItem($rss->title);
 				$content_item->setContentsLink($rss->link);
 				$content_item->setTitle($item->title);
-				$content_item->setNickName(max($item->author,$item->{'dc:creator'}));
+				$content_item->setNickName(max($item->author, $item->{'dc:creator'}));
 				//$content_item->setCategory($item->category);
-				$item->description = preg_replace('!<a href=!is','<a target="_blank" rel="noopener" href=', $item->description);
+				$item->description = preg_replace('!<a href=!is', '<a target="_blank" rel="noopener" href=', $item->description);
 				$content_item->setContent($this->_getSummary($item->description, $args->content_cut_size));
 				$content_item->setThumbnail($this->_getRssThumbnail($item->description));
 				$content_item->setLink($item->link);
-				$date = date('YmdHis', strtotime(max($item->pubdate,$item->pubDate,$item->{'dc:date'})));
+				$date = date('YmdHis', strtotime(max($item->pubdate, $item->pubDate, $item->{'dc:date'})));
 				$content_item->setRegdate($date);
 
 				$content_items[] = $content_item;
 			}
 		}
-		else if($xml_doc->feed && $xml_doc->feed->attrs->xmlns == 'http://www.w3.org/2005/Atom')
+		else if ($xml_doc->feed && $xml_doc->feed->attrs->xmlns == 'http://www.w3.org/2005/Atom')
 		{
 			// Atom 1.0 spec supported by misol
 			$rss->title = $xml_doc->feed->title->body;
 			$links = $xml_doc->feed->link;
-			if(is_array($links))
+			if (is_array($links))
 			{
 				foreach ($links as $value)
 				{
-					if($value->attrs->rel == 'alternate')
+					if ($value->attrs->rel == 'alternate')
 					{
 						$rss->link = $value->attrs->href;
 						break;
 					}
 				}
 			}
-			else if($links->attrs->rel == 'alternate') $rss->link = $links->attrs->href;
+			else if ($links->attrs->rel == 'alternate') $rss->link = $links->attrs->href;
 
 			$items = $xml_doc->feed->entry;
 
-			if(!$items) return;
-			if($items && !is_array($items)) $items = array($items);
+			if (!$items) return;
+			if ($items && !is_array($items)) $items = array($items);
 
 			$content_items = array();
 
 			foreach ($items as $key => $value)
 			{
-				if($key >= $args->list_count * $args->page_count) break;
+				if ($key >= $args->list_count * $args->page_count) break;
 				unset($item);
 
-				foreach($value as $key2 => $value2)
+				foreach ($value as $key2 => $value2)
 				{
-					if(is_array($value2)) $value2 = array_shift($value2);
+					if (is_array($value2)) $value2 = array_shift($value2);
 					$item->{$key2} = $this->_getRssBody($value2);
 				}
 
 				$content_item = new contentItem($rss->title);
 				$links = $value->link;
-				if(is_array($links))
+				if (is_array($links))
 				{
 					foreach ($links as $val)
 					{
-						if($val->attrs->rel == 'alternate')
+						if ($val->attrs->rel == 'alternate')
 						{
 							$item->link = $val->attrs->href;
 							break;
 						}
 					}
 				}
-				else if($links->attrs->rel == 'alternate') $item->link = $links->attrs->href;
+				else if ($links->attrs->rel == 'alternate') $item->link = $links->attrs->href;
 
 				$content_item->setContentsLink($rss->link);
-				if($item->title)
+				if ($item->title)
 				{
-					if(stripos($value->title->attrs->type, "html") === FALSE) $item->title = $value->title->body;
+					if (stripos($value->title->attrs->type, "html") === FALSE) $item->title = $value->title->body;
 				}
 				$content_item->setTitle($item->title);
-				$content_item->setNickName(max($item->author,$item->{'dc:creator'}));
+				$content_item->setNickName(max($item->author, $item->{'dc:creator'}));
 				$content_item->setAuthorSite($value->author->uri->body);
 
 				//$content_item->setCategory($item->category);
 				$item->description = ($item->content) ? $item->content : $item->description = $item->summary;
-				$item->description = preg_replace('!<a href=!is','<a target="_blank" rel="noopener" href=', $item->description);
+				$item->description = preg_replace('!<a href=!is', '<a target="_blank" rel="noopener" href=', $item->description);
 
-				if(($item->content && stripos($value->content->attrs->type, "html") === FALSE) || (!$item->content && stripos($value->summary->attrs->type, "html") === FALSE))
+				if (($item->content && stripos($value->content->attrs->type, "html") === FALSE) || (!$item->content && stripos($value->summary->attrs->type, "html") === FALSE))
 				{
 					$item->description = htmlspecialchars($item->description, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 
@@ -624,7 +624,7 @@ 
 				$content_item->setContent($this->_getSummary($item->description, $args->content_cut_size));
 				$content_item->setThumbnail($this->_getRssThumbnail($item->description));
 				$content_item->setLink($item->link);
-				$date = date('YmdHis', strtotime(max($item->published,$item->updated,$item->{'dc:date'})));
+				$date = date('YmdHis', strtotime(max($item->published, $item->updated, $item->{'dc:date'})));
 				$content_item->setRegdate($date);
 
 				$content_items[] = $content_item;
@@ -637,15 +637,15 @@ 
 	{
 		@preg_match('@<img[^>]+src\s*=\s*(?:"(.+)"|\'(.+)\'|([^\s>(?:/>)]+))@', $content, $matches);
 
-		if($matches[1])
+		if ($matches[1])
 		{
 			return $matches[1];
 		}
-		elseif($matches[2])
+		elseif ($matches[2])
 		{
 			return $matches[2];
 		}
-		elseif($matches[3])
+		elseif ($matches[3])
 		{
 			return $matches[3];
 		}
@@ -658,17 +658,17 @@ 
 	function _getTrackbackItems($args)
 	{
 		$oTrackbackModel = getModel('trackback');
-		if(!$oTrackbackModel)
+		if (!$oTrackbackModel)
 		{
 			return;
 		}
 
 		$obj = new stdClass;
 		// Get categories
-		$output = executeQueryArray('widgets.content.getCategories',$obj);
-		if($output->toBool() && $output->data)
+		$output = executeQueryArray('widgets.content.getCategories', $obj);
+		if ($output->toBool() && $output->data)
 		{
-			foreach($output->data as $key => $val)
+			foreach ($output->data as $key => $val)
 			{
 				$category_lists[$val->module_srl][$val->category_srl] = $val;
 			}
@@ -681,14 +681,14 @@ 
 		// Get model object from the trackback module and execute getTrackbackList() method
 		$output = $oTrackbackModel->getNewestTrackbackList($obj);
 		// If an error occurs, just ignore it.
-		if(!$output->toBool() || !$output->data) return;
+		if (!$output->toBool() || !$output->data) return;
 		// If the result exists, make each document as an object
 		$content_items = array();
-		foreach($output->data as $key => $item)
+		foreach ($output->data as $key => $item)
 		{
 			$domain = $args->module_srls_info[$item->module_srl]->domain;
 			$category = $category_lists[$item->module_srl]->text;
-			$url = getSiteUrl($domain,'','document_srl',$item->document_srl);
+			$url = getSiteUrl($domain, '', 'document_srl', $item->document_srl);
 			$browser_title = $args->module_srls_info[$item->module_srl]->browser_title;
 
 			$content_item = new contentItem($browser_title);
@@ -696,8 +696,8 @@ 
 			$content_item->setTitle($item->title);
 			$content_item->setCategory($category);
 			$content_item->setNickName($item->blog_name);
-			$content_item->setContent($item->excerpt);  ///<<
-			$content_item->setDomain($domain);  ///<<
+			$content_item->setContent($item->excerpt); ///<<
+			$content_item->setDomain($domain); ///<<
 			$content_item->setLink($url);
 			$content_item->add('mid', $args->mid_lists[$item->module_srl]);
 			$content_item->setRegdate($item->regdate);
@@ -706,7 +706,7 @@ 
 		return $content_items;
 	}
 
-	function _compile($args,$content_items)
+	function _compile($args, $content_items)
 	{
 		$oTemplate = &TemplateHandler::getInstance();
 		// Set variables for widget
@@ -720,7 +720,7 @@ 
 		$widget_info->nickname_cut_size = $args->nickname_cut_size;
 		$widget_info->new_window = $args->new_window;
 
-		$widget_info->duration_new = $args->duration_new * 60*60;
+		$widget_info->duration_new = $args->duration_new * 60 * 60;
 		$widget_info->thumbnail_type = $args->thumbnail_type;
 		$widget_info->thumbnail_width = $args->thumbnail_width;
 		$widget_info->thumbnail_height = $args->thumbnail_height;
@@ -738,12 +738,12 @@ 
 
 		$widget_info->markup_type = $args->markup_type;
 		// If it is a tab type, list up tab items and change key value(module_srl) to index 
-		if($args->tab_type != 'none' && $args->tab_type)
+		if ($args->tab_type != 'none' && $args->tab_type)
 		{
 			$tab = array();
-			foreach($args->mid_lists as $module_srl => $mid)
+			foreach ($args->mid_lists as $module_srl => $mid)
 			{
-				if(!is_array($content_items[$module_srl]) || !count($content_items[$module_srl])) continue;
+				if (!is_array($content_items[$module_srl]) || !count($content_items[$module_srl])) continue;
 
 				unset($tab_item);
 				$tab_item = new stdClass();
@@ -751,7 +751,7 @@ 
 				$tab_item->content_items = $content_items[$module_srl];
 				$tab_item->domain = $content_items[$module_srl][0]->getDomain();
 				$tab_item->url = $content_items[$module_srl][0]->getContentsLink();
-				if(!$tab_item->url) $tab_item->url = getSiteUrl($tab_item->domain, '','mid',$mid);
+				if (!$tab_item->url) $tab_item->url = getSiteUrl($tab_item->domain, '', 'mid', $mid);
 				$tab[] = $tab_item;
 			}
 			$widget_info->tab = $tab;
@@ -779,7 +779,7 @@ 
 	var $contents_link = null;
 	var $domain = null;
 
-	function contentItem($browser_title='')
+	function contentItem($browser_title = '')
 	{
 		$this->browser_title = $browser_title;
 	}
@@ -789,22 +789,22 @@ 
 	}
 	function setFirstThumbnailIdx($first_thumbnail_idx)
 	{
-		if(is_null($this->first_thumbnail) && $first_thumbnail_idx>-1)
+		if (is_null($this->first_thumbnail) && $first_thumbnail_idx > -1)
 		{
 			$this->has_first_thumbnail_idx = true;
-			$this->first_thumbnail_idx= $first_thumbnail_idx;
+			$this->first_thumbnail_idx = $first_thumbnail_idx;
 		}
 	}
 	function setExtraImages($extra_images)
 	{
-		$this->add('extra_images',$extra_images);
+		$this->add('extra_images', $extra_images);
 	}
 	function setDomain($domain)
 	{
 		static $default_domain = null;
-		if(!$domain)
+		if (!$domain)
 		{
-			if(is_null($default_domain)) $default_domain = Context::getDefaultUrl();
+			if (is_null($default_domain)) $default_domain = Context::getDefaultUrl();
 			$domain = $default_domain;
 		}
 		$this->domain = $domain;
@@ -868,17 +868,17 @@ 
 	{
 		return $this->get('module_srl');
 	}
-	function getTitle($cut_size = 0, $tail='...')
+	function getTitle($cut_size = 0, $tail = '...')
 	{
 		$title = htmlspecialchars($this->get('title'), ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 
-		if($cut_size) $title = cut_str($title, $cut_size, $tail);
+		if ($cut_size) $title = cut_str($title, $cut_size, $tail);
 
 		$attrs = array();
-		if($this->get('title_bold') == 'Y') $attrs[] = 'font-weight:bold';
-		if($this->get('title_color') && $this->get('title_color') != 'N') $attrs[] = 'color:#'.$this->get('title_color');
+		if ($this->get('title_bold') == 'Y') $attrs[] = 'font-weight:bold';
+		if ($this->get('title_color') && $this->get('title_color') != 'N') $attrs[] = 'color:#'.$this->get('title_color');
 
-		if(count($attrs)) $title = sprintf("<span style=\"%s\">%s</span>", implode(';', $attrs), $title);
+		if (count($attrs)) $title = sprintf("<span style=\"%s\">%s</span>", implode(';', $attrs), $title);
 
 		return $title;
 	}
@@ -890,9 +890,9 @@ 
 	{
 		return $this->get('category');
 	}
-	function getNickName($cut_size = 0, $tail='...')
+	function getNickName($cut_size = 0, $tail = '...')
 	{
-		if($cut_size) $nick_name = cut_str($this->get('nick_name'), $cut_size, $tail);
+		if ($cut_size) $nick_name = cut_str($this->get('nick_name'), $cut_size, $tail);
 		else $nick_name = $this->get('nick_name');
 
 		return $nick_name;
@@ -904,12 +904,12 @@ 
 	function getCommentCount()
 	{
 		$comment_count = $this->get('comment_count');
-		return $comment_count>0 ? $comment_count : '';
+		return $comment_count > 0 ? $comment_count : '';
 	}
 	function getTrackbackCount()
 	{
 		$trackback_count = $this->get('trackback_count');
-		return $trackback_count>0 ? $trackback_count : '';
+		return $trackback_count > 0 ? $trackback_count : '';
 	}
 	function getRegdate($format = 'Y.m.d H:i:s')
 	{

modules/file/file.model.php

Braces +82 added lines, -31 removed lines

@@ -29,7 +29,9 @@ 
 		$mid = Context::get('mid');
 		$editor_sequence = Context::get('editor_sequence');
 		$upload_target_srl = Context::get('upload_target_srl');
-		if(!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		if(!$upload_target_srl) {
+			$upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		}
 
 		if($upload_target_srl)
 		{
@@ -68,26 +70,32 @@ 
 			}
 
 			$tmp_files = $this->getFiles($upload_target_srl);
-			if(!$tmp_files) $tmp_files = array();
+			if(!$tmp_files) {
+				$tmp_files = array();
+			}
 
 			foreach($tmp_files as $file_info)
 			{
-				if(!$file_info->file_srl) continue;
+				if(!$file_info->file_srl) {
+					continue;
+				}
 
 				$obj = new stdClass;
 				$obj->file_srl = $file_info->file_srl;
 				$obj->source_filename = $file_info->source_filename;
 				$obj->file_size = $file_info->file_size;
 				$obj->disp_file_size = FileHandler::filesize($file_info->file_size);
-				if($file_info->direct_download=='N') $obj->download_url = $this->getDownloadUrl($file_info->file_srl, $file_info->sid, $file_info->module_srl);
-				else $obj->download_url = str_replace('./', '', $file_info->uploaded_filename);
+				if($file_info->direct_download=='N') {
+					$obj->download_url = $this->getDownloadUrl($file_info->file_srl, $file_info->sid, $file_info->module_srl);
+				} else {
+					$obj->download_url = str_replace('./', '', $file_info->uploaded_filename);
+				}
 				$obj->direct_download = $file_info->direct_download;
 				$obj->cover_image = ($file_info->cover_image === 'Y') ? true : false;
 				$files[] = $obj;
 				$attached_size += $file_info->file_size;
 			}
-		}
-		else
+		} else
 		{
 			$upload_target_srl = 0;
 			$attached_size = 0;
@@ -155,8 +163,12 @@ 
 
 		$file_module_config = $oModuleModel->getModuleConfig('file');
 
-		if($module_srl) $file_config = $oModuleModel->getModulePartConfig('file',$module_srl);
-		if(!$file_config) $file_config = $file_module_config;
+		if($module_srl) {
+			$file_config = $oModuleModel->getModulePartConfig('file',$module_srl);
+		}
+		if(!$file_config) {
+			$file_config = $file_module_config;
+		}
 
 		$config = new stdClass();
 
@@ -171,25 +183,53 @@ 
 			$config->allow_outlink_format = $file_config->allow_outlink_format;
 		}
 		// Property for all files comes first than each property
-		if(!$config->allowed_filesize) $config->allowed_filesize = $file_module_config->allowed_filesize;
-		if(!$config->allowed_attach_size) $config->allowed_attach_size = $file_module_config->allowed_attach_size;
-		if(!$config->allowed_filetypes) $config->allowed_filetypes = $file_module_config->allowed_filetypes;
-		if(!$config->allow_outlink) $config->allow_outlink = $file_module_config->allow_outlink;
-		if(!$config->allow_outlink_site) $config->allow_outlink_site = $file_module_config->allow_outlink_site;
-		if(!$config->allow_outlink_format) $config->allow_outlink_format = $file_module_config->allow_outlink_format;
-		if(!$config->download_grant) $config->download_grant = $file_module_config->download_grant;
+		if(!$config->allowed_filesize) {
+			$config->allowed_filesize = $file_module_config->allowed_filesize;
+		}
+		if(!$config->allowed_attach_size) {
+			$config->allowed_attach_size = $file_module_config->allowed_attach_size;
+		}
+		if(!$config->allowed_filetypes) {
+			$config->allowed_filetypes = $file_module_config->allowed_filetypes;
+		}
+		if(!$config->allow_outlink) {
+			$config->allow_outlink = $file_module_config->allow_outlink;
+		}
+		if(!$config->allow_outlink_site) {
+			$config->allow_outlink_site = $file_module_config->allow_outlink_site;
+		}
+		if(!$config->allow_outlink_format) {
+			$config->allow_outlink_format = $file_module_config->allow_outlink_format;
+		}
+		if(!$config->download_grant) {
+			$config->download_grant = $file_module_config->download_grant;
+		}
 		// Default setting if not exists
-		if(!$config->allowed_filesize) $config->allowed_filesize = '2';
-		if(!$config->allowed_attach_size) $config->allowed_attach_size = '3';
-		if(!$config->allowed_filetypes) $config->allowed_filetypes = '*.*';
-		if(!$config->allow_outlink) $config->allow_outlink = 'Y';
-		if(!$config->download_grant) $config->download_grant = array();
+		if(!$config->allowed_filesize) {
+			$config->allowed_filesize = '2';
+		}
+		if(!$config->allowed_attach_size) {
+			$config->allowed_attach_size = '3';
+		}
+		if(!$config->allowed_filetypes) {
+			$config->allowed_filetypes = '*.*';
+		}
+		if(!$config->allow_outlink) {
+			$config->allow_outlink = 'Y';
+		}
+		if(!$config->download_grant) {
+			$config->download_grant = array();
+		}
 
 		$size = ini_get('upload_max_filesize');
 		$unit = strtolower($size[strlen($size) - 1]);
 		$size = (float)$size;
-		if($unit == 'g') $size *= 1024;
-		if($unit == 'k') $size /= 1024;
+		if($unit == 'g') {
+			$size *= 1024;
+		}
+		if($unit == 'k') {
+			$size /= 1024;
+		}
 
 		if($config->allowed_filesize > $size) 
 		{	
@@ -215,7 +255,9 @@ 
 		$args = new stdClass();
 		$args->file_srl = $file_srl;
 		$output = executeQueryArray('file.getFile', $args, $columnList);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// old version compatibility
 		if(count($output->data) == 1)
@@ -224,8 +266,7 @@ 
 			$file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid, $file->module_srl);
 
 			return $file;
-		}
-		else
+		} else
 		{
 			$fileList = array();
 
@@ -255,13 +296,19 @@ 
 		$args = new stdClass();
 		$args->upload_target_srl = $upload_target_srl;
 		$args->sort_index = $sortIndex;
-		if($ckValid) $args->isvalid = 'Y';
+		if($ckValid) {
+			$args->isvalid = 'Y';
+		}
 		$output = executeQueryArray('file.getFiles', $args, $columnList);
-		if(!$output->data) return;
+		if(!$output->data) {
+			return;
+		}
 
 		$file_list = $output->data;
 
-		if($file_list && !is_array($file_list)) $file_list = array($file_list);
+		if($file_list && !is_array($file_list)) {
+			$file_list = array($file_list);
+		}
 
 		foreach ($file_list as &$file)
 		{
@@ -346,7 +393,9 @@ 
 	 */
 	function getFileGrant($file_info, $member_info)
 	{
-		if(!$file_info) return null;
+		if(!$file_info) {
+			return null;
+		}
 
 		if($_SESSION['__XE_UPLOADING_FILES_INFO__'][$file_info->file_srl])
 		{
@@ -359,7 +408,9 @@ 
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($file_info->upload_target_srl);
-		if($oDocument->isExists()) $document_grant = $oDocument->isGranted();
+		if($oDocument->isExists()) {
+			$document_grant = $oDocument->isGranted();
+		}
 
 		$file_grant->is_deletable = ($document_grant || $member_info->is_admin == 'Y' || $member_info->member_srl == $file_info->member_srl || $grant->manager);
 

Doc Comments +4 added lines, -4 removed lines

@@ -20,7 +20,7 @@ 
 	 * It is used when a file list of the upload_target_srl is requested for creating/updating a document.
 	 * Attempt to replace with sever-side session if upload_target_srl is not yet determined
 	 *
-	 * @return void
+	 * @return BaseObject|null
 	 */
 	function getFileList()
 	{
@@ -146,7 +146,7 @@ 
 	 * Get file configurations
 	 *
 	 * @param int $module_srl If set this, returns specific module's configuration. Otherwise returns global configuration.
-	 * @return object Returns configuration.
+	 * @return stdClass Returns configuration.
 	 */
 	function getFileConfig($module_srl = null)
 	{
@@ -276,7 +276,7 @@ 
 	/**
 	 * Return configurations of the attachement (it automatically checks if an administrator is)
 	 *
-	 * @return object Returns a file configuration of current module. If user is admin, returns PHP's max file size and allow all file types.
+	 * @return stdClass Returns a file configuration of current module. If user is admin, returns PHP's max file size and allow all file types.
 	 */
 	function getUploadConfig()
 	{
@@ -330,7 +330,7 @@ 
 	 * Return file configuration of the module
 	 *
 	 * @param int $module_srl The sequence of module to get configuration
-	 * @return object
+	 * @return stdClass
 	 */
 	function getFileModuleConfig($module_srl)
 	{

Spacing +55 added lines, -55 removed lines

@@ -29,9 +29,9 @@ 
 		$mid = Context::get('mid');
 		$editor_sequence = Context::get('editor_sequence');
 		$upload_target_srl = Context::get('upload_target_srl');
-		if(!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		if (!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
 
-		if($upload_target_srl)
+		if ($upload_target_srl)
 		{
 			$oDocumentModel = getModel('document');
 			$oCommentModel = getModel('comment');
@@ -40,10 +40,10 @@ 
 			$oDocument = $oDocumentModel->getDocument($upload_target_srl);
 
 			// comment 권한 확인
-			if(!$oDocument->isExists())
+			if (!$oDocument->isExists())
 			{
 				$oComment = $oCommentModel->getComment($upload_target_srl);
-				if($oComment->isExists() && $oComment->isSecret() && !$oComment->isGranted())
+				if ($oComment->isExists() && $oComment->isSecret() && !$oComment->isGranted())
 				{
 					return new BaseObject(-1, 'msg_not_permitted');
 				}
@@ -52,34 +52,34 @@ 
 			}
 
 			// document 권한 확인
-			if($oDocument->isExists() && $oDocument->isSecret() && !$oDocument->isGranted())
+			if ($oDocument->isExists() && $oDocument->isSecret() && !$oDocument->isGranted())
 			{
 				return new BaseObject(-1, 'msg_not_permitted');
 			}
 
 			// 모듈 권한 확인
-			if($oDocument->isExists())
+			if ($oDocument->isExists())
 			{
 				$grant = $oModuleModel->getGrant($oModuleModel->getModuleInfoByModuleSrl($oDocument->get('module_srl')), $logged_info);
-				if(!$grant->access)
+				if (!$grant->access)
 				{
 					return new BaseObject(-1, 'msg_not_permitted');
 				}
 			}
 
 			$tmp_files = $this->getFiles($upload_target_srl);
-			if(!$tmp_files) $tmp_files = array();
+			if (!$tmp_files) $tmp_files = array();
 
-			foreach($tmp_files as $file_info)
+			foreach ($tmp_files as $file_info)
 			{
-				if(!$file_info->file_srl) continue;
+				if (!$file_info->file_srl) continue;
 
 				$obj = new stdClass;
 				$obj->file_srl = $file_info->file_srl;
 				$obj->source_filename = $file_info->source_filename;
 				$obj->file_size = $file_info->file_size;
 				$obj->disp_file_size = FileHandler::filesize($file_info->file_size);
-				if($file_info->direct_download=='N') $obj->download_url = $this->getDownloadUrl($file_info->file_srl, $file_info->sid, $file_info->module_srl);
+				if ($file_info->direct_download == 'N') $obj->download_url = $this->getDownloadUrl($file_info->file_srl, $file_info->sid, $file_info->module_srl);
 				else $obj->download_url = str_replace('./', '', $file_info->uploaded_filename);
 				$obj->direct_download = $file_info->direct_download;
 				$obj->cover_image = ($file_info->cover_image === 'Y') ? true : false;
@@ -99,17 +99,17 @@ 
 		//$config = $oModuleModel->getModuleInfoByMid($mid);	//perhaps config varialbles not used
 
 		$file_config = $this->getUploadConfig();
-		$left_size = $file_config->allowed_attach_size*1024*1024 - $attached_size;
+		$left_size = $file_config->allowed_attach_size * 1024 * 1024 - $attached_size;
 		// Settings of required information
 		$attached_size = FileHandler::filesize($attached_size);
-		$allowed_attach_size = FileHandler::filesize($file_config->allowed_attach_size*1024*1024);
-		$allowed_filesize = FileHandler::filesize($file_config->allowed_filesize*1024*1024);
+		$allowed_attach_size = FileHandler::filesize($file_config->allowed_attach_size * 1024 * 1024);
+		$allowed_filesize = FileHandler::filesize($file_config->allowed_filesize * 1024 * 1024);
 		$allowed_filetypes = $file_config->allowed_filetypes;
-		$this->add("files",$files);
-		$this->add("editor_sequence",$editor_sequence);
-		$this->add("upload_target_srl",$upload_target_srl);
-		$this->add("upload_status",$upload_status);
-		$this->add("left_size",$left_size);
+		$this->add("files", $files);
+		$this->add("editor_sequence", $editor_sequence);
+		$this->add("upload_target_srl", $upload_target_srl);
+		$this->add("upload_status", $upload_status);
+		$this->add("left_size", $left_size);
 		$this->add('attached_size', $attached_size);
 		$this->add('allowed_attach_size', $allowed_attach_size);
 		$this->add('allowed_filesize', $allowed_filesize);
@@ -127,7 +127,7 @@ 
 		$args = new stdClass();
 		$args->upload_target_srl = $upload_target_srl;
 		$output = executeQuery('file.getFilesCount', $args);
-		return (int)$output->data->count;
+		return (int) $output->data->count;
 	}
 
 	/**
@@ -137,7 +137,7 @@ 
 	 * @param string $sid
 	 * @return string Returns a url
 	 */
-	function getDownloadUrl($file_srl, $sid, $module_srl="")
+	function getDownloadUrl($file_srl, $sid, $module_srl = "")
 	{
 		return sprintf('?module=%s&act=%s&file_srl=%s&sid=%s&module_srl=%s', 'file', 'procFileDownload', $file_srl, $sid, $module_srl);
 	}
@@ -155,12 +155,12 @@ 
 
 		$file_module_config = $oModuleModel->getModuleConfig('file');
 
-		if($module_srl) $file_config = $oModuleModel->getModulePartConfig('file',$module_srl);
-		if(!$file_config) $file_config = $file_module_config;
+		if ($module_srl) $file_config = $oModuleModel->getModulePartConfig('file', $module_srl);
+		if (!$file_config) $file_config = $file_module_config;
 
 		$config = new stdClass();
 
-		if($file_config)
+		if ($file_config)
 		{
 			$config->allowed_filesize = $file_config->allowed_filesize;
 			$config->allowed_attach_size = $file_config->allowed_attach_size;
@@ -171,31 +171,31 @@ 
 			$config->allow_outlink_format = $file_config->allow_outlink_format;
 		}
 		// Property for all files comes first than each property
-		if(!$config->allowed_filesize) $config->allowed_filesize = $file_module_config->allowed_filesize;
-		if(!$config->allowed_attach_size) $config->allowed_attach_size = $file_module_config->allowed_attach_size;
-		if(!$config->allowed_filetypes) $config->allowed_filetypes = $file_module_config->allowed_filetypes;
-		if(!$config->allow_outlink) $config->allow_outlink = $file_module_config->allow_outlink;
-		if(!$config->allow_outlink_site) $config->allow_outlink_site = $file_module_config->allow_outlink_site;
-		if(!$config->allow_outlink_format) $config->allow_outlink_format = $file_module_config->allow_outlink_format;
-		if(!$config->download_grant) $config->download_grant = $file_module_config->download_grant;
+		if (!$config->allowed_filesize) $config->allowed_filesize = $file_module_config->allowed_filesize;
+		if (!$config->allowed_attach_size) $config->allowed_attach_size = $file_module_config->allowed_attach_size;
+		if (!$config->allowed_filetypes) $config->allowed_filetypes = $file_module_config->allowed_filetypes;
+		if (!$config->allow_outlink) $config->allow_outlink = $file_module_config->allow_outlink;
+		if (!$config->allow_outlink_site) $config->allow_outlink_site = $file_module_config->allow_outlink_site;
+		if (!$config->allow_outlink_format) $config->allow_outlink_format = $file_module_config->allow_outlink_format;
+		if (!$config->download_grant) $config->download_grant = $file_module_config->download_grant;
 		// Default setting if not exists
-		if(!$config->allowed_filesize) $config->allowed_filesize = '2';
-		if(!$config->allowed_attach_size) $config->allowed_attach_size = '3';
-		if(!$config->allowed_filetypes) $config->allowed_filetypes = '*.*';
-		if(!$config->allow_outlink) $config->allow_outlink = 'Y';
-		if(!$config->download_grant) $config->download_grant = array();
+		if (!$config->allowed_filesize) $config->allowed_filesize = '2';
+		if (!$config->allowed_attach_size) $config->allowed_attach_size = '3';
+		if (!$config->allowed_filetypes) $config->allowed_filetypes = '*.*';
+		if (!$config->allow_outlink) $config->allow_outlink = 'Y';
+		if (!$config->download_grant) $config->download_grant = array();
 
 		$size = ini_get('upload_max_filesize');
 		$unit = strtolower($size[strlen($size) - 1]);
-		$size = (float)$size;
-		if($unit == 'g') $size *= 1024;
-		if($unit == 'k') $size /= 1024;
+		$size = (float) $size;
+		if ($unit == 'g') $size *= 1024;
+		if ($unit == 'k') $size /= 1024;
 
-		if($config->allowed_filesize > $size) 
+		if ($config->allowed_filesize > $size) 
 		{	
 			$config->allowed_filesize = $size;
 		}
-		if($config->allowed_attach_size > $size) 
+		if ($config->allowed_attach_size > $size) 
 		{
 			$config->allowed_attach_size = $size;
 		}
@@ -215,10 +215,10 @@ 
 		$args = new stdClass();
 		$args->file_srl = $file_srl;
 		$output = executeQueryArray('file.getFile', $args, $columnList);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// old version compatibility
-		if(count($output->data) == 1)
+		if (count($output->data) == 1)
 		{
 			$file = $output->data[0];
 			$file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid, $file->module_srl);
@@ -229,9 +229,9 @@ 
 		{
 			$fileList = array();
 
-			if(is_array($output->data))
+			if (is_array($output->data))
 			{
-				foreach($output->data as $key=>$value)
+				foreach ($output->data as $key=>$value)
 				{
 					$file = $value;
 					$file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid, $file->module_srl);
@@ -255,13 +255,13 @@ 
 		$args = new stdClass();
 		$args->upload_target_srl = $upload_target_srl;
 		$args->sort_index = $sortIndex;
-		if($ckValid) $args->isvalid = 'Y';
+		if ($ckValid) $args->isvalid = 'Y';
 		$output = executeQueryArray('file.getFiles', $args, $columnList);
-		if(!$output->data) return;
+		if (!$output->data) return;
 
 		$file_list = $output->data;
 
-		if($file_list && !is_array($file_list)) $file_list = array($file_list);
+		if ($file_list && !is_array($file_list)) $file_list = array($file_list);
 
 		foreach ($file_list as &$file)
 		{
@@ -284,14 +284,14 @@ 
 
 		$module_srl = Context::get('module_srl');
 		// Get the current module if module_srl doesn't exist
-		if(!$module_srl)
+		if (!$module_srl)
 		{
 			$current_module_info = Context::get('current_module_info');
 			$module_srl = $current_module_info->module_srl;
 		}
 		$file_config = $this->getFileConfig($module_srl);
 
-		if($logged_info->is_admin == 'Y')
+		if ($logged_info->is_admin == 'Y')
 		{
 			$iniPostMaxSize = FileHandler::returnbytes(ini_get('post_max_size'));
 			$iniUploadMaxSize = FileHandler::returnbytes(ini_get('upload_max_filesize'));
@@ -317,9 +317,9 @@ 
 			'%s : %s/ %s<br /> %s : %s (%s : %s)',
 			Context::getLang('allowed_attach_size'),
 			FileHandler::filesize($attached_size),
-			FileHandler::filesize($file_config->allowed_attach_size*1024*1024),
+			FileHandler::filesize($file_config->allowed_attach_size * 1024 * 1024),
 			Context::getLang('allowed_filesize'),
-			FileHandler::filesize($file_config->allowed_filesize*1024*1024),
+			FileHandler::filesize($file_config->allowed_filesize * 1024 * 1024),
 			Context::getLang('allowed_filetypes'),
 			$file_config->allowed_filetypes
 		);
@@ -346,9 +346,9 @@ 
 	 */
 	function getFileGrant($file_info, $member_info)
 	{
-		if(!$file_info) return null;
+		if (!$file_info) return null;
 
-		if($_SESSION['__XE_UPLOADING_FILES_INFO__'][$file_info->file_srl])
+		if ($_SESSION['__XE_UPLOADING_FILES_INFO__'][$file_info->file_srl])
 		{
 			$file_grant->is_deletable = true;
 			return $file_grant;
@@ -359,7 +359,7 @@ 
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($file_info->upload_target_srl);
-		if($oDocument->isExists()) $document_grant = $oDocument->isGranted();
+		if ($oDocument->isExists()) $document_grant = $oDocument->isGranted();
 
 		$file_grant->is_deletable = ($document_grant || $member_info->is_admin == 'Y' || $member_info->member_srl == $file_info->member_srl || $grant->manager);
 

modules/board/board.controller.php

Braces +47 added lines, -24 removed lines

@@ -36,26 +36,39 @@ 
 		// setup variables
 		$obj = Context::getRequestVars();
 		$obj->module_srl = $this->module_srl;
-		if($obj->is_notice!='Y'||!$this->grant->manager) $obj->is_notice = 'N';
+		if($obj->is_notice!='Y'||!$this->grant->manager) {
+			$obj->is_notice = 'N';
+		}
 		$obj->commentStatus = $obj->comment_status;
 
 		$oModuleModel = getModel('module');
 		$module_config = $oModuleModel->getModuleInfoByModuleSrl($obj->module_srl);
 		if($module_config->mobile_use_editor === 'Y')
 		{
-			if(!isset($obj->use_editor)) $obj->use_editor = 'Y';
-			if(!isset($obj->use_html)) $obj->use_html = 'Y';
-		}
-		else
+			if(!isset($obj->use_editor)) {
+				$obj->use_editor = 'Y';
+			}
+			if(!isset($obj->use_html)) {
+				$obj->use_html = 'Y';
+			}
+		} else
 		{
-			if(!isset($obj->use_editor)) $obj->use_editor = 'N';
-			if(!isset($obj->use_html)) $obj->use_html = 'N';
+			if(!isset($obj->use_editor)) {
+				$obj->use_editor = 'N';
+			}
+			if(!isset($obj->use_html)) {
+				$obj->use_html = 'N';
+			}
 		}
 
 		settype($obj->title, "string");
-		if($obj->title == '') $obj->title = cut_str(trim(strip_tags(nl2br($obj->content))),20,'...');
+		if($obj->title == '') {
+			$obj->title = cut_str(trim(strip_tags(nl2br($obj->content))),20,'...');
+		}
 		//setup dpcument title tp 'Untitled'
-		if($obj->title == '') $obj->title = 'Untitled';
+		if($obj->title == '') {
+			$obj->title = 'Untitled';
+		}
 
 		// unset document style if the user is not the document manager
 		if(!$this->grant->manager)
@@ -96,8 +109,7 @@ 
 			{
 				$oDocument->add('member_srl', $obj->member_srl);
 			}
-		}
-		else
+		} else
 		{
 			$bAnonymous = false;
 		}
@@ -169,7 +181,9 @@ 
 				for($i=0;$i<count($target_mail);$i++)
 				{
 					$email_address = trim($target_mail[$i]);
-					if(!$email_address) continue;
+					if(!$email_address) {
+						continue;
+					}
 					$oMail->setReceiptor($email_address, $email_address);
 					$oMail->send();
 				}
@@ -263,7 +277,9 @@ 
 		$obj = Context::getRequestVars();
 		$obj->module_srl = $this->module_srl;
 
-		if(!$this->module_info->use_status) $this->module_info->use_status = 'PUBLIC';
+		if(!$this->module_info->use_status) {
+			$this->module_info->use_status = 'PUBLIC';
+		}
 		if(!is_array($this->module_info->use_status))
 		{
 			$this->module_info->use_status = explode('|@|', $this->module_info->use_status);
@@ -272,8 +288,7 @@ 
 		if(in_array('SECRET', $this->module_info->use_status))
 		{
 			$this->module_info->secret = 'Y';
-		}
-		else
+		} else
 		{
 			unset($obj->is_secret);
 			$this->module_info->secret = 'N';
@@ -283,13 +298,20 @@ 
 		$module_config = $oModuleModel->getModuleInfoByModuleSrl($obj->module_srl);
 		if($module_config->mobile_use_editor === 'Y')
 		{
-			if(!isset($obj->use_editor)) $obj->use_editor = 'Y';
-			if(!isset($obj->use_html)) $obj->use_html = 'Y';
-		}
-		else
+			if(!isset($obj->use_editor)) {
+				$obj->use_editor = 'Y';
+			}
+			if(!isset($obj->use_html)) {
+				$obj->use_html = 'Y';
+			}
+		} else
 		{
-			if(!isset($obj->use_editor)) $obj->use_editor = 'N';
-			if(!isset($obj->use_html)) $obj->use_html = 'N';
+			if(!isset($obj->use_editor)) {
+				$obj->use_editor = 'N';
+			}
+			if(!isset($obj->use_html)) {
+				$obj->use_html = 'N';
+			}
 		}
 
 		// check if the doument is existed
@@ -309,8 +331,7 @@ 
 			$obj->email_address = $obj->homepage = $obj->user_id = '';
 			$obj->user_name = $obj->nick_name = 'anonymous';
 			$bAnonymous = true;
-		}
-		else
+		} else
 		{
 			$bAnonymous = false;
 		}
@@ -416,7 +437,9 @@ 
 		// generate trackback module controller object
 		$oTrackbackController = getController('trackback');
 
-		if(!$oTrackbackController) return;
+		if(!$oTrackbackController) {
+			return;
+		}
 
 		$output = $oTrackbackController->deleteTrackback($trackback_srl, $this->grant->manager);
 		if(!$output->toBool())

Spacing +74 added lines, -74 removed lines

@@ -23,11 +23,11 @@ 
 	function procBoardInsertDocument()
 	{
 		// check grant
-		if($this->module_info->module != "board")
+		if ($this->module_info->module != "board")
 		{
 			return new BaseObject(-1, "msg_invalid_request");
 		}
-		if(!$this->grant->write_document)
+		if (!$this->grant->write_document)
 		{
 			return new BaseObject(-1, 'msg_not_permitted');
 		}
@@ -36,29 +36,29 @@ 
 		// setup variables
 		$obj = Context::getRequestVars();
 		$obj->module_srl = $this->module_srl;
-		if($obj->is_notice!='Y'||!$this->grant->manager) $obj->is_notice = 'N';
+		if ($obj->is_notice != 'Y' || !$this->grant->manager) $obj->is_notice = 'N';
 		$obj->commentStatus = $obj->comment_status;
 
 		$oModuleModel = getModel('module');
 		$module_config = $oModuleModel->getModuleInfoByModuleSrl($obj->module_srl);
-		if($module_config->mobile_use_editor === 'Y')
+		if ($module_config->mobile_use_editor === 'Y')
 		{
-			if(!isset($obj->use_editor)) $obj->use_editor = 'Y';
-			if(!isset($obj->use_html)) $obj->use_html = 'Y';
+			if (!isset($obj->use_editor)) $obj->use_editor = 'Y';
+			if (!isset($obj->use_html)) $obj->use_html = 'Y';
 		}
 		else
 		{
-			if(!isset($obj->use_editor)) $obj->use_editor = 'N';
-			if(!isset($obj->use_html)) $obj->use_html = 'N';
+			if (!isset($obj->use_editor)) $obj->use_editor = 'N';
+			if (!isset($obj->use_html)) $obj->use_html = 'N';
 		}
 
 		settype($obj->title, "string");
-		if($obj->title == '') $obj->title = cut_str(trim(strip_tags(nl2br($obj->content))),20,'...');
+		if ($obj->title == '') $obj->title = cut_str(trim(strip_tags(nl2br($obj->content))), 20, '...');
 		//setup dpcument title tp 'Untitled'
-		if($obj->title == '') $obj->title = 'Untitled';
+		if ($obj->title == '') $obj->title = 'Untitled';
 
 		// unset document style if the user is not the document manager
-		if(!$this->grant->manager)
+		if (!$this->grant->manager)
 		{
 			unset($obj->title_color);
 			unset($obj->title_bold);
@@ -75,24 +75,24 @@ 
 
 		// update the document if it is existed
 		$is_update = false;
-		if($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl)
+		if ($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl)
 		{
 			$is_update = true;
 		}
 
 		// if use anonymous is true
-		if($this->module_info->use_anonymous == 'Y')
+		if ($this->module_info->use_anonymous == 'Y')
 		{
 			$this->module_info->admin_mail = '';
 			$obj->notify_message = 'N';
-			if($is_update===false)
+			if ($is_update === false)
 			{
-				$obj->member_srl = -1*$logged_info->member_srl;
+				$obj->member_srl = -1 * $logged_info->member_srl;
 			}
 			$obj->email_address = $obj->homepage = $obj->user_id = '';
 			$obj->user_name = $obj->nick_name = 'anonymous';
 			$bAnonymous = true;
-			if($is_update===false)
+			if ($is_update === false)
 			{
 				$oDocument->add('member_srl', $obj->member_srl);
 			}
@@ -102,10 +102,10 @@ 
 			$bAnonymous = false;
 		}
 
-		if($obj->is_secret == 'Y' || strtoupper($obj->status == 'SECRET'))
+		if ($obj->is_secret == 'Y' || strtoupper($obj->status == 'SECRET'))
 		{
 			$use_status = explode('|@|', $this->module_info->use_status);
-			if(!is_array($use_status) || !in_array('SECRET', $use_status))
+			if (!is_array($use_status) || !in_array('SECRET', $use_status))
 			{
 				unset($obj->is_secret);
 				$obj->status = 'PUBLIC';
@@ -113,24 +113,24 @@ 
 		}
 
 		// update the document if it is existed
-		if($is_update)
+		if ($is_update)
 		{
-			if(!$oDocument->isGranted())
+			if (!$oDocument->isGranted())
 			{
-				return new BaseObject(-1,'msg_not_permitted');
+				return new BaseObject(-1, 'msg_not_permitted');
 			}
 
-			if($this->module_info->use_anonymous == 'Y') {
+			if ($this->module_info->use_anonymous == 'Y') {
 				$obj->member_srl = abs($oDocument->get('member_srl')) * -1;
 				$oDocument->add('member_srl', $obj->member_srl);
 			}
 
-			if($this->module_info->protect_content=="Y" && $oDocument->get('comment_count')>0 && $this->grant->manager==false)
+			if ($this->module_info->protect_content == "Y" && $oDocument->get('comment_count') > 0 && $this->grant->manager == false)
 			{
-				return new BaseObject(-1,'msg_protect_content');
+				return new BaseObject(-1, 'msg_protect_content');
 			}
 
-			if(!$this->grant->manager)
+			if (!$this->grant->manager)
 			{
 				// notice & document style same as before if not manager
 				$obj->is_notice = $oDocument->get('is_notice');
@@ -139,7 +139,7 @@ 
 			}
 			
 			// modify list_order if document status is temp
-			if($oDocument->get('status') == 'TEMP')
+			if ($oDocument->get('status') == 'TEMP')
 			{
 				$obj->last_update = $obj->regdate = date('YmdHis');
 				$obj->update_order = $obj->list_order = (getNextSequence() * -1);
@@ -155,21 +155,21 @@ 
 			$obj->document_srl = $output->get('document_srl');
 
 			// send an email to admin user
-			if($output->toBool() && $this->module_info->admin_mail)
+			if ($output->toBool() && $this->module_info->admin_mail)
 			{
 				$oModuleModel = getModel('module');
 				$member_config = $oModuleModel->getModuleConfig('member');
 				
 				$oMail = new Mail();
 				$oMail->setTitle($obj->title);
-				$oMail->setContent( sprintf("From : <a href=\"%s\">%s</a><br/>\r\n%s", getFullUrl('','document_srl',$obj->document_srl), getFullUrl('','document_srl',$obj->document_srl), $obj->content));
+				$oMail->setContent(sprintf("From : <a href=\"%s\">%s</a><br/>\r\n%s", getFullUrl('', 'document_srl', $obj->document_srl), getFullUrl('', 'document_srl', $obj->document_srl), $obj->content));
 				$oMail->setSender($obj->user_name ? $obj->user_name : 'anonymous', $obj->email_address ? $obj->email_address : $member_config->webmaster_email);
 
-				$target_mail = explode(',',$this->module_info->admin_mail);
-				for($i=0;$i<count($target_mail);$i++)
+				$target_mail = explode(',', $this->module_info->admin_mail);
+				for ($i = 0; $i < count($target_mail); $i++)
 				{
 					$email_address = trim($target_mail[$i]);
-					if(!$email_address) continue;
+					if (!$email_address) continue;
 					$oMail->setReceiptor($email_address, $email_address);
 					$oMail->send();
 				}
@@ -177,7 +177,7 @@ 
 		}
 
 		// if there is an error
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -187,7 +187,7 @@ 
 		$this->add('document_srl', $output->get('document_srl'));
 
 		// alert a message
-		if(Context::get('xeVirtualRequestMethod') !== 'xml')
+		if (Context::get('xeVirtualRequestMethod') !== 'xml')
 		{
 			$this->setMessage($msg_code);
 		}
@@ -202,7 +202,7 @@ 
 		$document_srl = Context::get('document_srl');
 
 		// if the document is not existed
-		if(!$document_srl)
+		if (!$document_srl)
 		{
 			return $this->doError('msg_invalid_document');
 		}
@@ -210,7 +210,7 @@ 
 		$oDocumentModel = &getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
 		// check protect content
-		if($this->module_info->protect_content=="Y" && $oDocument->get('comment_count')>0 && $this->grant->manager==false)
+		if ($this->module_info->protect_content == "Y" && $oDocument->get('comment_count') > 0 && $this->grant->manager == false)
 		{
 			return new BaseObject(-1, 'msg_protect_content');
 		}
@@ -220,7 +220,7 @@ 
 
 		// delete the document
 		$output = $oDocumentController->deleteDocument($document_srl, $this->grant->manager);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -229,7 +229,7 @@ 
 		$this->setRedirectUrl(getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '', 'page', Context::get('page'), 'document_srl', ''));
 		$this->add('mid', Context::get('mid'));
 		$this->add('page', Context::get('page'));
-		if(Context::get('xeVirtualRequestMethod') !== 'xml')
+		if (Context::get('xeVirtualRequestMethod') !== 'xml')
 		{
 			$this->setMessage('success_deleted');
 		}
@@ -253,7 +253,7 @@ 
 	function procBoardInsertComment()
 	{
 		// check grant
-		if(!$this->grant->write_comment)
+		if (!$this->grant->write_comment)
 		{
 			return new BaseObject(-1, 'msg_not_permitted');
 		}
@@ -263,13 +263,13 @@ 
 		$obj = Context::getRequestVars();
 		$obj->module_srl = $this->module_srl;
 
-		if(!$this->module_info->use_status) $this->module_info->use_status = 'PUBLIC';
-		if(!is_array($this->module_info->use_status))
+		if (!$this->module_info->use_status) $this->module_info->use_status = 'PUBLIC';
+		if (!is_array($this->module_info->use_status))
 		{
 			$this->module_info->use_status = explode('|@|', $this->module_info->use_status);
 		}
 
-		if(in_array('SECRET', $this->module_info->use_status))
+		if (in_array('SECRET', $this->module_info->use_status))
 		{
 			$this->module_info->secret = 'Y';
 		}
@@ -281,31 +281,31 @@ 
 
 		$oModuleModel = getModel('module');
 		$module_config = $oModuleModel->getModuleInfoByModuleSrl($obj->module_srl);
-		if($module_config->mobile_use_editor === 'Y')
+		if ($module_config->mobile_use_editor === 'Y')
 		{
-			if(!isset($obj->use_editor)) $obj->use_editor = 'Y';
-			if(!isset($obj->use_html)) $obj->use_html = 'Y';
+			if (!isset($obj->use_editor)) $obj->use_editor = 'Y';
+			if (!isset($obj->use_html)) $obj->use_html = 'Y';
 		}
 		else
 		{
-			if(!isset($obj->use_editor)) $obj->use_editor = 'N';
-			if(!isset($obj->use_html)) $obj->use_html = 'N';
+			if (!isset($obj->use_editor)) $obj->use_editor = 'N';
+			if (!isset($obj->use_html)) $obj->use_html = 'N';
 		}
 
 		// check if the doument is existed
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($obj->document_srl);
-		if(!$oDocument->isExists())
+		if (!$oDocument->isExists())
 		{
-			return new BaseObject(-1,'msg_not_founded');
+			return new BaseObject(-1, 'msg_not_founded');
 		}
 
 		// For anonymous use, remove writer's information and notifying information
-		if($this->module_info->use_anonymous == 'Y')
+		if ($this->module_info->use_anonymous == 'Y')
 		{
 			$this->module_info->admin_mail = '';
 			$obj->notify_message = 'N';
-			$obj->member_srl = -1*$logged_info->member_srl;
+			$obj->member_srl = -1 * $logged_info->member_srl;
 			$obj->email_address = $obj->homepage = $obj->user_id = '';
 			$obj->user_name = $obj->nick_name = 'anonymous';
 			$bAnonymous = true;
@@ -323,7 +323,7 @@ 
 
 		// check the comment is existed
 		// if the comment is not existed, then generate a new sequence
-		if(!$obj->comment_srl)
+		if (!$obj->comment_srl)
 		{
 			$obj->comment_srl = getNextSequence();
 		} else {
@@ -331,14 +331,14 @@ 
 		}
 
 		// if comment_srl is not existed, then insert the comment
-		if($comment->comment_srl != $obj->comment_srl)
+		if ($comment->comment_srl != $obj->comment_srl)
 		{
 
 			// parent_srl is existed
-			if($obj->parent_srl)
+			if ($obj->parent_srl)
 			{
 				$parent_comment = $oCommentModel->getComment($obj->parent_srl);
-				if(!$parent_comment->comment_srl)
+				if (!$parent_comment->comment_srl)
 				{
 					return new BaseObject(-1, 'msg_invalid_request');
 				}
@@ -352,9 +352,9 @@ 
 		// update the comment if it is not existed
 		} else {
 			// check the grant
-			if(!$comment->isGranted())
+			if (!$comment->isGranted())
 			{
-				return new BaseObject(-1,'msg_not_permitted');
+				return new BaseObject(-1, 'msg_not_permitted');
 			}
 
 			$obj->parent_srl = $comment->parent_srl;
@@ -362,12 +362,12 @@ 
 			$comment_srl = $obj->comment_srl;
 		}
 
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
-		if(Context::get('xeVirtualRequestMethod') !== 'xml')
+		if (Context::get('xeVirtualRequestMethod') !== 'xml')
 		{
 			$this->setMessage('success_registed');
 		}
@@ -383,7 +383,7 @@ 
 	{
 		// get the comment_srl
 		$comment_srl = Context::get('comment_srl');
-		if(!$comment_srl)
+		if (!$comment_srl)
 		{
 			return $this->doError('msg_invalid_request');
 		}
@@ -392,7 +392,7 @@ 
 		$oCommentController = getController('comment');
 
 		$output = $oCommentController->deleteComment($comment_srl, $this->grant->manager);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -400,7 +400,7 @@ 
 		$this->add('mid', Context::get('mid'));
 		$this->add('page', Context::get('page'));
 		$this->add('document_srl', $output->get('document_srl'));
-		if(Context::get('xeVirtualRequestMethod') !== 'xml')
+		if (Context::get('xeVirtualRequestMethod') !== 'xml')
 		{
 			$this->setMessage('success_deleted');
 		}
@@ -416,10 +416,10 @@ 
 		// generate trackback module controller object
 		$oTrackbackController = getController('trackback');
 
-		if(!$oTrackbackController) return;
+		if (!$oTrackbackController) return;
 
 		$output = $oTrackbackController->deleteTrackback($trackback_srl, $this->grant->manager);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -427,7 +427,7 @@ 
 		$this->add('mid', Context::get('mid'));
 		$this->add('page', Context::get('page'));
 		$this->add('document_srl', $output->get('document_srl'));
-		if(Context::get('xeVirtualRequestMethod') !== 'xml')
+		if (Context::get('xeVirtualRequestMethod') !== 'xml')
 		{
 			$this->setMessage('success_deleted');
 		}
@@ -446,18 +446,18 @@ 
 		$oMemberModel = getModel('member');
 
 		// if the comment exists
-		if($comment_srl)
+		if ($comment_srl)
 		{
 			// get the comment information
 			$oCommentModel = getModel('comment');
 			$oComment = $oCommentModel->getComment($comment_srl);
-			if(!$oComment->isExists())
+			if (!$oComment->isExists())
 			{
 				return new BaseObject(-1, 'msg_invalid_request');
 			}
 
 			// compare the comment password and the user input password
-			if(!$oMemberModel->isValidPassword($oComment->get('password'),$password))
+			if (!$oMemberModel->isValidPassword($oComment->get('password'), $password))
 			{
 				return new BaseObject(-1, 'msg_invalid_password');
 			}
@@ -467,13 +467,13 @@ 
 			 // get the document information
 			$oDocumentModel = getModel('document');
 			$oDocument = $oDocumentModel->getDocument($document_srl);
-			if(!$oDocument->isExists())
+			if (!$oDocument->isExists())
 			{
 				return new BaseObject(-1, 'msg_invalid_request');
 			}
 
 			// compare the document password and the user input password
-			if(!$oMemberModel->isValidPassword($oDocument->get('password'),$password))
+			if (!$oMemberModel->isValidPassword($oDocument->get('password'), $password))
 			{
 				return new BaseObject(-1, 'msg_invalid_password');
 			}
@@ -490,7 +490,7 @@ 
 		$member_srl = Context::get('target_srl');
 		$mid = Context::get('cur_mid');
 
-		if(!$member_srl || !$mid)
+		if (!$member_srl || !$mid)
 		{
 			return new BaseObject();
 		}
@@ -502,13 +502,13 @@ 
 		$columnList = array('module');
 		$cur_module_info = $oModuleModel->getModuleInfoByMid($mid, 0, $columnList);
 
-		if($cur_module_info->module != 'board')
+		if ($cur_module_info->module != 'board')
 		{
 			return new BaseObject();
 		}
 
 		// get the member information
-		if($member_srl == $logged_info->member_srl)
+		if ($member_srl == $logged_info->member_srl)
 		{
 			$member_info = $logged_info;
 		} else {
@@ -516,13 +516,13 @@ 
 			$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
 		}
 
-		if(!$member_info->user_id)
+		if (!$member_info->user_id)
 		{
 			return new BaseObject();
 		}
 
 		//search
-		$url = getUrl('','mid',$mid,'search_target','nick_name','search_keyword',$member_info->nick_name);
+		$url = getUrl('', 'mid', $mid, 'search_target', 'nick_name', 'search_keyword', $member_info->nick_name);
 		$oMemberController = getController('member');
 		$oMemberController->addMemberPopupMenu($url, 'cmd_view_own_document', '');
 

modules/admin/admin.admin.model.php

Indentation +4 added lines, -4 removed lines

@@ -956,10 +956,10 @@
 
 		$file_exsit = FileHandler::readFile(_XE_PATH_ . 'files/attach/xeicon/' . $virtual_site . $iconname);
 		if(!$file_exsit && $default === true)
-        {
-            $icon_url = './modules/admin/tpl/img/' . $default_icon_name;
-        }
-        elseif($file_exsit)
+		{
+			$icon_url = './modules/admin/tpl/img/' . $default_icon_name;
+		}
+		elseif($file_exsit)
 		{
 			$default_url = Context::getDefaultUrl();
 			if($default_url && substr_compare($default_url, '/', -1) === 0) $default_url = substr($default_url, 0, -1);

Doc Comments +6 added lines

@@ -867,6 +867,7 @@ 
 	 * Returns a list of all sites that contain modules
 	 * For each site domain and site_srl are retrieved
 	 *
+	 * @param string $domain
 	 * @return array
 	 */
 	function getAllSitesThatHaveModules($domain = NULL)
@@ -945,6 +946,11 @@ 
 		return $this->iconUrlCheck('mobicon.png', 'mobiconSample.png', $default);
 	}
 
+	/**
+	 * @param string $iconname
+	 * @param string $default_icon_name
+	 * @param boolean $default
+	 */
 	function iconUrlCheck($iconname, $default_icon_name, $default)
 	{
 		$site_info = Context::get('site_module_info');

Spacing +141 added lines, -141 removed lines

@@ -30,18 +30,18 @@ 
 	{
 		$ftp_info = Context::getRequestVars();
 
-		if(!$ftp_info->ftp_host)
+		if (!$ftp_info->ftp_host)
 		{
 			$ftp_info->ftp_host = "127.0.0.1";
 		}
 
-		if(!$ftp_info->ftp_port || !is_numeric($ftp_info->ftp_port))
+		if (!$ftp_info->ftp_port || !is_numeric($ftp_info->ftp_port))
 		{
 			$ftp_info->ftp_port = '22';
 		}
 
 		$connection = ssh2_connect($ftp_info->ftp_host, $ftp_info->ftp_port);
-		if(!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
+		if (!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
 		{
 			return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 		}
@@ -58,29 +58,29 @@ 
 		$path_candidate = array();
 
 		$temp = '';
-		foreach($path_info as $path)
+		foreach ($path_info as $path)
 		{
-			$temp = '/' . $path . $temp;
+			$temp = '/'.$path.$temp;
 			$path_candidate[] = $temp;
 		}
 
 		// try
-		foreach($path_candidate as $path)
+		foreach ($path_candidate as $path)
 		{
 			// upload check file
-			if(!@ssh2_scp_send($connection, FileHandler::getRealPath('./files/cache/ftp_check'), $path . 'ftp_check.html'))
+			if (!@ssh2_scp_send($connection, FileHandler::getRealPath('./files/cache/ftp_check'), $path.'ftp_check.html'))
 			{
 				continue;
 			}
 
 			// get check file
-			$result = FileHandler::getRemoteResource(getNotencodedFullUrl() . 'ftp_check.html');
+			$result = FileHandler::getRemoteResource(getNotencodedFullUrl().'ftp_check.html');
 
 			// delete temp check file
-			@ssh2_sftp_unlink($sftp, $path . 'ftp_check.html');
+			@ssh2_sftp_unlink($sftp, $path.'ftp_check.html');
 
 			// found
-			if($result == $pin)
+			if ($result == $pin)
 			{
 				$found_path = $path;
 				break;
@@ -89,7 +89,7 @@ 
 
 		FileHandler::removeFile('./files/cache/ftp_check', $pin);
 
-		if($found_path)
+		if ($found_path)
 		{
 			$this->add('found_path', $found_path);
 		}
@@ -99,24 +99,24 @@ 
 	{
 		$ftp_info = Context::getRequestVars();
 
-		if(!$ftp_info->ftp_host)
+		if (!$ftp_info->ftp_host)
 		{
 			$ftp_info->ftp_host = "127.0.0.1";
 		}
 
-		if(!$ftp_info->ftp_port || !is_numeric($ftp_info->ftp_port))
+		if (!$ftp_info->ftp_port || !is_numeric($ftp_info->ftp_port))
 		{
 			$ftp_info->ftp_port = '22';
 		}
 
 		$connection = ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port);
-		if(!$connection)
+		if (!$connection)
 		{
 			return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
 		}
 
 		$login_result = @ftp_login($connection, $ftp_info->ftp_user, $ftp_info->ftp_password);
-		if(!$login_result)
+		if (!$login_result)
 		{
 			ftp_close($connection);
 			return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
@@ -133,29 +133,29 @@ 
 		$path_candidate = array();
 
 		$temp = '';
-		foreach($path_info as $path)
+		foreach ($path_info as $path)
 		{
-			$temp = '/' . $path . $temp;
+			$temp = '/'.$path.$temp;
 			$path_candidate[] = $temp;
 		}
 
 		// try
-		foreach($path_candidate as $path)
+		foreach ($path_candidate as $path)
 		{
 			// upload check file
-			if(!ftp_put($connection, $path . 'ftp_check.html', FileHandler::getRealPath('./files/cache/ftp_check'), FTP_BINARY))
+			if (!ftp_put($connection, $path.'ftp_check.html', FileHandler::getRealPath('./files/cache/ftp_check'), FTP_BINARY))
 			{
 				continue;
 			}
 
 			// get check file
-			$result = FileHandler::getRemoteResource(getNotencodedFullUrl() . 'ftp_check.html');
+			$result = FileHandler::getRemoteResource(getNotencodedFullUrl().'ftp_check.html');
 
 			// delete temp check file
-			ftp_delete($connection, $path . 'ftp_check.html');
+			ftp_delete($connection, $path.'ftp_check.html');
 
 			// found
-			if($result == $pin)
+			if ($result == $pin)
 			{
 				$found_path = $path;
 				break;
@@ -164,7 +164,7 @@ 
 
 		FileHandler::removeFile('./files/cache/ftp_check', $pin);
 
-		if($found_path)
+		if ($found_path)
 		{
 			$this->add('found_path', $found_path);
 		}
@@ -175,39 +175,39 @@ 
 	 */
 	function getAdminFTPPath()
 	{
-		Context::loadLang(_XE_PATH_ . 'modules/autoinstall/lang');
+		Context::loadLang(_XE_PATH_.'modules/autoinstall/lang');
 		@set_time_limit(5);
-		require_once(_XE_PATH_ . 'libs/ftp.class.php');
+		require_once(_XE_PATH_.'libs/ftp.class.php');
 
 		$ftp_info = Context::getRequestVars();
 
-		if(!$ftp_info->ftp_user || !$ftp_info->ftp_password)
+		if (!$ftp_info->ftp_user || !$ftp_info->ftp_password)
 		{
 			return new BaseObject(1, 'msg_ftp_invalid_auth_info');
 		}
 
-		if(!$ftp_info->ftp_host)
+		if (!$ftp_info->ftp_host)
 		{
 			$ftp_info->ftp_host = '127.0.0.1';
 		}
 
-		if(!$ftp_info->ftp_port || !is_numeric($ftp_info->ftp_port))
+		if (!$ftp_info->ftp_port || !is_numeric($ftp_info->ftp_port))
 		{
 			$ftp_info->ftp_port = '21';
 		}
 
-		if($ftp_info->sftp == 'Y')
+		if ($ftp_info->sftp == 'Y')
 		{
-			if(!function_exists('ssh2_sftp'))
+			if (!function_exists('ssh2_sftp'))
 			{
 				return new BaseObject(-1, 'disable_sftp_support');
 			}
 			return $this->getSFTPPath();
 		}
 
-		if($ftp_info->ftp_pasv == 'N')
+		if ($ftp_info->ftp_pasv == 'N')
 		{
-			if(function_exists('ftp_connect'))
+			if (function_exists('ftp_connect'))
 			{
 				return $this->getFTPPath();
 			}
@@ -215,12 +215,12 @@ 
 		}
 
 		$oFTP = new ftp();
-		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 new BaseObject(1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
 		}
 
-		if(!$oFTP->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
+		if (!$oFTP->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 		{
 			return new BaseObject(1, 'msg_ftp_invalid_auth_info');
 		}
@@ -236,29 +236,29 @@ 
 		$path_candidate = array();
 
 		$temp = '';
-		foreach($path_info as $path)
+		foreach ($path_info as $path)
 		{
-			$temp = '/' . $path . $temp;
+			$temp = '/'.$path.$temp;
 			$path_candidate[] = $temp;
 		}
 
 		// try
-		foreach($path_candidate as $path)
+		foreach ($path_candidate as $path)
 		{
 			// upload check file
-			if(!$oFTP->ftp_put($path . 'ftp_check.html', FileHandler::getRealPath('./files/cache/ftp_check')))
+			if (!$oFTP->ftp_put($path.'ftp_check.html', FileHandler::getRealPath('./files/cache/ftp_check')))
 			{
 				continue;
 			}
 
 			// get check file
-			$result = FileHandler::getRemoteResource(getNotencodedFullUrl() . 'ftp_check.html');
+			$result = FileHandler::getRemoteResource(getNotencodedFullUrl().'ftp_check.html');
 
 			// delete temp check file
-			$oFTP->ftp_delete($path . 'ftp_check.html');
+			$oFTP->ftp_delete($path.'ftp_check.html');
 
 			// found
-			if($result == $pin)
+			if ($result == $pin)
 			{
 				$found_path = $path;
 				break;
@@ -267,7 +267,7 @@ 
 
 		FileHandler::removeFile('./files/cache/ftp_check', $pin);
 
-		if($found_path)
+		if ($found_path)
 		{
 			$this->add('found_path', $found_path);
 		}
@@ -280,27 +280,27 @@ 
 	function getSFTPList()
 	{
 		$ftp_info = Context::getRequestVars();
-		if(!$ftp_info->ftp_host)
+		if (!$ftp_info->ftp_host)
 		{
 			$ftp_info->ftp_host = "127.0.0.1";
 		}
 		$connection = ssh2_connect($ftp_info->ftp_host, $ftp_info->ftp_port);
-		if(!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
+		if (!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
 		{
 			return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 		}
 
 		$sftp = ssh2_sftp($connection);
-		$curpwd = "ssh2.sftp://$sftp" . $this->pwd;
+		$curpwd = "ssh2.sftp://$sftp".$this->pwd;
 		$dh = @opendir($curpwd);
-		if(!$dh)
+		if (!$dh)
 		{
 			return new BaseObject(-1, 'msg_ftp_invalid_path');
 		}
 		$list = array();
-		while(($file = readdir($dh)) !== FALSE)
+		while (($file = readdir($dh)) !== FALSE)
 		{
-			if(is_dir($curpwd . $file))
+			if (is_dir($curpwd.$file))
 			{
 				$file .= "/";
 			}
@@ -320,32 +320,32 @@ 
 	 */
 	function getAdminFTPList()
 	{
-		Context::loadLang(_XE_PATH_ . 'modules/autoinstall/lang');
+		Context::loadLang(_XE_PATH_.'modules/autoinstall/lang');
 		@set_time_limit(5);
 
-		require_once(_XE_PATH_ . 'libs/ftp.class.php');
+		require_once(_XE_PATH_.'libs/ftp.class.php');
 
 		$ftp_info = Context::getRequestVars();
-		if(!$ftp_info->ftp_user || !$ftp_info->ftp_password)
+		if (!$ftp_info->ftp_user || !$ftp_info->ftp_password)
 		{
 			return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 		}
 
 		$this->pwd = $ftp_info->ftp_root_path;
 
-		if(!$ftp_info->ftp_host)
+		if (!$ftp_info->ftp_host)
 		{
 			$ftp_info->ftp_host = "127.0.0.1";
 		}
 
-		if(!$ftp_info->ftp_port || !is_numeric($ftp_info->ftp_port))
+		if (!$ftp_info->ftp_port || !is_numeric($ftp_info->ftp_port))
 		{
 			$ftp_info->ftp_port = "21";
 		}
 
-		if($ftp_info->sftp == 'Y')
+		if ($ftp_info->sftp == 'Y')
 		{
-			if(!function_exists('ssh2_sftp'))
+			if (!function_exists('ssh2_sftp'))
 			{
 				return new BaseObject(-1, 'disable_sftp_support');
 			}
@@ -353,9 +353,9 @@ 
 		}
 
 		$oFtp = new ftp();
-		if($oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port))
+		if ($oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port))
 		{
-			if($oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
+			if ($oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
 				$_list = $oFtp->ftp_rawlist($this->pwd);
 				$oFtp->ftp_quit();
@@ -367,17 +367,17 @@ 
 		}
 		$list = array();
 
-		if($_list)
+		if ($_list)
 		{
-			foreach($_list as $k => $v)
+			foreach ($_list as $k => $v)
 			{
 				$src = new stdClass();
 				$src->data = $v;
 				$res = Context::convertEncoding($src);
 				$v = $res->data;
-				if(strpos($v, 'd') === 0 || strpos($v, '<DIR>'))
+				if (strpos($v, 'd') === 0 || strpos($v, '<DIR>'))
 				{
-					$list[] = substr(strrchr($v, ' '), 1) . '/';
+					$list[] = substr(strrchr($v, ' '), 1).'/';
 				}
 			}
 		}
@@ -400,7 +400,7 @@ 
 			, 'module' => array('addon', 'admin', 'autoinstall', 'comment', 'communication', 'counter', 'document', 'editor', 'file', 'importer', 'install', 'integration_search', 'layout', 'member', 'menu', 'message', 'module', 'opage', 'page', 'point', 'poll', 'rss', 'session', 'spamfilter', 'tag', 'trackback', 'trash', 'widget')
 			, 'addon' => array('autolink', 'blogapi', 'captcha', 'counter', 'member_communication', 'member_extra_info', 'mobile', 'openid_delegation_id', 'point_level_icon', 'resize_image')
 			, 'layout' => array('default')
-			, 'widget' => array('content', 'language_select', 'login_info','mcontent')
+			, 'widget' => array('content', 'language_select', 'login_info', 'mcontent')
 			, 'widgetstyle' => array(),
 		);
 		$info = array();
@@ -420,86 +420,86 @@ 
 		$info['use_ssl'] = $db_info->use_ssl;
 		
 		$info['phpext'] = '';
-		foreach(get_loaded_extensions() as $ext)
+		foreach (get_loaded_extensions() as $ext)
 		{
 			$ext = strtolower($ext);
-			if(in_array($ext, $skip['ext']))
+			if (in_array($ext, $skip['ext']))
 			{
 				continue;
 			}
-			$info['phpext'] .= '|' . $ext;
+			$info['phpext'] .= '|'.$ext;
 		}
 		$info['phpext'] = substr($info['phpext'], 1);
 
 		$info['module'] = '';
 		$oModuleModel = getModel('module');
 		$module_list = $oModuleModel->getModuleList();
-		if($module_list) foreach($module_list as $module)
+		if ($module_list) foreach ($module_list as $module)
 		{
-			if(in_array($module->module, $skip['module']))
+			if (in_array($module->module, $skip['module']))
 			{
 				continue;
 			}
-			$info['module'] .= '|' . $module->module;
+			$info['module'] .= '|'.$module->module;
 		}
 		$info['module'] = substr($info['module'], 1);
 
 		$info['addon'] = '';
 		$oAddonAdminModel = getAdminModel('addon');
 		$addon_list = $oAddonAdminModel->getAddonList();
-		if($addon_list) foreach($addon_list as $addon)
+		if ($addon_list) foreach ($addon_list as $addon)
 		{
-			if(in_array($addon->addon, $skip['addon']))
+			if (in_array($addon->addon, $skip['addon']))
 			{
 				continue;
 			}
-			$info['addon'] .= '|' . $addon->addon;
+			$info['addon'] .= '|'.$addon->addon;
 		}
 		$info['addon'] = substr($info['addon'], 1);
 
 		$info['layout'] = "";
 		$oLayoutModel = getModel('layout');
 		$layout_list = $oLayoutModel->getDownloadedLayoutList();
-		if($layout_list) foreach($layout_list as $layout)
+		if ($layout_list) foreach ($layout_list as $layout)
 		{
-			if(in_array($layout->layout, $skip['layout']))
+			if (in_array($layout->layout, $skip['layout']))
 			{
 				continue;
 			}
-			$info['layout'] .= '|' . $layout->layout;
+			$info['layout'] .= '|'.$layout->layout;
 		}
 		$info['layout'] = substr($info['layout'], 1);
 
 		$info['widget'] = "";
 		$oWidgetModel = getModel('widget');
 		$widget_list = $oWidgetModel->getDownloadedWidgetList();
-		if($widget_list) foreach($widget_list as $widget)
+		if ($widget_list) foreach ($widget_list as $widget)
 		{
-			if(in_array($widget->widget, $skip['widget']))
+			if (in_array($widget->widget, $skip['widget']))
 			{
 				continue;
 			}
-			$info['widget'] .= '|' . $widget->widget;
+			$info['widget'] .= '|'.$widget->widget;
 		}
 		$info['widget'] = substr($info['widget'], 1);
 
 		$info['widgetstyle'] = "";
 		$oWidgetModel = getModel('widget');
 		$widgetstyle_list = $oWidgetModel->getDownloadedWidgetStyleList();
-		if($widgetstyle_list) foreach($widgetstyle_list as $widgetstyle)
+		if ($widgetstyle_list) foreach ($widgetstyle_list as $widgetstyle)
 		{
-			if(in_array($widgetstyle->widgetStyle, $skip['widgetstyle']))
+			if (in_array($widgetstyle->widgetStyle, $skip['widgetstyle']))
 			{
 				continue;
 			}
-			$info['widgetstyle'] .= '|' . $widgetstyle->widgetStyle;
+			$info['widgetstyle'] .= '|'.$widgetstyle->widgetStyle;
 		}
 		$info['widgetstyle'] = substr($info['widgetstyle'], 1);
 
 		$param = '';
-		foreach($info as $k => $v)
+		foreach ($info as $k => $v)
 		{
-			if($v)
+			if ($v)
 			{
 				$param .= sprintf('&%s=%s', $k, urlencode($v));
 			}
@@ -515,13 +515,13 @@ 
 	 */
 	function getThemeList()
 	{
-		$path = _XE_PATH_ . 'themes';
+		$path = _XE_PATH_.'themes';
 		$list = FileHandler::readDir($path);
 
 		$theme_info = array();
-		if(count($list) > 0)
+		if (count($list) > 0)
 		{
-			foreach($list as $val)
+			foreach ($list as $val)
 			{
 				$theme_info[$val] = $this->getThemeInfo($val);
 			}
@@ -538,20 +538,20 @@ 
 	 */
 	function getThemeInfo($theme_name, $layout_list = NULL)
 	{
-		if($GLOBALS['__ThemeInfo__'][$theme_name])
+		if ($GLOBALS['__ThemeInfo__'][$theme_name])
 		{
 			return $GLOBALS['__ThemeInfo__'][$theme_name];
 		}
 
-		$info_file = _XE_PATH_ . 'themes/' . $theme_name . '/conf/info.xml';
-		if(!file_exists($info_file))
+		$info_file = _XE_PATH_.'themes/'.$theme_name.'/conf/info.xml';
+		if (!file_exists($info_file))
 		{
 			return;
 		}
 
 		$oXmlParser = new XmlParser();
 		$_xml_obj = $oXmlParser->loadXmlFile($info_file);
-		if(!$_xml_obj->theme)
+		if (!$_xml_obj->theme)
 		{
 			return;
 		}
@@ -562,16 +562,16 @@ 
 		$theme_info = new stdClass();
 		$theme_info->name = $theme_name;
 		$theme_info->title = $xml_obj->title->body;
-		$thumbnail = './themes/' . $theme_name . '/thumbnail.png';
+		$thumbnail = './themes/'.$theme_name.'/thumbnail.png';
 		$theme_info->thumbnail = (FileHandler::exists($thumbnail)) ? $thumbnail : NULL;
 		$theme_info->version = $xml_obj->version->body;
 		$date_obj = new stdClass();
 		sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
 		$theme_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
 		$theme_info->description = $xml_obj->description->body;
-		$theme_info->path = './themes/' . $theme_name . '/';
+		$theme_info->path = './themes/'.$theme_name.'/';
 
-		if(!is_array($xml_obj->publisher))
+		if (!is_array($xml_obj->publisher))
 		{
 			$publisher_list = array();
 			$publisher_list[] = $xml_obj->publisher;
@@ -582,7 +582,7 @@ 
 		}
 
 		$theme_info->publisher = array();
-		foreach($publisher_list as $publisher)
+		foreach ($publisher_list as $publisher)
 		{
 			$publisher_obj = new stdClass();
 			$publisher_obj->name = $publisher->name->body;
@@ -595,10 +595,10 @@ 
 		$layout_path = $layout->directory->attrs->path;
 		$layout_parse = explode('/', $layout_path);
 		$layout_info = new stdClass();
-		switch($layout_parse[1])
+		switch ($layout_parse[1])
 		{
 			case 'themes' :
-					$layout_info->name = $theme_name . '|@|' . $layout_parse[count($layout_parse) - 1];
+					$layout_info->name = $theme_name.'|@|'.$layout_parse[count($layout_parse) - 1];
 					break;
 
 			case 'layouts' :
@@ -615,11 +615,11 @@ 
 		$oLayoutModel = getModel('layout');
 		$layout_info_list = array();
 		$layout_list = $oLayoutModel->getLayoutList($site_info->site_srl);
-		if($layout_list)
+		if ($layout_list)
 		{
-			foreach($layout_list as $val)
+			foreach ($layout_list as $val)
 			{
-				if($val->layout == $layout_info->name)
+				if ($val->layout == $layout_info->name)
 				{
 					$is_new_layout = FALSE;
 					$layout_info->layout_srl = $val->layout_srl;
@@ -628,7 +628,7 @@ 
 			}
 		}
 
-		if($is_new_layout)
+		if ($is_new_layout)
 		{
 			$site_module_info = Context::get('site_module_info');
 			$args = new stdClass();
@@ -646,7 +646,7 @@ 
 		$theme_info->layout_info = $layout_info;
 
 		$skin_infos = $xml_obj->skininfos;
-		if(is_array($skin_infos->skininfo))
+		if (is_array($skin_infos->skininfo))
 		{
 			$skin_list = $skin_infos->skininfo;
 		}
@@ -657,17 +657,17 @@ 
 
 		$oModuleModel = getModel('module');
 		$skins = array();
-		foreach($skin_list as $val)
+		foreach ($skin_list as $val)
 		{
 			$skin_info = new stdClass();
 			unset($skin_parse);
 			$skin_parse = explode('/', $val->directory->attrs->path);
-			switch($skin_parse[1])
+			switch ($skin_parse[1])
 			{
 				case 'themes' :
 						$is_theme = TRUE;
 						$module_name = $skin_parse[count($skin_parse) - 1];
-						$skin_info->name = $theme_name . '|@|' . $module_name;
+						$skin_info->name = $theme_name.'|@|'.$module_name;
 						break;
 
 				case 'modules' :
@@ -681,9 +681,9 @@ 
 			$skin_info->is_theme = $is_theme;
 			$skins[$module_name] = $skin_info;
 
-			if($is_theme)
+			if ($is_theme)
 			{
-				if(!$GLOBALS['__ThemeModuleSkin__'][$module_name])
+				if (!$GLOBALS['__ThemeModuleSkin__'][$module_name])
 				{
 					$GLOBALS['__ThemeModuleSkin__'][$module_name] = array();
 					$GLOBALS['__ThemeModuleSkin__'][$module_name]['skins'] = array();
@@ -705,7 +705,7 @@ 
 	 */
 	function getModulesSkinList()
 	{
-		if($GLOBALS['__ThemeModuleSkin__']['__IS_PARSE__'])
+		if ($GLOBALS['__ThemeModuleSkin__']['__IS_PARSE__'])
 		{
 			return $GLOBALS['__ThemeModuleSkin__'];
 		}
@@ -713,7 +713,7 @@ 
 		sort($searched_list);
 
 		$searched_count = count($searched_list);
-		if(!$searched_count)
+		if (!$searched_count)
 		{
 			return;
 		}
@@ -721,13 +721,13 @@ 
 		$exceptionModule = array('editor', 'poll', 'homepage', 'textyle');
 
 		$oModuleModel = getModel('module');
-		foreach($searched_list as $val)
+		foreach ($searched_list as $val)
 		{
-			$skin_list = $oModuleModel->getSkins(_XE_PATH_ . 'modules/' . $val);
+			$skin_list = $oModuleModel->getSkins(_XE_PATH_.'modules/'.$val);
 
-			if(is_array($skin_list) && count($skin_list) > 0 && !in_array($val, $exceptionModule))
+			if (is_array($skin_list) && count($skin_list) > 0 && !in_array($val, $exceptionModule))
 			{
-				if(!$GLOBALS['__ThemeModuleSkin__'][$val])
+				if (!$GLOBALS['__ThemeModuleSkin__'][$val])
 				{
 					$GLOBALS['__ThemeModuleSkin__'][$val] = array();
 					$moduleInfo = $oModuleModel->getModuleInfoXml($val);
@@ -751,23 +751,23 @@ 
 		static $lang = false;
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($lang === false && $oCacheHandler->isSupport())
+		if ($lang === false && $oCacheHandler->isSupport())
 		{
-			$cache_key = 'admin_menu_langs:' . Context::getLangType();
+			$cache_key = 'admin_menu_langs:'.Context::getLangType();
 			$lang = $oCacheHandler->get($cache_key);
 
-			if($lang === false)
+			if ($lang === false)
 			{
 				$lang = array();
 				$oModuleModel = getModel('module');
 				$installed_module_list = $oModuleModel->getModulesXmlInfo();
 
-				foreach($installed_module_list as $key => $value)
+				foreach ($installed_module_list as $key => $value)
 				{
 					$moduleActionInfo = $oModuleModel->getModuleActionXml($value->module);
-					if(is_object($moduleActionInfo->menu))
+					if (is_object($moduleActionInfo->menu))
 					{
-						foreach($moduleActionInfo->menu as $key2 => $value2)
+						foreach ($moduleActionInfo->menu as $key2 => $value2)
 						{
 							$lang[$key2] = $value2->title;
 						}
@@ -792,19 +792,19 @@ 
 		$args = new stdClass();
 		$args->site_srl = $siteSrl;
 		$output = executeQueryArray('admin.getFavoriteList', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
-		if(!$output->data)
+		if (!$output->data)
 		{
 			return new BaseObject();
 		}
 
-		if($isGetModuleInfo && is_array($output->data))
+		if ($isGetModuleInfo && is_array($output->data))
 		{
 			$oModuleModel = getModel('module');
-			foreach($output->data AS $key => $value)
+			foreach ($output->data AS $key => $value)
 			{
 				$moduleInfo = $oModuleModel->getModuleInfoXml($value->module);
 				$output->data[$key]->admin_index_act = $moduleInfo->admin_index_act;
@@ -829,13 +829,13 @@ 
 		$args->site_srl = $siteSrl;
 		$args->module = $module;
 		$output = executeQuery('admin.getFavorite', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
 		$returnObject = new BaseObject();
-		if($output->data)
+		if ($output->data)
 		{
 			$returnObject->add('result', TRUE);
 			$returnObject->add('favoriteSrl', $output->data->admin_favorite_srl);
@@ -854,7 +854,7 @@ 
 	 */
 	function getSiteAllList()
 	{
-		if(Context::get('domain'))
+		if (Context::get('domain'))
 		{
 			$domain = Context::get('domain');
 		}
@@ -871,7 +871,7 @@ 
 	function getAllSitesThatHaveModules($domain = NULL)
 	{
 		$args = new stdClass();
-		if($domain)
+		if ($domain)
 		{
 			$args->domain = $domain;
 		}
@@ -879,31 +879,31 @@ 
 
 		$siteList = array();
 		$output = executeQueryArray('admin.getSiteAllList', $args, $columnList);
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$siteList = $output->data;
 		}
 
 		$oModuleModel = getModel('module');
-		foreach($siteList as $key => $value)
+		foreach ($siteList as $key => $value)
 		{
 			$args->site_srl = $value->site_srl;
 			$list = $oModuleModel->getModuleSrlList($args);
 
-			if(!is_array($list))
+			if (!is_array($list))
 			{
 				$list = array($list);
 			}
 
-			foreach($list as $k => $v)
+			foreach ($list as $k => $v)
 			{
-				if(!is_dir(_XE_PATH_ . 'modules/' . $v->module))
+				if (!is_dir(_XE_PATH_.'modules/'.$v->module))
 				{
 					unset($list[$k]);
 				}
 			}
 
-			if(!count($list))
+			if (!count($list))
 			{
 				unset($siteList[$key]);
 			}
@@ -920,13 +920,13 @@ 
 	{
 		$args = new stdClass();
 
-		if($date)
+		if ($date)
 		{
 			$args->regDate = date('Ymd', strtotime($date));
 		}
 
 		$output = executeQuery('admin.getSiteCountByDate', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return 0;
 		}
@@ -948,21 +948,21 @@ 
 	{
 		$site_info = Context::get('site_module_info');
 		$virtual_site = '';
-		if($site_info->site_srl) 
+		if ($site_info->site_srl) 
 		{
-			$virtual_site = $site_info->site_srl . '/';
+			$virtual_site = $site_info->site_srl.'/';
 		}
 
-		$file_exsit = FileHandler::readFile(_XE_PATH_ . 'files/attach/xeicon/' . $virtual_site . $iconname);
-		if(!$file_exsit && $default === true)
+		$file_exsit = FileHandler::readFile(_XE_PATH_.'files/attach/xeicon/'.$virtual_site.$iconname);
+		if (!$file_exsit && $default === true)
         {
-            $icon_url = './modules/admin/tpl/img/' . $default_icon_name;
+            $icon_url = './modules/admin/tpl/img/'.$default_icon_name;
         }
-        elseif($file_exsit)
+        elseif ($file_exsit)
 		{
 			$default_url = Context::getDefaultUrl();
-			if($default_url && substr_compare($default_url, '/', -1) === 0) $default_url = substr($default_url, 0, -1);
-			$icon_url = $default_url . '/files/attach/xeicon/' . $virtual_site . $iconname;
+			if ($default_url && substr_compare($default_url, '/', -1) === 0) $default_url = substr($default_url, 0, -1);
+			$icon_url = $default_url.'/files/attach/xeicon/'.$virtual_site.$iconname;
 		}
 		return $icon_url;
 	}

Braces +25 added lines, -20 removed lines

@@ -303,8 +303,7 @@ 
 			if(is_dir($curpwd . $file))
 			{
 				$file .= "/";
-			}
-			else
+			} else
 			{
 				continue;
 			}
@@ -359,8 +358,7 @@ 
 			{
 				$_list = $oFtp->ftp_rawlist($this->pwd);
 				$oFtp->ftp_quit();
-			}
-			else
+			} else
 			{
 				return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 			}
@@ -380,8 +378,7 @@ 
 					$list[] = substr(strrchr($v, ' '), 1) . '/';
 				}
 			}
-		}
-		else
+		} else
 		{
 			return new BaseObject(-1, 'msg_ftp_no_directory');
 		}
@@ -434,11 +431,13 @@ 
 		$info['module'] = '';
 		$oModuleModel = getModel('module');
 		$module_list = $oModuleModel->getModuleList();
-		if($module_list) foreach($module_list as $module)
+		if($module_list) {
+			foreach($module_list as $module)
 		{
 			if(in_array($module->module, $skip['module']))
 			{
 				continue;
+		}
 			}
 			$info['module'] .= '|' . $module->module;
 		}
@@ -447,11 +446,13 @@ 
 		$info['addon'] = '';
 		$oAddonAdminModel = getAdminModel('addon');
 		$addon_list = $oAddonAdminModel->getAddonList();
-		if($addon_list) foreach($addon_list as $addon)
+		if($addon_list) {
+			foreach($addon_list as $addon)
 		{
 			if(in_array($addon->addon, $skip['addon']))
 			{
 				continue;
+		}
 			}
 			$info['addon'] .= '|' . $addon->addon;
 		}
@@ -460,11 +461,13 @@ 
 		$info['layout'] = "";
 		$oLayoutModel = getModel('layout');
 		$layout_list = $oLayoutModel->getDownloadedLayoutList();
-		if($layout_list) foreach($layout_list as $layout)
+		if($layout_list) {
+			foreach($layout_list as $layout)
 		{
 			if(in_array($layout->layout, $skip['layout']))
 			{
 				continue;
+		}
 			}
 			$info['layout'] .= '|' . $layout->layout;
 		}
@@ -473,11 +476,13 @@ 
 		$info['widget'] = "";
 		$oWidgetModel = getModel('widget');
 		$widget_list = $oWidgetModel->getDownloadedWidgetList();
-		if($widget_list) foreach($widget_list as $widget)
+		if($widget_list) {
+			foreach($widget_list as $widget)
 		{
 			if(in_array($widget->widget, $skip['widget']))
 			{
 				continue;
+		}
 			}
 			$info['widget'] .= '|' . $widget->widget;
 		}
@@ -486,11 +491,13 @@ 
 		$info['widgetstyle'] = "";
 		$oWidgetModel = getModel('widget');
 		$widgetstyle_list = $oWidgetModel->getDownloadedWidgetStyleList();
-		if($widgetstyle_list) foreach($widgetstyle_list as $widgetstyle)
+		if($widgetstyle_list) {
+			foreach($widgetstyle_list as $widgetstyle)
 		{
 			if(in_array($widgetstyle->widgetStyle, $skip['widgetstyle']))
 			{
 				continue;
+		}
 			}
 			$info['widgetstyle'] .= '|' . $widgetstyle->widgetStyle;
 		}
@@ -575,8 +582,7 @@ 
 		{
 			$publisher_list = array();
 			$publisher_list[] = $xml_obj->publisher;
-		}
-		else
+		} else
 		{
 			$publisher_list = $xml_obj->publisher;
 		}
@@ -649,8 +655,7 @@ 
 		if(is_array($skin_infos->skininfo))
 		{
 			$skin_list = $skin_infos->skininfo;
-		}
-		else
+		} else
 		{
 			$skin_list = array($skin_infos->skininfo);
 		}
@@ -839,8 +844,7 @@ 
 		{
 			$returnObject->add('result', TRUE);
 			$returnObject->add('favoriteSrl', $output->data->admin_favorite_srl);
-		}
-		else
+		} else
 		{
 			$returnObject->add('result', FALSE);
 		}
@@ -957,11 +961,12 @@ 
 		if(!$file_exsit && $default === true)
         {
             $icon_url = './modules/admin/tpl/img/' . $default_icon_name;
-        }
-        elseif($file_exsit)
+        } elseif($file_exsit)
 		{
 			$default_url = Context::getDefaultUrl();
-			if($default_url && substr_compare($default_url, '/', -1) === 0) $default_url = substr($default_url, 0, -1);
+			if($default_url && substr_compare($default_url, '/', -1) === 0) {
+				$default_url = substr($default_url, 0, -1);
+			}
 			$icon_url = $default_url . '/files/attach/xeicon/' . $virtual_site . $iconname;
 		}
 		return $icon_url;

modules/widget/widget.class.php

Spacing +4 added lines, -4 removed lines

@@ -30,10 +30,10 @@ 
 		$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))
 		{
 			// widget compile display.after trigger for further (04/14/2009)
-			if(!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before')) return true;
+			if (!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before')) return true;
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -49,10 +49,10 @@ 
 		$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))
 		{
 			// widget compile display.after trigger for further (04/14/2009)
-			if(!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before'))
+			if (!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before'))
 			{
 				$oModuleController->insertTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before');
 			}

Braces +3 added lines, -1 removed lines

@@ -33,7 +33,9 @@
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// widget compile display.after trigger for further (04/14/2009)
-			if(!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before')) return true;
+			if(!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before')) {
+				return true;
+			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}

modules/message/message.class.php

Spacing +6 added lines, -6 removed lines

@@ -23,17 +23,17 @@ 
 		$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))
 		{
 			$config = $oModuleModel->getModuleConfig('message');
 
-			if($config->skin)
+			if ($config->skin)
 			{
 				$config_parse = explode('.', $config->skin);
 				if (count($config_parse) > 1)
 				{
 					$template_path = sprintf('./themes/%s/modules/message/', $config_parse[0]);
-					if(is_dir($template_path)) return true;
+					if (is_dir($template_path)) return true;
 				}
 			}
 
@@ -51,17 +51,17 @@ 
 		$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))
 		{
 			$config = $oModuleModel->getModuleConfig('message');
 
-			if($config->skin)
+			if ($config->skin)
 			{
 				$config_parse = explode('.', $config->skin);
 				if (count($config_parse) > 1)
 				{
 					$template_path = sprintf('./themes/%s/modules/message/', $config_parse[0]);
-					if(is_dir($template_path))
+					if (is_dir($template_path))
 					{
 						$config->skin = implode('|@|', $config_parse);
 						$oModuleController = getController('module');

Braces +3 added lines, -1 removed lines

@@ -33,7 +33,9 @@
 				if (count($config_parse) > 1)
 				{
 					$template_path = sprintf('./themes/%s/modules/message/', $config_parse[0]);
-					if(is_dir($template_path)) return true;
+					if(is_dir($template_path)) {
+						return true;
+					}
 				}
 			}
 

modules/comment/comment.class.php

Spacing +29 added lines, -29 removed lines

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

modules/member/member.admin.view.php

Spacing +72 added lines, -72 removed lines

@@ -43,16 +43,16 @@ 
 
 		// if member_srl exists, set memberInfo
 		$member_srl = Context::get('member_srl');
-		if($member_srl) 
+		if ($member_srl) 
 		{
 			$this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
-			if(!$this->memberInfo)
+			if (!$this->memberInfo)
 			{
-				Context::set('member_srl','');
+				Context::set('member_srl', '');
 			}
 			else
 			{
-				Context::set('member_info',$this->memberInfo);
+				Context::set('member_info', $this->memberInfo);
 			}
 		}
 
@@ -79,30 +79,30 @@ 
 
 		$filter = Context::get('filter_type');
 		global $lang;
-		switch($filter)
+		switch ($filter)
 		{
-			case 'super_admin' : Context::set('filter_type_title', $lang->cmd_show_super_admin_member);break;
-			case 'site_admin' : Context::set('filter_type_title', $lang->cmd_show_site_admin_member);break;
-			default : Context::set('filter_type_title', $lang->cmd_show_all_member);break;
+			case 'super_admin' : Context::set('filter_type_title', $lang->cmd_show_super_admin_member); break;
+			case 'site_admin' : Context::set('filter_type_title', $lang->cmd_show_site_admin_member); break;
+			default : Context::set('filter_type_title', $lang->cmd_show_all_member); break;
 		}
 		// retrieve list of groups for each member
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $key => $member)
+			foreach ($output->data as $key => $member)
 			{
-				$output->data[$key]->group_list = $oMemberModel->getMemberGroups($member->member_srl,0);
+				$output->data[$key]->group_list = $oMemberModel->getMemberGroups($member->member_srl, 0);
 			}
 		}
 		$config = $this->memberConfig;
 		$memberIdentifiers = array('user_id'=>'user_id', 'user_name'=>'user_name', 'nick_name'=>'nick_name');
 		$usedIdentifiers = array();	
 
-		if(is_array($config->signupForm))
+		if (is_array($config->signupForm))
 		{
-			foreach($config->signupForm as $signupItem)
+			foreach ($config->signupForm as $signupItem)
 			{
-				if(!count($memberIdentifiers)) break;
-				if(in_array($signupItem->name, $memberIdentifiers) && ($signupItem->required || $signupItem->isUse))
+				if (!count($memberIdentifiers)) break;
+				if (in_array($signupItem->name, $memberIdentifiers) && ($signupItem->required || $signupItem->isUse))
 				{
 					unset($memberIdentifiers[$signupItem->name]);
 					$usedIdentifiers[$signupItem->name] = $lang->{$signupItem->name};
@@ -140,14 +140,14 @@ 
 	{
 		$config = $this->memberConfig;
 
-		if($config->redirect_url)
+		if ($config->redirect_url)
 		{
 			$mid = str_ireplace(Context::getDefaultUrl(), '', $config->redirect_url);
 
 			$siteModuleInfo = Context::get('site_module_info');
 
 			$oModuleModel = getModel('module');
-			$moduleInfo = $oModuleModel->getModuleInfoByMid($mid, (int)$siteModuleInfo->site_srl);
+			$moduleInfo = $oModuleModel->getModuleInfoByMid($mid, (int) $siteModuleInfo->site_srl);
 
 			$config->redirect_url = $moduleInfo->module_srl;
 			Context::set('config', $config);
@@ -173,9 +173,9 @@ 
 		Context::set('editor', $editor);
 
 		$signupForm = $config->signupForm;
-		foreach($signupForm as $val)
+		foreach ($signupForm as $val)
 		{
-			if($val->name == 'user_id')
+			if ($val->name == 'user_id')
 			{
 				$userIdInfo = $val;
 				break;
@@ -183,7 +183,7 @@ 
 		}
 
 		$oSecurity = new Security();
-		if($userIdInfo->isUse)
+		if ($userIdInfo->isUse)
 		{
 			// get denied ID list
 			Context::set('useUserID', 1);
@@ -274,16 +274,16 @@ 
 		Context::set('editor', $editor);
 
 		$signupForm = $config->signupForm;
-		foreach($signupForm as $val)
+		foreach ($signupForm as $val)
 		{
-			if($val->name == 'user_id')
+			if ($val->name == 'user_id')
 			{
 				$userIdInfo = $val;
 				break;
 			}
 		}
 
-		if($userIdInfo->isUse)
+		if ($userIdInfo->isUse)
 		{
 			// get denied ID list
 			Context::set('useUserID', 1);
@@ -344,14 +344,14 @@ 
 		$oMemberModel = getModel('member');
 
 		$memberInfo = Context::get('member_info');
-		if(isset($memberInfo))
+		if (isset($memberInfo))
 		{
 			$memberInfo->signature = $oMemberModel->getSignature($this->memberInfo->member_srl);
 		}
 		Context::set('member_info', $memberInfo);
 
 		// get an editor for the signature
-		if($memberInfo->member_srl)
+		if ($memberInfo->member_srl)
 		{
 			$oEditorModel = getModel('editor');
 			$option = new stdClass();
@@ -405,7 +405,7 @@ 
 		}
 
 		$member_config = $this->memberConfig;
-		if(!$this->memberConfig)
+		if (!$this->memberConfig)
 		{
 			$member_config = $this->memberConfig = $oMemberModel->getMemberConfig();
 		}
@@ -416,25 +416,25 @@ 
 		$formTags = array();
 		global $lang;
 
-		foreach($member_config->signupForm as $no=>$formInfo)
+		foreach ($member_config->signupForm as $no=>$formInfo)
 		{
-			if(!$formInfo->isUse)continue;
+			if (!$formInfo->isUse)continue;
 
 			// 회원 본인이 아닌 경우 입력 폼 제거
-			if($formInfo->name == 'find_account_question' && $memberInfo['member_srl'] !== $logged_info->member_srl)
+			if ($formInfo->name == 'find_account_question' && $memberInfo['member_srl'] !== $logged_info->member_srl)
 			{
 				unset($member_config->signupForm[$no]);
 				continue;
 			}
 
-			if($formInfo->name == $member_config->identifier || $formInfo->name == 'password') continue;
+			if ($formInfo->name == $member_config->identifier || $formInfo->name == 'password') continue;
 
 			$formTag = new stdClass();
 			$inputTag = '';
 			$formTag->title = ($formInfo->isDefaultForm) ? $lang->{$formInfo->name} : $formInfo->title;
-			if($isAdmin)
+			if ($isAdmin)
 			{
-				if($formInfo->mustRequired) $formTag->title = '<em style="color:red">*</em> '.$formTag->title;
+				if ($formInfo->mustRequired) $formTag->title = '<em style="color:red">*</em> '.$formTag->title;
 			}
 			else
 			{
@@ -442,28 +442,28 @@ 
 			}
 			$formTag->name = $formInfo->name;
 
-			if($formInfo->isDefaultForm)
+			if ($formInfo->isDefaultForm)
 			{
-				if($formInfo->imageType)
+				if ($formInfo->imageType)
 				{
 					$formTag->type = 'image';
-					if($formInfo->name == 'profile_image')
+					if ($formInfo->name == 'profile_image')
 					{
 						$target = $memberInfo['profile_image'];
 						$functionName = 'doDeleteProfileImage';
 					}
-					else if($formInfo->name == 'image_name')
+					else if ($formInfo->name == 'image_name')
 					{
 						$target = $memberInfo['image_name'];
 						$functionName = 'doDeleteImageName';
 					}
-					else if($formInfo->name == 'image_mark')
+					else if ($formInfo->name == 'image_mark')
 					{
 						$target = $memberInfo['image_mark'];
 						$functionName = 'doDeleteImageMark';
 					}
 
-					if($target->src)
+					if ($target->src)
 					{
 						$inputTag = sprintf('<input type="hidden" name="__%s_exist" value="true" /><span id="%s"><img src="%s" alt="%s" /> <button type="button" onclick="%s(%d);return false;">%s</button></span>',
 							$formInfo->name,
@@ -486,7 +486,7 @@ 
 						$lang->{$formInfo->name.'_max_height'},
 						$member_config->{$formInfo->name.'_max_height'});
 					}//end imageType
-					else if($formInfo->name == 'birthday')
+					else if ($formInfo->name == 'birthday')
 					{
 						$formTag->type = 'date';
 						$inputTag = sprintf('<input type="hidden" name="birthday" id="date_birthday" value="%s" /><input type="text" placeholder="YYYY-MM-DD" name="birthday_ui" class="inputDate" id="birthday" value="%s" readonly="readonly" /> <input type="button" value="%s" class="btn dateRemover" />',
@@ -494,16 +494,16 @@ 
 							zdate($memberInfo['birthday'], 'Y-m-d', false),
 							$lang->cmd_delete);
 					}
-					else if($formInfo->name == 'find_account_question')
+					else if ($formInfo->name == 'find_account_question')
 					{
 						$disabled = (!!$memberInfo['member_srl']) ? 'disabled="disabled"' : '';
 
 						$formTag->type = 'select';
 						$inputTag = '<select name="find_account_question" id="find_account_question" style="display:block;margin:0 0 8px 0" %s>%s</select>';
 						$optionTag = array();
-						foreach($lang->find_account_question_items as $key=>$val)
+						foreach ($lang->find_account_question_items as $key=>$val)
 						{
-							if($key == $memberInfo['find_account_question']) $selected = 'selected="selected"';
+							if ($key == $memberInfo['find_account_question']) $selected = 'selected="selected"';
 							else $selected = '';
 							$optionTag[] = sprintf('<option value="%s" %s >%s</option>',
 								$key,
@@ -511,24 +511,24 @@ 
 								$val);
 						}
 						$inputTag = sprintf($inputTag, $disabled, implode('', $optionTag));
-						$inputTag .= '<input type="text" name="find_account_answer" id="find_account_answer" title="'.Context::getLang('find_account_answer').'" value="" ' . $disabled . ' />';
+						$inputTag .= '<input type="text" name="find_account_answer" id="find_account_answer" title="'.Context::getLang('find_account_answer').'" value="" '.$disabled.' />';
 
-						if($disabled) {
-							$inputTag .= ' <label><input type="checkbox" name="modify_find_account_answer" value="Y" /> ' . Context::getLang('cmd_modify') . '</label>';
+						if ($disabled) {
+							$inputTag .= ' <label><input type="checkbox" name="modify_find_account_answer" value="Y" /> '.Context::getLang('cmd_modify').'</label>';
 							$inputTag .= '<script>(function($) {$(function() {$(\'[name=modify_find_account_answer]\').change(function() {var $this = $(this); if($this.prop(\'checked\')) {$(\'[name=find_account_question],[name=find_account_answer]\').attr(\'disabled\', false); } else {$(\'[name=find_account_question]\').attr(\'disabled\', true); $(\'[name=find_account_answer]\').attr(\'disabled\', true).val(\'\'); } }); }); })(jQuery);</script>';
 						}
 					}
-					else if($formInfo->name == 'email_address')
+					else if ($formInfo->name == 'email_address')
 					{
 						$formTag->type = 'email';
 						$inputTag = '<input type="email" name="email_address" id="email_address" value="'.$memberInfo['email_address'].'" />';
 					}
-					else if($formInfo->name == 'homepage')
+					else if ($formInfo->name == 'homepage')
 					{
 						$formTag->type = 'url';
 						$inputTag = '<input type="url" name="homepage" id="homepage" value="'.$memberInfo['homepage'].'" />';
 					}
-					else if($formInfo->name == 'blog')
+					else if ($formInfo->name == 'blog')
 					{
 						$formTag->type = 'url';
 						$inputTag = '<input type="url" name="blog" id="blog" value="'.$memberInfo['blog'].'" />';
@@ -549,92 +549,92 @@ 
 					$extentionReplace = array();
 
 					$formTag->type = $extendForm->column_type;
-					if($extendForm->column_type == 'text')
+					if ($extendForm->column_type == 'text')
 					{
 						$template = '<input type="text" name="%column_name%" id="%column_name%" value="%value%" />';
 					}
-					else if($extendForm->column_type == 'homepage')
+					else if ($extendForm->column_type == 'homepage')
 					{
 						$template = '<input type="url" name="%column_name%" id="%column_name%" value="%value%" />';
 					}
-					else if($extendForm->column_type == 'email_address')
+					else if ($extendForm->column_type == 'email_address')
 					{
 						$template = '<input type="email" name="%column_name%" id="%column_name%" value="%value%" />';
 					}
-					else if($extendForm->column_type == 'tel')
+					else if ($extendForm->column_type == 'tel')
 					{
 						$extentionReplace = array('tel_0' => $extendForm->value[0],
 							'tel_1' => $extendForm->value[1],
 							'tel_2' => $extendForm->value[2]);
 						$template = '<input type="tel" name="%column_name%[]" id="%column_name%" value="%tel_0%" size="4" maxlength="4" style="width:30px" title="First Number" /> - <input type="tel" name="%column_name%[]" value="%tel_1%" size="4" maxlength="4" style="width:35px" title="Second Number" /> - <input type="tel" name="%column_name%[]" value="%tel_2%" size="4" maxlength="4" style="width:35px" title="Third Number" />';
 					}
-					else if($extendForm->column_type == 'textarea')
+					else if ($extendForm->column_type == 'textarea')
 					{
 						$template = '<textarea name="%column_name%" id="%column_name%" rows="4" cols="42">%value%</textarea>';
 					}
-					else if($extendForm->column_type == 'checkbox')
+					else if ($extendForm->column_type == 'checkbox')
 					{
 						$template = '';
-						if($extendForm->default_value)
+						if ($extendForm->default_value)
 						{
 							$template = '<div style="padding-top:5px">%s</div>';
 							$__i = 0;
 							$optionTag = array();
-							foreach($extendForm->default_value as $v)
+							foreach ($extendForm->default_value as $v)
 							{
 								$checked = '';
-								if(is_array($extendForm->value) && in_array($v, $extendForm->value))$checked = 'checked="checked"';
+								if (is_array($extendForm->value) && in_array($v, $extendForm->value))$checked = 'checked="checked"';
 								$optionTag[] = '<label for="%column_name%'.$__i.'"><input type="checkbox" id="%column_name%'.$__i.'" name="%column_name%[]" value="'.$v.'" '.$checked.' /> '.$v.'</label>';
 								$__i++;
 							}
 							$template = sprintf($template, implode('', $optionTag));
 						}
 					}
-					else if($extendForm->column_type == 'radio')
+					else if ($extendForm->column_type == 'radio')
 					{
 						$template = '';
-						if($extendForm->default_value)
+						if ($extendForm->default_value)
 						{
 							$template = '<div style="padding-top:5px">%s</div>';
 							$optionTag = array();
-							foreach($extendForm->default_value as $v)
+							foreach ($extendForm->default_value as $v)
 							{
-								if($extendForm->value == $v)$checked = 'checked="checked"';
+								if ($extendForm->value == $v)$checked = 'checked="checked"';
 								else $checked = '';
 								$optionTag[] = '<label><input type="radio" name="%column_name%" value="'.$v.'" '.$checked.' /> '.$v.'</label>';
 							}
 							$template = sprintf($template, implode('', $optionTag));
 						}
 					}
-					else if($extendForm->column_type == 'select')
+					else if ($extendForm->column_type == 'select')
 					{
 						$template = '<select name="'.$formInfo->name.'" id="'.$formInfo->name.'">%s</select>';
 						$optionTag = array();
 						$optionTag[] = sprintf('<option value="">%s</option>', $lang->cmd_select);
-						if($extendForm->default_value)
+						if ($extendForm->default_value)
 						{
-							foreach($extendForm->default_value as $v)
+							foreach ($extendForm->default_value as $v)
 							{
-								if($v == $extendForm->value) $selected = 'selected="selected"';
+								if ($v == $extendForm->value) $selected = 'selected="selected"';
 								else $selected = '';
 								$optionTag[] = sprintf('<option value="%s" %s >%s</option>', $v, $selected, $v);
 							}
 						}
 						$template = sprintf($template, implode('', $optionTag));
 					}
-					else if($extendForm->column_type == 'kr_zip')
+					else if ($extendForm->column_type == 'kr_zip')
 					{
 						$krzipModel = getModel('krzip');
-						if($krzipModel && method_exists($krzipModel , 'getKrzipCodeSearchHtml' ))
+						if ($krzipModel && method_exists($krzipModel, 'getKrzipCodeSearchHtml'))
 						{
 							$template = $krzipModel->getKrzipCodeSearchHtml($extendForm->column_name, $extendForm->value);
 						}
 					}
-					else if($extendForm->column_type == 'jp_zip')
+					else if ($extendForm->column_type == 'jp_zip')
 					{
 						$template = '<input type="text" name="%column_name%" id="%column_name%" value="%value%" />';
 					}
-					else if($extendForm->column_type == 'date')
+					else if ($extendForm->column_type == 'date')
 					{
 						$extentionReplace = array('date' => zdate($extendForm->value, 'Y-m-d'), 'cmd_delete' => $lang->cmd_delete);
 						$template = '<input type="hidden" name="%column_name%" id="date_%column_name%" value="%value%" /><input type="text" placeholder="YYYY-MM-DD" class="inputDate" value="%date%" readonly="readonly" /> <input type="button" value="%cmd_delete%" class="btn dateRemover" />';
@@ -643,7 +643,7 @@ 
 					$replace = array_merge($extentionReplace, $replace);
 					$inputTag = preg_replace_callback('@%(\w+)%@', function($n) use($replace) { return $replace[$n[1]]; }, $template);
 
-					if($extendForm->description)
+					if ($extendForm->description)
 						$inputTag .= '<p class="help-block">'.$extendForm->description.'</p>';
 				}
 				$formTag->inputTag = $inputTag;
@@ -674,12 +674,12 @@ 
 	function dispMemberAdminInsertJoinForm() {
 		// Get the value of join_form
 		$member_join_form_srl = Context::get('member_join_form_srl');
-		if($member_join_form_srl)
+		if ($member_join_form_srl)
 		{
 			$oMemberModel = getModel('member');
 			$join_form = $oMemberModel->getJoinForm($member_join_form_srl);
 
-			if(!$join_form) Context::set('member_join_form_srl','',true);
+			if (!$join_form) Context::set('member_join_form_srl', '', true);
 			else
 			{
 				Context::set('join_form', $join_form);

Braces +62 added lines, -57 removed lines

@@ -49,8 +49,7 @@ 
 			if(!$this->memberInfo)
 			{
 				Context::set('member_srl','');
-			}
-			else
+			} else
 			{
 				Context::set('member_info',$this->memberInfo);
 			}
@@ -101,7 +100,9 @@ 
 		{
 			foreach($config->signupForm as $signupItem)
 			{
-				if(!count($memberIdentifiers)) break;
+				if(!count($memberIdentifiers)) {
+					break;
+				}
 				if(in_array($signupItem->name, $memberIdentifiers) && ($signupItem->required || $signupItem->isUse))
 				{
 					unset($memberIdentifiers[$signupItem->name]);
@@ -316,7 +317,9 @@ 
 		$extendForm = $oMemberModel->getCombineJoinForm($this->memberInfo);
 		Context::set('extend_form_list', $extendForm);
 		$memberInfo = get_object_vars(Context::get('member_info'));
-		if (!is_array($memberInfo['group_list'])) $memberInfo['group_list'] = array();
+		if (!is_array($memberInfo['group_list'])) {
+			$memberInfo['group_list'] = array();
+		}
 		Context::set('memberInfo', $memberInfo);
 
 		$disableColumns = array('password', 'find_account_question', 'find_account_answer');
@@ -418,7 +421,9 @@ 
 
 		foreach($member_config->signupForm as $no=>$formInfo)
 		{
-			if(!$formInfo->isUse)continue;
+			if(!$formInfo->isUse) {
+				continue;
+			}
 
 			// 회원 본인이 아닌 경우 입력 폼 제거
 			if($formInfo->name == 'find_account_question' && $memberInfo['member_srl'] !== $logged_info->member_srl)
@@ -427,18 +432,23 @@ 
 				continue;
 			}
 
-			if($formInfo->name == $member_config->identifier || $formInfo->name == 'password') continue;
+			if($formInfo->name == $member_config->identifier || $formInfo->name == 'password') {
+				continue;
+			}
 
 			$formTag = new stdClass();
 			$inputTag = '';
 			$formTag->title = ($formInfo->isDefaultForm) ? $lang->{$formInfo->name} : $formInfo->title;
 			if($isAdmin)
 			{
-				if($formInfo->mustRequired) $formTag->title = '<em style="color:red">*</em> '.$formTag->title;
-			}
-			else
+				if($formInfo->mustRequired) {
+					$formTag->title = '<em style="color:red">*</em> '.$formTag->title;
+				}
+			} else
 			{
-				if ($formInfo->required && $formInfo->name != 'password') $formTag->title = '<em style="color:red">*</em> '.$formTag->title;
+				if ($formInfo->required && $formInfo->name != 'password') {
+					$formTag->title = '<em style="color:red">*</em> '.$formTag->title;
+				}
 			}
 			$formTag->name = $formInfo->name;
 
@@ -451,13 +461,11 @@ 
 					{
 						$target = $memberInfo['profile_image'];
 						$functionName = 'doDeleteProfileImage';
-					}
-					else if($formInfo->name == 'image_name')
+					} else if($formInfo->name == 'image_name')
 					{
 						$target = $memberInfo['image_name'];
 						$functionName = 'doDeleteImageName';
-					}
-					else if($formInfo->name == 'image_mark')
+					} else if($formInfo->name == 'image_mark')
 					{
 						$target = $memberInfo['image_mark'];
 						$functionName = 'doDeleteImageMark';
@@ -473,8 +481,7 @@ 
 							$functionName,
 							$memberInfo['member_srl'],
 							$lang->cmd_delete);
-					}
-					else
+					} else
 					{
 						$inputTag = sprintf('<input type="hidden" name="__%s_exist" value="false" />', $formInfo->name);
 					}
@@ -493,8 +500,7 @@ 
 							$memberInfo['birthday'],
 							zdate($memberInfo['birthday'], 'Y-m-d', false),
 							$lang->cmd_delete);
-					}
-					else if($formInfo->name == 'find_account_question')
+					} else if($formInfo->name == 'find_account_question')
 					{
 						$disabled = (!!$memberInfo['member_srl']) ? 'disabled="disabled"' : '';
 
@@ -503,8 +509,11 @@ 
 						$optionTag = array();
 						foreach($lang->find_account_question_items as $key=>$val)
 						{
-							if($key == $memberInfo['find_account_question']) $selected = 'selected="selected"';
-							else $selected = '';
+							if($key == $memberInfo['find_account_question']) {
+								$selected = 'selected="selected"';
+							} else {
+								$selected = '';
+							}
 							$optionTag[] = sprintf('<option value="%s" %s >%s</option>',
 								$key,
 								$selected,
@@ -517,23 +526,19 @@ 
 							$inputTag .= ' <label><input type="checkbox" name="modify_find_account_answer" value="Y" /> ' . Context::getLang('cmd_modify') . '</label>';
 							$inputTag .= '<script>(function($) {$(function() {$(\'[name=modify_find_account_answer]\').change(function() {var $this = $(this); if($this.prop(\'checked\')) {$(\'[name=find_account_question],[name=find_account_answer]\').attr(\'disabled\', false); } else {$(\'[name=find_account_question]\').attr(\'disabled\', true); $(\'[name=find_account_answer]\').attr(\'disabled\', true).val(\'\'); } }); }); })(jQuery);</script>';
 						}
-					}
-					else if($formInfo->name == 'email_address')
+					} else if($formInfo->name == 'email_address')
 					{
 						$formTag->type = 'email';
 						$inputTag = '<input type="email" name="email_address" id="email_address" value="'.$memberInfo['email_address'].'" />';
-					}
-					else if($formInfo->name == 'homepage')
+					} else if($formInfo->name == 'homepage')
 					{
 						$formTag->type = 'url';
 						$inputTag = '<input type="url" name="homepage" id="homepage" value="'.$memberInfo['homepage'].'" />';
-					}
-					else if($formInfo->name == 'blog')
+					} else if($formInfo->name == 'blog')
 					{
 						$formTag->type = 'url';
 						$inputTag = '<input type="url" name="blog" id="blog" value="'.$memberInfo['blog'].'" />';
-					}
-					else
+					} else
 					{
 						$formTag->type = 'text';
 						$inputTag = sprintf('<input type="text" name="%s" id="%s" value="%s" />',
@@ -552,27 +557,22 @@ 
 					if($extendForm->column_type == 'text')
 					{
 						$template = '<input type="text" name="%column_name%" id="%column_name%" value="%value%" />';
-					}
-					else if($extendForm->column_type == 'homepage')
+					} else if($extendForm->column_type == 'homepage')
 					{
 						$template = '<input type="url" name="%column_name%" id="%column_name%" value="%value%" />';
-					}
-					else if($extendForm->column_type == 'email_address')
+					} else if($extendForm->column_type == 'email_address')
 					{
 						$template = '<input type="email" name="%column_name%" id="%column_name%" value="%value%" />';
-					}
-					else if($extendForm->column_type == 'tel')
+					} else if($extendForm->column_type == 'tel')
 					{
 						$extentionReplace = array('tel_0' => $extendForm->value[0],
 							'tel_1' => $extendForm->value[1],
 							'tel_2' => $extendForm->value[2]);
 						$template = '<input type="tel" name="%column_name%[]" id="%column_name%" value="%tel_0%" size="4" maxlength="4" style="width:30px" title="First Number" /> - <input type="tel" name="%column_name%[]" value="%tel_1%" size="4" maxlength="4" style="width:35px" title="Second Number" /> - <input type="tel" name="%column_name%[]" value="%tel_2%" size="4" maxlength="4" style="width:35px" title="Third Number" />';
-					}
-					else if($extendForm->column_type == 'textarea')
+					} else if($extendForm->column_type == 'textarea')
 					{
 						$template = '<textarea name="%column_name%" id="%column_name%" rows="4" cols="42">%value%</textarea>';
-					}
-					else if($extendForm->column_type == 'checkbox')
+					} else if($extendForm->column_type == 'checkbox')
 					{
 						$template = '';
 						if($extendForm->default_value)
@@ -583,14 +583,15 @@ 
 							foreach($extendForm->default_value as $v)
 							{
 								$checked = '';
-								if(is_array($extendForm->value) && in_array($v, $extendForm->value))$checked = 'checked="checked"';
+								if(is_array($extendForm->value) && in_array($v, $extendForm->value)) {
+									$checked = 'checked="checked"';
+								}
 								$optionTag[] = '<label for="%column_name%'.$__i.'"><input type="checkbox" id="%column_name%'.$__i.'" name="%column_name%[]" value="'.$v.'" '.$checked.' /> '.$v.'</label>';
 								$__i++;
 							}
 							$template = sprintf($template, implode('', $optionTag));
 						}
-					}
-					else if($extendForm->column_type == 'radio')
+					} else if($extendForm->column_type == 'radio')
 					{
 						$template = '';
 						if($extendForm->default_value)
@@ -599,14 +600,16 @@ 
 							$optionTag = array();
 							foreach($extendForm->default_value as $v)
 							{
-								if($extendForm->value == $v)$checked = 'checked="checked"';
-								else $checked = '';
+								if($extendForm->value == $v) {
+									$checked = 'checked="checked"';
+								} else {
+									$checked = '';
+								}
 								$optionTag[] = '<label><input type="radio" name="%column_name%" value="'.$v.'" '.$checked.' /> '.$v.'</label>';
 							}
 							$template = sprintf($template, implode('', $optionTag));
 						}
-					}
-					else if($extendForm->column_type == 'select')
+					} else if($extendForm->column_type == 'select')
 					{
 						$template = '<select name="'.$formInfo->name.'" id="'.$formInfo->name.'">%s</select>';
 						$optionTag = array();
@@ -615,26 +618,26 @@ 
 						{
 							foreach($extendForm->default_value as $v)
 							{
-								if($v == $extendForm->value) $selected = 'selected="selected"';
-								else $selected = '';
+								if($v == $extendForm->value) {
+									$selected = 'selected="selected"';
+								} else {
+									$selected = '';
+								}
 								$optionTag[] = sprintf('<option value="%s" %s >%s</option>', $v, $selected, $v);
 							}
 						}
 						$template = sprintf($template, implode('', $optionTag));
-					}
-					else if($extendForm->column_type == 'kr_zip')
+					} else if($extendForm->column_type == 'kr_zip')
 					{
 						$krzipModel = getModel('krzip');
 						if($krzipModel && method_exists($krzipModel , 'getKrzipCodeSearchHtml' ))
 						{
 							$template = $krzipModel->getKrzipCodeSearchHtml($extendForm->column_name, $extendForm->value);
 						}
-					}
-					else if($extendForm->column_type == 'jp_zip')
+					} else if($extendForm->column_type == 'jp_zip')
 					{
 						$template = '<input type="text" name="%column_name%" id="%column_name%" value="%value%" />';
-					}
-					else if($extendForm->column_type == 'date')
+					} else if($extendForm->column_type == 'date')
 					{
 						$extentionReplace = array('date' => zdate($extendForm->value, 'Y-m-d'), 'cmd_delete' => $lang->cmd_delete);
 						$template = '<input type="hidden" name="%column_name%" id="date_%column_name%" value="%value%" /><input type="text" placeholder="YYYY-MM-DD" class="inputDate" value="%date%" readonly="readonly" /> <input type="button" value="%cmd_delete%" class="btn dateRemover" />';
@@ -643,8 +646,9 @@ 
 					$replace = array_merge($extentionReplace, $replace);
 					$inputTag = preg_replace_callback('@%(\w+)%@', function($n) use($replace) { return $replace[$n[1]]; }, $template);
 
-					if($extendForm->description)
-						$inputTag .= '<p class="help-block">'.$extendForm->description.'</p>';
+					if($extendForm->description) {
+											$inputTag .= '<p class="help-block">'.$extendForm->description.'</p>';
+					}
 				}
 				$formTag->inputTag = $inputTag;
 				$formTags[] = $formTag;
@@ -679,8 +683,9 @@ 
 			$oMemberModel = getModel('member');
 			$join_form = $oMemberModel->getJoinForm($member_join_form_srl);
 
-			if(!$join_form) Context::set('member_join_form_srl','',true);
-			else
+			if(!$join_form) {
+				Context::set('member_join_form_srl','',true);
+			} else
 			{
 				Context::set('join_form', $join_form);
 				$security = new Security();

Doc Comments +1 added lines, -1 removed lines

@@ -386,7 +386,7 @@
 	/**
 	 * Get tags by the member info type 
 	 *
-	 * @param object $memberInfo
+	 * @param string $memberInfo
 	 * @param boolean $isAdmin (true : admin, false : not admin)
 	 *
 	 * @return array

modules/communication/communication.class.php

Spacing +11 added lines, -11 removed lines

@@ -29,17 +29,17 @@ 
 		$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))
 		{
 			$config = $oModuleModel->getModuleConfig('message');
 
-			if($config->skin)
+			if ($config->skin)
 			{
 				$config_parse = explode('.', $config->skin);
-				if(count($config_parse) > 1)
+				if (count($config_parse) > 1)
 				{
 					$template_path = sprintf('./themes/%s/modules/communication/', $config_parse[0]);
-					if(is_dir($template_path))
+					if (is_dir($template_path))
 					{
 						return TRUE;
 					}
@@ -49,7 +49,7 @@ 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		if(!is_dir("./files/member_extra_info/new_message_flags"))
+		if (!is_dir("./files/member_extra_info/new_message_flags"))
 		{
 			return TRUE;
 		}
@@ -66,21 +66,21 @@ 
 		$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))
 		{
 			$config = $oModuleModel->getModuleConfig('message');
-			if(!is_object($config))
+			if (!is_object($config))
 			{
 				$config = new stdClass();
 			}
 
-			if($config->skin)
+			if ($config->skin)
 			{
 				$config_parse = explode('.', $config->skin);
-				if(count($config_parse) > 1)
+				if (count($config_parse) > 1)
 				{
 					$template_path = sprintf('./themes/%s/modules/communication/', $config_parse[0]);
-					if(is_dir($template_path))
+					if (is_dir($template_path))
 					{
 						$config->skin = implode('|@|', $config_parse);
 						$oModuleController = getController('module');
@@ -92,7 +92,7 @@ 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		if(!is_dir("./files/member_extra_info/new_message_flags"))
+		if (!is_dir("./files/member_extra_info/new_message_flags"))
 		{
 			FileHandler::makeDir('./files/member_extra_info/new_message_flags');
 		}