xpressengine / xe-core

modules/editor/components/image_gallery/image_gallery.class.php

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * @class  image_gallery
- * @author NAVER (developers@xpressengine.com)
- * @brief Making images uploaded to the image gallery
- */
+	 * @class  image_gallery
+	 * @author NAVER (developers@xpressengine.com)
+	 * @brief Making images uploaded to the image gallery
+	 */
 class image_gallery extends EditorHandler
 {
 	// editor_sequence from the editor must attend mandatory wearing ....

Spacing +11 added lines, -11 removed lines

@@ -26,7 +26,7 @@ 
 	function getPopupContent()
 	{
 		// Pre-compiled source code to compile template return to
-		$tpl_path = $this->component_path.'tpl';
+		$tpl_path = $this->component_path . 'tpl';
 		$tpl_file = 'popup.html';
 
 		Context::set("tpl_path", $tpl_path);
@@ -45,14 +45,14 @@ 
 	{
 		$gallery_info = new stdClass();
 		$gallery_info->srl = rand(111111, 999999);
-		$gallery_info->border_thickness = (int)$xml_obj->attrs->border_thickness;
+		$gallery_info->border_thickness = (int) $xml_obj->attrs->border_thickness;
 		$gallery_info->gallery_style = $xml_obj->attrs->gallery_style;
 		$color_preg = "/^([a-fA-F0-9]{6})/";
-		$gallery_info->border_color = preg_replace($color_preg,"#$1",$xml_obj->attrs->border_color);
-		$gallery_info->bg_color = preg_replace($color_preg,"#$1",$xml_obj->attrs->bg_color);
+		$gallery_info->border_color = preg_replace($color_preg, "#$1", $xml_obj->attrs->border_color);
+		$gallery_info->bg_color = preg_replace($color_preg, "#$1", $xml_obj->attrs->bg_color);
 		$gallery_info->gallery_align = $xml_obj->attrs->gallery_align;
 
-		if(!in_array($gallery_info->gallery_align, array('left', 'center', 'right'))) {
+		if (!in_array($gallery_info->gallery_align, array('left', 'center', 'right'))) {
 			$gallery_info->gallery_align = 'center';
 		}
 
@@ -62,10 +62,10 @@ 
 		$gallery_info->images_list = preg_grep("/^[a-z0-9\/]+\.(gif|jpe?g|png)+$/", $images_list);
 
 		// If you set the output to output the XML code generated a list of the image
-		if(Context::getResponseMethod() == 'XMLRPC')
+		if (Context::getResponseMethod() == 'XMLRPC')
 		{
 			$output = array();
-			for($i=0;$i<count($gallery_info->images_list);$i++)
+			for ($i = 0; $i < count($gallery_info->images_list); $i++)
 			{
 				$output[] = sprintf('<img src="%s" alt="" />', $gallery_info->images_list[$i]);
 			}
@@ -73,16 +73,16 @@ 
 			return implode('<br />', $output);
 		}
 		// HTML gallery output, the output settings via the template for the conversion to generate the html code should
-		preg_match_all('/(width|height)([^[:digit:]]+)([0-9]+)/i',$xml_obj->attrs->style,$matches);
+		preg_match_all('/(width|height)([^[:digit:]]+)([0-9]+)/i', $xml_obj->attrs->style, $matches);
 		$gallery_info->width = trim($matches[3][0]);
-		if(!$gallery_info->width) $gallery_info->width = 400;
+		if (!$gallery_info->width) $gallery_info->width = 400;
 
 		Context::set('gallery_info', $gallery_info);
 
-		$tpl_path = $this->component_path.'tpl';
+		$tpl_path = $this->component_path . 'tpl';
 		Context::set("tpl_path", $tpl_path);
 
-		if($gallery_info->gallery_style == "list") $tpl_file = 'list_gallery.html';
+		if ($gallery_info->gallery_style == "list") $tpl_file = 'list_gallery.html';
 		else $tpl_file = 'slide_gallery.html';
 
 		$oTemplate = &TemplateHandler::getInstance();

Braces +8 added lines, -3 removed lines

@@ -75,15 +75,20 @@
 		// HTML gallery output, the output settings via the template for the conversion to generate the html code should
 		preg_match_all('/(width|height)([^[:digit:]]+)([0-9]+)/i',$xml_obj->attrs->style,$matches);
 		$gallery_info->width = trim($matches[3][0]);
-		if(!$gallery_info->width) $gallery_info->width = 400;
+		if(!$gallery_info->width) {
+			$gallery_info->width = 400;
+		}
 
 		Context::set('gallery_info', $gallery_info);
 
 		$tpl_path = $this->component_path.'tpl';
 		Context::set("tpl_path", $tpl_path);
 
-		if($gallery_info->gallery_style == "list") $tpl_file = 'list_gallery.html';
-		else $tpl_file = 'slide_gallery.html';
+		if($gallery_info->gallery_style == "list") {
+			$tpl_file = 'list_gallery.html';
+		} else {
+			$tpl_file = 'slide_gallery.html';
+		}
 
 		$oTemplate = &TemplateHandler::getInstance();
 		return $oTemplate->compile($tpl_path, $tpl_file);

modules/editor/components/image_link/image_link.class.php

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * @class  image_link
- * @author NAVER (developers@xpressengine.com)
- * @brief Add an image, or to modify the properties of components
- */
+	 * @class  image_link
+	 * @author NAVER (developers@xpressengine.com)
+	 * @brief Add an image, or to modify the properties of components
+	 */
 class image_link extends EditorHandler
 {
 	// editor_sequence from the editor must attend mandatory wearing ....

Spacing +29 added lines, -29 removed lines

@@ -26,7 +26,7 @@ 
 	function getPopupContent()
 	{
 		// Pre-compiled source code to compile template return to
-		$tpl_path = $this->component_path.'tpl';
+		$tpl_path = $this->component_path . 'tpl';
 		$tpl_file = 'popup.html';
 
 		Context::set("tpl_path", $tpl_path);
@@ -49,57 +49,57 @@ 
 		$align = $xml_obj->attrs->align;
 		$alt = $xml_obj->attrs->alt;
 		$title = $xml_obj->attrs->title;
-		$border = (int)$xml_obj->attrs->border;
+		$border = (int) $xml_obj->attrs->border;
 		$link_url = $xml_obj->attrs->link_url;
 		$open_window = $xml_obj->attrs->open_window;
 		$style = $xml_obj->attrs->style;
-		$margin = (int)$xml_obj->attrs->margin;
+		$margin = (int) $xml_obj->attrs->margin;
 
-		$src = str_replace(array('&','"'), array('&','&qout;'), $src);
+		$src = str_replace(array('&', '"'), array('&', '&qout;'), $src);
 		$src = str_replace('&', '&', $src);
 
 		// Image containing the address to the address conversion request uri (rss output, etc. purposes)
 		$temp_src = explode('/', $src);
-		if(substr($src, 0,2)=='./') $src = Context::getRequestUri().substr($src, 2);
-		else if(substr($src , 0, 1)=='/')
+		if (substr($src, 0, 2) == './') $src = Context::getRequestUri() . substr($src, 2);
+		else if (substr($src, 0, 1) == '/')
 		{
-			if($_SERVER['HTTPS']=='on') $http_src = 'https://';
+			if ($_SERVER['HTTPS'] == 'on') $http_src = 'https://';
 			else $http_src = 'http://';
-			$src = $http_src.$_SERVER['HTTP_HOST'].$src;
+			$src = $http_src . $_SERVER['HTTP_HOST'] . $src;
 		}
-		else if(!strpos($temp_src[0],':') && $src) $src = Context::getRequestUri().$src;
+		else if (!strpos($temp_src[0], ':') && $src) $src = Context::getRequestUri() . $src;
 
 		$attr_output = array();
-		$attr_output = array("src=\"".$src."\"");
-		$attr_output[] = "alt=\"".$alt."\"";
+		$attr_output = array("src=\"" . $src . "\"");
+		$attr_output[] = "alt=\"" . $alt . "\"";
 
-		if($title)
+		if ($title)
 		{
-			$attr_output[] = "title=\"".$title."\"";
+			$attr_output[] = "title=\"" . $title . "\"";
 		}
-		if($margin)
+		if ($margin)
 		{
-			$style = trim(preg_replace('/margin[a-z\-]*[ ]*:[ ]*[0-9 a-z]+(;| )/i','', $style)).';';
-			$style = str_replace(';;',';',$style);
-			if($style == ';') $style = '';
-			$style .= ' margin:'.$margin.'px;';
+			$style = trim(preg_replace('/margin[a-z\-]*[ ]*:[ ]*[0-9 a-z]+(;| )/i', '', $style)) . ';';
+			$style = str_replace(';;', ';', $style);
+			if ($style == ';') $style = '';
+			$style .= ' margin:' . $margin . 'px;';
 		}
-		if($align) $attr_output[] = "align=\"".$align."\"";
-		if($width) $attr_output[] = 'width="'.$width.'"';
-		if($height) $attr_output[] = 'height="'.$height.'"';
-		if($border)
+		if ($align) $attr_output[] = "align=\"" . $align . "\"";
+		if ($width) $attr_output[] = 'width="' . $width . '"';
+		if ($height) $attr_output[] = 'height="' . $height . '"';
+		if ($border)
 		{
-			$style = trim(preg_replace('/border[a-z\-]*[ ]*:[ ]*[0-9 a-z]+(;| )/i','', $style)).';';
-			$style = str_replace(';;',';',$style);
-			if($style == ';') $style = '';
-			$style .= ' border-style: solid; border-width:'.$border.'px;';
+			$style = trim(preg_replace('/border[a-z\-]*[ ]*:[ ]*[0-9 a-z]+(;| )/i', '', $style)) . ';';
+			$style = str_replace(';;', ';', $style);
+			if ($style == ';') $style = '';
+			$style .= ' border-style: solid; border-width:' . $border . 'px;';
 		}
 
-		$code = sprintf("<img %s style=\"%s\" />", implode(' ',$attr_output), $style);
+		$code = sprintf("<img %s style=\"%s\" />", implode(' ', $attr_output), $style);
 
-		if($link_url)
+		if ($link_url)
 		{
-			if($open_window =='Y') $code = sprintf('<a href="%s" onclick="window.open(this.href);return false;">%s</a>', $link_url, $code);
+			if ($open_window == 'Y') $code = sprintf('<a href="%s" onclick="window.open(this.href);return false;">%s</a>', $link_url, $code);
 			else $code = sprintf('<a href="%s" >%s</a>', $link_url, $code);
 		}
 		return $code;

Braces +30 added lines, -12 removed lines

@@ -60,14 +60,19 @@ 
 
 		// Image containing the address to the address conversion request uri (rss output, etc. purposes)
 		$temp_src = explode('/', $src);
-		if(substr($src, 0,2)=='./') $src = Context::getRequestUri().substr($src, 2);
-		else if(substr($src , 0, 1)=='/')
+		if(substr($src, 0,2)=='./') {
+			$src = Context::getRequestUri().substr($src, 2);
+		} else if(substr($src , 0, 1)=='/')
 		{
-			if($_SERVER['HTTPS']=='on') $http_src = 'https://';
-			else $http_src = 'http://';
+			if($_SERVER['HTTPS']=='on') {
+				$http_src = 'https://';
+			} else {
+				$http_src = 'http://';
+			}
 			$src = $http_src.$_SERVER['HTTP_HOST'].$src;
+		} else if(!strpos($temp_src[0],':') && $src) {
+			$src = Context::getRequestUri().$src;
 		}
-		else if(!strpos($temp_src[0],':') && $src) $src = Context::getRequestUri().$src;
 
 		$attr_output = array();
 		$attr_output = array("src=\"".$src."\"");
@@ -81,17 +86,27 @@ 
 		{
 			$style = trim(preg_replace('/margin[a-z\-]*[ ]*:[ ]*[0-9 a-z]+(;| )/i','', $style)).';';
 			$style = str_replace(';;',';',$style);
-			if($style == ';') $style = '';
+			if($style == ';') {
+				$style = '';
+			}
 			$style .= ' margin:'.$margin.'px;';
 		}
-		if($align) $attr_output[] = "align=\"".$align."\"";
-		if($width) $attr_output[] = 'width="'.$width.'"';
-		if($height) $attr_output[] = 'height="'.$height.'"';
+		if($align) {
+			$attr_output[] = "align=\"".$align."\"";
+		}
+		if($width) {
+			$attr_output[] = 'width="'.$width.'"';
+		}
+		if($height) {
+			$attr_output[] = 'height="'.$height.'"';
+		}
 		if($border)
 		{
 			$style = trim(preg_replace('/border[a-z\-]*[ ]*:[ ]*[0-9 a-z]+(;| )/i','', $style)).';';
 			$style = str_replace(';;',';',$style);
-			if($style == ';') $style = '';
+			if($style == ';') {
+				$style = '';
+			}
 			$style .= ' border-style: solid; border-width:'.$border.'px;';
 		}
 
@@ -99,8 +114,11 @@ 
 
 		if($link_url)
 		{
-			if($open_window =='Y') $code = sprintf('<a href="%s" onclick="window.open(this.href);return false;">%s</a>', $link_url, $code);
-			else $code = sprintf('<a href="%s" >%s</a>', $link_url, $code);
+			if($open_window =='Y') {
+				$code = sprintf('<a href="%s" onclick="window.open(this.href);return false;">%s</a>', $link_url, $code);
+			} else {
+				$code = sprintf('<a href="%s" >%s</a>', $link_url, $code);
+			}
 		}
 		return $code;
 	}

modules/editor/components/poll_maker/poll_maker.class.php

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * @class  poll_maker
- * @author NAVER (developers@xpressengine.com)
- * @brief Editor provides the ability to link to the url.
- */
+	 * @class  poll_maker
+	 * @author NAVER (developers@xpressengine.com)
+	 * @brief Editor provides the ability to link to the url.
+	 */
 class poll_maker extends EditorHandler
 {
 	// editor_sequence from the editor must attend mandatory wearing ....

Spacing +4 added lines, -4 removed lines

@@ -30,7 +30,7 @@ 
 		$skin_list = $oModuleModel->getSkins(_XE_PATH_ . 'modules/poll/');
 		Context::set('skin_list', $skin_list);
 		// Pre-compiled source code to compile template return to
-		$tpl_path = $this->component_path.'tpl';
+		$tpl_path = $this->component_path . 'tpl';
 		$tpl_file = 'popup.html';
 
 		$oTemplate = &TemplateHandler::getInstance();
@@ -47,11 +47,11 @@ 
 	{
 		$poll_srl = $xml_obj->attrs->poll_srl;
 		$skin = $xml_obj->attrs->skin;
-		if(!$skin) $skin = 'default';
+		if (!$skin) $skin = 'default';
 
-		preg_match('/width([^[:digit:]]+)([0-9]+)/i',$xml_obj->attrs->style,$matches);
+		preg_match('/width([^[:digit:]]+)([0-9]+)/i', $xml_obj->attrs->style, $matches);
 		$width = $matches[2];
-		if(!$width) $width = 400;
+		if (!$width) $width = 400;
 		$style = sprintf('width:%dpx', $width);
 		// poll model object creation to come get it return html
 		$oPollModel = getModel('poll');

Braces +6 added lines, -2 removed lines

@@ -47,11 +47,15 @@
 	{
 		$poll_srl = $xml_obj->attrs->poll_srl;
 		$skin = $xml_obj->attrs->skin;
-		if(!$skin) $skin = 'default';
+		if(!$skin) {
+			$skin = 'default';
+		}
 
 		preg_match('/width([^[:digit:]]+)([0-9]+)/i',$xml_obj->attrs->style,$matches);
 		$width = $matches[2];
-		if(!$width) $width = 400;
+		if(!$width) {
+			$width = 400;
+		}
 		$style = sprintf('width:%dpx', $width);
 		// poll model object creation to come get it return html
 		$oPollModel = getModel('poll');

modules/editor/editor.admin.controller.php

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * @class  editorAdminController
- * @author NAVER (developers@xpressengine.com)
- * @brief editor of the module admin controller class
- */
+	 * @class  editorAdminController
+	 * @author NAVER (developers@xpressengine.com)
+	 * @brief editor of the module admin controller class
+	 */
 class editorAdminController extends editor
 {
 	/**

Spacing +28 added lines, -28 removed lines

@@ -23,26 +23,26 @@ 
 		$enables = Context::get('enables');
 		$component_names = Context::get('component_names');
 
-		if(!is_array($component_names)) $component_names = array();
-		if(!is_array($enables)) $enables = array();
+		if (!is_array($component_names)) $component_names = array();
+		if (!is_array($enables)) $enables = array();
 
 		$unables = array_diff($component_names, $enables);
 		$componentList = array();
 
-		foreach($enables as $component_name)
+		foreach ($enables as $component_name)
 		{
 			$componentList[$component_name] = 'Y';
 		}
-		foreach($unables as $component_name)
+		foreach ($unables as $component_name)
 		{
 			$componentList[$component_name] = 'N';
 		}
 
-		$output = $this->editorListOrder($component_names,$site_module_info->site_srl);
-		if(!$output->toBool()) return new Object();
+		$output = $this->editorListOrder($component_names, $site_module_info->site_srl);
+		if (!$output->toBool()) return new Object();
 
-		$output = $this->editorCheckUse($componentList,$site_module_info->site_srl);
-		if(!$output->toBool()) return new Object();
+		$output = $this->editorCheckUse($componentList, $site_module_info->site_srl);
+		if (!$output->toBool()) return new Object();
 
 		$oEditorController = getController('editor');
 		$oEditorController->removeCache($site_module_info->site_srl);
@@ -57,11 +57,11 @@ 
 		$args = new stdClass();
 		$args->site_srl = $site_srl;
 
-		foreach($componentList as $componentName => $value)
+		foreach ($componentList as $componentName => $value)
 		{
 			$args->component_name = $componentName;
 			$args->enabled = $value;
-			if($site_srl == 0)
+			if ($site_srl == 0)
 			{
 				$output = executeQuery('editor.updateComponent', $args);
 			}
@@ -70,7 +70,7 @@ 
 				$output = executeQuery('editor.updateSiteComponent', $args);
 			}
 		}
-		if(!$output->toBool()) return new Object();
+		if (!$output->toBool()) return new Object();
 
 		unset($componentList);
 		return $output;
@@ -84,13 +84,13 @@ 
 		$args = new stdClass();
 		$args->site_srl = $site_srl;
 		$list_order_num = '30';
-		if(is_array($component_names))
+		if (is_array($component_names))
 		{
-			foreach($component_names as $name)
+			foreach ($component_names as $name)
 			{
 				$args->list_order = $list_order_num;
 				$args->component_name = $name;
-				if($site_srl == 0)
+				if ($site_srl == 0)
 				{
 					$output = executeQuery('editor.updateComponent', $args);
 				}
@@ -99,7 +99,7 @@ 
 					$output = executeQuery('editor.updateSiteComponent', $args);
 				}
 
-				if(!$output->toBool()) return new Object();
+				if (!$output->toBool()) return new Object();
 				$list_order_num++;
 			}
 		}
@@ -124,11 +124,11 @@ 
 		$args = new stdClass;
 		$args->component_name = $component_name;
 		$args->extra_vars = serialize($extra_vars);
-		$args->site_srl = (int)$site_module_info->site_srl;
+		$args->site_srl = (int) $site_module_info->site_srl;
 
-		if(!$args->site_srl) $output = executeQuery('editor.updateComponent', $args);
+		if (!$args->site_srl) $output = executeQuery('editor.updateComponent', $args);
 		else $output = executeQuery('editor.updateSiteComponent', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$oEditorController = getController('editor');
 		$oEditorController->removeCache($args->site_srl);
@@ -145,10 +145,10 @@ 
 		$oModuleController = getController('module');
 		$configVars = Context::getRequestVars();
 
-		if($configVars->font_defined != 'Y') $config->font_defined = $configVars->font_defined = 'N';
+		if ($configVars->font_defined != 'Y') $config->font_defined = $configVars->font_defined = 'N';
 		else $config->font_defined = 'Y';
 
-		if($config->font_defined == 'Y')
+		if ($config->font_defined == 'Y')
 			$config->content_font = $configVars->content_font_defined;
 		else
 			$config->content_font = $configVars->content_font;
@@ -159,11 +159,11 @@ 
 		$config->comment_editor_height = $configVars->comment_editor_height;
 		$config->content_style = $configVars->content_style;
 
-		$config->content_font_size= $configVars->content_font_size.'px';
-		$config->sel_editor_colorset= $configVars->sel_editor_colorset;
-		$config->sel_comment_editor_colorset= $configVars->sel_comment_editor_colorset;
+		$config->content_font_size = $configVars->content_font_size . 'px';
+		$config->sel_editor_colorset = $configVars->sel_editor_colorset;
+		$config->sel_comment_editor_colorset = $configVars->sel_comment_editor_colorset;
 
-		$oModuleController->insertModuleConfig('editor',$config);
+		$oModuleController->insertModuleConfig('editor', $config);
 		$this->setRedirectUrl(Context::get('error_return_url'));
 	}
 
@@ -172,7 +172,7 @@ 
 	 */
 	function insertComponent($component_name, $enabled = false, $site_srl = 0)
 	{
-		if($enabled) $enabled = 'Y';
+		if ($enabled) $enabled = 'Y';
 		else $enabled = 'N';
 
 		$args = new stdClass;
@@ -180,12 +180,12 @@ 
 		$args->enabled = $enabled;
 		$args->site_srl = $site_srl;
 		// Check if the component exists
-		if(!$site_srl) $output = executeQuery('editor.isComponentInserted', $args);
+		if (!$site_srl) $output = executeQuery('editor.isComponentInserted', $args);
 		else $output = executeQuery('editor.isSiteComponentInserted', $args);
-		if($output->data->count) return new Object(-1, 'msg_component_is_not_founded');
+		if ($output->data->count) return new Object(-1, 'msg_component_is_not_founded');
 		// Inert a component
 		$args->list_order = getNextSequence();
-		if(!$site_srl) $output = executeQuery('editor.insertComponent', $args);
+		if (!$site_srl) $output = executeQuery('editor.insertComponent', $args);
 		else $output = executeQuery('editor.insertSiteComponent', $args);
 
 		$oEditorController = getController('editor');

Braces +56 added lines, -26 removed lines

@@ -23,8 +23,12 @@ 
 		$enables = Context::get('enables');
 		$component_names = Context::get('component_names');
 
-		if(!is_array($component_names)) $component_names = array();
-		if(!is_array($enables)) $enables = array();
+		if(!is_array($component_names)) {
+			$component_names = array();
+		}
+		if(!is_array($enables)) {
+			$enables = array();
+		}
 
 		$unables = array_diff($component_names, $enables);
 		$componentList = array();
@@ -39,10 +43,14 @@ 
 		}
 
 		$output = $this->editorListOrder($component_names,$site_module_info->site_srl);
-		if(!$output->toBool()) return new Object();
+		if(!$output->toBool()) {
+			return new Object();
+		}
 
 		$output = $this->editorCheckUse($componentList,$site_module_info->site_srl);
-		if(!$output->toBool()) return new Object();
+		if(!$output->toBool()) {
+			return new Object();
+		}
 
 		$oEditorController = getController('editor');
 		$oEditorController->removeCache($site_module_info->site_srl);
@@ -64,13 +72,14 @@ 
 			if($site_srl == 0)
 			{
 				$output = executeQuery('editor.updateComponent', $args);
-			}
-			else
+			} else
 			{
 				$output = executeQuery('editor.updateSiteComponent', $args);
 			}
 		}
-		if(!$output->toBool()) return new Object();
+		if(!$output->toBool()) {
+			return new Object();
+		}
 
 		unset($componentList);
 		return $output;
@@ -93,13 +102,14 @@ 
 				if($site_srl == 0)
 				{
 					$output = executeQuery('editor.updateComponent', $args);
-				}
-				else
+				} else
 				{
 					$output = executeQuery('editor.updateSiteComponent', $args);
 				}
 
-				if(!$output->toBool()) return new Object();
+				if(!$output->toBool()) {
+					return new Object();
+				}
 				$list_order_num++;
 			}
 		}
@@ -126,9 +136,14 @@ 
 		$args->extra_vars = serialize($extra_vars);
 		$args->site_srl = (int)$site_module_info->site_srl;
 
-		if(!$args->site_srl) $output = executeQuery('editor.updateComponent', $args);
-		else $output = executeQuery('editor.updateSiteComponent', $args);
-		if(!$output->toBool()) return $output;
+		if(!$args->site_srl) {
+			$output = executeQuery('editor.updateComponent', $args);
+		} else {
+			$output = executeQuery('editor.updateSiteComponent', $args);
+		}
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$oEditorController = getController('editor');
 		$oEditorController->removeCache($args->site_srl);
@@ -145,13 +160,17 @@ 
 		$oModuleController = getController('module');
 		$configVars = Context::getRequestVars();
 
-		if($configVars->font_defined != 'Y') $config->font_defined = $configVars->font_defined = 'N';
-		else $config->font_defined = 'Y';
+		if($configVars->font_defined != 'Y') {
+			$config->font_defined = $configVars->font_defined = 'N';
+		} else {
+			$config->font_defined = 'Y';
+		}
 
-		if($config->font_defined == 'Y')
-			$config->content_font = $configVars->content_font_defined;
-		else
-			$config->content_font = $configVars->content_font;
+		if($config->font_defined == 'Y') {
+					$config->content_font = $configVars->content_font_defined;
+		} else {
+					$config->content_font = $configVars->content_font;
+		}
 
 		$config->editor_skin = $configVars->editor_skin;
 		$config->editor_height = $configVars->editor_height;
@@ -172,21 +191,32 @@ 
 	 */
 	function insertComponent($component_name, $enabled = false, $site_srl = 0)
 	{
-		if($enabled) $enabled = 'Y';
-		else $enabled = 'N';
+		if($enabled) {
+			$enabled = 'Y';
+		} else {
+			$enabled = 'N';
+		}
 
 		$args = new stdClass;
 		$args->component_name = $component_name;
 		$args->enabled = $enabled;
 		$args->site_srl = $site_srl;
 		// Check if the component exists
-		if(!$site_srl) $output = executeQuery('editor.isComponentInserted', $args);
-		else $output = executeQuery('editor.isSiteComponentInserted', $args);
-		if($output->data->count) return new Object(-1, 'msg_component_is_not_founded');
+		if(!$site_srl) {
+			$output = executeQuery('editor.isComponentInserted', $args);
+		} else {
+			$output = executeQuery('editor.isSiteComponentInserted', $args);
+		}
+		if($output->data->count) {
+			return new Object(-1, 'msg_component_is_not_founded');
+		}
 		// Inert a component
 		$args->list_order = getNextSequence();
-		if(!$site_srl) $output = executeQuery('editor.insertComponent', $args);
-		else $output = executeQuery('editor.insertSiteComponent', $args);
+		if(!$site_srl) {
+			$output = executeQuery('editor.insertComponent', $args);
+		} else {
+			$output = executeQuery('editor.insertSiteComponent', $args);
+		}
 
 		$oEditorController = getController('editor');
 		$oEditorController->removeCache($site_srl);

modules/editor/editor.admin.view.php

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * @class  editorAdminView
- * @author NAVER (developers@xpressengine.com)
- * @brief editor admin view of the module class
- */
+	 * @class  editorAdminView
+	 * @author NAVER (developers@xpressengine.com)
+	 * @brief editor admin view of the module class
+	 */
 class editorAdminView extends editor
 {
 	/**

Spacing +31 added lines, -31 removed lines

@@ -22,59 +22,59 @@ 
 	{
 		$component_count = 0;
 		$site_module_info = Context::get('site_module_info');
-		$site_srl = (int)$site_module_info->site_srl;
+		$site_srl = (int) $site_module_info->site_srl;
 
 		// Get a type of component
 		$oEditorModel = getModel('editor');
 		$oModuleModel = getModel('module');
 		$editor_config = $oModuleModel->getModuleConfig('editor');
 
-		if(!$editor_config)
+		if (!$editor_config)
 		{
 			$editor_config = new stdClass();
 		}
 
 		//editor_config init
-		if(!$editor_config->editor_height) $editor_config->editor_height = 300;
-		if(!$editor_config->comment_editor_height) $editor_config->comment_editor_height = 100;
-		if(!$editor_config->editor_skin) $editor_config->editor_skin = 'ckeditor';
-		if(!$editor_config->comment_editor_skin) $editor_config->comment_editor_skin = 'ckeditor';
-		if(!$editor_config->sel_editor_colorset) $editor_config->sel_editor_colorset= 'moono';
-		if(!$editor_config->sel_comment_editor_colorset) $editor_config->sel_comment_editor_colorset= 'moono';
+		if (!$editor_config->editor_height) $editor_config->editor_height = 300;
+		if (!$editor_config->comment_editor_height) $editor_config->comment_editor_height = 100;
+		if (!$editor_config->editor_skin) $editor_config->editor_skin = 'ckeditor';
+		if (!$editor_config->comment_editor_skin) $editor_config->comment_editor_skin = 'ckeditor';
+		if (!$editor_config->sel_editor_colorset) $editor_config->sel_editor_colorset = 'moono';
+		if (!$editor_config->sel_comment_editor_colorset) $editor_config->sel_comment_editor_colorset = 'moono';
 
 		$component_list = $oEditorModel->getComponentList(false, $site_srl, true);
-		$editor_skin_list = FileHandler::readDir(_XE_PATH_.'modules/editor/skins');
+		$editor_skin_list = FileHandler::readDir(_XE_PATH_ . 'modules/editor/skins');
 
-		$skin_info = $oModuleModel->loadSkinInfo($this->module_path,$editor_config->editor_skin);
+		$skin_info = $oModuleModel->loadSkinInfo($this->module_path, $editor_config->editor_skin);
 
-		$contents = FileHandler::readDir(_XE_PATH_.'modules/editor/styles');
+		$contents = FileHandler::readDir(_XE_PATH_ . 'modules/editor/styles');
 		$content_style_list = array();
-		for($i=0,$c=count($contents);$i<$c;$i++)
+		for ($i = 0, $c = count($contents); $i < $c; $i++)
 		{
 			$style = $contents[$i];
-			$info = $oModuleModel->loadSkinInfo($this->module_path,$style,'styles');
+			$info = $oModuleModel->loadSkinInfo($this->module_path, $style, 'styles');
 			$content_style_list[$style] = new stdClass();
 			$content_style_list[$style]->title = $info->title;
 		}
 
 		// Get install info, update info, count
 		$oAutoinstallModel = getModel('autoinstall');
-		foreach($component_list as $component_name => $xml_info)
+		foreach ($component_list as $component_name => $xml_info)
 		{
 			$component_count++;
-			$xml_info->path = './modules/editor/components/'.$xml_info->component_name;
+			$xml_info->path = './modules/editor/components/' . $xml_info->component_name;
 			$xml_info->delete_url = $oAutoinstallModel->getRemoveUrlByPath($xml_info->path);
 			$xml_info->package_srl = $oAutoinstallModel->getPackageSrlByPath($xml_info->path);
-			if($xml_info->package_srl) $targetpackages[$xml_info->package_srl] = 0;
+			if ($xml_info->package_srl) $targetpackages[$xml_info->package_srl] = 0;
 		}
 
-		if(is_array($targetpackages))	$packages = $oAutoinstallModel->getInstalledPackages(array_keys($targetpackages));
+		if (is_array($targetpackages))	$packages = $oAutoinstallModel->getInstalledPackages(array_keys($targetpackages));
 
-		foreach($component_list as $component_name => $xml_info)
+		foreach ($component_list as $component_name => $xml_info)
 		{
-			if($packages[$xml_info->package_srl])	$xml_info->need_update = $packages[$xml_info->package_srl]->need_update;
+			if ($packages[$xml_info->package_srl])	$xml_info->need_update = $packages[$xml_info->package_srl]->need_update;
 		}
-		$editor_config_default = array( "editor_height" => "300", "comment_editor_height" => "100","content_font_size"=>"13");
+		$editor_config_default = array("editor_height" => "300", "comment_editor_height" => "100", "content_font_size"=>"13");
 
 		//editor preview
 		$config = $oEditorModel->getEditorConfig();
@@ -128,7 +128,7 @@ 
 		$security = new Security();
 		$security->encodeHTML('component_list....');
 
-		$this->setTemplatePath($this->module_path.'tpl');
+		$this->setTemplatePath($this->module_path . 'tpl');
 		$this->setTemplateFile('admin_index');
 	}
 
@@ -138,12 +138,12 @@ 
 	function dispEditorAdminSetupComponent()
 	{
 		$site_module_info = Context::get('site_module_info');
-		$site_srl = (int)$site_module_info->site_srl;
+		$site_srl = (int) $site_module_info->site_srl;
 
 		$component_name = Context::get('component_name');
 		// Get information of the editor component
 		$oEditorModel = getModel('editor');
-		$component = $oEditorModel->getComponent($component_name,$site_srl);
+		$component = $oEditorModel->getComponent($component_name, $site_srl);
 		Context::set('component', $component);
 		// Get a group list to set a group
 		$oMemberModel = getModel('member');
@@ -152,20 +152,20 @@ 
 		// Get a mid list
 		$oModuleModel = getModel('module');
 
-		$args =new stdClass();
+		$args = new stdClass();
 		$args->site_srl = $site_srl;
 		$columnList = array('module_srl', 'mid', 'module_category_srl', 'browser_title');
 		$mid_list = $oModuleModel->getMidList($args, $columnList);
 		// Combination of module_category and module
-		if(!$args->site_srl)
+		if (!$args->site_srl)
 		{
 			// Get a list of module category
 			$module_categories = $oModuleModel->getModuleCategories();
 
-			if(!is_array($mid_list)) $mid_list = array($mid_list);
-			foreach($mid_list as $module_srl => $module)
+			if (!is_array($mid_list)) $mid_list = array($mid_list);
+			foreach ($mid_list as $module_srl => $module)
 			{
-				if($module) $module_categories[$module->module_category_srl]->list[$module_srl] = $module; 
+				if ($module) $module_categories[$module->module_category_srl]->list[$module_srl] = $module; 
 			}
 		}
 		else
@@ -173,15 +173,15 @@ 
 			$module_categories[0]->list = $mid_list;
 		}
 
-		Context::set('mid_list',$module_categories);
+		Context::set('mid_list', $module_categories);
 
 		//Security
 		$security = new Security();
 		$security->encodeHTML('group_list..title');
 		$security->encodeHTML('component...');
-		$security->encodeHTML('mid_list..title','mid_list..list..browser_title');
+		$security->encodeHTML('mid_list..title', 'mid_list..list..browser_title');
 
-		$this->setTemplatePath($this->module_path.'tpl');
+		$this->setTemplatePath($this->module_path . 'tpl');
 		$this->setTemplateFile('setup_component');
 	}
 }

Braces +34 added lines, -13 removed lines

@@ -35,12 +35,24 @@ 
 		}
 
 		//editor_config init
-		if(!$editor_config->editor_height) $editor_config->editor_height = 300;
-		if(!$editor_config->comment_editor_height) $editor_config->comment_editor_height = 100;
-		if(!$editor_config->editor_skin) $editor_config->editor_skin = 'ckeditor';
-		if(!$editor_config->comment_editor_skin) $editor_config->comment_editor_skin = 'ckeditor';
-		if(!$editor_config->sel_editor_colorset) $editor_config->sel_editor_colorset= 'moono';
-		if(!$editor_config->sel_comment_editor_colorset) $editor_config->sel_comment_editor_colorset= 'moono';
+		if(!$editor_config->editor_height) {
+			$editor_config->editor_height = 300;
+		}
+		if(!$editor_config->comment_editor_height) {
+			$editor_config->comment_editor_height = 100;
+		}
+		if(!$editor_config->editor_skin) {
+			$editor_config->editor_skin = 'ckeditor';
+		}
+		if(!$editor_config->comment_editor_skin) {
+			$editor_config->comment_editor_skin = 'ckeditor';
+		}
+		if(!$editor_config->sel_editor_colorset) {
+			$editor_config->sel_editor_colorset= 'moono';
+		}
+		if(!$editor_config->sel_comment_editor_colorset) {
+			$editor_config->sel_comment_editor_colorset= 'moono';
+		}
 
 		$component_list = $oEditorModel->getComponentList(false, $site_srl, true);
 		$editor_skin_list = FileHandler::readDir(_XE_PATH_.'modules/editor/skins');
@@ -65,14 +77,20 @@ 
 			$xml_info->path = './modules/editor/components/'.$xml_info->component_name;
 			$xml_info->delete_url = $oAutoinstallModel->getRemoveUrlByPath($xml_info->path);
 			$xml_info->package_srl = $oAutoinstallModel->getPackageSrlByPath($xml_info->path);
-			if($xml_info->package_srl) $targetpackages[$xml_info->package_srl] = 0;
+			if($xml_info->package_srl) {
+				$targetpackages[$xml_info->package_srl] = 0;
+			}
 		}
 
-		if(is_array($targetpackages))	$packages = $oAutoinstallModel->getInstalledPackages(array_keys($targetpackages));
+		if(is_array($targetpackages)) {
+			$packages = $oAutoinstallModel->getInstalledPackages(array_keys($targetpackages));
+		}
 
 		foreach($component_list as $component_name => $xml_info)
 		{
-			if($packages[$xml_info->package_srl])	$xml_info->need_update = $packages[$xml_info->package_srl]->need_update;
+			if($packages[$xml_info->package_srl]) {
+				$xml_info->need_update = $packages[$xml_info->package_srl]->need_update;
+			}
 		}
 		$editor_config_default = array( "editor_height" => "300", "comment_editor_height" => "100","content_font_size"=>"13");
 
@@ -162,13 +180,16 @@ 
 			// Get a list of module category
 			$module_categories = $oModuleModel->getModuleCategories();
 
-			if(!is_array($mid_list)) $mid_list = array($mid_list);
+			if(!is_array($mid_list)) {
+				$mid_list = array($mid_list);
+			}
 			foreach($mid_list as $module_srl => $module)
 			{
-				if($module) $module_categories[$module->module_category_srl]->list[$module_srl] = $module; 
+				if($module) {
+					$module_categories[$module->module_category_srl]->list[$module_srl] = $module;
+				}
 			}
-		}
-		else
+		} else
 		{
 			$module_categories[0]->list = $mid_list;
 		}

modules/editor/editor.api.php

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * @class  editorAPI
- * @author NAVER (developers@xpressengine.com)
- * @brief 
- */
+	 * @class  editorAPI
+	 * @author NAVER (developers@xpressengine.com)
+	 * @brief 
+	 */
 class editorAPI extends editor
 {
 	function dispEditorSkinColorset(&$oModule)

modules/editor/editor.class.php

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * @class  editor
- * @author NAVER (developers@xpressengine.com)
- * @brief high class of the editor odule 
- */
+	 * @class  editor
+	 * @author NAVER (developers@xpressengine.com)
+	 * @brief high class of the editor odule 
+	 */
 class editor extends ModuleObject
 {
 	/**

Spacing +27 added lines, -27 removed lines

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

Braces +45 added lines, -21 removed lines

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

modules/editor/editor.view.php

Spacing +20 added lines, -20 removed lines

@@ -21,20 +21,20 @@ 
 	function dispEditorPopup()
 	{
 		// add a css file
-		Context::loadFile($this->module_path."tpl/css/editor.css", true);
+		Context::loadFile($this->module_path . "tpl/css/editor.css", true);
 		// List variables
 		$editor_sequence = Context::get('editor_sequence');
 		$component = Context::get('component');
 
 		$site_module_info = Context::get('site_module_info');
-		$site_srl = (int)$site_module_info->site_srl;
+		$site_srl = (int) $site_module_info->site_srl;
 		// Get compoenet object
 		$oEditorModel = getModel('editor');
 		$oComponent = &$oEditorModel->getComponentObject($component, $editor_sequence, $site_srl);
-		if(!$oComponent->toBool())
+		if (!$oComponent->toBool())
 		{
 			Context::set('message', sprintf(Context::getLang('msg_component_is_not_founded'), $component));
-			$this->setTemplatePath($this->module_path.'tpl');
+			$this->setTemplatePath($this->module_path . 'tpl');
 			$this->setTemplateFile('component_not_founded');
 		}
 		else
@@ -45,7 +45,7 @@ 
 			// Set layout to popup_layout
 			$this->setLayoutFile('popup_layout');
 			// Set a template
-			$this->setTemplatePath($this->module_path.'tpl');
+			$this->setTemplatePath($this->module_path . 'tpl');
 			$this->setTemplateFile('popup');
 		}
 	}
@@ -58,13 +58,13 @@ 
 		$component_name = Context::get('component_name');
 
 		$site_module_info = Context::get('site_module_info');
-		$site_srl = (int)$site_module_info->site_srl;
+		$site_srl = (int) $site_module_info->site_srl;
 
 		$oEditorModel = getModel('editor');
 		$component = $oEditorModel->getComponent($component_name, $site_srl);
 		Context::set('component', $component);
 
-		$this->setTemplatePath($this->module_path.'tpl');
+		$this->setTemplatePath($this->module_path . 'tpl');
 		$this->setTemplateFile('view_component');
 		$this->setLayoutFile("popup_layout");
 	}
@@ -77,12 +77,12 @@ 
 		$current_module_srl = Context::get('module_srl');
 		$current_module_srls = Context::get('module_srls');
 
-		if(!$current_module_srl && !$current_module_srls)
+		if (!$current_module_srl && !$current_module_srls)
 		{
 			// Get information of the current module
 			$current_module_info = Context::get('current_module_info');
 			$current_module_srl = $current_module_info->module_srl;
-			if(!$current_module_srl) return new Object();
+			if (!$current_module_srl) return new Object();
 		}
 		// Get editors settings
 		$oEditorModel = getModel('editor');
@@ -92,20 +92,20 @@ 
 
 		$oModuleModel = getModel('module');
 		// Get a list of editor skin
-		$editor_skin_list = FileHandler::readDir(_XE_PATH_.'modules/editor/skins');
+		$editor_skin_list = FileHandler::readDir(_XE_PATH_ . 'modules/editor/skins');
 		Context::set('editor_skin_list', $editor_skin_list);
 
-		$skin_info = $oModuleModel->loadSkinInfo($this->module_path,$editor_config->editor_skin);
+		$skin_info = $oModuleModel->loadSkinInfo($this->module_path, $editor_config->editor_skin);
 		Context::set('editor_colorset_list', $skin_info->colorset);
-		$skin_info = $oModuleModel->loadSkinInfo($this->module_path,$editor_config->comment_editor_skin);
+		$skin_info = $oModuleModel->loadSkinInfo($this->module_path, $editor_config->comment_editor_skin);
 		Context::set('editor_comment_colorset_list', $skin_info->colorset);
 
-		$contents = FileHandler::readDir(_XE_PATH_.'modules/editor/styles');
+		$contents = FileHandler::readDir(_XE_PATH_ . 'modules/editor/styles');
 		$content_style_list = array();
-		for($i=0,$c=count($contents);$i<$c;$i++)
+		for ($i = 0, $c = count($contents); $i < $c; $i++)
 		{
 			$style = $contents[$i];
-			$info = $oModuleModel->loadSkinInfo($this->module_path,$style,'styles');
+			$info = $oModuleModel->loadSkinInfo($this->module_path, $style, 'styles');
 			$content_style_list[$style] = new stdClass();
 			$content_style_list[$style]->title = $info->title;
 		}			
@@ -125,7 +125,7 @@ 
 
 		// Set a template file
 		$oTemplate = &TemplateHandler::getInstance();
-		$tpl = $oTemplate->compile($this->module_path.'tpl', 'editor_module_config');
+		$tpl = $oTemplate->compile($this->module_path . 'tpl', 'editor_module_config');
 		$obj .= $tpl;
 
 		return new Object();
@@ -134,7 +134,7 @@ 
 
 	function dispEditorPreview()
 	{
-		$this->setTemplatePath($this->module_path.'tpl');
+		$this->setTemplatePath($this->module_path . 'tpl');
 		$this->setTemplateFile('preview');
 	}
 
@@ -142,7 +142,7 @@ 
 	{
 		$skin = Context::get('skin');
 		$oModuleModel = getModel('module');
-		$skin_info = $oModuleModel->loadSkinInfo($this->module_path,$skin);
+		$skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin);
 		$colorset = $skin_info->colorset;
 		Context::set('colorset', $colorset);
 	}
@@ -154,7 +154,7 @@ 
 
 		$mode = Context::get('mode');
 
-		if($mode != 'main')
+		if ($mode != 'main')
 		{
 			$option_com = new stdClass();
 			$option_com->allow_fileupload = false;
@@ -195,7 +195,7 @@ 
 		Context::set('editor', $editor);
 
 		$this->setLayoutFile('popup_layout');
-		$this->setTemplatePath($this->module_path.'tpl');
+		$this->setTemplatePath($this->module_path . 'tpl');
 		$this->setTemplateFile('config_preview');
 	}
 }

Braces +5 added lines, -5 removed lines

@@ -36,8 +36,7 @@ 
 			Context::set('message', sprintf(Context::getLang('msg_component_is_not_founded'), $component));
 			$this->setTemplatePath($this->module_path.'tpl');
 			$this->setTemplateFile('component_not_founded');
-		}
-		else
+		} else
 		{
 			// Get the result after executing a method to display popup url of the component
 			$popup_content = $oComponent->getPopupContent();
@@ -82,7 +81,9 @@ 
 			// Get information of the current module
 			$current_module_info = Context::get('current_module_info');
 			$current_module_srl = $current_module_info->module_srl;
-			if(!$current_module_srl) return new Object();
+			if(!$current_module_srl) {
+				return new Object();
+			}
 		}
 		// Get editors settings
 		$oEditorModel = getModel('editor');
@@ -172,8 +173,7 @@ 
 			$option_com->content_style = $config->comment_content_style;
 			$option_com->colorset = $config->sel_comment_editor_colorset;
 			$editor = $oEditorModel->getEditor(0, $option_com);
-		}
-		else
+		} else
 		{
 			$option = new stdClass();
 			$option->allow_fileupload = false;

modules/file/file.admin.view.php

Indentation +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * Admin view of the module class file
- * @author NAVER (developers@xpressengine.com)
- */
+	 * Admin view of the module class file
+	 * @author NAVER (developers@xpressengine.com)
+	 */
 class fileAdminView extends file
 {
 	/**

Spacing +36 added lines, -36 removed lines

@@ -36,7 +36,7 @@ 
 				, 'source_filename', 'isvalid', 'file_size', 'download_count', 'files.regdate', 'ipaddress', 'member.member_srl', 'member.nick_name', 'uploaded_filename');
 		$output = $oFileAdminModel->getFileList($args, $columnList);
 		// Get the document for looping a list
-		if($output->data)
+		if ($output->data)
 		{
 			$oCommentModel = getModel('comment');
 			$oDocumentModel = getModel('document');
@@ -45,31 +45,31 @@ 
 			$file_list = array();
 			$document_list = array();
 			$comment_list = array();
-			$module_list= array();
+			$module_list = array();
 
 			$doc_srls = array();
 			$com_srls = array();
-			$mod_srls= array();
+			$mod_srls = array();
 
-			foreach($output->data as $file)
+			foreach ($output->data as $file)
 			{
 				$file_srl = $file->file_srl;
 				$target_srl = $file->upload_target_srl;
 				$file_update_args = new stdClass();
 				$file_update_args->file_srl = $file_srl;
 				// Find and update if upload_target_type doesn't exist
-				if(!$file->upload_target_type)
+				if (!$file->upload_target_type)
 				{
 					// Pass if upload_target_type is already found 
-					if($document_list[$target_srl])
+					if ($document_list[$target_srl])
 					{
 						$file->upload_target_type = 'doc';
 					}
-					else if($comment_list[$target_srl])
+					else if ($comment_list[$target_srl])
 					{
 						$file->upload_target_type = 'com';
 					}
-					else if($module_list[$target_srl])
+					else if ($module_list[$target_srl])
 					{
 						$file->upload_target_type = 'mod';
 					}
@@ -77,17 +77,17 @@ 
 					{
 						// document
 						$document = $oDocumentModel->getDocument($target_srl);
-						if($document->isExists())
+						if ($document->isExists())
 						{
 							$file->upload_target_type = 'doc';
 							$file_update_args->upload_target_type = $file->upload_target_type;
 							$document_list[$target_srl] = $document;
 						}
 						// comment
-						if(!$file->upload_target_type)
+						if (!$file->upload_target_type)
 						{
 							$comment = $oCommentModel->getComment($target_srl);
-							if($comment->isExists())
+							if ($comment->isExists())
 							{
 								$file->upload_target_type = 'com';
 								$file->target_document_srl = $comment->document_srl;
@@ -97,41 +97,41 @@ 
 							}
 						}
 						// module (for a page)
-						if(!$file->upload_target_type)
+						if (!$file->upload_target_type)
 						{
 							$module = $oModuleModel->getModulesInfo($target_srl);
-							if($module)
+							if ($module)
 							{
 								$file->upload_target_type = 'mod';
 								$file_update_args->upload_target_type = $file->upload_target_type;
 								$module_list[$module->comment_srl] = $module;
 							}
 						}
-						if($file_update_args->upload_target_type)
+						if ($file_update_args->upload_target_type)
 						{
 							executeQuery('file.updateFileTargetType', $file_update_args);
 						}
 					}
 					// Check if data is already obtained
-					for($i = 0; $i < $com_srls_count; ++$i)
+					for ($i = 0; $i < $com_srls_count; ++$i)
 					{
-						if($comment_list[$com_srls[$i]]) delete($com_srls[$i]);
+						if ($comment_list[$com_srls[$i]]) delete($com_srls[$i]);
 					}
-					for($i = 0; $i < $doc_srls_count; ++$i)
+					for ($i = 0; $i < $doc_srls_count; ++$i)
 					{
-						if($document_list[$doc_srls[$i]]) delete($doc_srls[$i]);
+						if ($document_list[$doc_srls[$i]]) delete($doc_srls[$i]);
 					}
-					for($i = 0; $i < $mod_srls_count; ++$i)
+					for ($i = 0; $i < $mod_srls_count; ++$i)
 					{
-						if($module_list[$mod_srls[$i]]) delete($mod_srls[$i]);
+						if ($module_list[$mod_srls[$i]]) delete($mod_srls[$i]);
 					}
 				}
 
-				if($file->upload_target_type)
+				if ($file->upload_target_type)
 				{
-					if(!in_array($file->upload_target_srl, ${$file->upload_target_type.'_srls'}))
+					if (!in_array($file->upload_target_srl, ${$file->upload_target_type . '_srls'}))
 					{
-						${$file->upload_target_type.'_srls'}[] = $target_srl;
+						${$file->upload_target_type . '_srls'}[] = $target_srl;
 					}
 				}
 
@@ -144,10 +144,10 @@ 
 			$mod_srls = array_unique($mod_srls);
 			// Comment list
 			$com_srls_count = count($com_srls);
-			if($com_srls_count)
+			if ($com_srls_count)
 			{
 				$comment_output = $oCommentModel->getComments($com_srls);
-				foreach($comment_output as $comment)
+				foreach ($comment_output as $comment)
 				{
 					$comment_list[$comment->comment_srl] = $comment;
 					$doc_srls[] = $comment->document_srl;
@@ -155,12 +155,12 @@ 
 			}
 			// Document list
 			$doc_srls_count = count($doc_srls);
-			if($doc_srls_count)
+			if ($doc_srls_count)
 			{
 				$document_output = $oDocumentModel->getDocuments($doc_srls);
-				if(is_array($document_output))
+				if (is_array($document_output))
 				{
-					foreach($document_output as $document)
+					foreach ($document_output as $document)
 					{
 						$document_list[$document->document_srl] = $document;
 					}
@@ -168,22 +168,22 @@ 
 			}
 			// Module List
 			$mod_srls_count = count($mod_srls);
-			if($mod_srls_count)
+			if ($mod_srls_count)
 			{
 				$columnList = array('module_srl', 'mid', 'browser_title');
 				$module_output = $oModuleModel->getModulesInfo($mod_srls, $columnList);
-				if($module_output && is_array($module_output))
+				if ($module_output && is_array($module_output))
 				{
-					foreach($module_output as $module)
+					foreach ($module_output as $module)
 					{
 						$module_list[$module->module_srl] = $module;
 					}
 				}
 			}
 
-			foreach($file_list as $srl => $file)
+			foreach ($file_list as $srl => $file)
 			{
-				if($file->upload_target_type == 'com')
+				if ($file->upload_target_type == 'com')
 				{
 					$file_list[$srl]->target_document_srl = $comment_list[$file->upload_target_srl]->document_srl;
 				}
@@ -203,7 +203,7 @@ 
 		$security->encodeHTML('file_list..');
 		$security->encodeHTML('module_list..');
 
-		$this->setTemplatePath($this->module_path.'tpl');
+		$this->setTemplatePath($this->module_path . 'tpl');
 		$this->setTemplateFile('file_list');
 	}
 
@@ -216,13 +216,13 @@ 
 	{
 		$oFileModel = getModel('file');
 		$config = $oFileModel->getFileConfig();
-		Context::set('config',$config);
+		Context::set('config', $config);
 		$iniPostMaxSize = FileHandler::returnbytes(ini_get('post_max_size'));
 		$iniUploadMaxSize = FileHandler::returnbytes(ini_get('upload_max_filesize'));
 		$iniMinSize = min($iniPostMaxSize, $iniUploadMaxSize);
 		Context::set('upload_max_filesize', FileHandler::filesize($iniMinSize));
 		// Set a template file
-		$this->setTemplatePath($this->module_path.'tpl');
+		$this->setTemplatePath($this->module_path . 'tpl');
 		$this->setTemplateFile('adminConfig');
 	}
 }

Braces +12 added lines, -9 removed lines

@@ -64,16 +64,13 @@ 
 					if($document_list[$target_srl])
 					{
 						$file->upload_target_type = 'doc';
-					}
-					else if($comment_list[$target_srl])
+					} else if($comment_list[$target_srl])
 					{
 						$file->upload_target_type = 'com';
-					}
-					else if($module_list[$target_srl])
+					} else if($module_list[$target_srl])
 					{
 						$file->upload_target_type = 'mod';
-					}
-					else
+					} else
 					{
 						// document
 						$document = $oDocumentModel->getDocument($target_srl);
@@ -115,15 +112,21 @@ 
 					// Check if data is already obtained
 					for($i = 0; $i < $com_srls_count; ++$i)
 					{
-						if($comment_list[$com_srls[$i]]) delete($com_srls[$i]);
+						if($comment_list[$com_srls[$i]]) {
+							delete($com_srls[$i]);
+						}
 					}
 					for($i = 0; $i < $doc_srls_count; ++$i)
 					{
-						if($document_list[$doc_srls[$i]]) delete($doc_srls[$i]);
+						if($document_list[$doc_srls[$i]]) {
+							delete($doc_srls[$i]);
+						}
 					}
 					for($i = 0; $i < $mod_srls_count; ++$i)
 					{
-						if($module_list[$mod_srls[$i]]) delete($mod_srls[$i]);
+						if($module_list[$mod_srls[$i]]) {
+							delete($mod_srls[$i]);
+						}
 					}
 				}