supernova-ws / SuperNova

includes/functions/int_fleet_events.php

Upper-Lower-Casing +9 added lines, -9 removed lines

@@ -87,18 +87,18 @@ 
     case 0:
       $objFleet->event_time = $objFleet->time_arrive_to_target;
       $is_this_planet = (
-        ($planetrow['galaxy'] == $objFleet->fleet_end_galaxy) AND
-        ($planetrow['system'] == $objFleet->fleet_end_system) AND
-        ($planetrow['planet'] == $objFleet->fleet_end_planet) AND
+        ($planetrow['galaxy'] == $objFleet->fleet_end_galaxy) and
+        ($planetrow['system'] == $objFleet->fleet_end_system) and
+        ($planetrow['planet'] == $objFleet->fleet_end_planet) and
         ($planetrow['planet_type'] == $planet_end_type));
     break;
 
     case 1:
       $objFleet->event_time = $objFleet->time_mission_job_complete;
       $is_this_planet = (
-        ($planetrow['galaxy'] == $objFleet->fleet_end_galaxy) AND
-        ($planetrow['system'] == $objFleet->fleet_end_system) AND
-        ($planetrow['planet'] == $objFleet->fleet_end_planet) AND
+        ($planetrow['galaxy'] == $objFleet->fleet_end_galaxy) and
+        ($planetrow['system'] == $objFleet->fleet_end_system) and
+        ($planetrow['planet'] == $objFleet->fleet_end_planet) and
         ($planetrow['planet_type'] == $planet_end_type));
     break;
 
@@ -106,9 +106,9 @@ 
     case 3:
       $objFleet->event_time = $objFleet->time_return_to_source;
       $is_this_planet = (
-        ($planetrow['galaxy'] == $objFleet->fleet_start_galaxy) AND
-        ($planetrow['system'] == $objFleet->fleet_start_system) AND
-        ($planetrow['planet'] == $objFleet->fleet_start_planet) AND
+        ($planetrow['galaxy'] == $objFleet->fleet_start_galaxy) and
+        ($planetrow['system'] == $objFleet->fleet_start_system) and
+        ($planetrow['planet'] == $objFleet->fleet_start_planet) and
         ($planetrow['planet_type'] == $objFleet->fleet_start_type));
     break;
 

admin/sxd/tmpl.php

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -288,7 +288,7 @@ 
 </script>
 </body>
 </html>
-HTML;
+html;
 }
 
 function sxd_tpl_auth($error = ''){
@@ -350,5 +350,5 @@ 
 </div>
 </body>
 </html>
-HTML;
+html;
 }
\ No newline at end of file

admin/sxd/load.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 	if(count($obj) == 0) return '[]';
 	$is_obj = isset($obj[count($obj) - 1]) ? false : true;
 	$str = $is_obj ? '{' : '[';
-    foreach ($obj AS $key  => $value) {
+    foreach ($obj as $key  => $value) {
     	$str .= $is_obj ? "'" . addcslashes($key, "\n\r\t'\\/") . "'" . ':' : ''; 
         if     (is_array($value))   $str .= sxd_php2json($value);
         elseif (is_null($value))    $str .= 'null';

admin/sxd/index.php

Upper-Lower-Casing +26 added lines, -26 removed lines

@@ -39,7 +39,7 @@ 
 			$this->langs = &$langs;
 			$lng = 'en';
 			if(preg_match_all('/[a-z]{2}(-[a-z]{2})?/', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $m)) {
-				foreach($m[0] AS $l){
+				foreach($m[0] as $l){
 					if(isset($langs[$l])){
 						$lng_name = $l;
 						break;
@@ -75,7 +75,7 @@ 
 			$this->CFG['my_db'] = '';
 		}
 		if ($args) { // консольный режим
-		    foreach($args AS $key => $arg){
+		    foreach($args as $key => $arg){
 		        if (preg_match("/^-([hupoj])=(.*?)$/", $arg, $m)){
 		            switch ($m[1]) {
 		                case 'h': $this->CFG['my_host'] = $m[2]; break; // хост
@@ -119,7 +119,7 @@ 
 				$port = !empty($_POST['port']) && is_numeric($_POST['port']) ? $_POST['port'] : 3306;
 				$temp = preg_split('/\s+/', $this->CFG['auth']);
 				if(!empty($_REQUEST['lang']) && preg_match('/^[a-z]{2}(-[a-z]{2})?$/', $_REQUEST['lang'])) {$this->loadLang($_REQUEST['lang']);}
-				foreach($temp AS $a){
+				foreach($temp as $a){
 					switch($a) {
 						case 'cfg': 	if(empty($user)) {continue;}
 										$auth = !empty($CFG['user']) && isset($CFG['pass']) && $CFG['user']== $user && $CFG['pass'] == $pass;
@@ -144,7 +144,7 @@ 
 					header("Location: ./");
 					exit;
 				}
-				foreach(array('user', 'pass', 'host', 'port') AS $key){
+				foreach(array('user', 'pass', 'host', 'port') as $key){
 					$_POST[$key] = !empty($_POST[$key]) ? htmlspecialchars($_POST[$key], ENT_NOQUOTES) : '';
 				}
 				$_POST['save'] = !empty($_POST['save']) ? ' CHECKED' : '';
@@ -156,7 +156,7 @@ 
 				}
 				$this->lng_list = '<option value="auto">- auto -</opinion>';
 				if(!isset($this->langs)) {include('lang/list.php');$this->langs = &$langs;}
-				foreach($this->langs AS $k => $v){
+				foreach($this->langs as $k => $v){
 					$this->lng_list .= "<option value=\"{$k}\"" . ($k == (!empty($_REQUEST['lang']) ? $this->LNG['name'] : $this->CFG['lang']) ? ' SELECTED' : '') . ">{$v}</opinion>";
 				}
 				include('tmpl.php');
@@ -344,7 +344,7 @@ 
         	echo "alert(" . sxd_esc(mysql_error()) . ");";
 	}
 	function cfg2js($cfg){
-		foreach($cfg AS $k => $v){
+		foreach($cfg as $k => $v){
 			$cfg[$k] = sxd_esc($v, false);
 		}
 		return $cfg;
@@ -429,11 +429,11 @@ 
 	}
 	function createFilters(&$obj, &$filter, &$object){
 		$types = array('TA', 'TC', 'VI', 'PR', 'FU', 'TR', 'EV');
-		foreach($types AS $type){
+		foreach($types as $type){
 			$filter[$type] = array();
 			$object[$type] = array();
 			if(!empty($obj[$type])){
-				foreach($obj[$type] AS $v){
+				foreach($obj[$type] as $v){
 					if(strpos($v, '*') !== false) {
 						$filter[$type][] = str_replace('*', '.*?', $v); 
 					}
@@ -492,12 +492,12 @@ 
 		$rows = 0;
 		$this->tab_rows = array();
 		$todo = array();
-		foreach($objects AS $t => $list){
+		foreach($objects as $t => $list){
 			if($t == 'TA' && (!empty($object['TC']) || !empty($filter['TC']))) {}
 			elseif(empty($object[$t]) && empty($filter[$t])) {continue;}
 			if (empty($list)) continue;
 			
-			foreach($list AS $item){
+			foreach($list as $item){
 				switch($t){
 					case 'TA':
 						$type = '';
@@ -631,7 +631,7 @@ 
 						$tab = $m[2];
 						$this->rtl[7] = 0;
 						$this->rtl[8] = 0;
-						foreach($this->JOB['todo']['TA'] AS $t){
+						foreach($this->JOB['todo']['TA'] as $t){
 							if($t[1] == $tab) {
 								$this->rtl[8] = $t[2];
 							}	
@@ -684,7 +684,7 @@ 
 							$this->rtl[5] = $m[2];
 							$this->rtl[7] = 0;
 							$this->rtl[8] = 0;
-							mysql_query("DROP {$types[$m[1]]} IF EXISTS `{$m[2]}`") or sxd_my_error();
+							mysql_query("drop {$types[$m[1]]} IF EXISTS `{$m[2]}`") or sxd_my_error();
 							$this->addLog(sprintf($this->LNG["restore_{$m[1]}"], $m[2]));
 							$ei = 0;
 						}
@@ -730,7 +730,7 @@ 
 		$this->rtl[6] = '';
 		$this->rtl[7] = 0;
 		$this->rtl[8] = 0;
-		foreach($this->JOB['todo']['TA'] AS $tab){
+		foreach($this->JOB['todo']['TA'] as $tab){
 			if ($tab[0] == 'TC') continue;
 			mysql_query("ALTER TABLE `{$tab[1]}` ENABLE KEYS") or sxd_my_error();
 			$this->rtl[1] = time();
@@ -919,7 +919,7 @@ 
 		$todo = $header = array();
 		$tabs = $rows = 0;
 		$only_create = explode(' ', $this->CFG['only_create']);
-		foreach($queries AS $query){
+		foreach($queries as $query){
 			$t = $query[2];
 			if($t == 'TA' && (!empty($object['TC']) || !empty($filter['TC']))) {}
 			elseif(empty($object[$t]) && empty($filter[$t])) continue;
@@ -976,9 +976,9 @@ 
 			}
 			
 			while (count($views) > 0) {
-				foreach($views AS $n => $view) {
+				foreach($views as $n => $view) {
 					$can_dumped = true;
-					foreach($view AS $k) {
+					foreach($view as $k) {
 						if (isset($views[$k]) && !isset($dumped[$k])) $can_dumped = false;	
 					}
 					if ($can_dumped) {
@@ -1006,7 +1006,7 @@ 
 		$this->JOB['todo'] = $todo;
 		$this->saveJob($this->JOB['job'], $this->JOB);
 		$fcache = implode('|', array('#SXD20', V_SXD, V_MYSQL, V_PHP, date('Y.m.d H:i:s'), $this->JOB['db'], $this->JOB['charset'], $tabs, $rows, sxd_esc($this->JOB['comment'], false))) . "\n";
-		foreach($header AS $t => $o){
+		foreach($header as $t => $o){
 			if (!empty($o)) $fcache .= "#{$t} " . implode('|', $o) . "\n";	
 		}
 		$this->fh_rtl = fopen($this->JOB['file_rtl'], 'wb');
@@ -1031,10 +1031,10 @@ 
 		$time_old = time();
 		$exit_time = $time_old + $this->CFG['time_web'] - 1;
 		$no_cache = V_MYSQL < 40101 ? 'SQL_NO_CACHE ' : '';
-		foreach($this->JOB['todo'] AS $t => $o){
+		foreach($this->JOB['todo'] as $t => $o){
 			if (empty($this->rtl[4])) $this->rtl[4] = $t;
 			elseif ($this->rtl[4] != $t) continue;
-			foreach($o AS $n){ 
+			foreach($o as $n){ 
 				if (empty($this->rtl[5])) {
 					$this->rtl[5] = $n[1];
 					$this->rtl[7] = 0;
@@ -1074,7 +1074,7 @@ 
 			            $time_old = time();
 			            $z = 0;
 			            // Достаем данные
-			            $r = mysql_unbuffered_query("SELECT {$no_cache}* FROM `{$n[1]}`{$from}");
+			            $r = mysql_unbuffered_query("select {$no_cache}* FROM `{$n[1]}`{$from}");
 			            while($row = mysql_fetch_row($r)) {
 			            	 if (strlen($fcache) >= 61440) {
 			            	 	$z = 0;
@@ -1167,7 +1167,7 @@ 
                 if (!empty($this->JOB['del_count'])){
                     ksort($files);
                     $file_to_delete = count($files) - $this->JOB['del_count'];
-                    foreach ($files AS $file){
+                    foreach ($files as $file){
                         if ($file_to_delete-- > 0){ 
                         	if(unlink($this->CFG['backup_path'] . $file)) $this->addLog(sprintf($this->LNG['del_by_count'], $file));
                             else  $this->addLog(sprintf($this->LNG['del_fail'], $file));
@@ -1205,7 +1205,7 @@ 
         $qq = (V_MYSQL < 50000) ? '' : '\'';
 		if ($this->CFG['my_db']) {
 			$tmp = explode(',', $this->CFG['my_db']);
-			foreach($tmp AS $d){
+			foreach($tmp as $d){
 				$d = trim($d);
 				$items[] = $qq . sxd_esc($d, false) . $qq;
 				$dbs[$d] = "{$d} (0)";
@@ -1220,7 +1220,7 @@ 
     		}	
 		}
 		if(V_MYSQL < 50000){
-			foreach($items AS $item){
+			foreach($items as $item){
     			$tables = mysql_query("SHOW TABLES FROM `{$item}`") or sxd_my_error();
     			if ($tables) {
     	  			$tabs = mysql_num_rows($tables);
@@ -1361,13 +1361,13 @@ 
 			$objects['TA'][$tab_prefix][] = $t;
 			unset($objects['TA'][$i]);
 		}
-		foreach($objects AS $type => $o){
+		foreach($objects as $type => $o){
 			if(!count($o)) continue;
 			if($type == 'TA') {
 				$open_childs = count($o['*']) > 1 ? 0 : 1;
 				$obj .= "[{$row},0," . sxd_esc($info[$type][0]) . ",1,1,1],";
 				$row++;
-				foreach($o['*'] AS $value){
+				foreach($o['*'] as $value){
 					if(is_string($value)){
 						if(count($o[$value]) > 1)	{
 							$obj .= "[{$row},1,'{$value}*',1,1,{$open_childs}],";	
@@ -1541,7 +1541,7 @@ 
 	if(count($obj) == 0) return '[]';
 	$is_obj = isset($obj[0]) && isset($obj[count($obj) - 1]) ? false : true;
 	$str = $is_obj ? '{' : '[';
-    foreach ($obj AS $key  => $value) {
+    foreach ($obj as $key  => $value) {
     	$str .= $is_obj ? "'" . addcslashes($key, "\n\r\t'\\/") . "'" . ':' : ''; 
         if     (is_array($value))   $str .= sxd_php2json($value);
         elseif (is_null($value))    $str .= 'null';

admin/sxd/info.php

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
 			$logs = array();
 			if(!empty($rawlog)){
 				$temp = explode("\n", $rawlog);
-				foreach($temp AS $l){
+				foreach($temp as $l){
 					if(empty($l)) continue;
 					$t = explode("\t", $l);
 					if(count($t) < 3) continue;
@@ -103,7 +103,7 @@ 
 		include('lang/list.php');
 		$lng = 'en';
 		if(preg_match_all('/[a-z]{2}(-[a-z]{2})?/', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $m)) {
-			foreach($m[0] AS $l){
+			foreach($m[0] as $l){
 				if(isset($langs[$l])){
 					$lng_name = $l;
 					break;

classes/DBStatic/DBStaticChat.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -157,7 +157,7 @@
    * @return array|bool|mysqli_result|null
    */
   public static function db_chat_player_get($player_id, $fields) {
-    return classSupernova::$db->doSelectFetchArray("SELECT {$fields} FROM {{chat_player}} WHERE `chat_player_player_id` = {$player_id} LIMIT 1");
+    return classSupernova::$db->doSelectFetchArray("select {$fields} FROM {{chat_player}} WHERE `chat_player_player_id` = {$player_id} LIMIT 1");
   }
 
 

classes/debug.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
 
     $result = array();
     $transaction_id = classSupernova::$db->getTransaction()->getNextQueryTransactionId();
-    $result[] = "tID {$transaction_id}";
+    $result[] = "tid {$transaction_id}";
     foreach($backtrace as $a_trace) {
       if(in_array($a_trace['function'], $exclude_functions)) {
         continue;

classes/template.php

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -586,7 +586,7 @@ 
       // Search array to get correct position
       list($search_key, $search_value) = @each($key);
 
-      $key = NULL;
+      $key = null;
       foreach ($this->_tpldata[$blockname] as $i => $val_ary)
       {
         if ($val_ary[$search_key] === $search_value)
@@ -597,7 +597,7 @@ 
       }
 
       // key/value pair not found
-      if ($key === NULL)
+      if ($key === null)
       {
         return false;
       }

classes/UBE/UBEFleetList.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -232,7 +232,7 @@
   public function ube_calculate_attack_results(UBE $ube) {
     // Каждый флот атакует все
     foreach($this->_container as $attack_fleet_data) {
-      defined('DEBUG_UBE') ? print("Fleet {$attack_fleet_data->db_id} attacks<br /><div style='margin-left: 30px;'>") : false;
+      defined('DEBUG_UBE') ? print("fleet {$attack_fleet_data->db_id} attacks<br /><div style='margin-left: 30px;'>") : false;
 
       $attack_fleet_data->attack_fleets($this, $ube->is_simulator);