xpressengine / xe-core

addons/captcha/captcha.addon.php

Spacing +43 added lines, -43 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) XEHub <https://www.xehub.io> */
 
-if(!defined("__XE__")) exit();
+if (!defined("__XE__")) exit();
 
 /**
  * @file captcha.addon.php
@@ -9,7 +9,7 @@ 
  * @brief Captcha for a particular action
  * English alphabets and voice verification added
  * */
-if(!class_exists('AddonCaptcha', false))
+if (!class_exists('AddonCaptcha', false))
 {
 	class AddonCaptcha
 	{
@@ -24,7 +24,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']);
 			}
@@ -33,19 +33,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;
 			}
@@ -54,13 +54,13 @@ 
 
 			$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');
+						Context::loadLang(_XE_PATH_.'addons/captcha/lang');
 						$_SESSION['XE_VALIDATOR_ERROR'] = -1;
 						$_SESSION['XE_VALIDATOR_MESSAGE'] = Context::getLang('captcha_denied');
 						$_SESSION['XE_VALIDATOR_MESSAGE_TYPE'] = 'error';
@@ -72,16 +72,16 @@ 
 				{
 					Context::addHtmlHeader('<script>
 						if(!captchaTargetAct) {var captchaTargetAct = [];}
-						captchaTargetAct.push("' . implode('","', $this->target_acts) . '");
+						captchaTargetAct.push("' . implode('","', $this->target_acts).'");
 						</script>');
 					Context::loadFile(array('./addons/captcha/captcha.min.js', 'body', '', null), true);
 				}
 			}
 
 			// 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');
+				Context::loadLang(_XE_PATH_.'addons/captcha/lang');
 				$ModuleHandler->error = "captcha_denied";
 			}
 
@@ -91,7 +91,7 @@ 
 		function createKeyword()
 		{
 			$type = Context::get('captchaType');
-			if($type == 'inline' && $_SESSION['captcha_keyword'])
+			if ($type == 'inline' && $_SESSION['captcha_keyword'])
 			{
 				return;
 			}
@@ -104,19 +104,19 @@ 
 
 		function before_module_init_setCaptchaSession()
 		{
-			if($_SESSION['captcha_authed'])
+			if ($_SESSION['captcha_authed'])
 			{
 				return false;
 			}
 			// Load language files
-			Context::loadLang(_XE_PATH_ . 'addons/captcha/lang');
+			Context::loadLang(_XE_PATH_.'addons/captcha/lang');
 			// Generate keywords
 			$this->createKeyword();
 
 			$target = Context::getLang('target_captcha');
 			header("Content-Type: text/xml; charset=UTF-8");
 			header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-			header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+			header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 			header("Cache-Control: no-store, no-cache, must-revalidate");
 			header("Cache-Control: post-check=0, pre-check=0", false);
 			header("Pragma: no-cache");
@@ -133,11 +133,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();
 			}
@@ -159,7 +159,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};
 			}
@@ -181,7 +181,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);
@@ -191,7 +191,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);
@@ -206,7 +206,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]);
@@ -218,7 +218,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);
 			}
@@ -230,7 +230,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);
 			}
@@ -238,7 +238,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);
 			}
@@ -248,7 +248,7 @@ 
 
 		function before_module_init_captchaAudio()
 		{
-			if($_SESSION['captcha_authed'])
+			if ($_SESSION['captcha_authed'])
 			{
 				return false;
 			}
@@ -260,8 +260,8 @@ 
 			header("Content-Disposition: attachment; filename=\"captcha_audio.mp3\"");
 			header('Cache-Control: no-store, no-cache, must-revalidate');
 			header('Expires: Sun, 1 Jan 2000 12:00:00 GMT');
-			header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . 'GMT');
-			header('Content-Length: ' . strlen($data));
+			header('Last-Modified: '.gmdate('D, d M Y H:i:s').'GMT');
+			header('Content-Length: '.strlen($data));
 
 			echo $data;
 			Context::close();
@@ -272,17 +272,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;
 					}
@@ -297,14 +297,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;
@@ -317,14 +317,14 @@ 
 
 		function before_module_init_captchaCompare()
 		{
-			if(!$this->compareCaptcha())
+			if (!$this->compareCaptcha())
 			{
 				return false;
 			}
 
 			header("Content-Type: text/xml; charset=UTF-8");
 			header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-			header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+			header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 			header("Cache-Control: no-store, no-cache, must-revalidate");
 			header("Cache-Control: post-check=0, pre-check=0", false);
 			header("Pragma: no-cache");
@@ -339,7 +339,7 @@ 
 			unset($_SESSION['captcha_authed']);
 			$this->createKeyword();
 
-			$swfURL = getUrl() . 'addons/captcha/swf/play.swf';
+			$swfURL = getUrl().'addons/captcha/swf/play.swf';
 			Context::unloadFile('./addons/captcha/captcha.min.js');
 			Context::loadFile(array('./addons/captcha/inline_captcha.js', 'body'));
 
@@ -377,18 +377,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;
 	}

Braces +8 added lines, -6 removed lines

@@ -1,7 +1,9 @@ 
 <?php
 /* Copyright (C) XEHub <https://www.xehub.io> */
 
-if(!defined("__XE__")) exit();
+if(!defined("__XE__")) {
+	exit();
+}
 
 /**
  * @file captcha.addon.php
@@ -67,8 +69,7 @@ 
 						$_SESSION['XE_VALIDATOR_RETURN_URL'] = Context::get('error_return_url');
 						$ModuleHandler->_setInputValueToSession();
 					}
-				}
-				else
+				} else
 				{
 					Context::addHtmlHeader('<script>
 						if(!captchaTargetAct) {var captchaTargetAct = [];}
@@ -198,8 +199,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);
 				}
@@ -297,7 +297,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['captcha_authed'])
 			{

addons/counter/counter.addon.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) XEHub <https://www.xehub.io> */
 
-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) XEHub <https://www.xehub.io> */
 
-if(!defined('__XE__'))
+if(!defined('__XE__')) {
 	exit();
+}
 
 /**
  * @file counter.addon.php

addons/adminlogging/adminlogging.addon.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) XEHub <https://www.xehub.io> */
 
-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) XEHub <https://www.xehub.io> */
 
-if(!defined('__XE__'))
+if(!defined('__XE__')) {
 	exit();
+}
 
 /**
  * @file adminlogging.addon.php

addons/point_level_icon/point_level_icon.addon.php

Spacing +4 added lines, -4 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) XEHub <https://www.xehub.io> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 	exit();
 
 /**
@@ -12,15 +12,15 @@ 
  * Display point level icon before user name when point system is enabled.
  * */
 // return unless before_display_content
-if($called_position != "before_display_content" || Context::get('act') == 'dispPageAdminContentModify' || Context::getResponseMethod() != 'HTML' || isCrawler())
+if ($called_position != "before_display_content" || Context::get('act') == 'dispPageAdminContentModify' || Context::getResponseMethod() != 'HTML' || isCrawler())
 {
 	return;
 }
 
-require_once(_XE_PATH_ . 'addons/point_level_icon/point_level_icon.lib.php');
+require_once(_XE_PATH_.'addons/point_level_icon/point_level_icon.lib.php');
 
 $temp_output = preg_replace_callback('!<(div|span|a)([^\>]*)member_([0-9\-]+)([^\>]*)>(.*?)\<\/(div|span|a)\>!is', 'pointLevelIconTrans', $output);
-if($temp_output)
+if ($temp_output)
 {
 	$output = $temp_output;
 }

Braces +2 added lines, -1 removed lines

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

addons/autolink/autolink.addon.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) XEHub <https://www.xehub.io> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 	exit();
 
 /**
@@ -9,7 +9,7 @@ 
  * @author XEHub (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")
 {
 	Context::loadFile(array('./addons/autolink/autolink.js', 'body', '', null), true);
 }

Braces +2 added lines, -1 removed lines

@@ -1,8 +1,9 @@
 <?php
 /* Copyright (C) XEHub <https://www.xehub.io> */
 
-if(!defined('__XE__'))
+if(!defined('__XE__')) {
 	exit();
+}
 
 /**
  * @file autolink.addon.php

addons/captcha_member/captcha_member.addon.php

Spacing +44 added lines, -44 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) XEHub <https://www.xehub.io> */
 
-if(!defined("__XE__")) exit();
+if (!defined("__XE__")) exit();
 
 /**
  * @file captcha.addon.php
@@ -9,7 +9,7 @@ 
  * @brief Captcha for a particular action
  * English alphabets and voice verification added
  * */
-if(!class_exists('AddonMemberCaptcha', false))
+if (!class_exists('AddonMemberCaptcha', false))
 {
 	class AddonMemberCaptcha
 	{
@@ -32,7 +32,7 @@ 
 		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;
 			}
@@ -40,11 +40,11 @@ 
 			// {
 			// 	return false;
 			// }
-			if($_SESSION['XE_VALIDATOR_ERROR'] == -1)
+			if ($_SESSION['XE_VALIDATOR_ERROR'] == -1)
 			{
 				$_SESSION['member_captcha_authed'] = false;
 			}
-			if($_SESSION['member_captcha_authed'])
+			if ($_SESSION['member_captcha_authed'])
 			{
 				return false;
 			}
@@ -52,26 +52,26 @@ 
 			$type = Context::get('captchaType');
 
 			$this->target_acts = array();
-			if($this->addon_info->apply_find_account == 'apply')
+			if ($this->addon_info->apply_find_account == 'apply')
 			{
 				$this->target_acts[] = 'procMemberFindAccount';
 			}
-			if($this->addon_info->apply_resend_auth_mail == 'apply')
+			if ($this->addon_info->apply_resend_auth_mail == 'apply')
 			{
 				$this->target_acts[] = 'procMemberResendAuthMail';
 			}
-			if($this->addon_info->apply_signup == 'apply')
+			if ($this->addon_info->apply_signup == 'apply')
 			{
 				$this->target_acts[] = 'procMemberInsert';
 			}
 
-			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_member/lang');
+						Context::loadLang(_XE_PATH_.'addons/captcha_member/lang');
 						$_SESSION['XE_VALIDATOR_ERROR'] = -1;
 						$_SESSION['XE_VALIDATOR_MESSAGE'] = Context::getLang('captcha_denied');
 						$_SESSION['XE_VALIDATOR_MESSAGE_TYPE'] = 'error';
@@ -83,16 +83,16 @@ 
 				{
 					Context::addHtmlHeader('<script>
 						if(!captchaTargetAct) {var captchaTargetAct = [];}
-						captchaTargetAct.push("' . implode('","', $this->target_acts) . '");
+						captchaTargetAct.push("' . implode('","', $this->target_acts).'");
 						</script>');
 					Context::loadFile(array('./addons/captcha/captcha.min.js', 'body', '', null), true);
 				}
 			}
 
 			// compare session when calling actions such as writing a post or a comment on the board/issue tracker module
-			if(!$_SESSION['member_captcha_authed'] && in_array(Context::get('act'), $this->target_acts))
+			if (!$_SESSION['member_captcha_authed'] && in_array(Context::get('act'), $this->target_acts))
 			{
-				Context::loadLang(_XE_PATH_ . 'addons/captcha_member/lang');
+				Context::loadLang(_XE_PATH_.'addons/captcha_member/lang');
 				$ModuleHandler->error = "captcha_denied";
 			}
 
@@ -102,7 +102,7 @@ 
 		function createKeyword()
 		{
 			$type = Context::get('captchaType');
-			if($type == 'inline' && $_SESSION['captcha_keyword'])
+			if ($type == 'inline' && $_SESSION['captcha_keyword'])
 			{
 				return;
 			}
@@ -115,19 +115,19 @@ 
 
 		function before_module_init_setCaptchaSession()
 		{
-			if($_SESSION['member_captcha_authed'])
+			if ($_SESSION['member_captcha_authed'])
 			{
 				return false;
 			}
 			// Load language files
-			Context::loadLang(_XE_PATH_ . 'addons/captcha_member/lang');
+			Context::loadLang(_XE_PATH_.'addons/captcha_member/lang');
 			// Generate keywords
 			$this->createKeyword();
 
 			$target = Context::getLang('target_captcha');
 			header("Content-Type: text/xml; charset=UTF-8");
 			header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-			header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+			header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 			header("Cache-Control: no-store, no-cache, must-revalidate");
 			header("Cache-Control: post-check=0, pre-check=0", false);
 			header("Pragma: no-cache");
@@ -144,11 +144,11 @@ 
 
 		function before_module_init_captchaImage()
 		{
-			if($_SESSION['member_captcha_authed'])
+			if ($_SESSION['member_captcha_authed'])
 			{
 				return false;
 			}
-			if(Context::get('renew'))
+			if (Context::get('renew'))
 			{
 				$this->createKeyword();
 			}
@@ -170,7 +170,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};
 			}
@@ -192,7 +192,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);
@@ -202,7 +202,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);
@@ -217,7 +217,7 @@ 
 			}
 
 			// Combine images of each character
-			for($i = 1; $i < count($im); $i++)
+			for ($i = 1; $i < count($im); $i++)
 			{
 				imagecopy($im[0], $im[$i], (($w + 2) * ($i - 1)), 0, 0, 0, $w, $h);
 				imagedestroy($im[$i]);
@@ -229,7 +229,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);
 			}
@@ -241,7 +241,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);
 			}
@@ -249,7 +249,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);
 			}
@@ -259,7 +259,7 @@ 
 
 		function before_module_init_captchaAudio()
 		{
-			if($_SESSION['member_captcha_authed'])
+			if ($_SESSION['member_captcha_authed'])
 			{
 				return false;
 			}
@@ -271,8 +271,8 @@ 
 			header("Content-Disposition: attachment; filename=\"captcha_audio.mp3\"");
 			header('Cache-Control: no-store, no-cache, must-revalidate');
 			header('Expires: Sun, 1 Jan 2000 12:00:00 GMT');
-			header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . 'GMT');
-			header('Content-Length: ' . strlen($data));
+			header('Last-Modified: '.gmdate('D, d M Y H:i:s').'GMT');
+			header('Content-Length: '.strlen($data));
 
 			echo $data;
 			Context::close();
@@ -283,17 +283,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;
 					}
@@ -308,14 +308,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['member_captcha_authed'])
+			if ($_SESSION['member_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['member_captcha_authed'] = true;
 				return true;
@@ -328,14 +328,14 @@ 
 
 		function before_module_init_captchaCompare()
 		{
-			if(!$this->compareCaptcha())
+			if (!$this->compareCaptcha())
 			{
 				return false;
 			}
 
 			header("Content-Type: text/xml; charset=UTF-8");
 			header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-			header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+			header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 			header("Cache-Control: no-store, no-cache, must-revalidate");
 			header("Cache-Control: post-check=0, pre-check=0", false);
 			header("Pragma: no-cache");
@@ -350,7 +350,7 @@ 
 			unset($_SESSION['member_captcha_authed']);
 			$this->createKeyword();
 
-			$swfURL = getUrl() . 'addons/captcha/swf/play.swf';
+			$swfURL = getUrl().'addons/captcha/swf/play.swf';
 			Context::unloadFile('./addons/captcha/captcha.min.js');
 			Context::loadFile(array('./addons/captcha/inline_captcha.js', 'body'));
 
@@ -388,18 +388,18 @@ 
 
 $oAddonMemberCaptcha = &$GLOBALS['__AddonMemberCaptcha__'];
 
-if(method_exists($oAddonMemberCaptcha, $called_position))
+if (method_exists($oAddonMemberCaptcha, $called_position))
 {
-	if(!call_user_func_array(array(&$oAddonMemberCaptcha, $called_position), array(&$this)))
+	if (!call_user_func_array(array(&$oAddonMemberCaptcha, $called_position), array(&$this)))
 	{
 		return false;
 	}
 }
 
 $addon_act = Context::get('captcha_action');
-if($addon_act && method_exists($oAddonMemberCaptcha, $called_position . '_' . $addon_act))
+if ($addon_act && method_exists($oAddonMemberCaptcha, $called_position.'_'.$addon_act))
 {
-	if(!call_user_func_array(array(&$oAddonMemberCaptcha, $called_position . '_' . $addon_act), array(&$this)))
+	if (!call_user_func_array(array(&$oAddonMemberCaptcha, $called_position.'_'.$addon_act), array(&$this)))
 	{
 		return false;
 	}

Braces +8 added lines, -6 removed lines

@@ -1,7 +1,9 @@ 
 <?php
 /* Copyright (C) XEHub <https://www.xehub.io> */
 
-if(!defined("__XE__")) exit();
+if(!defined("__XE__")) {
+	exit();
+}
 
 /**
  * @file captcha.addon.php
@@ -78,8 +80,7 @@ 
 						$_SESSION['XE_VALIDATOR_RETURN_URL'] = Context::get('error_return_url');
 						$ModuleHandler->_setInputValueToSession();
 					}
-				}
-				else
+				} else
 				{
 					Context::addHtmlHeader('<script>
 						if(!captchaTargetAct) {var captchaTargetAct = [];}
@@ -209,8 +210,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);
 				}
@@ -308,7 +308,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/member_communication/member_communication.addon.php

Spacing +12 added lines, -12 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) XEHub <https://www.xehub.io> */
 
-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,35 +23,35 @@ 
 /**
  * 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');
+	Context::loadLang(_XE_PATH_.'modules/communication/lang');
 	// Add menus on the member login information
 	$oMemberController = getController('member');
 	$oMemberController->addMemberMenu('dispCommunicationFriend', 'cmd_view_friend');
 	$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))
+	$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))
 	{
 		// Pop-up to display messages if a flag on new message is set
 		$new_message_count = (int) trim(FileHandler::readFile($flag_file));
 		FileHandler::removeFile($flag_file);
-		Context::loadLang(_XE_PATH_ . 'addons/member_communication/lang');
+		Context::loadLang(_XE_PATH_.'addons/member_communication/lang');
 		Context::loadFile(array('./addons/member_communication/tpl/member_communication.js'), true);
 
 		$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');
 
 	// 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) XEHub <https://www.xehub.io> */
 
-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.addon.php

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) XEHub <https://www.xehub.io> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 {
 	exit();
 }
@@ -17,7 +17,7 @@ 
 /**
  * Just before displaying, change image name/ image mark
  */
-if($called_position != "before_display_content" || Context::get('act') == 'dispPageAdminContentModify' || Context::getResponseMethod() != 'HTML' || isCrawler())
+if ($called_position != "before_display_content" || Context::get('act') == 'dispPageAdminContentModify' || Context::getResponseMethod() != 'HTML' || isCrawler())
 {
 	return;
 }
@@ -25,7 +25,7 @@ 
 require_once('./addons/member_extra_info/member_extra_info.lib.php');
 // 1. Find a part <div class="member_MemberSerialNumber"> content </div> in the output document, change it to image name/mark by using MemberController::transImageName()
 $temp_output = preg_replace_callback('!<(div|span|a)([^\>]*)member_([0-9]+)([^\>]*)>(.*?)\<\/(div|span|a)\>!is', 'memberTransImageName', $output);
-if($temp_output)
+if ($temp_output)
 {
 	$output = $temp_output;
 }

addons/oembed/oembed.addon.php

Spacing +2 added lines, -2 removed lines

@@ -1,12 +1,12 @@
 <?php
 /* Copyright (C) XEHub <https://www.xehub.io> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 {
 	exit();
 }
 
-if($called_position == 'after_module_proc' && Context::getResponseMethod() == 'HTML')
+if ($called_position == 'after_module_proc' && Context::getResponseMethod() == 'HTML')
 {
 	Context::loadFile('./addons/oembed/jquery.oembed.css');
 	Context::loadFile(array('./addons/oembed/jquery.oembed.js', 'body', '', null), true);