xpressengine / xe-core

tools/minify/minify.php

Doc Comments +6 added lines

@@ -172,6 +172,9 @@ 
 	}
 }
 
+/**
+ * @param string $ext
+ */
 function get_target_files($ext, $dir, $files_to_skip) {
 	$files = glob("{$dir}*.{$ext}");
 	$skips = glob("{$dir}*.min.{$ext}");
@@ -181,6 +184,9 @@ 
 	return $files;
 }
 
+/**
+ * @param string $content
+ */
 function closure_compile($content) {
 	require_once dirname(__FILE__).'/../../classes/httprequest/XEHttpRequest.class.php';
 

Spacing +38 added lines, -38 removed lines

@@ -11,7 +11,7 @@ 
  * @author NAVER(developer@xpressengine.com)
  */
 
-if(version_compare(PHP_VERSION, '5.3.0', '<')) {
+if (version_compare(PHP_VERSION, '5.3.0', '<')) {
 	echo "PHP 5.3.0 or above version is required.";
 	exit(1);
 }
@@ -21,8 +21,8 @@ 
 	$argc = $_SERVER['argc'];
 
 	// get target directories
-	if($argc < 1) exit;
-	elseif($argc < 2) $dirs = array($_SERVER['PWD']);
+	if ($argc < 1) exit;
+	elseif ($argc < 2) $dirs = array($_SERVER['PWD']);
 	else $dirs = array_slice($argv, 1);
 
 	$dirs = array_map('realpath', $dirs);
@@ -33,7 +33,7 @@ 
 
 // add directory separator
 function add_dirsep($path) {
-	if(substr($path,-1) != DIRECTORY_SEPARATOR) $path .= DIRECTORY_SEPARATOR;
+	if (substr($path, -1) != DIRECTORY_SEPARATOR) $path .= DIRECTORY_SEPARATOR;
 	return $path;
 }
 
@@ -46,38 +46,38 @@ 
 	echo " Done\n";
 
 	// merge
-	foreach($config['merge'] as $target=>$files) {
+	foreach ($config['merge'] as $target=>$files) {
 		merge($files, $target, $dir);
 	}
 
 	// files to skip
 	$files_to_skip = $config['skip'];
-	foreach($files_to_skip as $idx=>$file) {
-		if($file) $files_to_skip[$idx] = realpath($dir.trim($file));
+	foreach ($files_to_skip as $idx=>$file) {
+		if ($file) $files_to_skip[$idx] = realpath($dir . trim($file));
 	}
 
 	echo "  Minifying JavaScript files...";
 	$js_files = get_target_files('js', $dir, $files_to_skip);
 
-	if(count($js_files) && !class_exists('JSMinPlus')) {
-		require dirname(__FILE__).'/jsminplus/jsminplus.php';
+	if (count($js_files) && !class_exists('JSMinPlus')) {
+		require dirname(__FILE__) . '/jsminplus/jsminplus.php';
 	}
-	foreach($js_files as $file) {
-		if(!is_readable($file)) continue;
+	foreach ($js_files as $file) {
+		if (!is_readable($file)) continue;
 
 		$target  = preg_replace('@\.js$@', '.min.js', $file);
 		$content = file_get_contents($file);
 
 		// save copyright to preserve it
-		if(preg_match('@^[ \t]*(/\*\*.+?\*/)@s', $content, $matches)) {
-			$copyright = $matches[1]."\n";
+		if (preg_match('@^[ \t]*(/\*\*.+?\*/)@s', $content, $matches)) {
+			$copyright = $matches[1] . "\n";
 		} else {
 			$copyright = '';
 		}
 
-		if($config['use_closure_compiler']) {
+		if ($config['use_closure_compiler']) {
 			$content = closure_compile($content);
-			if(!$content) {
+			if (!$content) {
 				echo "   CANNOT compile the js file with closure compiler.\n";
 				echo "   Trying again with JSMinPlus.\n";
 				$content = JSMinPlus::minify($content);
@@ -86,7 +86,7 @@ 
 			$content = JSMinPlus::minify($content);
 		}
 
-		file_put_contents($target, $copyright.$content, LOCK_EX);
+		file_put_contents($target, $copyright . $content, LOCK_EX);
 
 		echo '.';
 	}
@@ -95,19 +95,19 @@ 
 	echo "  Minifying CSS files...";
 	$css_files = get_target_files('css', $dir, $files_to_skip);
 
-	if(count($css_files) && !class_exists('CSSmin')) {
-		require dirname(__FILE__).'/cssmin/CSSmin.php';
+	if (count($css_files) && !class_exists('CSSmin')) {
+		require dirname(__FILE__) . '/cssmin/CSSmin.php';
 	}
 
 	$oCSSmin = new CSSmin();
 
-	foreach($css_files as $file) {
-		if(!is_readable($file)) continue;
+	foreach ($css_files as $file) {
+		if (!is_readable($file)) continue;
 
 		$target  = preg_replace('@\.css$@', '.min.css', $file);
 		$content = file_get_contents($file);
 
-		file_put_contents($target, $copyright.$oCSSmin->run($content), LOCK_EX);
+		file_put_contents($target, $copyright . $oCSSmin->run($content), LOCK_EX);
 		echo '.';
 	}
 	echo " Done\n";
@@ -115,59 +115,59 @@ 
 
 function read_config($dir) {
 	$default = array('option'=>array(), 'skip'=>array(), 'merge'=>array());
-	$file    = $dir.'minify.ini';
+	$file    = $dir . 'minify.ini';
 
-	if(!is_readable($file)) return $default;
+	if (!is_readable($file)) return $default;
 
 	$config_str = file_get_contents($file);
 	$config_str = preg_replace_callback('/(\[(?:skip|merge *>> *.+?)\])([\s\S]+?)(?=\[|$)/', 'transform_config_str', $config_str);
 
 	$config = parse_ini_string($config_str, 1);
-	if($config === false) return $default;
+	if ($config === false) return $default;
 
-	if(is_array($config['skip'])) $config['skip'] = array_keys($config['skip']);
+	if (is_array($config['skip'])) $config['skip'] = array_keys($config['skip']);
 
-	foreach($config as $section=>$value) {
-		if(preg_match('/merge *>> *(.+)/', $section, $match)) {
-			if(!is_array($config['merge'])) $config['merge'] = array();
+	foreach ($config as $section=>$value) {
+		if (preg_match('/merge *>> *(.+)/', $section, $match)) {
+			if (!is_array($config['merge'])) $config['merge'] = array();
 			$config['merge'][trim($match[1])] = array_keys($value);
 
 			unset($config[$section]);
 		}
 	}
 
-	if(is_array($config['option'])) $config = array_merge($config['option'], $config);
+	if (is_array($config['option'])) $config = array_merge($config['option'], $config);
 	$config = array_merge($default, $config);
 
 	return $config;
 }
 
 function transform_config_str($matches) {
-	if(!$matches[2]) return $matches[0];
+	if (!$matches[2]) return $matches[0];
 	$values = preg_replace('/$/m', '=', trim($matches[2]));
 
 	return "{$matches[1]}\n{$values}\n\n";
 }
 
 function merge($files, $target, $base_dir) {
-	if(!is_array($files)) return false;
+	if (!is_array($files)) return false;
 
 	$body   = '';
 	$is_css = !!preg_match('/\.css$/', $target);
 
-	foreach($files as $file) {
-		$file = $base_dir.trim($file);
-		if(!is_readable($file)) continue;
+	foreach ($files as $file) {
+		$file = $base_dir . trim($file);
+		if (!is_readable($file)) continue;
 
 		$content = trim(file_get_contents($file));
-		if($is_css && $body) $content = preg_replace('/^@.+?;/m', '', $content);
-		if($content) $body .= $content."\n";
+		if ($is_css && $body) $content = preg_replace('/^@.+?;/m', '', $content);
+		if ($content) $body .= $content . "\n";
 	}
 
 	if ($body) {
 		$file_count = count($files);
 		echo "  Merging {$file_count} files to create {$target} file...";
-		file_put_contents($base_dir.$target, $body, LOCK_EX);
+		file_put_contents($base_dir . $target, $body, LOCK_EX);
 		echo " Done\n";
 	}
 }
@@ -182,7 +182,7 @@ 
 }
 
 function closure_compile($content) {
-	require_once dirname(__FILE__).'/../../classes/httprequest/XEHttpRequest.class.php';
+	require_once dirname(__FILE__) . '/../../classes/httprequest/XEHttpRequest.class.php';
 
 	$req = new XEHttpRequest('closure-compiler.appspot.com', 80);
 	$ret = $req->send('/compile', 'POST', 5, array(

Braces +49 added lines, -17 removed lines

@@ -21,9 +21,13 @@ 
 	$argc = $_SERVER['argc'];
 
 	// get target directories
-	if($argc < 1) exit;
-	elseif($argc < 2) $dirs = array($_SERVER['PWD']);
-	else $dirs = array_slice($argv, 1);
+	if($argc < 1) {
+		exit;
+	} elseif($argc < 2) {
+		$dirs = array($_SERVER['PWD']);
+	} else {
+		$dirs = array_slice($argv, 1);
+	}
 
 	$dirs = array_map('realpath', $dirs);
 	$dirs = array_map('add_dirsep', $dirs);
@@ -33,7 +37,9 @@ 
 
 // add directory separator
 function add_dirsep($path) {
-	if(substr($path,-1) != DIRECTORY_SEPARATOR) $path .= DIRECTORY_SEPARATOR;
+	if(substr($path,-1) != DIRECTORY_SEPARATOR) {
+		$path .= DIRECTORY_SEPARATOR;
+	}
 	return $path;
 }
 
@@ -53,7 +59,9 @@ 
 	// files to skip
 	$files_to_skip = $config['skip'];
 	foreach($files_to_skip as $idx=>$file) {
-		if($file) $files_to_skip[$idx] = realpath($dir.trim($file));
+		if($file) {
+			$files_to_skip[$idx] = realpath($dir.trim($file));
+		}
 	}
 
 	echo "  Minifying JavaScript files...";
@@ -63,7 +71,9 @@ 
 		require dirname(__FILE__).'/jsminplus/jsminplus.php';
 	}
 	foreach($js_files as $file) {
-		if(!is_readable($file)) continue;
+		if(!is_readable($file)) {
+			continue;
+		}
 
 		$target  = preg_replace('@\.js$@', '.min.js', $file);
 		$content = file_get_contents($file);
@@ -102,7 +112,9 @@ 
 	$oCSSmin = new CSSmin();
 
 	foreach($css_files as $file) {
-		if(!is_readable($file)) continue;
+		if(!is_readable($file)) {
+			continue;
+		}
 
 		$target  = preg_replace('@\.css$@', '.min.css', $file);
 		$content = file_get_contents($file);
@@ -117,51 +129,71 @@ 
 	$default = array('option'=>array(), 'skip'=>array(), 'merge'=>array());
 	$file    = $dir.'minify.ini';
 
-	if(!is_readable($file)) return $default;
+	if(!is_readable($file)) {
+		return $default;
+	}
 
 	$config_str = file_get_contents($file);
 	$config_str = preg_replace_callback('/(\[(?:skip|merge *>> *.+?)\])([\s\S]+?)(?=\[|$)/', 'transform_config_str', $config_str);
 
 	$config = parse_ini_string($config_str, 1);
-	if($config === false) return $default;
+	if($config === false) {
+		return $default;
+	}
 
-	if(is_array($config['skip'])) $config['skip'] = array_keys($config['skip']);
+	if(is_array($config['skip'])) {
+		$config['skip'] = array_keys($config['skip']);
+	}
 
 	foreach($config as $section=>$value) {
 		if(preg_match('/merge *>> *(.+)/', $section, $match)) {
-			if(!is_array($config['merge'])) $config['merge'] = array();
+			if(!is_array($config['merge'])) {
+				$config['merge'] = array();
+			}
 			$config['merge'][trim($match[1])] = array_keys($value);
 
 			unset($config[$section]);
 		}
 	}
 
-	if(is_array($config['option'])) $config = array_merge($config['option'], $config);
+	if(is_array($config['option'])) {
+		$config = array_merge($config['option'], $config);
+	}
 	$config = array_merge($default, $config);
 
 	return $config;
 }
 
 function transform_config_str($matches) {
-	if(!$matches[2]) return $matches[0];
+	if(!$matches[2]) {
+		return $matches[0];
+	}
 	$values = preg_replace('/$/m', '=', trim($matches[2]));
 
 	return "{$matches[1]}\n{$values}\n\n";
 }
 
 function merge($files, $target, $base_dir) {
-	if(!is_array($files)) return false;
+	if(!is_array($files)) {
+		return false;
+	}
 
 	$body   = '';
 	$is_css = !!preg_match('/\.css$/', $target);
 
 	foreach($files as $file) {
 		$file = $base_dir.trim($file);
-		if(!is_readable($file)) continue;
+		if(!is_readable($file)) {
+			continue;
+		}
 
 		$content = trim(file_get_contents($file));
-		if($is_css && $body) $content = preg_replace('/^@.+?;/m', '', $content);
-		if($content) $body .= $content."\n";
+		if($is_css && $body) {
+			$content = preg_replace('/^@.+?;/m', '', $content);
+		}
+		if($content) {
+			$body .= $content."\n";
+		}
 	}
 
 	if ($body) {

Indentation +9 added lines, -9 removed lines

@@ -1,15 +1,15 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * Minify
- * This script comnbines multiple JavaScript or CSS files with minifying.
- * PHP 5.3.0 or above version is required.
- *
- * Usage : php minify.php [TARGET_DIR ...]
- * TARGET_DIR use the current working directory as a default path.
- *
- * @author NAVER(developer@xpressengine.com)
- */
+	 * Minify
+	 * This script comnbines multiple JavaScript or CSS files with minifying.
+	 * PHP 5.3.0 or above version is required.
+	 *
+	 * Usage : php minify.php [TARGET_DIR ...]
+	 * TARGET_DIR use the current working directory as a default path.
+	 *
+	 * @author NAVER(developer@xpressengine.com)
+	 */
 
 if(version_compare(PHP_VERSION, '5.3.0', '<')) {
 	echo "PHP 5.3.0 or above version is required.";

addons/adminlogging/adminlogging.addon.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 	exit();
 
 /**
@@ -10,7 +10,7 @@ 
  * @brief admin log
  */
 $logged_info = Context::get('logged_info');
-if($logged_info && $logged_info->is_admin == 'Y' && stripos(Context::get('act'), 'admin') !== false && $called_position == 'before_module_proc')
+if ($logged_info && $logged_info->is_admin == 'Y' && stripos(Context::get('act'), 'admin') !== false && $called_position == 'before_module_proc')
 {
 	$oAdminloggingController = getController('adminlogging');
 	$oAdminloggingController->insertLog($this->module, $this->act);

Braces +2 added lines, -1 removed lines

@@ -1,8 +1,9 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if(!defined('__XE__')) {
 	exit();
+}
 
 /**
  * @file point.addon.php

addons/autolink/autolink.addon.php

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 	exit();
 
 /**
@@ -9,9 +9,9 @@ 
  * @author NAVER (developers@xpressengine.com)
  * @brief Automatic link add-on
  */
-if($called_position == 'after_module_proc' && Context::getResponseMethod() == "HTML")
+if ($called_position == 'after_module_proc' && Context::getResponseMethod() == "HTML")
 {
-	if(Mobile::isFromMobilePhone())
+	if (Mobile::isFromMobilePhone())
 	{
 		Context::addJsFile('./common/js/jquery.min.js', false, '', -1000000);
 		Context::addJsFile('./common/js/xe.min.js', false, '', -1000000);

Braces +2 added lines, -1 removed lines

@@ -1,8 +1,9 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if(!defined('__XE__')) {
 	exit();
+}
 
 /**
  * @file point.addon.php

addons/blogapi/blogapi.addon.php

Spacing +78 added lines, -78 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 	exit();
 
 /**
@@ -13,7 +13,7 @@ 
  * It should be called before executing the module(before_module_proc). If not, it is forced to shut down.
  * */
 // Insert a rsd tag when called_position is after_module_proc
-if($called_position == 'after_module_proc')
+if ($called_position == 'after_module_proc')
 {
 	// Create rsd address of the current module
 	$site_module_info = Context::get('site_module_info');
@@ -22,7 +22,7 @@ 
 	Context::addHtmlHeader("    " . '<link rel="EditURI" type="application/rsd+xml" title="RSD" href="' . $rsd_url . '" />');
 }
 // If act isnot api, just return
-if($_REQUEST['act'] != 'api')
+if ($_REQUEST['act'] != 'api')
 {
 	return;
 }
@@ -33,7 +33,7 @@ 
 $xml = $GLOBALS['HTTP_RAW_POST_DATA'];
 
 // If HTTP_RAW_POST_DATA is NULL, Print error message
-if(!$xml)
+if (!$xml)
 {
 	$content = getXmlRpcFailure(1, 'Invalid Method Call');
 	printContent($content);
@@ -41,38 +41,38 @@ 
 
 // xmlprc parsing
 // Parse the requested xmlrpc
-if(Security::detectingXEE($xml))
+if (Security::detectingXEE($xml))
 {
 	header("HTTP/1.0 400 Bad Request");
 	exit;
 }
 
-if(version_compare(PHP_VERSION, '5.2.11', '<=')) libxml_disable_entity_loader(true);
+if (version_compare(PHP_VERSION, '5.2.11', '<=')) libxml_disable_entity_loader(true);
 $xml = new SimpleXMLElement($xml, LIBXML_NONET | LIBXML_NOENT);
 
-$method_name = (string)$xml->methodName;
+$method_name = (string) $xml->methodName;
 $params = $xml->params->param;
 
 // Compatible with some of methodname
-if(in_array($method_name, array('metaWeblog.deletePost', 'metaWeblog.getUsersBlogs', 'metaWeblog.getUserInfo')))
+if (in_array($method_name, array('metaWeblog.deletePost', 'metaWeblog.getUsersBlogs', 'metaWeblog.getUserInfo')))
 {
 	$method_name = str_replace('metaWeblog.', 'blogger.', $method_name);
 }
 
 // Get user_id, password and attempt log-in
-$user_id = trim((string)$params[1]->value->string);
-$password = trim((string)$params[2]->value->string);
+$user_id = trim((string) $params[1]->value->string);
+$password = trim((string) $params[2]->value->string);
 
 // Before executing the module, authentication is processed.
-if($called_position == 'before_module_init')
+if ($called_position == 'before_module_init')
 {
 	// Attempt log-in by using member controller
-	if($user_id && $password)
+	if ($user_id && $password)
 	{
 		$oMemberController = getController('member');
 		$output = $oMemberController->doLogin($user_id, $password);
 		// If login fails, an error message appears
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$content = getXmlRpcFailure(1, $output->getMessage());
 			printContent($content);
@@ -86,10 +86,10 @@ 
 }
 
 // Before module processing, handle requests from blogapi tool and then terminate.
-if($called_position == 'before_module_proc')
+if ($called_position == 'before_module_proc')
 {
 	// Check writing permission 
-	if(!$this->grant->write_document)
+	if (!$this->grant->write_document)
 	{
 		printContent(getXmlRpcFailure(1, 'no permission'));
 	}
@@ -102,7 +102,7 @@ 
 	$tmp_uploaded_path = sprintf(_XE_PATH_ . 'files/cache/blogapi/%s/%s/', $this->mid, $user_id);
 	$uploaded_target_path = sprintf(_XE_PATH_ . 'files/cache/blogapi/%s/%s/', $this->mid, $user_id);
 
-	switch($method_name)
+	switch ($method_name)
 	{
 		// Blog information
 		case 'blogger.getUsersBlogs' :
@@ -119,9 +119,9 @@ 
 		// Return a list of categories
 		case 'metaWeblog.getCategories' :
 			$category_obj_list = array();
-			if($category_list)
+			if ($category_list)
 			{
-				foreach($category_list as $category_srl => $category_info)
+				foreach ($category_list as $category_srl => $category_info)
 				{
 					$obj = new stdClass();
 					$obj->description = $category_info->title;
@@ -142,35 +142,35 @@ 
 			// Check a file upload permission
 			$oFileModel = getModel('file');
 			$file_module_config = $oFileModel->getFileModuleConfig($this->module_srl);
-			if(is_array($file_module_config->download_grant) && count($file_module_config->download_grant) > 0)
+			if (is_array($file_module_config->download_grant) && count($file_module_config->download_grant) > 0)
 			{
 				$logged_info = Context::get('logged_info');
-				if($logged_info->is_admin != 'Y')
+				if ($logged_info->is_admin != 'Y')
 				{
 					$is_permitted = false;
-					for($i = 0; $i < count($file_module_config->download_grant); $i++)
+					for ($i = 0; $i < count($file_module_config->download_grant); $i++)
 					{
 						$group_srl = $file_module_config->download_grant[$i];
-						if($logged_info->group_list[$group_srl])
+						if ($logged_info->group_list[$group_srl])
 						{
 							$is_permitted = true;
 							break;
 						}
 					}
-					if(!$is_permitted){
+					if (!$is_permitted) {
 						printContent(getXmlRpcFailure(1, 'no permission'));
 					}
 				}
 			}
 
 			$fileinfo = $params[3]->value->struct->member;
-			foreach($fileinfo as $key => $val)
+			foreach ($fileinfo as $key => $val)
 			{
-				$nodename = (string)$val->name;
-				if($nodename == 'bits')
-					$filedata = base64_decode((string)$val->value->base64);
-				elseif($nodename == 'name')
-					$filename = (string)$val->value->string;
+				$nodename = (string) $val->name;
+				if ($nodename == 'bits')
+					$filedata = base64_decode((string) $val->value->base64);
+				elseif ($nodename == 'name')
+					$filename = (string) $val->value->string;
 			}
 
 			$tmp_arr = explode('/', $filename);
@@ -188,8 +188,8 @@ 
 			break;
 		// Get posts
 		case 'metaWeblog.getPost' :
-			$document_srl = (string)$params[0]->value->string;
-			if(!$document_srl)
+			$document_srl = (string) $params[0]->value->string;
+			if (!$document_srl)
 			{
 				printContent(getXmlRpcFailure(1, 'no permission'));
 			}
@@ -197,7 +197,7 @@ 
 			{
 				$oDocumentModel = getModel('document');
 				$oDocument = $oDocumentModel->getDocument($document_srl);
-				if(!$oDocument->isExists() || !$oDocument->isGranted())
+				if (!$oDocument->isExists() || !$oDocument->isGranted())
 				{
 					printContent(getXmlRpcFailure(1, 'no permission'));
 				}
@@ -205,11 +205,11 @@ 
 				{
 					// Get a list of categories and set Context
 					$category = "";
-					if($oDocument->get('category_srl'))
+					if ($oDocument->get('category_srl'))
 					{
 						$oDocumentModel = getModel('document');
 						$category_list = $oDocumentModel->getCategoryList($oDocument->get('module_srl'));
-						if($category_list[$oDocument->get('category_srl')])
+						if ($category_list[$oDocument->get('category_srl')])
 						{
 							$category = $category_list[$oDocument->get('category_srl')]->title;
 						}
@@ -251,35 +251,35 @@ 
 			$obj = new stdClass();
 			$info = $params[3];
 			// Get information of post, title, and category
-			foreach($info->value->struct->member as $val)
+			foreach ($info->value->struct->member as $val)
 			{
-				switch((string)$val->name)
+				switch ((string) $val->name)
 				{
 					case 'title' :
-						$obj->title = (string)$val->value->string;
+						$obj->title = (string) $val->value->string;
 						break;
 					case 'description' :
-						$obj->content = (string)$val->value->string;
+						$obj->content = (string) $val->value->string;
 						break;
 					case 'categories' :
 						$categories = $val->value->array->data->value;
-						$category = (string)$categories[0]->string;
-						if($category && $category_list)
+						$category = (string) $categories[0]->string;
+						if ($category && $category_list)
 						{
-							foreach($category_list as $category_srl => $category_info)
+							foreach ($category_list as $category_srl => $category_info)
 							{
-								if($category_info->title == $category)
+								if ($category_info->title == $category)
 									$obj->category_srl = $category_srl;
 							}
 						}
 						break;
 					case 'tagwords' :
 						$tags = $val->value->array->data->value;
-						foreach($tags as $tag)
+						foreach ($tags as $tag)
 						{
-							$tag_list[] = (string)$tag->string;
+							$tag_list[] = (string) $tag->string;
 						}
-						if(count($tag_list))
+						if (count($tag_list))
 							$obj->tags = implode(',', $tag_list);
 						break;
 				}
@@ -291,14 +291,14 @@ 
 			$obj->module_srl = $this->module_srl;
 
 			// Attachment
-			if(is_dir($tmp_uploaded_path))
+			if (is_dir($tmp_uploaded_path))
 			{
 				$file_list = FileHandler::readDir($tmp_uploaded_path);
 				$file_count = count($file_list);
-				if($file_count)
+				if ($file_count)
 				{
 					$oFileController = getController('file');
-					for($i = 0; $i < $file_count; $i++)
+					for ($i = 0; $i < $file_count; $i++)
 					{
 						$file_info['tmp_name'] = sprintf('%s%s', $tmp_uploaded_path, $file_list[$i]);
 						$file_info['name'] = $file_list[$i];
@@ -324,7 +324,7 @@ 
 			$obj->homepage = $logged_info->homepage;
 			$output = $oDocumentController->insertDocument($obj, TRUE);
 
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$content = getXmlRpcFailure(1, $output->getMessage());
 			}
@@ -339,17 +339,17 @@ 
 
 		// Edit post
 		case 'metaWeblog.editPost' :
-			$tmp_val = (string)$params[0]->value->string;
-			if(!$tmp_val)
-				$tmp_val = (string)$params[0]->value->i4;
-			if(!$tmp_val)
+			$tmp_val = (string) $params[0]->value->string;
+			if (!$tmp_val)
+				$tmp_val = (string) $params[0]->value->i4;
+			if (!$tmp_val)
 			{
 				$content = getXmlRpcFailure(1, 'no permission');
 				break;
 			}
 			$tmp_arr = explode('/', $tmp_val);
 			$document_srl = array_pop($tmp_arr);
-			if(!$document_srl)
+			if (!$document_srl)
 			{
 				$content = getXmlRpcFailure(1, 'no permission');
 				break;
@@ -358,7 +358,7 @@ 
 			$oDocumentModel = getModel('document');
 			$oDocument = $oDocumentModel->getDocument($document_srl);
 			// Check if a permission to modify a document is granted
-			if(!$oDocument->isGranted())
+			if (!$oDocument->isGranted())
 			{
 				$content = getXmlRpcFailure(1, 'no permission');
 				break;
@@ -368,35 +368,35 @@ 
 
 			$info = $params[3];
 			// Get information of post, title, and category
-			foreach($info->value->struct->member as $val)
+			foreach ($info->value->struct->member as $val)
 			{
-				switch((string)$val->name)
+				switch ((string) $val->name)
 				{
 					case 'title' :
-						$obj->title = (string)$val->value->string;
+						$obj->title = (string) $val->value->string;
 						break;
 					case 'description' :
-						$obj->content = (string)$val->value->string;
+						$obj->content = (string) $val->value->string;
 						break;
 					case 'categories' :
 						$categories = $val->value->array->data->value;
-						$category = (string)$categories[0]->string;
-						if($category && $category_list)
+						$category = (string) $categories[0]->string;
+						if ($category && $category_list)
 						{
-							foreach($category_list as $category_srl => $category_info)
+							foreach ($category_list as $category_srl => $category_info)
 							{
-								if($category_info->title == $category)
+								if ($category_info->title == $category)
 									$obj->category_srl = $category_srl;
 							}
 						}
 						break;
 					case 'tagwords' :
 						$tags = $val->value->array->data->value;
-						foreach($tags as $tag)
+						foreach ($tags as $tag)
 						{
-							$tag_list[] = (string)$tag->string;
+							$tag_list[] = (string) $tag->string;
 						}
-						if(count($tag_list))
+						if (count($tag_list))
 							$obj->tags = implode(',', $tag_list);
 						break;
 				}
@@ -405,20 +405,20 @@ 
 			$obj->document_srl = $document_srl;
 			$obj->module_srl = $this->module_srl;
 			// Attachment
-			if(is_dir($tmp_uploaded_path))
+			if (is_dir($tmp_uploaded_path))
 			{
 				$file_list = FileHandler::readDir($tmp_uploaded_path);
 				$file_count = count($file_list);
-				if($file_count)
+				if ($file_count)
 				{
 					$oFileController = getController('file');
-					for($i = 0; $i < $file_count; $i++)
+					for ($i = 0; $i < $file_count; $i++)
 					{
 						$file_info['tmp_name'] = sprintf('%s%s', $tmp_uploaded_path, $file_list[$i]);
 						$file_info['name'] = $file_list[$i];
 
 						$moved_filename = sprintf('./files/attach/images/%s/%s/%s', $this->module_srl, $document_srl, $file_info['name']);
-						if(file_exists($moved_filename))
+						if (file_exists($moved_filename))
 							continue;
 
 						$fileOutput = $oFileController->insertFile($file_info, $this->module_srl, $document_srl, 0, true);
@@ -433,7 +433,7 @@ 
 			$oDocumentController = getController('document');
 			$output = $oDocumentController->updateDocument($oDocument, $obj, TRUE);
 
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$content = getXmlRpcFailure(1, $output->getMessage());
 			}
@@ -447,19 +447,19 @@ 
 			break;
 		// Delete the post
 		case 'blogger.deletePost' :
-			$tmp_val = (string)$params[1]->value->string;
+			$tmp_val = (string) $params[1]->value->string;
 			$tmp_arr = explode('/', $tmp_val);
 			$document_srl = array_pop($tmp_arr);
 			// Get a document
 			$oDocumentModel = getModel('document');
 			$oDocument = $oDocumentModel->getDocument($document_srl);
 			// If the document exists
-			if(!$oDocument->isExists())
+			if (!$oDocument->isExists())
 			{
 				$content = getXmlRpcFailure(1, 'not exists');
 				// Check if a permission to delete a document is granted
 			}
-			elseif(!$oDocument->isGranted())
+			elseif (!$oDocument->isGranted())
 			{
 				$content = getXmlRpcFailure(1, 'no permission');
 				break;
@@ -469,7 +469,7 @@ 
 			{
 				$oDocumentController = getController('document');
 				$output = $oDocumentController->deleteDocument($document_srl);
-				if(!$output->toBool())
+				if (!$output->toBool())
 					$content = getXmlRpcFailure(1, $output->getMessage());
 				else
 					$content = getXmlRpcResponse(true);
@@ -489,7 +489,7 @@ 
 			$args->search_target = 'member_srl';
 			$args->search_keyword = $logged_info->member_srl;
 			$output = $oDocumentModel->getDocumentList($args);
-			if(!$output->toBool() || !$output->data)
+			if (!$output->toBool() || !$output->data)
 			{
 				$content = getXmlRpcFailure(1, 'post not founded');
 			}
@@ -498,12 +498,12 @@ 
 				$oEditorController = getController('editor');
 
 				$posts = array();
-				foreach($output->data as $key => $oDocument)
+				foreach ($output->data as $key => $oDocument)
 				{
 					$post = new stdClass();
 					$post->categories = array();
 					$post->dateCreated = date("Ymd", $oDocument->getRegdateTime()) . 'T' . date("H:i:s", $oDocument->getRegdateTime());
-					$post->description = sprintf('<![CDATA[%s]]>',$oEditorController->transComponent($oDocument->getContent(false, false, true, false)));
+					$post->description = sprintf('<![CDATA[%s]]>', $oEditorController->transComponent($oDocument->getContent(false, false, true, false)));
 					$post->link = $post->permaLink = getFullUrl('', 'document_srl', $oDocument->document_srl);
 					$post->postid = $oDocument->document_srl;
 					$post->title = htmlspecialchars($oDocument->get('title'), ENT_COMPAT | ENT_HTML401, 'UTF-8', false);

Braces +41 added lines, -38 removed lines

@@ -1,8 +1,9 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if(!defined('__XE__')) {
 	exit();
+}
 
 /**
  * @file blogapicounter.addon.php
@@ -47,7 +48,9 @@ 
 	exit;
 }
 
-if(version_compare(PHP_VERSION, '5.2.11', '<=')) libxml_disable_entity_loader(true);
+if(version_compare(PHP_VERSION, '5.2.11', '<=')) {
+	libxml_disable_entity_loader(true);
+}
 $xml = new SimpleXMLElement($xml, LIBXML_NONET | LIBXML_NOENT);
 
 $method_name = (string)$xml->methodName;
@@ -77,8 +80,7 @@ 
 			$content = getXmlRpcFailure(1, $output->getMessage());
 			printContent($content);
 		}
-	}
-	else
+	} else
 	{
 		$content = getXmlRpcFailure(1, 'not logged');
 		printContent($content);
@@ -167,10 +169,11 @@ 
 			foreach($fileinfo as $key => $val)
 			{
 				$nodename = (string)$val->name;
-				if($nodename == 'bits')
-					$filedata = base64_decode((string)$val->value->base64);
-				elseif($nodename == 'name')
-					$filename = (string)$val->value->string;
+				if($nodename == 'bits') {
+									$filedata = base64_decode((string)$val->value->base64);
+				} elseif($nodename == 'name') {
+									$filename = (string)$val->value->string;
+				}
 			}
 
 			$tmp_arr = explode('/', $filename);
@@ -192,16 +195,14 @@ 
 			if(!$document_srl)
 			{
 				printContent(getXmlRpcFailure(1, 'no permission'));
-			}
-			else
+			} else
 			{
 				$oDocumentModel = getModel('document');
 				$oDocument = $oDocumentModel->getDocument($document_srl);
 				if(!$oDocument->isExists() || !$oDocument->isGranted())
 				{
 					printContent(getXmlRpcFailure(1, 'no permission'));
-				}
-				else
+				} else
 				{
 					// Get a list of categories and set Context
 					$category = "";
@@ -268,8 +269,9 @@ 
 						{
 							foreach($category_list as $category_srl => $category_info)
 							{
-								if($category_info->title == $category)
-									$obj->category_srl = $category_srl;
+								if($category_info->title == $category) {
+																	$obj->category_srl = $category_srl;
+								}
 							}
 						}
 						break;
@@ -279,8 +281,9 @@ 
 						{
 							$tag_list[] = (string)$tag->string;
 						}
-						if(count($tag_list))
-							$obj->tags = implode(',', $tag_list);
+						if(count($tag_list)) {
+													$obj->tags = implode(',', $tag_list);
+						}
 						break;
 				}
 			}
@@ -327,8 +330,7 @@ 
 			if(!$output->toBool())
 			{
 				$content = getXmlRpcFailure(1, $output->getMessage());
-			}
-			else
+			} else
 			{
 				$content = getXmlRpcResponse(strval($document_srl));
 			}
@@ -340,8 +342,9 @@ 
 		// Edit post
 		case 'metaWeblog.editPost' :
 			$tmp_val = (string)$params[0]->value->string;
-			if(!$tmp_val)
-				$tmp_val = (string)$params[0]->value->i4;
+			if(!$tmp_val) {
+							$tmp_val = (string)$params[0]->value->i4;
+			}
 			if(!$tmp_val)
 			{
 				$content = getXmlRpcFailure(1, 'no permission');
@@ -385,8 +388,9 @@ 
 						{
 							foreach($category_list as $category_srl => $category_info)
 							{
-								if($category_info->title == $category)
-									$obj->category_srl = $category_srl;
+								if($category_info->title == $category) {
+																	$obj->category_srl = $category_srl;
+								}
 							}
 						}
 						break;
@@ -396,8 +400,9 @@ 
 						{
 							$tag_list[] = (string)$tag->string;
 						}
-						if(count($tag_list))
-							$obj->tags = implode(',', $tag_list);
+						if(count($tag_list)) {
+													$obj->tags = implode(',', $tag_list);
+						}
 						break;
 				}
 			}
@@ -418,8 +423,9 @@ 
 						$file_info['name'] = $file_list[$i];
 
 						$moved_filename = sprintf('./files/attach/images/%s/%s/%s', $this->module_srl, $document_srl, $file_info['name']);
-						if(file_exists($moved_filename))
-							continue;
+						if(file_exists($moved_filename)) {
+													continue;
+						}
 
 						$fileOutput = $oFileController->insertFile($file_info, $this->module_srl, $document_srl, 0, true);
 						$uploaded_filename = $fileOutput->get('uploaded_filename');
@@ -436,8 +442,7 @@ 
 			if(!$output->toBool())
 			{
 				$content = getXmlRpcFailure(1, $output->getMessage());
-			}
-			else
+			} else
 			{
 				$content = getXmlRpcResponse(true);
 				FileHandler::removeDir($tmp_uploaded_path);
@@ -458,21 +463,20 @@ 
 			{
 				$content = getXmlRpcFailure(1, 'not exists');
 				// Check if a permission to delete a document is granted
-			}
-			elseif(!$oDocument->isGranted())
+			} elseif(!$oDocument->isGranted())
 			{
 				$content = getXmlRpcFailure(1, 'no permission');
 				break;
 				// Delete
-			}
-			else
+			} else
 			{
 				$oDocumentController = getController('document');
 				$output = $oDocumentController->deleteDocument($document_srl);
-				if(!$output->toBool())
-					$content = getXmlRpcFailure(1, $output->getMessage());
-				else
-					$content = getXmlRpcResponse(true);
+				if(!$output->toBool()) {
+									$content = getXmlRpcFailure(1, $output->getMessage());
+				} else {
+									$content = getXmlRpcResponse(true);
+				}
 			}
 
 			printContent($content);
@@ -492,8 +496,7 @@ 
 			if(!$output->toBool() || !$output->data)
 			{
 				$content = getXmlRpcFailure(1, 'post not founded');
-			}
-			else
+			} else
 			{
 				$oEditorController = getController('editor');
 

addons/blogapi/blogapi.func.php

Spacing +11 added lines, -11 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 	exit();
 
 /**
@@ -31,42 +31,42 @@ 
 // Encoding
 function _getEncodedVal($val, $is_sub_set = false)
 {
-	if(preg_match('/^\<\!\[CDATA\[/',$val))
+	if (preg_match('/^\<\!\[CDATA\[/', $val))
 	{
 		$buff = sprintf("<value>%s</value>", $val);
 	}
-	elseif(is_int($val))
+	elseif (is_int($val))
 	{
 		$buff = sprintf("<value><i4>%d</i4></value>", $val);
 	}
-	elseif(is_string($val) && preg_match('/^([0-9]+)T([0-9\:]+)$/', $val))
+	elseif (is_string($val) && preg_match('/^([0-9]+)T([0-9\:]+)$/', $val))
 	{
 		$buff = sprintf("<value><dateTime.iso8601>%s</dateTime.iso8601></value>\n", $val);
 	}
-	elseif(is_double($val))
+	elseif (is_double($val))
 	{
 		$buff = sprintf("<value><double>%f</double></value>", $val);
 	}
-	elseif(is_bool($val))
+	elseif (is_bool($val))
 	{
 		$buff = sprintf("<value><boolean>%d</boolean></value>", $val ? 1 : 0);
 	}
-	elseif(is_object($val))
+	elseif (is_object($val))
 	{
 		$values = get_object_vars($val);
 		$val_count = count($values);
 		$buff = "<value><struct>";
-		foreach($values as $k => $v)
+		foreach ($values as $k => $v)
 		{
 			$buff .= sprintf("<member>\n<name>%s</name>\n%s</member>\n", htmlspecialchars($k, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), _getEncodedVal($v, true));
 		}
 		$buff .= "</struct></value>\n";
 	}
-	elseif(is_array($val))
+	elseif (is_array($val))
 	{
 		$val_count = count($val);
 		$buff = "<value><array>\n<data>";
-		for($i = 0; $i < $val_count; $i++)
+		for ($i = 0; $i < $val_count; $i++)
 		{
 			$buff .= _getEncodedVal($val[$i], true);
 		}
@@ -76,7 +76,7 @@ 
 	{
 		$buff = sprintf("<value><string>%s</string></value>\n", $val);
 	}
-	if(!$is_sub_set)
+	if (!$is_sub_set)
 	{
 		return sprintf("<param>\n%s</param>", $buff);
 	}

Braces +9 added lines, -15 removed lines

@@ -1,8 +1,9 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if(!defined('__XE__')) {
 	exit();
+}
 
 /**
  * @file ./addons/blogapi/blogapi.func.php
@@ -34,24 +35,19 @@ 
 	if(preg_match('/^\<\!\[CDATA\[/',$val))
 	{
 		$buff = sprintf("<value>%s</value>", $val);
-	}
-	elseif(is_int($val))
+	} elseif(is_int($val))
 	{
 		$buff = sprintf("<value><i4>%d</i4></value>", $val);
-	}
-	elseif(is_string($val) && preg_match('/^([0-9]+)T([0-9\:]+)$/', $val))
+	} elseif(is_string($val) && preg_match('/^([0-9]+)T([0-9\:]+)$/', $val))
 	{
 		$buff = sprintf("<value><dateTime.iso8601>%s</dateTime.iso8601></value>\n", $val);
-	}
-	elseif(is_double($val))
+	} elseif(is_double($val))
 	{
 		$buff = sprintf("<value><double>%f</double></value>", $val);
-	}
-	elseif(is_bool($val))
+	} elseif(is_bool($val))
 	{
 		$buff = sprintf("<value><boolean>%d</boolean></value>", $val ? 1 : 0);
-	}
-	elseif(is_object($val))
+	} elseif(is_object($val))
 	{
 		$values = get_object_vars($val);
 		$val_count = count($values);
@@ -61,8 +57,7 @@ 
 			$buff .= sprintf("<member>\n<name>%s</name>\n%s</member>\n", htmlspecialchars($k, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), _getEncodedVal($v, true));
 		}
 		$buff .= "</struct></value>\n";
-	}
-	elseif(is_array($val))
+	} elseif(is_array($val))
 	{
 		$val_count = count($val);
 		$buff = "<value><array>\n<data>";
@@ -71,8 +66,7 @@ 
 			$buff .= _getEncodedVal($val[$i], true);
 		}
 		$buff .= "</data>\n</array></value>";
-	}
-	else
+	} else
 	{
 		$buff = sprintf("<value><string>%s</string></value>\n", $val);
 	}

addons/captcha/captcha.addon.php

Spacing +35 added lines, -35 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined("__XE__")) exit();
+if (!defined("__XE__")) exit();
 
 /**
  * @file captcha.addon.php
@@ -9,10 +9,10 @@ 
  * @brief Captcha for a particular action
  * English alphabets and voice verification added
  * */
-if(!class_exists('AddonCaptcha', false))
+if (!class_exists('AddonCaptcha', false))
 {
 	// On the mobile mode, XE Core does not load jquery and xe.js as normal.
-	if(Mobile::isFromMobilePhone())
+	if (Mobile::isFromMobilePhone())
 	{
 		Context::loadFile(array('./common/js/jquery.min.js', 'head', NULL, -100000), true);
 		Context::loadFile(array('./common/js/xe.min.js', 'head', NULL, -100000), true);
@@ -31,7 +31,7 @@ 
 
 		function before_module_proc()
 		{
-			if($this->addon_info->act_type == 'everytime' && $_SESSION['captcha_authed'])
+			if ($this->addon_info->act_type == 'everytime' && $_SESSION['captcha_authed'])
 			{
 				unset($_SESSION['captcha_authed']);
 			}
@@ -40,19 +40,19 @@ 
 		function before_module_init(&$ModuleHandler)
 		{
 			$logged_info = Context::get('logged_info');
-			if($logged_info->is_admin == 'Y' || $logged_info->is_site_admin)
+			if ($logged_info->is_admin == 'Y' || $logged_info->is_site_admin)
 			{
 				return false;
 			}
-			if($this->addon_info->target != 'all' && Context::get('is_logged'))
+			if ($this->addon_info->target != 'all' && Context::get('is_logged'))
 			{
 				return false;
 			}
-			if($_SESSION['XE_VALIDATOR_ERROR'] == -1)
+			if ($_SESSION['XE_VALIDATOR_ERROR'] == -1)
 			{
 				$_SESSION['captcha_authed'] = false;
 			}
-			if($_SESSION['captcha_authed'])
+			if ($_SESSION['captcha_authed'])
 			{
 				return false;
 			}
@@ -61,11 +61,11 @@ 
 
 			$this->target_acts = array('procBoardInsertDocument', 'procBoardInsertComment', 'procIssuetrackerInsertIssue', 'procIssuetrackerInsertHistory', 'procTextyleInsertComment');
 
-			if(Context::getRequestMethod() != 'XMLRPC' && Context::getRequestMethod() !== 'JSON')
+			if (Context::getRequestMethod() != 'XMLRPC' && Context::getRequestMethod() !== 'JSON')
 			{
-				if($type == 'inline')
+				if ($type == 'inline')
 				{
-					if(!$this->compareCaptcha())
+					if (!$this->compareCaptcha())
 					{
 						Context::loadLang(_XE_PATH_ . 'addons/captcha/lang');
 						$_SESSION['XE_VALIDATOR_ERROR'] = -1;
@@ -86,7 +86,7 @@ 
 			}
 
 			// compare session when calling actions such as writing a post or a comment on the board/issue tracker module
-			if(!$_SESSION['captcha_authed'] && in_array(Context::get('act'), $this->target_acts))
+			if (!$_SESSION['captcha_authed'] && in_array(Context::get('act'), $this->target_acts))
 			{
 				Context::loadLang(_XE_PATH_ . 'addons/captcha/lang');
 				$ModuleHandler->error = "captcha_denied";
@@ -98,7 +98,7 @@ 
 		function createKeyword()
 		{
 			$type = Context::get('captchaType');
-			if($type == 'inline' && $_SESSION['captcha_keyword'])
+			if ($type == 'inline' && $_SESSION['captcha_keyword'])
 			{
 				return;
 			}
@@ -111,7 +111,7 @@ 
 
 		function before_module_init_setCaptchaSession()
 		{
-			if($_SESSION['captcha_authed'])
+			if ($_SESSION['captcha_authed'])
 			{
 				return false;
 			}
@@ -140,11 +140,11 @@ 
 
 		function before_module_init_captchaImage()
 		{
-			if($_SESSION['captcha_authed'])
+			if ($_SESSION['captcha_authed'])
 			{
 				return false;
 			}
-			if(Context::get('renew'))
+			if (Context::get('renew'))
 			{
 				$this->createKeyword();
 			}
@@ -166,7 +166,7 @@ 
 		function createCaptchaImage($string)
 		{
 			$arr = array();
-			for($i = 0, $c = strlen($string); $i < $c; $i++)
+			for ($i = 0, $c = strlen($string); $i < $c; $i++)
 			{
 				$arr[] = $string{$i};
 			}
@@ -188,7 +188,7 @@ 
 			shuffle($deg);
 
 			// Create an image for each letter
-			foreach($arr as $i => $str)
+			foreach ($arr as $i => $str)
 			{
 				$im[$i + 1] = @imagecreate($w, $h);
 				$background_color = imagecolorallocate($im[$i + 1], 255, 255, 255);
@@ -198,7 +198,7 @@ 
 				$ran = range(1, 20);
 				shuffle($ran);
 
-				if(function_exists('imagerotate'))
+				if (function_exists('imagerotate'))
 				{
 					imagestring($im[$i + 1], (array_pop($ran) % 3) + 3, 2, (array_pop($ran) % 8), $str, $text_color);
 					$im[$i + 1] = imagerotate($im[$i + 1], array_pop($deg), 0);
@@ -213,7 +213,7 @@ 
 			}
 
 			// Combine images of each character
-			for($i = 1, $c = count($im); $i<$c; $i++)
+			for ($i = 1, $c = count($im); $i < $c; $i++)
 			{
 				imagecopy($im[0], $im[$i], (($w + 2) * ($i - 1)), 0, 0, 0, $w, $h);
 				imagedestroy($im[$i]);
@@ -225,7 +225,7 @@ 
 			imagecopyresized($big, $im[0], 0, 0, 0, 0, ($w + 2) * $big_count * $c, $h * $big_count, ($w + 2) * $c, $h);
 			imagedestroy($im[0]);
 
-			if(function_exists('imageantialias'))
+			if (function_exists('imageantialias'))
 			{
 				imageantialias($big, true);
 			}
@@ -237,7 +237,7 @@ 
 			$h = $h * $big_count;
 			$d = array_pop($deg);
 
-			for($i = -abs($d); $i < $h + abs($d); $i = $i + 7)
+			for ($i = -abs($d); $i < $h + abs($d); $i = $i + 7)
 			{
 				imageline($big, 0, $i + $d, $w, $i, $line_color);
 			}
@@ -245,7 +245,7 @@ 
 			$x = range(0, ($w - 10));
 			shuffle($x);
 
-			for($i = 0; $i < 200; $i++)
+			for ($i = 0; $i < 200; $i++)
 			{
 				imagesetpixel($big, $x[$i] % $w, $x[$i + 1] % $h, $line_color);
 			}
@@ -255,7 +255,7 @@ 
 
 		function before_module_init_captchaAudio()
 		{
-			if($_SESSION['captcha_authed'])
+			if ($_SESSION['captcha_authed'])
 			{
 				return false;
 			}
@@ -279,17 +279,17 @@ 
 		{
 			$data = '';
 			$_audio = './addons/captcha/audio/F_%s.mp3';
-			for($i = 0, $c = strlen($string); $i < $c; $i++)
+			for ($i = 0, $c = strlen($string); $i < $c; $i++)
 			{
 				$_data = FileHandler::readFile(sprintf($_audio, $string{$i}));
 
 				$start = rand(5, 68); // Random start in 4-byte header and 64 byte data
 				$datalen = strlen($_data) - $start - 256; // Last unchanged 256 bytes
 
-				for($j = $start; $j < $datalen; $j+=64)
+				for ($j = $start; $j < $datalen; $j += 64)
 				{
 					$ch = ord($_data{$j});
-					if($ch < 9 || $ch > 119)
+					if ($ch < 9 || $ch > 119)
 					{
 						continue;
 					}
@@ -304,14 +304,14 @@ 
 
 		function compareCaptcha()
 		{
-			if(!in_array(Context::get('act'), $this->target_acts)) return true;
+			if (!in_array(Context::get('act'), $this->target_acts)) return true;
 
-			if($_SESSION['captcha_authed'])
+			if ($_SESSION['captcha_authed'])
 			{
 				return true;
 			}
 
-			if(strtoupper($_SESSION['captcha_keyword']) == strtoupper(Context::get('secret_text')))
+			if (strtoupper($_SESSION['captcha_keyword']) == strtoupper(Context::get('secret_text')))
 			{
 				$_SESSION['captcha_authed'] = true;
 				return true;
@@ -324,7 +324,7 @@ 
 
 		function before_module_init_captchaCompare()
 		{
-			if(!$this->compareCaptcha())
+			if (!$this->compareCaptcha())
 			{
 				return false;
 			}
@@ -384,18 +384,18 @@ 
 
 $oAddonCaptcha = &$GLOBALS['__AddonCaptcha__'];
 
-if(method_exists($oAddonCaptcha, $called_position))
+if (method_exists($oAddonCaptcha, $called_position))
 {
-	if(!call_user_func_array(array(&$oAddonCaptcha, $called_position), array(&$this)))
+	if (!call_user_func_array(array(&$oAddonCaptcha, $called_position), array(&$this)))
 	{
 		return false;
 	}
 }
 
 $addon_act = Context::get('captcha_action');
-if($addon_act && method_exists($oAddonCaptcha, $called_position . '_' . $addon_act))
+if ($addon_act && method_exists($oAddonCaptcha, $called_position . '_' . $addon_act))
 {
-	if(!call_user_func_array(array(&$oAddonCaptcha, $called_position . '_' . $addon_act), array(&$this)))
+	if (!call_user_func_array(array(&$oAddonCaptcha, $called_position . '_' . $addon_act), array(&$this)))
 	{
 		return false;
 	}

Doc Comments +3 added lines

@@ -286,6 +286,9 @@
 			exit();
 		}
 
+		/**
+		 * @param string $string
+		 */
 		function createCaptchaAudio($string)
 		{
 			$data = '';

Braces +8 added lines, -6 removed lines

@@ -1,7 +1,9 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined("__XE__")) exit();
+if(!defined("__XE__")) {
+	exit();
+}
 
 /**
  * @file captcha.addon.php
@@ -85,8 +87,7 @@ 
 						$_SESSION['XE_VALIDATOR_RETURN_URL'] = Context::get('error_return_url');
 						$ModuleHandler->_setInputValueToSession();
 					}
-				}
-				else
+				} else
 				{
 					Context::addHtmlHeader('<script>
 						if(!captchaTargetAct) {var captchaTargetAct = [];}
@@ -216,8 +217,7 @@ 
 
 					$background_color = imagecolorallocate($im[$i + 1], 255, 255, 255);
 					imagecolortransparent($im[$i + 1], $background_color);
-				}
-				else
+				} else
 				{
 					imagestring($im[$i + 1], (array_pop($ran) % 3) + 3, 2, (array_pop($ran) % 4), $str, $text_color);
 				}
@@ -315,7 +315,9 @@ 
 
 		function compareCaptcha()
 		{
-			if(!in_array(Context::get('act'), $this->target_acts)) return true;
+			if(!in_array(Context::get('act'), $this->target_acts)) {
+				return true;
+			}
 
 			if($_SESSION['member_captcha_authed'])
 			{

addons/counter/counter.addon.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 	exit();
 
 /**
@@ -10,7 +10,7 @@ 
  * @brief Counter add-on
  */
 // Execute if called_position is before_display_content
-if($called_position == 'before_module_init' && Context::get('module') != 'admin' && Context::getResponseMethod() == 'HTML' && Context::isInstalled() && !isCrawler())
+if ($called_position == 'before_module_init' && Context::get('module') != 'admin' && Context::getResponseMethod() == 'HTML' && Context::isInstalled() && !isCrawler())
 {
 	$oCounterController = getController('counter');
 	$oCounterController->counterExecute();

Braces +2 added lines, -1 removed lines

@@ -1,8 +1,9 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if(!defined('__XE__')) {
 	exit();
+}
 
 /**
  * @file point.addon.php

addons/member_communication/member_communication.addon.php

Spacing +9 added lines, -9 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 	exit();
 
 /**
@@ -15,7 +15,7 @@ 
  */
 // Stop if non-logged-in user is
 $logged_info = Context::get('logged_info');
-if(!$logged_info|| isCrawler())
+if (!$logged_info || isCrawler())
 {
 	return;
 }
@@ -23,7 +23,7 @@ 
 /**
  * Message/Friend munus are added on the pop-up window and member profile. Check if a new message is received
  * */
-if($this->module != 'member' && $called_position == 'before_module_init')
+if ($this->module != 'member' && $called_position == 'before_module_init')
 {
 	// Load a language file from the communication module
 	Context::loadLang(_XE_PATH_ . 'modules/communication/lang');
@@ -33,7 +33,7 @@ 
 	$oMemberController->addMemberMenu('dispCommunicationMessages', 'cmd_view_message_box');
 
 	$flag_file = _XE_PATH_ . 'files/member_extra_info/new_message_flags/' . getNumberingPath($logged_info->member_srl) . $logged_info->member_srl;
-	if($addon_info->use_alarm != 'N' && file_exists($flag_file))
+	if ($addon_info->use_alarm != 'N' && file_exists($flag_file))
 	{
 		// Pop-up to display messages if a flag on new message is set
 		$new_message_count = (int) trim(FileHandler::readFile($flag_file));
@@ -45,13 +45,13 @@ 
 		Context::addHtmlFooter("<script type=\"text/javascript\">jQuery(function(){ xeNotifyMessage('{$text}','{$new_message_count}'); });</script>");
 	}
 }
-elseif($this->act == 'getMemberMenu' && $called_position == 'before_module_proc')
+elseif ($this->act == 'getMemberMenu' && $called_position == 'before_module_proc')
 {
 	$member_srl = Context::get('target_srl');
 	$oCommunicationModel = getModel('communication');
 
 	// Add a feature to display own message box.
-	if($logged_info->member_srl == $member_srl)
+	if ($logged_info->member_srl == $member_srl)
 	{
 		$mid = Context::get('cur_mid');
 		$oMemberController = getController('member');
@@ -66,17 +66,17 @@ 
 		// Get member information
 		$oMemberModel = getModel('member');
 		$target_member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
-		if(!$target_member_info->member_srl)
+		if (!$target_member_info->member_srl)
 		{
 			return;
 		}
 
 		$oMemberController = getController('member');
 		// Add a menu for sending message
-		if($logged_info->is_admin == 'Y' || $target_member_info->allow_message == 'Y' || ($target_member_info->allow_message == 'F' && $oCommunicationModel->isFriend($member_srl)))
+		if ($logged_info->is_admin == 'Y' || $target_member_info->allow_message == 'Y' || ($target_member_info->allow_message == 'F' && $oCommunicationModel->isFriend($member_srl)))
 			$oMemberController->addMemberPopupMenu(getUrl('', 'mid', Context::get('cur_mid'), 'act', 'dispCommunicationSendMessage', 'receiver_srl', $member_srl), 'cmd_send_message', '', 'popup');
 		// Add a menu for listing friends (if a friend is new)
-		if(!$oCommunicationModel->isAddedFriend($member_srl))
+		if (!$oCommunicationModel->isAddedFriend($member_srl))
 			$oMemberController->addMemberPopupMenu(getUrl('', 'mid', Context::get('cur_mid'), 'act', 'dispCommunicationAddFriend', 'target_srl', $member_srl), 'cmd_add_friend', '', 'popup');
 	}
 }

Braces +10 added lines, -9 removed lines

@@ -1,8 +1,9 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if(!defined('__XE__')) {
 	exit();
+}
 
 /**
  * @file member_communication.addon.php
@@ -44,8 +45,7 @@ 
 		$text = preg_replace('@\r?\n@', '\\n', addslashes(Context::getLang('alert_new_message_arrived')));
 		Context::addHtmlFooter("<script type=\"text/javascript\">jQuery(function(){ xeNotifyMessage('{$text}','{$new_message_count}'); });</script>");
 	}
-}
-elseif($this->act == 'getMemberMenu' && $called_position == 'before_module_proc')
+} elseif($this->act == 'getMemberMenu' && $called_position == 'before_module_proc')
 {
 	$member_srl = Context::get('target_srl');
 	$oCommunicationModel = getModel('communication');
@@ -60,8 +60,7 @@ 
 		// Display a list of friends
 		$oMemberController->addMemberPopupMenu(getUrl('', 'mid', $mid, 'act', 'dispCommunicationFriend'), 'cmd_view_friend', '', 'self');
 		// If not, Add menus to send message and to add friends
-	}
-	else
+	} else
 	{
 		// Get member information
 		$oMemberModel = getModel('member');
@@ -73,11 +72,13 @@ 
 
 		$oMemberController = getController('member');
 		// Add a menu for sending message
-		if($logged_info->is_admin == 'Y' || $target_member_info->allow_message == 'Y' || ($target_member_info->allow_message == 'F' && $oCommunicationModel->isFriend($member_srl)))
-			$oMemberController->addMemberPopupMenu(getUrl('', 'mid', Context::get('cur_mid'), 'act', 'dispCommunicationSendMessage', 'receiver_srl', $member_srl), 'cmd_send_message', '', 'popup');
+		if($logged_info->is_admin == 'Y' || $target_member_info->allow_message == 'Y' || ($target_member_info->allow_message == 'F' && $oCommunicationModel->isFriend($member_srl))) {
+					$oMemberController->addMemberPopupMenu(getUrl('', 'mid', Context::get('cur_mid'), 'act', 'dispCommunicationSendMessage', 'receiver_srl', $member_srl), 'cmd_send_message', '', 'popup');
+		}
 		// Add a menu for listing friends (if a friend is new)
-		if(!$oCommunicationModel->isAddedFriend($member_srl))
-			$oMemberController->addMemberPopupMenu(getUrl('', 'mid', Context::get('cur_mid'), 'act', 'dispCommunicationAddFriend', 'target_srl', $member_srl), 'cmd_add_friend', '', 'popup');
+		if(!$oCommunicationModel->isAddedFriend($member_srl)) {
+					$oMemberController->addMemberPopupMenu(getUrl('', 'mid', Context::get('cur_mid'), 'act', 'dispCommunicationAddFriend', 'target_srl', $member_srl), 'cmd_add_friend', '', 'popup');
+		}
 	}
 }
 /* End of file member_communication.addon.php */

addons/member_extra_info/member_extra_info.lib.php

Spacing +9 added lines, -9 removed lines

@@ -8,12 +8,12 @@ 
 {
 	// If member_srl < 0, then return text only in the body
 	$member_srl = $matches[3];
-	if($member_srl < 0)
+	if ($member_srl < 0)
 	{
 		return $matches[5];
 	}
 	// If member_srl=o(not a member), return the entire body
-	if(!$member_srl)
+	if (!$member_srl)
 	{
 		return $matches[0];
 	}
@@ -23,13 +23,13 @@ 
 
 	$_tmp = &$GLOBALS['_transImageNameList'][$member_srl];
 	// If pre-defined data in the global variablesm return it
-	if(!$_tmp->cached)
+	if (!$_tmp->cached)
 	{
 		$_tmp->cached = true;
 		$image_name_file = sprintf('files/member_extra_info/image_name/%s%d.gif', getNumberingPath($member_srl), $member_srl);
 		$image_mark_file = sprintf('files/member_extra_info/image_mark/%s%d.gif', getNumberingPath($member_srl), $member_srl);
 
-		if(file_exists(_XE_PATH_ . $image_name_file))
+		if (file_exists(_XE_PATH_ . $image_name_file))
 		{
 			$_tmp->image_name_file = $image_name_file;
 		}
@@ -38,7 +38,7 @@ 
 			$image_name_file = '';
 		}
 
-		if(file_exists(_XE_PATH_ . $image_mark_file))
+		if (file_exists(_XE_PATH_ . $image_mark_file))
 		{
 			$_tmp->image_mark_file = $image_mark_file;
 		}
@@ -59,7 +59,7 @@ 
 	}
 
 	// If image name and mark doesn't exist, set the original information
-	if(!$image_name_file && !$image_mark_file && !$group_image)
+	if (!$image_name_file && !$image_mark_file && !$group_image)
 	{
 		return $matches[0];
 	}
@@ -68,16 +68,16 @@ 
 
 	$config = $oMemberModel->getMemberConfig();
 
-	if($config->image_name == 'Y' && $image_name_file)
+	if ($config->image_name == 'Y' && $image_name_file)
 	{
 		$nick_name = sprintf('<img src="%s%s" alt="id: %s" title="id: %s" style="border:0;vertical-align:middle;margin-right:3px" />', Context::getRequestUri(), $image_name_file, strip_tags($nick_name), strip_tags($nick_name));
 	}
-	if($config->image_mark == 'Y' && $image_mark_file)
+	if ($config->image_mark == 'Y' && $image_mark_file)
 	{
 		$nick_name = sprintf('<img src="%s%s" alt="id: %s" title="id : %s" style="border:0;vertical-align:middle;margin-right:3px"/>%s', Context::getRequestUri(), $image_mark_file, strip_tags($nick_name), strip_tags($nick_name), $nick_name);
 	}
 
-	if($group_image)
+	if ($group_image)
 	{
 		$nick_name = sprintf('<img src="%s" style="border:0;max-height:16px;vertical-align:middle;margin-right:3px" alt="%s" title="%s" />%s', $group_image->src, $group_image->title, $group_image->description, $nick_name);
 	}

Braces +3 added lines, -6 removed lines

@@ -32,8 +32,7 @@ 
 		if(file_exists(_XE_PATH_ . $image_name_file))
 		{
 			$_tmp->image_name_file = $image_name_file;
-		}
-		else
+		} else
 		{
 			$image_name_file = '';
 		}
@@ -41,8 +40,7 @@ 
 		if(file_exists(_XE_PATH_ . $image_mark_file))
 		{
 			$_tmp->image_mark_file = $image_mark_file;
-		}
-		else
+		} else
 		{
 			$image_mark_file = '';
 		}
@@ -50,8 +48,7 @@ 
 		$site_module_info = Context::get('site_module_info');
 		$group_image = $oMemberModel->getGroupImageMark($member_srl, $site_module_info->site_srl);
 		$_tmp->group_image = $group_image;
-	}
-	else
+	} else
 	{
 		$group_image = $_tmp->group_image;
 		$image_name_file = $_tmp->image_name_file;