Renamed redefinition of $server (#203)

* Renamed redefinition of $server to $serverGroupName in modules * login.php * create.php
rathena · Sep 12, 2018 · a70ae78 · a70ae78
1 parent 99f8feb
commit a70ae78
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/lib/Flux.php b/lib/Flux.php
@@ -538,7 +538,7 @@ private static function registerAthenaServer($serverName, $athenaServerName, Flu
 	/**
 	 * Get Flux_LoginAthenaGroup server object by its ServerName.
 	 *
-	 * @param string
+	 * @param string $serverName Server group name.
 	 * @return mixed Returns Flux_LoginAthenaGroup instance or false on failure.
 	 * @access public
 	 */

diff --git a/modules/account/create.php b/modules/account/create.php
@@ -14,7 +14,7 @@
 	require_once 'Flux/RegisterError.php';
 
 	try {
-		$server    = $params->get('server');
+		$serverGroupName = $params->get('server');
 		$username  = $params->get('username');
 		$password  = $params->get('password');
 		$confirm   = $params->get('confirm_password');
@@ -24,7 +24,7 @@
 		$birthdate = $params->get('birthdate_date');
 		$code      = $params->get('security_code');
 
-		if (!($server = Flux::getServerGroupByName($server))) {
+		if (!($server = Flux::getServerGroupByName($serverGroupName))) {
 			throw new Flux_RegisterError('Invalid server', Flux_RegisterError::INVALID_SERVER);
 		}
 

diff --git a/modules/account/login.php b/modules/account/login.php
@@ -10,13 +10,13 @@
 $loginLogTable = Flux::config('FluxTables.LoginLogTable');
 
 if (count($_POST)) {
-	$server   = $params->get('server');
+	$serverGroupName = $params->get('server');
 	$username = $params->get('username');
 	$password = $params->get('password');
 	$code     = $params->get('security_code');
 
 	try {
-		$session->login($server, $username, $password, $code);
+		$session->login($serverGroupName, $username, $password, $code);
 		$returnURL = $params->get('return_url');
 
 		if ($session->loginAthenaGroup->loginServer->config->getUseMD5()) {
@@ -38,7 +38,7 @@
 	}
 	catch (Flux_LoginError $e) {
 		if ($username && $password && $e->getCode() != Flux_LoginError::INVALID_SERVER) {
-			$loginAthenaGroup = Flux::getServerGroupByName($server);
+			$loginAthenaGroup = Flux::getServerGroupByName($serverGroupName);
 
 			$sql = "SELECT account_id FROM {$loginAthenaGroup->loginDatabase}.login WHERE ";