supernova-ws / SuperNova

admin/sxd/index.php

Doc Comments +22 added lines

@@ -168,6 +168,11 @@ 
 		if(isset($_POST['ajax'])) $this->ajax($_POST['ajax']);
 		else $this->main();exit;
 	}
+
+	/**
+	 * @param string $name
+	 * @param string $content
+	 */
 	function saveToFile($name, $content){
 		$fp = fopen($name, "w");
 		fwrite($fp, $content);
@@ -248,6 +253,12 @@ 
 		include('tmpl.php');
 		echo sxd_tpl_page();
 	}
+
+	/**
+	 * @param string $name
+	 * @param integer $ico
+	 * @param string $opt_name
+	 */
 	function addCombo($name, $sel, $ico, $opt_name, $opts = ''){
 		$opts = !empty($opts) ? "{{$opt_name}:" . sxd_php2json($opts) . '}' : "'{$opt_name}'";
 		return "sxd.addCombo('{$name}', '{$sel}', {$ico}, {$opts});\n";
@@ -1313,6 +1324,10 @@ 
 		}
 		return $this->formatTree($tree, $objects);
 	}
+
+	/**
+	 * @param string $tree
+	 */
 	function getFileObjects($tree, $name, $formatTree = true){
 		// Достаем таблицы
 		$objects = array('TA' => array(), 'VI' => array(), 'PR' => array(), 'FU' => array(), 'TR' => array(), 'EV' => array());
@@ -1475,6 +1490,10 @@ 
 	function saveJob($job, $config){
 		$this->saveToFile($this->CFG['backup_path'] . $job . '.job.php', "<?php\n\$JOB = " . var_export($config, true) . ";\n" . "?>");
 	}
+
+	/**
+	 * @param string $mode
+	 */
 	function openFile($name, $mode){
 		if($mode == 'r') {
 			if(preg_match('/\.(sql|sql\.bz2|sql\.gz)$/i', $name, $m)) $this->JOB['file_ext'] = strtolower($m[1]);
@@ -1552,6 +1571,9 @@ 
     }
 	return  substr_replace($str, $is_obj ? '}' : ']', -1);
 }
+/**
+ * @param string $ver
+ */
 function sxd_ver2int($ver){
 	return preg_match("/^(\d+)\.(\d+)\.(\d+)/", $ver, $m) ? sprintf("%d%02d%02d", $m[1], $m[2], $m[3]) : 0;
 }

Spacing +284 added lines, -284 removed lines

@@ -33,27 +33,27 @@ 
 		define('V_PHP', sxd_ver2int(phpversion()));
 		$this->name = 'Sypex Dumper 2.0.11';
 	}
-	function loadLang($lng_name = 'auto'){
-		if($lng_name == 'auto'){
+	function loadLang($lng_name = 'auto') {
+		if ($lng_name == 'auto') {
 			include('lang/list.php');
 			$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){
-					if(isset($langs[$l])){
+			if (preg_match_all('/[a-z]{2}(-[a-z]{2})?/', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $m)) {
+				foreach ($m[0] AS $l) {
+					if (isset($langs[$l])) {
 						$lng_name = $l;
 						break;
 					}
 				}
 			}
 		}
-		if(file_exists("lang/lng_{$lng_name}.php")) include("lang/lng_{$lng_name}.php");
+		if (file_exists("lang/lng_{$lng_name}.php")) include("lang/lng_{$lng_name}.php");
 		else include("lang/lng_en.php");
 		$this->LNG = &$LNG;
 		$this->LNG['name'] = $lng_name;
 		return true;
 	}
-	function init($args = false){
+	function init($args = false) {
 		if (get_magic_quotes_gpc()) {
 			$_POST = sxd_antimagic($_POST);
 		}
@@ -66,7 +66,7 @@ 
 		$this->virtualize = false;
 		$this->cron_mode = false;
 		// Проверяем авторизацию и делаем коннект к базе
-		if(empty($this->CFG['my_user'])){
+		if (empty($this->CFG['my_user'])) {
 			$this->CFG['my_host'] = 'localhost';
 			$this->CFG['my_port'] = 3306;
 			$this->CFG['my_user'] = 'root';
@@ -75,8 +75,8 @@ 
 			$this->CFG['my_db'] = '';
 		}
 		if ($args) { // консольный режим
-		    foreach($args AS $key => $arg){
-		        if (preg_match("/^-([hupoj])=(.*?)$/", $arg, $m)){
+		    foreach ($args AS $key => $arg) {
+		        if (preg_match("/^-([hupoj])=(.*?)$/", $arg, $m)) {
 		            switch ($m[1]) {
 		                case 'h': $this->CFG['my_host'] = $m[2]; break; // хост
 		                case 'o': $this->CFG['my_port'] = $m[2]; break; // порт
@@ -90,73 +90,73 @@ 
 		    set_time_limit($CFG['time_cron']);
 		    // Загружаем конфиг файл, если нужно
 		    $auth = $this->connect();
-		    if($auth && !empty($this->CFG['sjob'])){
+		    if ($auth && !empty($this->CFG['sjob'])) {
 				$this->ajax($this->loadJob($this->CFG['sjob']));
 				echo file_get_contents($this->JOB['file_log']);
-				if(file_exists($this->JOB['file_log'])) unlink($this->JOB['file_log']);
-				if(file_exists($this->JOB['file_rtl'])) unlink($this->JOB['file_rtl']);
+				if (file_exists($this->JOB['file_log'])) unlink($this->JOB['file_log']);
+				if (file_exists($this->JOB['file_rtl'])) unlink($this->JOB['file_rtl']);
 		    }
 		    else echo 'Auth error';
 		    exit;
 		}
-		elseif(!empty($this->CFG['auth'])){ // Авторизация
+		elseif (!empty($this->CFG['auth'])) { // Авторизация
 			$auth = false;
 			$sfile = 'ses.php';
 			
-			if(!empty($_COOKIE['sxd']) && preg_match('/^[\da-f]{32}$/', $_COOKIE['sxd'])){
+			if (!empty($_COOKIE['sxd']) && preg_match('/^[\da-f]{32}$/', $_COOKIE['sxd'])) {
 				include($sfile);
-				if(isset($SES[$_COOKIE['sxd']])) {
+				if (isset($SES[$_COOKIE['sxd']])) {
 					$auth = true;
 					$this->CFG = $SES[$_COOKIE['sxd']]['cfg'];
 					$this->SES = &$SES;
 					$this->loadLang($this->CFG['lang']);
 				}
 			}
-			if(!$auth) {
+			if (!$auth) {
 				$user = !empty($_POST['user']) ? $_POST['user'] : '';
 				$pass = !empty($_POST['pass']) ? $_POST['pass'] : '';
 				$host = !empty($_POST['host']) ? $_POST['host'] : (!empty($this->CFG['my_host']) ? $this->CFG['my_host'] : 'localhost');
 				$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){
-					switch($a) {
-						case 'cfg': 	if(empty($user)) {continue;}
-										$auth = !empty($CFG['user']) && isset($CFG['pass']) && $CFG['user']== $user && $CFG['pass'] == $pass;
+				if (!empty($_REQUEST['lang']) && preg_match('/^[a-z]{2}(-[a-z]{2})?$/', $_REQUEST['lang'])) {$this->loadLang($_REQUEST['lang']); }
+				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;
 										break;
-						case 'mysql':	if(empty($user)) {continue;}
-										if($host != 'localhost' && !empty($this->CFG['my_host']) && $this->CFG['my_host'] != $host) {continue;}
+						case 'mysql':	if (empty($user)) {continue; }
+										if ($host != 'localhost' && !empty($this->CFG['my_host']) && $this->CFG['my_host'] != $host) {continue; }
 										$auth = $this->connect($host, $port, $user, $pass);
 										break;
 						default:		$file = 'auth_' . $a . '.php';
-										if(!file_exists($file)) continue;
+										if (!file_exists($file)) continue;
 										include	$file;
 					}
-					if($auth) break;
+					if ($auth) break;
 				}
-				if($auth){
-					$key = md5(rand(1,100000) . $user . microtime());
+				if ($auth) {
+					$key = md5(rand(1, 100000) . $user . microtime());
 					$CFG['lang'] = $this->LNG['name'];
 					$_COOKIE['sxd'] = $key;
 					$this->saveCFG();
-					if(V_PHP > 50200) setcookie('sxd', $key, !empty($_POST['save']) ? time() + 31536000 : 0, '', '', false, true);
+					if (V_PHP > 50200) setcookie('sxd', $key, !empty($_POST['save']) ? time() + 31536000 : 0, '', '', false, true);
 					else setcookie('sxd', $key, !empty($_POST['save']) ? time() + 31536000 : 0, '', '', false);
 					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' : '';
 			}
 			if (!$auth) {
-				if(!empty($_POST['ajax'])){
+				if (!empty($_POST['ajax'])) {
 					echo "sxd.hideLoading();alert('Session not found');";
 					exit;
 				}
 				$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){
+				if (!isset($this->langs)) {include('lang/list.php'); $this->langs = &$langs; }
+				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');
@@ -164,26 +164,26 @@ 
 				exit;
 			}
 		}
-		if(empty($_POST['ajax']['act']) || $_POST['ajax']['act'] != 'save_connect') $this->connect();
-		if(isset($_POST['ajax'])) $this->ajax($_POST['ajax']);
-		else $this->main();exit;
+		if (empty($_POST['ajax']['act']) || $_POST['ajax']['act'] != 'save_connect') $this->connect();
+		if (isset($_POST['ajax'])) $this->ajax($_POST['ajax']);
+		else $this->main(); exit;
 	}
-	function saveToFile($name, $content){
+	function saveToFile($name, $content) {
 		$fp = fopen($name, "w");
 		fwrite($fp, $content);
 		fclose($fp);
 	}
-	function connect($host = null, $port = null, $user = null, $pass = null){
+	function connect($host = null, $port = null, $user = null, $pass = null) {
 		$this->error = '';
 		$this->try = true;
-		if(!empty($user) && isset($pass)) {
+		if (!empty($user) && isset($pass)) {
 			$this->CFG['my_host'] = $host;
 			$this->CFG['my_port'] = $port;
 			$this->CFG['my_user'] = $user;
 			$this->CFG['my_pass'] = $pass;
 		}
-		if(mysql_connect($this->CFG['my_host'] . ($this->CFG['my_host']{0} != ':' ? ":{$this->CFG['my_port']}" : ''),  $this->CFG['my_user'], $this->CFG['my_pass'])) {
-			if(V_PHP > 50202) mysql_set_charset('utf8') or sxd_my_error();
+		if (mysql_connect($this->CFG['my_host'] . ($this->CFG['my_host']{0} != ':' ? ":{$this->CFG['my_port']}" : ''), $this->CFG['my_user'], $this->CFG['my_pass'])) {
+			if (V_PHP > 50202) mysql_set_charset('utf8') or sxd_my_error();
 			else mysql_query('SET NAMES utf8') or sxd_my_error();
 			define('V_MYSQL', sxd_ver2int(mysql_get_server_info()));
 		}
@@ -192,9 +192,9 @@ 
 			$this->error = "sxd.actions.tab_connects();alert(" . sxd_esc(mysql_error()) . ");";
 		}	
 		$this->try = false;
-		return V_MYSQL ? true: false;
+		return V_MYSQL ? true : false;
 	}
-	function main(){
+	function main() {
    		// Тулбар
 		$this->VAR['toolbar'] = sxd_php2json(
 			array(
@@ -215,7 +215,7 @@ 
   		$this->db = 'temp';
 		$zip = array($this->LNG['zip_none']);
 		if (function_exists("gzopen")) {
-			for($i = 1; $i <10; $i++){
+			for ($i = 1; $i < 10; $i++) {
 				$zip[] = "GZip: {$i}";
 			}
 			$zip[1] .= " ({$this->LNG['zip_min']})";
@@ -225,7 +225,7 @@ 
 		    $zip[10] = "BZip";
 		}
 		end($zip);
-		$zip[key($zip)] .=  " ({$this->LNG['zip_max']})";
+		$zip[key($zip)] .= " ({$this->LNG['zip_max']})";
 		$this->VAR['combos'] =
 			$this->addCombo('backup_db', $this->db, 11, 'db', array()/*$this->getDBList()*/) . 
 			$this->addCombo('backup_charset', 0, 9, 'charset', $this->getCharsetList()) .
@@ -248,17 +248,17 @@ 
 		include('tmpl.php');
 		echo sxd_tpl_page();
 	}
-	function addCombo($name, $sel, $ico, $opt_name, $opts = ''){
+	function addCombo($name, $sel, $ico, $opt_name, $opts = '') {
 		$opts = !empty($opts) ? "{{$opt_name}:" . sxd_php2json($opts) . '}' : "'{$opt_name}'";
 		return "sxd.addCombo('{$name}', '{$sel}', {$ico}, {$opts});\n";
 	}
-	function ajax($req){
+	function ajax($req) {
 		$res = '';
 		$act = $req['act'];
-		if($req['act'] == 'run_savedjob'){
+		if ($req['act'] == 'run_savedjob') {
 			$req = $this->loadJob($req);
 		}
-		switch($req['act']){
+		switch ($req['act']) {
 			case 'load_db': 
 				$res = $this->getObjects(str_replace('_db', '', $req['name']), $req['value']);
 				break;
@@ -274,14 +274,14 @@ 
 			case 'load_connect':
 				$CFG = $this->cfg2js($this->CFG); 
 				$res = "z('con_host').value = '{$CFG['my_host']}', z('con_port').value = '{$CFG['my_port']}', z('con_user').value = '{$CFG['my_user']}',
-			z('con_pass').value = '', z('con_comp').checked = {$CFG['my_comp']}, z('con_db').value = '{$CFG['my_db']}', z('con_pass').changed = false;" ;
+			z('con_pass').value = '', z('con_comp').checked = {$CFG['my_comp']}, z('con_db').value = '{$CFG['my_db']}', z('con_pass').changed = false;";
 				break;
 			case 'save_connect': 
 				$res = $this->saveConnect($req);
 				break;
 			case 'save_job': 
 				unset($req['act']);
-				$this->saveJob('sj_' . $req['job'] , $req);
+				$this->saveJob('sj_' . $req['job'], $req);
 				$res = $this->getSavedJobs();
 				break;
 			case 'add_db': 
@@ -296,9 +296,9 @@ 
 				$res = $this->saveOptions($req);
 				break;
 			case 'delete_file':
-				if(preg_match('/^[^\/]+?\.sql(\.(gz|bz2))?$/', $req['name'])) {
+				if (preg_match('/^[^\/]+?\.sql(\.(gz|bz2))?$/', $req['name'])) {
 					$file = $this->CFG['backup_path'] . $req['name'];
-					if(file_exists($file)) unlink($file);
+					if (file_exists($file)) unlink($file);
 				}
 				$res = $this->getFileListExtended();
 				break;
@@ -327,40 +327,40 @@ 
 		}	
 		echo $res;
 	}
-	function loadJob($job){
+	function loadJob($job) {
 		$file = $this->CFG['backup_path'] . 'sj_' . (is_array($job) ? $job['job'] : $job) . '.job.php';
-		if(!file_exists($file)) return;
+		if (!file_exists($file)) return;
 		include($file);
 		$JOB['act'] = $JOB['type'];
 		$JOB['type'] = 'run';
 		return $JOB;
 	}
-	function deleteDB($name){
+	function deleteDB($name) {
 		$r = mysql_query('DROP DATABASE `' . sxd_esc($name, false) . '`') or sxd_my_error();
-		if($r){
+		if ($r) {
         	echo "sxd.clearOpt('db');sxd.addOpt(" . sxd_php2json(array('db' => $this->getDBList())) . ");sxd.combos.services_db.select(0,'-');";
 		}
         else
         	echo "alert(" . sxd_esc(mysql_error()) . ");";
 	}
-	function cfg2js($cfg){
-		foreach($cfg AS $k => $v){
+	function cfg2js($cfg) {
+		foreach ($cfg AS $k => $v) {
 			$cfg[$k] = sxd_esc($v, false);
 		}
 		return $cfg;
 	}
-	function addDb($req){
+	function addDb($req) {
         $r = mysql_query('CREATE DATABASE `' . sxd_esc($req['name'], false) . '`' . (V_MYSQL > 40100 ? "CHARACTER SET {$req['charset']} COLLATE {$req['collate']}" : ''));
-        if($r)
+        if ($r)
         	echo "sxd.addOpt(" . sxd_php2json(array('db' => array($req['name'] => "{$req['name']} (0)"))) . ");";
         else
         	 sxd_my_error();
 	}
-	function saveConnect($req){
+	function saveConnect($req) {
 		$this->CFG['my_host'] = $req['host'];
-		$this->CFG['my_port'] = (int)$req['port'];
+		$this->CFG['my_port'] = (int) $req['port'];
 		$this->CFG['my_user'] = $req['user'];
-		if(isset($req['pass'])) $this->CFG['my_pass'] = $req['pass'];
+		if (isset($req['pass'])) $this->CFG['my_pass'] = $req['pass'];
 		$this->CFG['my_comp'] = $req['comp'] ? 1 : 0;
 		$this->CFG['my_db']   = $req['db'];
 		$this->saveCFG();
@@ -377,7 +377,7 @@ 
 			 echo $this->error;
 		}
 	}
-	function saveOptions($req){
+	function saveOptions($req) {
 		$this->CFG['time_web']    = $req['time_web'];
 		$this->CFG['time_cron']   = $req['time_cron'];
 		$this->CFG['backup_path'] = $req['backup_path'];
@@ -389,28 +389,28 @@ 
 		$this->CFG['confirm']     = $req['confirm'];
 		$this->saveCFG();
 	}
-	function saveCFG(){
+	function saveCFG() {
 		if (isset($_COOKIE['sxd'])) {
 			$this->SES[$_COOKIE['sxd']] = array('cfg' => $this->CFG, 'time' => time(), 'lng' => $this->LNG['name']);
 			$this->saveToFile('ses.php', "<?php\n\$SES = " . var_export($this->SES, true) . ";\n" . "?>");
 		}
-        if (!$this->virtualize){
+        if (!$this->virtualize) {
         	$this->saveToFile('cfg.php', "<?php\n\$CFG = " . var_export($this->CFG, true) . ";\n" . "?>");
         }
 	}
 	function runServices($job) {
 		$serv = array('optimize' => 'OPTIMIZE', 'analyze' => 'ANALYZE', 'check' => 'CHECK', 'repair' => 'REPAIR');
 		$add = array('check'  => array('', 'QUICK', 'FAST', 'CHANGED', 'MEDIUM', 'EXTENDED'), 'repair' => array('', 'QUICK', 'EXTENDED'));
-		if(isset($serv[$job['type']])) {
+		if (isset($serv[$job['type']])) {
 			mysql_select_db($job['db']);
 			$filter = $object = array();
 			$this->createFilters($job['obj'], $filter, $object);
 			$r = mysql_query('SHOW TABLE STATUS') or sxd_my_error();
 			if (!$r) return;
 			$tables = array();
-			while($item = mysql_fetch_assoc($r)){
-				if(V_MYSQL > 40101 && is_null($item['Engine']) && preg_match('/^VIEW/i', $item['Comment'])) continue;
-				if(sxd_check($item['Name'], $object['TA'], $filter['TA'])) $tables[] = "`{$item['Name']}`";
+			while ($item = mysql_fetch_assoc($r)) {
+				if (V_MYSQL > 40101 && is_null($item['Engine']) && preg_match('/^VIEW/i', $item['Comment'])) continue;
+				if (sxd_check($item['Name'], $object['TA'], $filter['TA'])) $tables[] = "`{$item['Name']}`";
 			}
 			$sql = $serv[$job['type']] . ' TABLE ' . implode(',', $tables);
 			
@@ -421,20 +421,20 @@ 
 			$r = mysql_query($sql) or sxd_my_error();
 			if (!$r) return;
 			$res = array();
-			while($item = mysql_fetch_row($r)){
+			while ($item = mysql_fetch_row($r)) {
 				$res[] = $item;
 			}
-			echo 'sxd.result.add(' . sxd_php2json($res). ');';
+			echo 'sxd.result.add(' . sxd_php2json($res) . ');';
 		}
 	}
-	function createFilters(&$obj, &$filter, &$object){
+	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){
-					if(strpos($v, '*') !== false) {
+			if (!empty($obj[$type])) {
+				foreach ($obj[$type] AS $v) {
+					if (strpos($v, '*') !== false) {
 						$filter[$type][] = str_replace('*', '.*?', $v); 
 					}
 					else {
@@ -445,7 +445,7 @@ 
 			}
 		}
 	}
-	function closeConnect(){
+	function closeConnect() {
 		//return;
 		@ignore_user_abort(1); 
 		header("SXD: {$this->name}");
@@ -456,15 +456,15 @@ 
 		@ob_end_flush();
 		@flush();
 	}
-	function resumeJob($job){
+	function resumeJob($job) {
 		$this->closeConnect();
 		include($this->CFG['backup_path'] . $job['job'] . '.job.php');
 		$this->JOB = &$JOB;
-		if(file_exists($this->JOB['file_stp'])) unlink($this->JOB['file_stp']);
+		if (file_exists($this->JOB['file_stp'])) unlink($this->JOB['file_stp']);
 		$this->fh_rtl = fopen($this->JOB['file_rtl'], 'r+b');
 		$this->fh_log = fopen($this->JOB['file_log'], 'ab');
 		$t = fgets($this->fh_rtl);
-		if(!empty($t)){
+		if (!empty($t)) {
 			$this->rtl = explode("\t", $t);	
 		}
 		else {
@@ -492,27 +492,27 @@ 
 		$rows = 0;
 		$this->tab_rows = array();
 		$todo = array();
-		foreach($objects AS $t => $list){
-			if($t == 'TA' && (!empty($object['TC']) || !empty($filter['TC']))) {}
-			elseif(empty($object[$t]) && empty($filter[$t])) {continue;}
+		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){
-				switch($t){
+			foreach ($list AS $item) {
+				switch ($t) {
 					case 'TA':
 						$type = '';
-						if(sxd_check($item[0], $object['TA'], $filter['TA'])){
+						if (sxd_check($item[0], $object['TA'], $filter['TA'])) {
 							$type = empty($item[1]) ? 'TC' : 'TA';
 						}
-						elseif(sxd_check($item[0], $object['TC'], $filter['TC'])) {
+						elseif (sxd_check($item[0], $object['TC'], $filter['TC'])) {
 							$type = 'TC';
 						}
 						else continue;
-						$todo['TA'][]   = array($type, $item[0], $item[1], $item[2]);
+						$todo['TA'][] = array($type, $item[0], $item[1], $item[2]);
 						$rows += $type == 'TA' ? $item[1] : 0;
 					break;
 					default:
-						if(sxd_check($item, $object[$t], $filter[$t])) {
+						if (sxd_check($item, $object[$t], $filter[$t])) {
 							$todo[$t][] = array($t, $item);
 						}
 				}
@@ -522,14 +522,14 @@ 
 		$this->JOB['file_rtl'] = $this->CFG['backup_path'] . $this->JOB['job'] . '.rtl';
 		$this->JOB['file_log'] = $this->CFG['backup_path'] . $this->JOB['job'] . '.log';
 		$this->JOB['file_stp'] = $this->CFG['backup_path'] . $this->JOB['job'] . '.stp';
-		if(file_exists($this->JOB['file_stp'])) unlink($this->JOB['file_stp']);
+		if (file_exists($this->JOB['file_stp'])) unlink($this->JOB['file_stp']);
 		
 		$this->fh_tmp = $this->openFile($this->JOB['file_tmp'], 'r');
 		// Для чужих дампов определяем разделители строк
-		if(is_null($this->JOB['obj'])) {
+		if (is_null($this->JOB['obj'])) {
 			$s = fread($this->fh_tmp, 2048);
-			if(strpos($s, "\r\n")) $this->JOB['eol'] = "\r\n";
-			elseif(strpos($s, "\n")) $this->JOB['eol'] = "\n";
+			if (strpos($s, "\r\n")) $this->JOB['eol'] = "\r\n";
+			elseif (strpos($s, "\n")) $this->JOB['eol'] = "\n";
 			else $this->JOB['eol'] = "\r";
 			$bom = strncmp($s, "\xEF\xBB\xBF", 3) == 0 ? 3 : ((strncmp($s, "\xFE\xFF", 2) == 0 || strncmp($s, "\xFF\xFE", 2) == 0) ? 2 : 0);
 			fseek($this->fh_tmp, $bom);
@@ -543,16 +543,16 @@ 
 		$this->addLog("{$this->LNG['combo_file']} {$this->JOB['file']}");
 		$this->runRestoreJob();
 	}
-	function runRestoreJob($continue = false){
+	function runRestoreJob($continue = false) {
 		$ei = false;
-		if($continue){
+		if ($continue) {
 			$this->fh_tmp = $this->openFile($this->JOB['file_tmp'], 'r');
 			fseek($this->fh_tmp, $this->rtl[3]);
-			if(!empty($this->rtl[6])) $this->setNames($this->JOB['correct'] == 1 && !empty($this->JOB['charset']) ? $this->JOB['charset'] : $this->rtl[6]);
-			if($this->rtl[7] < $this->rtl[10]) $ei = true; 
+			if (!empty($this->rtl[6])) $this->setNames($this->JOB['correct'] == 1 && !empty($this->JOB['charset']) ? $this->JOB['charset'] : $this->rtl[6]);
+			if ($this->rtl[7] < $this->rtl[10]) $ei = true; 
 		}
 		mysql_select_db($this->JOB['db']);
-		if(is_null($this->JOB['obj'])) $this->runRestoreJobForeign($continue);
+		if (is_null($this->JOB['obj'])) $this->runRestoreJobForeign($continue);
 		//mysql_query("SET NAMES 'UTF8'");
 		$types = array('VI' => 'View', 'PR' => 'Procedure', 'FU' => 'Function', 'TR' => 'Trigger', 'EV' => 'Event');
 		$fcache = '';
@@ -565,34 +565,34 @@ 
 		$this->rtl[1] = time();
 		fwrite($this->fh_rtl, implode("\t", $this->rtl));
 		$c = 0;
-		switch($this->JOB['strategy']){
+		switch ($this->JOB['strategy']) {
 			case 1: $tc = 'TRUNCATE'; $td = 'INSERT'; break;
 			case 2: $tc = ''; $td = 'REPLACE'; break;
 			case 3: $tc = ''; $td = 'INSERT IGNORE'; break;
 			default: $tc = 'DROP TABLE IF EXISTS'; $td = 'INSERT';
 		}
 		$tab_exists = array();
-		if($this->JOB['strategy'] > 0){
+		if ($this->JOB['strategy'] > 0) {
 			$r = mysql_query("SHOW TABLES") or sxd_my_error();
-			while($item = mysql_fetch_row($r)){
+			while ($item = mysql_fetch_row($r)) {
 				$tab_exists[$item[0]] = true;
 			}
 		}
 		$insert = $continue && $this->rtl[7] < $this->rtl[10] ? "{$td} INTO `{$this->rtl[5]}` VALUES " : '';
 		//$enable_index = array();
-		if(V_MYSQL > 40014) {
+		if (V_MYSQL > 40014) {
 			mysql_query("SET UNIQUE_CHECKS=0");
 			mysql_query("SET FOREIGN_KEY_CHECKS=0");
-			if(V_MYSQL > 40101) mysql_query("SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO'");
-			if(V_MYSQL > 40111) mysql_query("SET SQL_NOTES=0");
+			if (V_MYSQL > 40101) mysql_query("SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO'");
+			if (V_MYSQL > 40111) mysql_query("SET SQL_NOTES=0");
 		}
 		$log_sql = false;
 		$fields = '';
 		$time_old = time();
 		$exit_time = $time_old + $this->CFG['time_web'] - 1;
-		while($q = sxd_read_sql($this->fh_tmp, $seek, $ei)){	
-			if($time_old < time()) {
-				if(file_exists($this->JOB['file_stp'])){
+		while ($q = sxd_read_sql($this->fh_tmp, $seek, $ei)) {	
+			if ($time_old < time()) {
+				if (file_exists($this->JOB['file_stp'])) {
 					$type = file_get_contents($this->JOB['file_stp']);
 					$this->rtl[9] = !empty($type) ? $type : 2;
 					fseek($this->fh_rtl, 0);
@@ -605,7 +605,7 @@ 
 					exit;
 				}
 				$time_old = time();
-				if($time_old >= $exit_time){
+				if ($time_old >= $exit_time) {
 					$this->rtl[9] = 3;
 					fseek($this->fh_rtl, 0);
 					$this->rtl[1] = time();
@@ -615,9 +615,9 @@ 
 				}
 				clearstatcache(); 
 			}
-			switch($q{0}){
+			switch ($q{0}) {
 				case '(':
-					if($continue) {
+					if ($continue) {
 						$this->addLog(sprintf("{$this->LNG['restore_TC']} {$this->LNG['continue_from']}", $this->rtl[5], $this->rtl[3]));
 						$continue = false;
 					}
@@ -631,12 +631,12 @@ 
 						$tab = $m[2];
 						$this->rtl[7] = 0;
 						$this->rtl[8] = 0;
-						foreach($this->JOB['todo']['TA'] AS $t){
-							if($t[1] == $tab) {
+						foreach ($this->JOB['todo']['TA'] AS $t) {
+							if ($t[1] == $tab) {
 								$this->rtl[8] = $t[2];
 							}	
 						}
-						if($this->JOB['strategy']) {
+						if ($this->JOB['strategy']) {
 							$q = substr_replace($q, $insert, 0, strlen($m[0]));
 						}
 						//mysql_query("LOCK TABLES `{$tab}` WRITE") or die (mysql_error());
@@ -648,13 +648,13 @@ 
 				case 'C':
 					$ex = 1;
 					if (preg_match('/^CREATE TABLE `/', $q)) {
-						if($this->JOB['strategy'] != 0 && isset($tab_exists[$this->rtl[5]])) $ex = 0;
+						if ($this->JOB['strategy'] != 0 && isset($tab_exists[$this->rtl[5]])) $ex = 0;
 						else {
 							$ex = 1;
-							if((!empty($this->JOB['correct']) && !empty($this->JOB['charset']))){
+							if ((!empty($this->JOB['correct']) && !empty($this->JOB['charset']))) {
 								$q = preg_replace('/(DEFAULT)?\s*(CHARSET|CHARACTER SET|COLLATE)[=\s]+\w+/i', '', $q) . (V_MYSQL < 40100 ? '' : ' DEFAULT CHARSET=' . $this->JOB['charset']);
 							}
-							if(!empty($this->JOB['autoinc'])) $q = preg_replace("/AUTO_INCREMENT=\d+/", "AUTO_INCREMENT=1", $q);
+							if (!empty($this->JOB['autoinc'])) $q = preg_replace("/AUTO_INCREMENT=\d+/", "AUTO_INCREMENT=1", $q);
 						}
 						// Достаем имена полей таблицы
 						$fields = $this->JOB['strategy'] > 0 && preg_match_all('/^\s+(`.+?`) /m', $q, $f, PREG_PATTERN_ORDER) ? '(' . implode(',', $f[1]) . ')' : '';
@@ -665,18 +665,18 @@ 
 						//if(!empty($tab)) $enable_index[] = $tab;
 //						$this->setNames($this->JOB['correct'] == 1 && !empty($this->JOB['charset']) ? $this->JOB['charset'] : empty($m[3]) ? '' : $m[3]);
 						$this->setNames('binary');
-						if($m[1] == 'TC') {
+						if ($m[1] == 'TC') {
 							$this->addLog(sprintf($this->LNG['restore_TC'], $m[2]));
 							$insert = '';
 							$tab = '';
 							$this->rtl[4] = 'TD';
 							$this->rtl[5] = $m[2];
 							$ei = 0;
-							if($tc && ($this->JOB['strategy'] == 0 || isset($tab_exists[$m[2]]))) {
+							if ($tc && ($this->JOB['strategy'] == 0 || isset($tab_exists[$m[2]]))) {
 								mysql_query("{$tc} `{$m[2]}`") or sxd_my_error();
 							}
 						}
-						elseif($m[1] == 'TD'){
+						elseif ($m[1] == 'TD') {
 							$ei = 1;
 						}
 						else {
@@ -695,13 +695,13 @@ 
 					$insert = '';
 					$ex = 1;
 			}
-			if($ex) {
+			if ($ex) {
 				$this->rtl[3] = ftell($this->fh_tmp) - $seek;
 				fseek($this->fh_rtl, 0);
 				$this->rtl[1] = time();
 				fwrite($this->fh_rtl, implode("\t", $this->rtl));
-				if(mysql_query($q)) {
-					if($insert) {
+				if (mysql_query($q)) {
+					if ($insert) {
 						$c = 1;
 					}
 				}
@@ -710,7 +710,7 @@ 
 					sxd_my_error();
 				}
 				
-				if($c){
+				if ($c) {
 					$i = mysql_affected_rows();
 					$this->rtl[3] = ftell($this->fh_tmp) - $seek;
 					$this->rtl[7] += $i;
@@ -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();
@@ -747,7 +747,7 @@ 
 		fclose($this->fh_log);
 		fclose($this->fh_rtl);
 	}
-	function runRestoreJobForeign($continue = false){
+	function runRestoreJobForeign($continue = false) {
 		$ei = false;
 		
 		$fcache = '';
@@ -768,11 +768,11 @@ 
 		$time_old = time();
 		$exit_time = $time_old + $this->CFG['time_web'] - 1;
 		$delimiter = ";";
-		while($q = sxd_read_sql($this->fh_tmp, $seek, $ei, $delimiter, $this->JOB['eol'])){
+		while ($q = sxd_read_sql($this->fh_tmp, $seek, $ei, $delimiter, $this->JOB['eol'])) {
 			$q = ltrim($q);
-			if(empty($q)) break;
-			if($time_old < time()) {
-				if(file_exists($this->JOB['file_stp'])){
+			if (empty($q)) break;
+			if ($time_old < time()) {
+				if (file_exists($this->JOB['file_stp'])) {
 					$type = file_get_contents($this->JOB['file_stp']);
 					$this->rtl[9] = !empty($type) ? $type : 2;
 					fseek($this->fh_rtl, 0);
@@ -785,7 +785,7 @@ 
 					exit;
 				}
 				$time_old = time();
-				if($time_old >= $exit_time){
+				if ($time_old >= $exit_time) {
 					$this->rtl[9] = 3;
 					fseek($this->fh_rtl, 0);
 					$this->rtl[1] = time();
@@ -799,9 +799,9 @@ 
 				$repeat = false;
 				//error_log("-----------------\n[{$q}]\n", 3, "q.log");
 				//if(empty($q)) {continue 2;}
-				switch($q{0}){
+				switch ($q{0}) {
 					case '(':
-						if($continue) {
+						if ($continue) {
 							$this->addLog(sprintf("{$this->LNG['restore_TC']} {$this->LNG['continue_from']}", $this->rtl[5], $this->rtl[3]));
 							$continue = false;
 						}
@@ -827,11 +827,11 @@ 
 							$tab = $m[1];
 							$this->addLog(sprintf($this->LNG['restore_TC'], $tab));
 							//mysql_query("DROP TABLE IF EXISTS `{$tab}`");
-							if((!empty($this->JOB['correct']) && !empty($this->JOB['charset']))){
+							if ((!empty($this->JOB['correct']) && !empty($this->JOB['charset']))) {
 								$q = preg_replace('/(DEFAULT)?\s*(CHARSET|CHARACTER SET|COLLATE)[=\s]+\w+/i', '', $q) . (V_MYSQL < 40100 ? '' : ' DEFAULT CHARSET=' . $this->JOB['charset']);
 							}
-							elseif(empty($this->JOB['charset'])){
-								if(preg_match("/(CHARACTER SET|CHARSET)[=\s]+(\w+)/i", $q, $charset)){
+							elseif (empty($this->JOB['charset'])) {
+								if (preg_match("/(CHARACTER SET|CHARSET)[=\s]+(\w+)/i", $q, $charset)) {
 									$this->setNames($charset[2]);
 								}
 							}
@@ -857,15 +857,15 @@ 
 						$ex = 1;
 						$ei = 0;
 				}
-			}  while ($repeat);
-			if($ex) {
+			} while ($repeat);
+			if ($ex) {
 				$this->rtl[3] = ftell($this->fh_tmp) - $seek;
 				fseek($this->fh_rtl, 0);
 				$this->rtl[1] = time();
 				fwrite($this->fh_rtl, implode("\t", $this->rtl));
 				error_log("-----------------\n{$q}\n", 3, "sql.log");
-				if(mysql_query($q)) {
-					if($insert) {
+				if (mysql_query($q)) {
+					if ($insert) {
 						$c = 1;
 					}
 				}
@@ -874,7 +874,7 @@ 
 					sxd_my_error();
 				}
 				
-				if($c){
+				if ($c) {
 					$i = mysql_affected_rows();
 					$this->rtl[3] = ftell($this->fh_tmp) - $seek;
 					$this->rtl[7] += $i;
@@ -914,37 +914,37 @@ 
 			$queries[] = array("PROCEDURE STATUS WHERE db='{$this->JOB['db']}'", 'Name', 'PR');
 			$queries[] = array("FUNCTION STATUS WHERE db='{$this->JOB['db']}'", 'Name', 'FU');
 			$queries[] = array('TRIGGERS', 'Trigger', 'TR');
-			if(V_MYSQL > 50100) $queries[] = array('EVENTS', 'Name', 'EV');
+			if (V_MYSQL > 50100) $queries[] = array('EVENTS', 'Name', 'EV');
 		}
 		$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;
+			if ($t == 'TA' && (!empty($object['TC']) || !empty($filter['TC']))) {}
+			elseif (empty($object[$t]) && empty($filter[$t])) continue;
 			$r = mysql_query('SHOW ' . $query[0]) or sxd_my_error();
 			if (!$r) continue;
 			$todo[$t] = array();
 			$header[$t] = array();
 			
-			while($item = mysql_fetch_assoc($r)){
+			while ($item = mysql_fetch_assoc($r)) {
 				$n = $item[$query[1]];
-				switch($t){
+				switch ($t) {
 					case 'TA':
 					case 'TC':
-						if(V_MYSQL > 40101 && is_null($item['Engine']) && preg_match('/^VIEW/i', $item['Comment'])) {
-							if(sxd_check($n, $object['VI'], $filter['VI'])){
+						if (V_MYSQL > 40101 && is_null($item['Engine']) && preg_match('/^VIEW/i', $item['Comment'])) {
+							if (sxd_check($n, $object['VI'], $filter['VI'])) {
 								$todo['VI'] = array();
-								$header['VI']= array();
+								$header['VI'] = array();
 							}
 							continue;
 						}
-						elseif(sxd_check($n, $object['TA'], $filter['TA'])){
+						elseif (sxd_check($n, $object['TA'], $filter['TA'])) {
 							$engine = V_MYSQL > 40101 ? $item['Engine'] : $item['Type'];
 							$t = in_array($engine, $only_create) ? 'TC' : 'TA';
 						}
-						elseif(sxd_check($n, $object['TC'], $filter['TC'])) {
+						elseif (sxd_check($n, $object['TC'], $filter['TC'])) {
 							$t = 'TC';
 							$item['Rows'] = $item['Data_length'] = '';
 						}
@@ -955,7 +955,7 @@ 
 						$rows += $item['Rows'];
 					break;
 					default:
-						if(sxd_check($n, $object[$t], $filter[$t])) {
+						if (sxd_check($n, $object[$t], $filter[$t])) {
 							$todo[$t][] = array($t, $n, !empty($item['collation_connection']) ? $item['collation_connection'] : '');
 							$header[$t][] = $n;
 						}
@@ -968,7 +968,7 @@ 
 			$r = mysql_query("SELECT table_name, view_definition /*!50121 , collation_connection */ FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_SCHEMA = '{$this->JOB['db']}'") or sxd_my_error();
 			$views = $dumped = $views_collation = array();
 			$re = "/`{$this->JOB['db']}`.`(.+?)`/";
-			while($item = mysql_fetch_assoc($r)){
+			while ($item = mysql_fetch_assoc($r)) {
 				preg_match_all($re, preg_replace("/^select.+? from/i", '', $item['view_definition']), $m);
 				$used = $m[1];	
 				$views_collation[$item['table_name']] = !empty($item['collation_connection']) ? $item['collation_connection'] : '';
@@ -976,13 +976,13 @@ 
 			}
 			
 			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) {
-						if(sxd_check($n, $object['VI'], $filter['VI'])){
+						if (sxd_check($n, $object['VI'], $filter['VI'])) {
 							$todo['VI'][] = array('VI', $n, $views_collation[$n]);
 							$header['VI'][] = $n;
 						}
@@ -999,14 +999,14 @@ 
 		$this->JOB['file_rtl'] = $this->CFG['backup_path'] . $this->JOB['job'] . '.rtl';
 		$this->JOB['file_log'] = $this->CFG['backup_path'] . $this->JOB['job'] . '.log';
 		$this->JOB['file_stp'] = $this->CFG['backup_path'] . $this->JOB['job'] . '.stp';
-		if(file_exists($this->JOB['file_stp'])) unlink($this->JOB['file_stp']);
+		if (file_exists($this->JOB['file_stp'])) unlink($this->JOB['file_stp']);
 		$this->fh_tmp = $this->openFile($this->JOB['file_tmp'], 'w');
 		$this->JOB['file'] = sprintf('%s_%s.%s', (isset($this->JOB['title']) ? $this->JOB['job'] : $this->JOB['db']), date('Y-m-d_H-i-s'), $this->JOB['file_ext']);
 		$this->JOB['file_name'] = $this->CFG['backup_path'] . $this->JOB['file'];
 		$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');
@@ -1017,8 +1017,8 @@ 
 		$this->addLog(sprintf($this->LNG['backup_begin'], $this->JOB['db']));
 		$this->runBackupJob();
 	}
-	function runBackupJob($continue = false){
-		if($continue){
+	function runBackupJob($continue = false) {
+		if ($continue) {
 			$this->fh_tmp = $this->openFile($this->JOB['file_tmp'], 'a');
 			mysql_select_db($this->JOB['db']);
 		}
@@ -1027,14 +1027,14 @@ 
 		$fcache = '';
 		$writes = 0;
 		
-		if(V_MYSQL > 40101) mysql_query("SET SESSION character_set_results = '" . ($this->JOB['charset'] ? $this->JOB['charset'] : 'binary') ."'") or sxd_my_error();
+		if (V_MYSQL > 40101) mysql_query("SET SESSION character_set_results = '" . ($this->JOB['charset'] ? $this->JOB['charset'] : 'binary') . "'") or sxd_my_error();
 		$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;
@@ -1042,19 +1042,19 @@ 
 				}
 				elseif ($this->rtl[5] != $n[1]) continue;
 				// Делаем бэкап
-				switch($n[0]){
+				switch ($n[0]) {
 					case 'TC':
 					case 'TD': 				
 					case 'TA':
 						$from = '';
-						if ($n[0] == 'TC' || $this->rtl[7] == 0){
+						if ($n[0] == 'TC' || $this->rtl[7] == 0) {
 							// Бэкап структуры таблицы
 							$r = mysql_query("SHOW CREATE TABLE `{$n[1]}`") or sxd_my_error();
 							$item = mysql_fetch_assoc($r);
 						    $fcache .= "#\tTC`{$n[1]}`{$n[2]}\t;\n{$item['Create Table']}\t;\n";
 						    $this->addLog(sprintf($this->LNG['backup_TC'], $n[1]));
 			            	$this->rtl[7] = 0; 
-						    if($n[0] == 'TC' || !$n[4]) break;
+						    if ($n[0] == 'TC' || !$n[4]) break;
 						    // Бэкапим данные таблицы
 							$fcache .= "#\tTD`{$n[1]}`{$n[2]}\t;\nINSERT INTO `{$n[1]}` VALUES \n";
 						}
@@ -1066,7 +1066,7 @@ 
 						$notNum = array();
 						$r = mysql_query("SHOW COLUMNS FROM `{$n[1]}`") or sxd_my_error();
 			            $fields = 0;
-			            while($col = mysql_fetch_array($r)) {
+			            while ($col = mysql_fetch_array($r)) {
 			            	// TODO: проверить типы SET, ENUM и BIT
             				$notNum[$fields] = preg_match("/^(tinyint|smallint|mediumint|bigint|int|float|double|real|decimal|numeric|year)/", $col['Type']) ? 0 : 1; 
             				$fields++;
@@ -1075,22 +1075,22 @@ 
 			            $z = 0;
 			            // Достаем данные
 			            $r = mysql_unbuffered_query("SELECT {$no_cache}* FROM `{$n[1]}`{$from}");
-			            while($row = mysql_fetch_row($r)) {
+			            while ($row = mysql_fetch_row($r)) {
 			            	 if (strlen($fcache) >= 61440) {
 			            	 	$z = 0;
-								if($time_old < time()) {
-									if(file_exists($this->JOB['file_stp'])){
+								if ($time_old < time()) {
+									if (file_exists($this->JOB['file_stp'])) {
 										$type = file_get_contents($this->JOB['file_stp']);
 										$this->rtl[9] = !empty($type) ? $type : 2;
 										$this->write($fcache);
-										if($type == 1) {
+										if ($type == 1) {
 											
 										}
 										unset($this->rtl);
 										exit;
 									}
 									$time_old = time();
-									if($time_old >= $exit_time){
+									if ($time_old >= $exit_time) {
 										$this->rtl[9] = 3;
 										$this->write($fcache);
 										unset($this->rtl);
@@ -1100,9 +1100,9 @@ 
 								}
 								$this->write($fcache); 
 							}
-							for($k = 0; $k < $fields; $k++){
-								if(!isset($row[$k])) {$row[$k] = '\N';}
-								elseif($notNum[$k]) {$row[$k] =  '\'' . mysql_real_escape_string($row[$k]) . '\'';} // TODO: Потестить скорость эскэйпинга строк
+							for ($k = 0; $k < $fields; $k++) {
+								if (!isset($row[$k])) {$row[$k] = '\N'; }
+								elseif ($notNum[$k]) {$row[$k] = '\'' . mysql_real_escape_string($row[$k]) . '\''; } // TODO: Потестить скорость эскэйпинга строк
 							}
 							$fcache .= '(' . implode(',', $row) . "),\n";
 							$this->rtl[7]++;  
@@ -1110,11 +1110,11 @@ 
 						}
 						unset($row);
 						mysql_free_result($r);
-						$fcache = substr_replace($fcache, "\t;\n",  -2, 2);
+						$fcache = substr_replace($fcache, "\t;\n", -2, 2);
 					break;
 
 					default:
-						if(V_MYSQL < 50121 && $n[0] == 'TR'){
+						if (V_MYSQL < 50121 && $n[0] == 'TR') {
 							// SHOW CREATE TRIGGER отсутствует до MySQL 5.1.21
 							$r = mysql_query("SELECT * FROM `INFORMATION_SCHEMA`.`TRIGGERS` WHERE `TRIGGER_SCHEMA` = '{$this->JOB['db']}' AND `TRIGGER_NAME` = '{$n[1]}'") or sxd_my_error();
 							$item = mysql_fetch_assoc($r);
@@ -1141,11 +1141,11 @@ 
 		fclose($this->fh_tmp);
 		rename($this->JOB['file_tmp'], $this->JOB['file_name']);
 		$this->addLog(sprintf($this->LNG['backup_end'], $this->JOB['db']));
-		if(file_exists('sxd2ftp.php')) include('sxd2ftp.php');
+		if (file_exists('sxd2ftp.php')) include('sxd2ftp.php');
 		if ($this->JOB['del_time'] || $this->JOB['del_count']) {
             $this->addLog($this->LNG['autodelete']);
             $deldate = '';
-            if (!empty($this->JOB['del_time'])){ // Удаление по дням
+            if (!empty($this->JOB['del_time'])) { // Удаление по дням
                 $deldate = date("Y-m-d_H-i-s", time() - intval($this->JOB['del_time']) * 86400);
             }
             $deleted = false;
@@ -1155,72 +1155,72 @@ 
                 while (false !== ($file = readdir($dh))) { 
                     if (preg_match("/^{$name}_(\d{4}-\d{2}-\d{2}_\d{2}-\d{2}-\d{2})\.sql/", $file, $m)) { 
                         if ($deldate && $m[1] < $deldate) {
-                            if(unlink($this->CFG['backup_path'] . $file)) $this->addLog(sprintf($this->LNG['del_by_date'], $file));
+                            if (unlink($this->CFG['backup_path'] . $file)) $this->addLog(sprintf($this->LNG['del_by_date'], $file));
                             else  $this->addLog(sprintf($this->LNG['del_fail'], $file));
                             $deleted = true;
                         }
-                        else {$files[$m[1]] = $file;}
+                        else {$files[$m[1]] = $file; }
                     }
                 }
                 closedir($dh);
                 // Сортируем файлы по дате и удаляем самые старые
-                if (!empty($this->JOB['del_count'])){
+                if (!empty($this->JOB['del_count'])) {
                     ksort($files);
                     $file_to_delete = count($files) - $this->JOB['del_count'];
-                    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));
+                    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));
                             $deleted = true;
                         }
                     }
                 }
             }
-            if(!$deleted) $this->addLog($this->LNG['del_nothing']);
+            if (!$deleted) $this->addLog($this->LNG['del_nothing']);
 		}
 		fclose($this->fh_log);
 		fclose($this->fh_rtl);
 	}
-	function setNames($collation){
-		if(empty($collation)) return;
-		if($this->rtl[6] != $collation) {
+	function setNames($collation) {
+		if (empty($collation)) return;
+		if ($this->rtl[6] != $collation) {
 			mysql_query('SET NAMES \'' . preg_replace('/^(\w+?)_/', '\\1\' COLLATE \'\\1_', $collation) . '\'') or sxd_my_error();
 			/*if(!$this->rtl[7])*/ $this->addLog(sprintf($this->LNG['set_names'], $collation));
 			$this->rtl[6] = $collation;	
 		}
 	}
-	function write(&$str){
+	function write(&$str) {
 		fseek($this->fh_rtl, 0);
 		$this->rtl[1] = time();
 		$this->rtl[3] += fwrite($this->fh_tmp, $str);
 		fwrite($this->fh_rtl, implode("\t", $this->rtl));
 		$str = '';
 	}
-	function addLog($str, $type = 1){
+	function addLog($str, $type = 1) {
 		fwrite($this->fh_log, date('Y.m.d H:i:s') . "\t{$type}\t{$str}\n");
 	}
-	function getDBList(){
+	function getDBList() {
 		$dbs = $items = array();
         if (!V_MYSQL) return $dbs; 
         $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)";
 			}
 		}
-		else{
+		else {
 			$result = mysql_query("SHOW DATABASES") or sxd_my_error();
-    		while($item = mysql_fetch_row($result)){
-    			if($item[0] == 'information_schema' || $item[0] == 'mysql' || $item[0] == 'performance_schema') continue;
+    		while ($item = mysql_fetch_row($result)) {
+    			if ($item[0] == 'information_schema' || $item[0] == 'mysql' || $item[0] == 'performance_schema') continue;
     			$items[] = $qq . sxd_esc($item[0], false) . $qq;
     			$dbs[$item[0]] = "{$item[0]} (0)";
     		}	
 		}
-		if(V_MYSQL < 50000){
-			foreach($items AS $item){
+		if (V_MYSQL < 50000) {
+			foreach ($items AS $item) {
     			$tables = mysql_query("SHOW TABLES FROM `{$item}`") or sxd_my_error();
     			if ($tables) {
     	  			$tabs = mysql_num_rows($tables);
@@ -1231,59 +1231,59 @@ 
 		else {
 			$where = (count($items) > 0) ? 'WHERE `table_schema` IN (' . implode(',', $items) . ')' : '';
 			$result = mysql_query("SELECT `table_schema`, COUNT(*) FROM `information_schema`.`tables` {$where} GROUP BY `table_schema`") or sxd_my_error();
-			while($item = mysql_fetch_row($result)){
-    			if($item[0] == 'information_schema' || $item[0] == 'mysql' || $item[0] == 'performance_schema') continue;
+			while ($item = mysql_fetch_row($result)) {
+    			if ($item[0] == 'information_schema' || $item[0] == 'mysql' || $item[0] == 'performance_schema') continue;
     			$dbs[$item[0]] = "{$item[0]} ({$item[1]})";
     		}
 		}
 	    return $dbs;
 	}
-	function getCharsetList(){
+	function getCharsetList() {
 		$tmp = array(0 => '- auto -');
 		if (!V_MYSQL) return $tmp; 
-		if(V_MYSQL > 40101) {
+		if (V_MYSQL > 40101) {
 			$def_charsets = '';
-			if(!empty($this->CFG['charsets'])){
-				$def_charsets = preg_match_all("/([\w*?]+)\s*/", $this->CFG['charsets'], $m, PREG_PATTERN_ORDER) ? '/^(' . str_replace(array('?','*'), array('.','\w+?'), implode('|', $m[1])) . ')$/i' : '';
+			if (!empty($this->CFG['charsets'])) {
+				$def_charsets = preg_match_all("/([\w*?]+)\s*/", $this->CFG['charsets'], $m, PREG_PATTERN_ORDER) ? '/^(' . str_replace(array('?', '*'), array('.', '\w+?'), implode('|', $m[1])) . ')$/i' : '';
 			}
     		$r = mysql_query("SHOW CHARACTER SET") or sxd_my_error(); 
     		if ($r) {
-    			while($item = mysql_fetch_assoc($r)){
+    			while ($item = mysql_fetch_assoc($r)) {
     	  			if (empty($def_charsets) || preg_match($def_charsets, $item['Charset'])) $tmp[$item['Charset']] = "{$item['Charset']}"; // ({$item['Description']})
     			}
 			}
 		}
 	    return $tmp;
 	}
-	function getCollationList(){
+	function getCollationList() {
 		$tmp = array(); 
 		if (!V_MYSQL) return $tmp; 
-		if(V_MYSQL > 40101) {
+		if (V_MYSQL > 40101) {
 			$def_charsets = '';
-			if(!empty($this->CFG['charsets'])){
-				$def_charsets = preg_match_all("/([\w*?]+)\s*/", $this->CFG['charsets'], $m, PREG_PATTERN_ORDER) ? '/^(' . str_replace(array('?','*'), array('.','\w+?'), implode('|', $m[1])) . ')$/i' : '';
+			if (!empty($this->CFG['charsets'])) {
+				$def_charsets = preg_match_all("/([\w*?]+)\s*/", $this->CFG['charsets'], $m, PREG_PATTERN_ORDER) ? '/^(' . str_replace(array('?', '*'), array('.', '\w+?'), implode('|', $m[1])) . ')$/i' : '';
 			}
     		$r = mysql_query("SHOW COLLATION") or sxd_my_error(); 
     		if ($r) {
-    			while($item = mysql_fetch_assoc($r)){
+    			while ($item = mysql_fetch_assoc($r)) {
     	  			if (empty($def_charsets) || preg_match($def_charsets, $item['Charset'])) $tmp[$item['Charset']][$item['Collation']] = $item['Default'] == 'Yes' ? 1 : 0; 
     			}
 			}
 		}
 	    return $tmp;
 	}
-	function getObjects($tree, $db_name){
+	function getObjects($tree, $db_name) {
 		mysql_select_db($db_name);
 		// Достаем таблицы
 		$r = mysql_query('SHOW TABLE STATUS');
 		$tab_prefix_last = $tab_prefix = '*';
 		$objects = array('TA' => array(), 'VI' => array(), 'PR' => array(), 'FU' => array(), 'TR' => array(), 'EV' => array());
-		if($r){
-			while($item = mysql_fetch_assoc($r)){
-				if(V_MYSQL > 40101 && is_null($item['Engine']) && preg_match('/^VIEW/i', $item['Comment'])) {
-					$objects['VI'][]= $item['Name'];
+		if ($r) {
+			while ($item = mysql_fetch_assoc($r)) {
+				if (V_MYSQL > 40101 && is_null($item['Engine']) && preg_match('/^VIEW/i', $item['Comment'])) {
+					$objects['VI'][] = $item['Name'];
 				}
-				else{
+				else {
 					$objects['TA'][] = array($item['Name'], $item['Rows'], $item['Data_length']);
 				} 
 			}
@@ -1294,14 +1294,14 @@ 
 					"FUNCTION STATUS WHERE db='{$db_name}'",
 					'TRIGGERS'
 				);
-				if(V_MYSQL > 50100) $shows[] = "EVENTS WHERE db='{$db_name}'";
+				if (V_MYSQL > 50100) $shows[] = "EVENTS WHERE db='{$db_name}'";
 				// TODO: Поправить проверку событий и триггеров
-				for($i = 0, $l = count($shows); $i < $l; $i++){
+				for ($i = 0, $l = count($shows); $i < $l; $i++) {
 					$r = mysql_query('SHOW ' . $shows[$i]);
-					if($r && mysql_num_rows($r) > 0) {
+					if ($r && mysql_num_rows($r) > 0) {
 						$col_name = $shows[$i] == 'TRIGGERS' ? 'Trigger' : 'Name';
 						$type = substr($shows[$i], 0, 2);
-						while($item = mysql_fetch_assoc($r)){
+						while ($item = mysql_fetch_assoc($r)) {
 							$objects[$type][] = $item[$col_name];	
 						}
 					}
@@ -1313,32 +1313,32 @@ 
 		}
 		return $this->formatTree($tree, $objects);
 	}
-	function getFileObjects($tree, $name, $formatTree = true){
+	function getFileObjects($tree, $name, $formatTree = true) {
 		// Достаем таблицы
 		$objects = array('TA' => array(), 'VI' => array(), 'PR' => array(), 'FU' => array(), 'TR' => array(), 'EV' => array());
-		if(!preg_match('/\.sql(\.(gz|bz2))?$/i', $name, $m)) return '';
+		if (!preg_match('/\.sql(\.(gz|bz2))?$/i', $name, $m)) return '';
 		$name = $this->CFG['backup_path'] . $name;
-		if(!is_readable($name)) {return "sxd.tree.{$tree}.error(sxd.lng('err_fopen'))";}
+		if (!is_readable($name)) {return "sxd.tree.{$tree}.error(sxd.lng('err_fopen'))"; }
 		$fp   = $this->openFile($name, 'r');
 		$temp = fread($fp, 60000);
 		// Формат файла Sypex Dumper 2 - SXD20
 		//if(!preg_match('/^(#SXD20\|.+?)\n#EOH\n/s', $temp, $m)) return "sxd.tree.{$tree}.error(sxd.lng('err_sxd2'));z('restore_savejob').disabled = z('restore_runjob').disabled = true;";
-		if(preg_match('/^(#SXD20\|.+?)\n#EOH\n/s', $temp, $m)){
+		if (preg_match('/^(#SXD20\|.+?)\n#EOH\n/s', $temp, $m)) {
 			$head = explode("\n", $m[1]);
 			$h = explode('|', $head[0]);
-			for($i = 1, $c = count($head); $i < $c; $i++){
-				$objects[substr($head[$i], 1,2)] = explode('|', substr($head[$i], 4));
+			for ($i = 1, $c = count($head); $i < $c; $i++) {
+				$objects[substr($head[$i], 1, 2)] = explode('|', substr($head[$i], 4));
 			}
-			for($i = 0, $l = count($objects['TA']); $i < $l; $i++){
+			for ($i = 0, $l = count($objects['TA']); $i < $l; $i++) {
 				$objects['TA'][$i] = explode('`', $objects['TA'][$i]);
 			}
 		}
 		else {
 			$h[9] = '';
 		}
-		return $formatTree ? $this->formatTree($tree, $objects) .  "sxd.comment.restore.value = '{$h[9]}';z('restore_savejob').disabled = z('restore_runjob').disabled = false;" : $objects;
+		return $formatTree ? $this->formatTree($tree, $objects) . "sxd.comment.restore.value = '{$h[9]}';z('restore_savejob').disabled = z('restore_runjob').disabled = false;" : $objects;
 	}
-	function formatTree($tree, &$objects){
+	function formatTree($tree, &$objects) {
 		$obj = '';
 		$pid = $row = 1;
 		$info = array(
@@ -1351,7 +1351,7 @@ 
 		);
 		// Находим таблицы с префиксами
 		$tab_prefix_last = $tab_prefix = '*';
-		for($i = 0, $l = count($objects['TA']); $i < $l; $i++){
+		for ($i = 0, $l = count($objects['TA']); $i < $l; $i++) {
 			$t = $objects['TA'][$i];
 			$tab_prefix = preg_match("/^([a-z0-9]+_)/", $t[0], $m) ? $m[1] : '*';
 			if ($tab_prefix != $tab_prefix_last) {
@@ -1361,18 +1361,18 @@ 
 			$objects['TA'][$tab_prefix][] = $t;
 			unset($objects['TA'][$i]);
 		}
-		foreach($objects AS $type => $o){
-			if(!count($o)) continue;
-			if($type == 'TA') {
+		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){
-					if(is_string($value)){
-						if(count($o[$value]) > 1)	{
+				foreach ($o['*'] AS $value) {
+					if (is_string($value)) {
+						if (count($o[$value]) > 1) {
 							$obj .= "[{$row},1,'{$value}*',1,1,{$open_childs}],";	
 							$pid = $row++; 
-							for($i = 0, $l = count($o[$value]); $i < $l; $i++){
+							for ($i = 0, $l = count($o[$value]); $i < $l; $i++) {
 								$checked = ($o[$value][$i][1] == '' && $o[$value][$i][2] == '') ? 2 : 1;
 								$obj .= "[{$row},{$pid}," . sxd_esc($o[$value][$i][0]) . ",2,{$checked},{$o[$value][$i][2]}],";
 								$row++;
@@ -1383,7 +1383,7 @@ 
 						}
 					}
 					//$pid = 1;
-					if (is_array($value)){
+					if (is_array($value)) {
 						$checked = ($value[1] == '' && $value[2] == '') ? 2 : 1;
 						$obj .= "[{$row},1,'{$value[0]}',2,{$checked},{$value[2]}],";
 						$row++;	
@@ -1394,7 +1394,7 @@ 
 				$obj .= "[{$row},0," . sxd_esc($info[$type][0]) . ",{$info[$type][1]},1,1],";
 				$pid = $row++;
 				$info[$type][1]++;
-				for($i = 0, $l = count($o); $i < $l; $i++){
+				for ($i = 0, $l = count($o); $i < $l; $i++) {
 					$o[$i] = sxd_esc($o[$i], false);
 					$obj .= "[{$row},{$pid},'{$o[$i]}',{$info[$type][1]},1,0],";
 					$row++;	
@@ -1402,10 +1402,10 @@ 
 			} 
 		}
 		$add = '';
-		if($tree == 'restore') $add = "z('autoinc').disabled = z('restore_type').disabled = " . ($obj ? 'false' : 'true') . ";";
-		return ($obj ? 'sxd.tree.' . $tree . '.drawTree([' . substr_replace($obj, ']',  -1) . ");" : "sxd.tree.{$tree}.error(sxd.lng('err_sxd2'));") . $add;	
+		if ($tree == 'restore') $add = "z('autoinc').disabled = z('restore_type').disabled = " . ($obj ? 'false' : 'true') . ";";
+		return ($obj ? 'sxd.tree.' . $tree . '.drawTree([' . substr_replace($obj, ']', -1) . ");" : "sxd.tree.{$tree}.error(sxd.lng('err_sxd2'));") . $add;	
 	}
-	function getFileList(){
+	function getFileList() {
 		$files = array();
 		if (is_dir($this->CFG['backup_path']) && false !== ($handle = opendir($this->CFG['backup_path']))) {
             while (false !== ($file = readdir($handle))) {
@@ -1418,7 +1418,7 @@ 
         ksort($files);
 		return $files;
 	}
-	function getSavedJobs(){
+	function getSavedJobs() {
 		$sj = array('sj_backup' => array(), 'sj_restore' => array(),);
 		if (is_dir($this->CFG['backup_path']) && false !== ($handle = opendir($this->CFG['backup_path']))) {
             while (false !== ($file = readdir($handle))) {
@@ -1429,13 +1429,13 @@ 
             }
             closedir($handle);
         }
-        if(count($sj['sj_backup']) > 0){
+        if (count($sj['sj_backup']) > 0) {
         	ksort($sj['sj_backup']);	
 		}
         else {
         	$sj['sj_backup'] = array(0 => '<b>No Saved Jobs</b><br>' . $this->LNG['no_saved']);	
 		}
-		if(count($sj['sj_restore']) > 0){
+		if (count($sj['sj_restore']) > 0) {
         	ksort($sj['sj_restore']);	
 		}
         else {
@@ -1443,7 +1443,7 @@ 
 		}
 		return "sxd.clearOpt('sj_backup');sxd.clearOpt('sj_restore');sxd.addOpt(" . sxd_php2json($sj) . ");";
 	}
-	function getFileListExtended(){
+	function getFileListExtended() {
 		$files = array();
 		if (is_dir($this->CFG['backup_path']) && false !== ($handle = opendir($this->CFG['backup_path']))) {
             while (false !== ($file = readdir($handle))) {
@@ -1451,11 +1451,11 @@ 
                     $fp   = $this->openFile($this->CFG['backup_path'] . $file, 'r');
                     $ext  = !empty($m[2]) ? $m[2] : 'sql';
                     $temp = fgets($fp);
-                    if(preg_match('/^(#SXD20\|.+?)\n/s', $temp, $m)){
+                    if (preg_match('/^(#SXD20\|.+?)\n/s', $temp, $m)) {
                     	$h = explode('|', $m[1]);
                     	$files[] = array($h[5], substr($h[4], 0, -3), $ext, $h[7], number_format($h[8], 0, '', ' '), filesize($this->CFG['backup_path'] . $file), $h[9], $file);	
 					}
-					elseif(preg_match('/^(#SKD101\|.+?)\n/s', $temp, $m)){
+					elseif (preg_match('/^(#SKD101\|.+?)\n/s', $temp, $m)) {
                     	$h = explode('|', $m[1]);
                     	$files[] = array($h[1], substr($h[3], 0, -3), $ext, $h[2], number_format($h[4], 0, '', ' '), filesize($this->CFG['backup_path'] . $file), 'SXD 1.0.x', $file);	
 					}
@@ -1466,27 +1466,27 @@ 
             }
             closedir($handle);
         }
-        function s($a, $b){
+        function s($a, $b) {
 		    return strcmp($b[1], $a[1]);
 		}
         usort($files, 's');
 		return 'sxd.files.clear();sxd.files.add(' . sxd_php2json($files) . ');';
 	}
-	function saveJob($job, $config){
+	function saveJob($job, $config) {
 		$this->saveToFile($this->CFG['backup_path'] . $job . '.job.php', "<?php\n\$JOB = " . var_export($config, true) . ";\n" . "?>");
 	}
-	function openFile($name, $mode){
-		if($mode == 'r') {
-			if(preg_match('/\.(sql|sql\.bz2|sql\.gz)$/i', $name, $m)) $this->JOB['file_ext'] = strtolower($m[1]);
+	function openFile($name, $mode) {
+		if ($mode == 'r') {
+			if (preg_match('/\.(sql|sql\.bz2|sql\.gz)$/i', $name, $m)) $this->JOB['file_ext'] = strtolower($m[1]);
 		}
-		else{
-			switch($this->JOB['zip']) {
+		else {
+			switch ($this->JOB['zip']) {
 				case 0 : $this->JOB['file_ext'] = 'sql'; break;
 				case 10: $this->JOB['file_ext'] = 'sql.bz2'; break;
 				default: $this->JOB['file_ext'] = 'sql.gz'; break; 
 			}
 		}
-		switch ($this->JOB['file_ext']){
+		switch ($this->JOB['file_ext']) {
 			case 'sql':
 				return fopen($name, "{$mode}b");
 				break;
@@ -1500,28 +1500,28 @@ 
 		}
 	}
 }
-function sxd_read_sql($f, &$seek, $ei, $delimiter = "\t;", $eol = "\n"){
+function sxd_read_sql($f, &$seek, $ei, $delimiter = "\t;", $eol = "\n") {
 	static $l = '';
 	static $r = 0;
 	$fs = ftell($f);
 	$delim_len = strlen($delimiter . $eol);
-	while($r || $s = fread($f, 61440)){
-		if(!$r) $l .= $s;
+	while ($r || $s = fread($f, 61440)) {
+		if (!$r) $l .= $s;
 		$pos = strpos($l, $delimiter . $eol);
 		if ($pos !== false) {
 			// Есть окончание запроса
 			$q = substr($l, 0, $pos);
-			$l = substr($l, $pos+$delim_len);
+			$l = substr($l, $pos + $delim_len);
 			$r = 1;
 			$seek = strlen($l);
 			return $q;
 		}
-		if($ei) {
+		if ($ei) {
 			$pos = strrpos($l, $eol);
-			if($pos > 0 && $l{$pos-1} === ',') {
+			if ($pos > 0 && $l{$pos - 1} === ',') {
 				// Окончание не найдено
-				$q = substr($l, 0, $pos-1);
-				$l = substr($l, $pos+ strlen($eol));
+				$q = substr($l, 0, $pos - 1);
+				$l = substr($l, $pos + strlen($eol));
 				$seek = strlen($l);
 				$r = 0;
 				return $q;
@@ -1534,16 +1534,16 @@ 
 	}
 	return false;
 }
-function sxd_check($n, $obj, $filt){
+function sxd_check($n, $obj, $filt) {
 	return isset($obj[$n]) || ($filt && preg_match($filt, $n));
 }
-function sxd_php2json($obj){
-	if(count($obj) == 0) return '[]';
+function sxd_php2json($obj) {
+	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) {
     	$str .= $is_obj ? "'" . addcslashes($key, "\n\r\t'\\/") . "'" . ':' : ''; 
-        if     (is_array($value))   $str .= sxd_php2json($value);
+        if (is_array($value))   $str .= sxd_php2json($value);
         elseif (is_null($value))    $str .= 'null';
         elseif (is_bool($value))    $str .= $value ? 'true' : 'false';
 		elseif (is_numeric($value)) $str .= $value;
@@ -1552,27 +1552,27 @@ 
     }
 	return  substr_replace($str, $is_obj ? '}' : ']', -1);
 }
-function sxd_ver2int($ver){
+function sxd_ver2int($ver) {
 	return preg_match("/^(\d+)\.(\d+)\.(\d+)/", $ver, $m) ? sprintf("%d%02d%02d", $m[1], $m[2], $m[3]) : 0;
 }
-function sxd_error_handler($errno, $errmsg, $filename, $linenum, $vars){
+function sxd_error_handler($errno, $errmsg, $filename, $linenum, $vars) {
     global $SXD;
-    if($SXD->try) return;
-	if($errno == 8192) return;
-    if(strpos($errmsg, 'timezone settings')) return;
+    if ($SXD->try) return;
+	if ($errno == 8192) return;
+    if (strpos($errmsg, 'timezone settings')) return;
     $errortype = array(1 => 'Error', 2 => 'Warning', 4 => 'Parsing Error', 8 => 'Notice', 16 => 'Core Error', 32 => 'Core Warning', 64 => 'Compile Error',
 					   128 => 'Compile Warning', 256 => 'MySQL Error', 512 => 'Warning', 1024 => 'Notice',
 						2048 => 'Strict', 8192 => 'Deprecated', 16384 => 'Deprecated');
 	$str = sxd_esc("{$errortype[$errno]}: {$errmsg} ({$filename}:{$linenum})", false);
-	if(SXD_DEBUG) error_log("[index.php]\n{$str}\n", 3, "backup/error.log");
+	if (SXD_DEBUG) error_log("[index.php]\n{$str}\n", 3, "backup/error.log");
 	
-    if($errno == 8 || $errno == 1024) {
+    if ($errno == 8 || $errno == 1024) {
     	if (!$SXD->fh_log && !$SXD->fh_rtl) echo isset($_POST['ajax']) ? "alert('" . ($str) . "');" : $str;
     	else {
     		fwrite($SXD->fh_log, date('Y.m.d H:i:s') . "\t3\t{$str}\n");
 		}
 	}
-    elseif($errno < 1024) {
+    elseif ($errno < 1024) {
     	$SXD->error = true;
     	if (!$SXD->fh_log && !$SXD->fh_rtl) echo isset($_POST['ajax']) ? "alert('" . ($str) . "');" : $str;
     	else {
@@ -1587,17 +1587,17 @@ 
     	die;
 	}
 }
-function sxd_esc($str, $quoted = true){
+function sxd_esc($str, $quoted = true) {
 	return $quoted ? "'" . addcslashes($str, "\\\0\n\r\t\'") . "'" : addcslashes($str, "\\\0\n\r\t\'");
 }
-function sxd_my_error(){
+function sxd_my_error() {
 	trigger_error(mysql_error(), E_USER_ERROR);	
 }
-function sxd_shutdown(){
+function sxd_shutdown() {
 	global $SXD;
-	if(isset($SXD->fh_rtl) && is_resource($SXD->fh_rtl) && !empty($SXD->rtl) && empty($SXD->error)) {
+	if (isset($SXD->fh_rtl) && is_resource($SXD->fh_rtl) && !empty($SXD->rtl) && empty($SXD->error)) {
 		$SXD->rtl[1] = time();
-		if(!empty($SXD->JOB['file_stp']) && file_exists(dirname(__FILE__) . '/' . $SXD->JOB['file_stp'])){
+		if (!empty($SXD->JOB['file_stp']) && file_exists(dirname(__FILE__) . '/' . $SXD->JOB['file_stp'])) {
 			$type = file_get_contents(dirname(__FILE__) . '/' . $SXD->JOB['file_stp']);
 			$SXD->rtl[9] = !empty($type) ? $type : 2;
 		}
@@ -1606,6 +1606,6 @@ 
 		fwrite($SXD->fh_rtl, implode("\t", $SXD->rtl));
 	}
 }
-function sxd_antimagic($arr){
+function sxd_antimagic($arr) {
 	return is_array($arr) ? array_map('sxd_antimagic', $arr) : stripslashes($arr);
 }

includes/functions/eco_get_build_data.php

Doc Comments +4 added lines

@@ -10,6 +10,7 @@ 
  *
  * 1.0 - copyright (c) 2010 by Gorlum for http://supernova.ws
  * @version 1.0
+ * @param integer $lab_require
  */
 function eco_get_lab_max_effective_level(&$user, $lab_require)
 {
@@ -193,6 +194,9 @@ 
   return $result;
 }
 
+/**
+ * @param integer[] $unit_list
+ */
 function eco_is_builds_in_que($planet_que, $unit_list)
 {
   $eco_is_builds_in_que = false;

includes/functions/eco_queue.php

Doc Comments +6 added lines

@@ -55,6 +55,9 @@ 
 }
 
 
+/**
+ * @param integer $build_mode
+ */
 function que_build($user, $planet, $build_mode = BUILD_CREATE, $redirect = true) {
   global $lang, $config;
 
@@ -378,6 +381,9 @@ 
   return classSupernova::db_que_list_by_type_location($user_id, $planet_id, $que_type, $for_update);
 }
 
+/**
+ * @param integer $unit_id
+ */
 function que_add_unit($unit_id, $user = array(), $planet = array(), $build_data, $unit_level = 0, $unit_amount = 1, $build_mode = BUILD_CREATE) {
   // TODO Унифицировать проверки
 

Spacing +94 added lines, -94 removed lines

@@ -7,8 +7,8 @@ 
 
 function que_get_unit_que($unit_id) {
   $que_type = false;
-  foreach(sn_get_groups('ques') as $que_id => $que_data) {
-    if(in_array($unit_id, $que_data['unit_list'])) {
+  foreach (sn_get_groups('ques') as $que_id => $que_data) {
+    if (in_array($unit_id, $que_data['unit_list'])) {
       $que_type = $que_id;
       break;
     }
@@ -19,14 +19,14 @@ 
 
 
 function que_get_max_que_length($user, $planet, $que_id, $que_data = null) {
-  if(empty($que_data)) {
+  if (empty($que_data)) {
     $que_data = sn_get_groups('ques');
     $que_data = $que_data[$que_id];
   }
 
 
   $que_length = 1;
-  switch($que_id) {
+  switch ($que_id) {
     case QUE_RESEARCH:
       $que_length = classSupernova::$config->server_que_length_research + mrc_get_level($user, null, UNIT_PREMIUM); // TODO - вынести в модуль
     break;
@@ -40,8 +40,8 @@ 
 
 function eco_que_str2arr($que_str) {
   $que_arr = explode(';', $que_str);
-  foreach($que_arr as $que_index => &$que_item) {
-    if($que_item) {
+  foreach ($que_arr as $que_index => &$que_item) {
+    if ($que_item) {
       $que_item = explode(',', $que_item);
     } else {
       unset($que_arr[$que_index]);
@@ -52,7 +52,7 @@ 
 }
 
 function eco_que_arr2str($que_arr) {
-  foreach($que_arr as &$que_item) {
+  foreach ($que_arr as &$que_item) {
     $que_item = implode(',', $que_item);
   }
 
@@ -64,28 +64,28 @@ 
   $classLocale = classLocale::$lang;
 
   $is_autoconvert = false;
-  if($build_mode == BUILD_AUTOCONVERT || sys_get_param_int('auto_convert')) {
+  if ($build_mode == BUILD_AUTOCONVERT || sys_get_param_int('auto_convert')) {
     $build_mode = BUILD_CREATE;
     $is_autoconvert = true;
   }
 
   $unit_amount_qued = 0;
   try {
-    if(!$user['id']) {
+    if (!$user['id']) {
       throw new exception('{Нет идентификатора пользователя - сообщите Администрации}', ERR_ERROR); // TODO EXCEPTION
     }
 
     $unit_id = sys_get_param_int('unit_id');
-    if(!$unit_id) {
+    if (!$unit_id) {
       throw new exception('{Нет идентификатора юнита - сообщите Администрации}', ERR_ERROR); // TODO EXCEPTION
     }
 
     $que_id = que_get_unit_que($unit_id);
-    if(!$que_id) {
+    if (!$que_id) {
       throw new exception('{Неправильный тип очереди - сообщите Администрации}', ERR_ERROR); // TODO EXCEPTION
     }
 
-    if($build_mode == BUILD_DESTROY && $que_id != QUE_STRUCTURES) {
+    if ($build_mode == BUILD_DESTROY && $que_id != QUE_STRUCTURES) {
       throw new exception('{Уничтожать можно только здания на планете}', ERR_ERROR); // TODO EXCEPTION
     }
 
@@ -93,11 +93,11 @@ 
     $que_data = $que_data[$que_id];
 
     // TODO Переделать под подочереди
-    if($que_id == QUE_STRUCTURES) {
+    if ($que_id == QUE_STRUCTURES) {
       $sn_groups_build_allow = sn_get_groups('build_allow');
       $que_data['unit_list'] = $sn_groups_build_allow[$planet['planet_type']];
 
-      if(!isset($que_data['unit_list'][$unit_id])) {
+      if (!isset($que_data['unit_list'][$unit_id])) {
         throw new exception('{Это здание нельзя строить на ' . ($planet['planet_type'] == PT_PLANET ? 'планете' : 'луне'), ERR_ERROR); // TODO EXCEPTION
       }
     }
@@ -108,7 +108,7 @@ 
     // Это нужно, что бы заблокировать пользователя и работу с очередями
     $user = DBStaticUser::db_user_by_id($user['id']);
     // Это нужно, что бы заблокировать планету от списания ресурсов
-    if(isset($planet['id']) && $planet['id']) {
+    if (isset($planet['id']) && $planet['id']) {
       $planet = DBStaticPlanet::db_planet_by_id($planet['id'], true);
     } else {
       $planet['id'] = 0;
@@ -120,12 +120,12 @@ 
     $in_que = &$que['in_que'][$que_id][$user['id']][$planet_id];
     $que_max_length = que_get_max_que_length($user, $planet, $que_id, $que_data);
     // TODO Добавить вызовы функций проверок текущей и максимальной длин очередей
-    if(count($in_que) >= $que_max_length) {
+    if (count($in_que) >= $que_max_length) {
       throw new exception('{Все слоты очереди заняты}', ERR_ERROR); // TODO EXCEPTION
     }
 
     // TODO Отдельно посмотреть на уничтожение зданий - что бы можно было уничтожать их без планов
-    switch(eco_can_build_unit($user, $planet, $unit_id)) {
+    switch (eco_can_build_unit($user, $planet, $unit_id)) {
       case BUILD_ALLOWED:
       break;
       case BUILD_UNIT_BUSY:
@@ -133,7 +133,7 @@ 
       break; // TODO EXCEPTION eco_bld_msg_err_laboratory_upgrading
       // case BUILD_REQUIRE_NOT_MEET:
       default:
-        if($build_mode == BUILD_CREATE) {
+        if ($build_mode == BUILD_CREATE) {
           throw new exception('{Требования не удовлетворены}', ERR_ERROR);
         }
       break; // TODO EXCEPTION eco_bld_msg_err_requirements_not_meet
@@ -143,33 +143,33 @@ 
     $unit_amount_qued = $unit_amount;
     $units_qued = isset($in_que[$unit_id]) ? $in_que[$unit_id] : 0;
     $unit_level = mrc_get_level($user, $planet, $unit_id, true, true) + $units_qued;
-    if($unit_max = get_unit_param($unit_id, P_MAX_STACK)) {
-      if($unit_level >= $unit_max) {
+    if ($unit_max = get_unit_param($unit_id, P_MAX_STACK)) {
+      if ($unit_level >= $unit_max) {
         throw new exception('{Максимальное количество юнитов данного типа уже достигнуто или будет достигнуто по окончанию очереди}', ERR_ERROR); // TODO EXCEPTION
       }
       $unit_amount = max(0, min($unit_amount, $unit_max - $unit_level));
     }
 
-    if($unit_amount < 1) {
+    if ($unit_amount < 1) {
       throw new exception('{Неправильное количество юнитов - сообщите Администрации}', ERR_ERROR); // TODO EXCEPTION
     }
 
     // TODO Переделать eco_unit_busy для всех типов зданий
-    if(get_unit_param($unit_id, P_STACKABLE)) {
+    if (get_unit_param($unit_id, P_STACKABLE)) {
       // TODO Поле 'max_Lot_size' для ограничения размера стэка в очереди - то ли в юниты, то ли в очередь
-      if(in_array($unit_id, $group_missile = sn_get_groups(GROUP_STR_MISSILES))) {
+      if (in_array($unit_id, $group_missile = sn_get_groups(GROUP_STR_MISSILES))) {
         // TODO Поле 'container' - указывает на родительску структуру, в которой хранится данный юнит и по вместительности которой нужно применять размер юнита
         $used_silo = 0;
-        foreach($group_missile as $missile_id) {
+        foreach ($group_missile as $missile_id) {
           $missile_qued = isset($in_que[$missile_id]) ? $in_que[$missile_id] : 0;
           $used_silo += (mrc_get_level($user, $planet, $missile_id, true, true) + $missile_qued) * get_unit_param($missile_id, P_UNIT_SIZE);
         }
         $free_silo = mrc_get_level($user, $planet, STRUC_SILO) * get_unit_param(STRUC_SILO, P_CAPACITY) - $used_silo;
-        if($free_silo <= 0) {
+        if ($free_silo <= 0) {
           throw new exception('{Ракетная шахта уже заполнена или будет заполнена по окончанию очереди}', ERR_ERROR); // TODO EXCEPTION
         }
         $unit_size = get_unit_param($unit_id, P_UNIT_SIZE);
-        if($free_silo < $unit_size) {
+        if ($free_silo < $unit_size) {
           throw new exception("{В ракетной шахте нет места для {$classLocale['tech'][$unit_id]}}", ERR_ERROR); // TODO EXCEPTION
         }
         $unit_amount = max(0, min($unit_amount, floor($free_silo / $unit_size)));
@@ -177,9 +177,9 @@ 
       $unit_level = $new_unit_level = 0;
     } else {
       $unit_amount = 1;
-      if($que_id == QUE_STRUCTURES) {
+      if ($que_id == QUE_STRUCTURES) {
         $sectors_qued = is_array($in_que) ? array_sum($in_que) : 0;
-        if($build_mode == BUILD_CREATE && eco_planet_fields_max($planet) - $planet['field_current'] - $sectors_qued <= 0) {
+        if ($build_mode == BUILD_CREATE && eco_planet_fields_max($planet) - $planet['field_current'] - $sectors_qued <= 0) {
           throw new exception('{Не хватает секторов на планете}', ERR_ERROR); // TODO EXCEPTION
         }
       }
@@ -191,9 +191,9 @@ 
 
     $exchange = array();
     $market_get_autoconvert_cost = market_get_autoconvert_cost();
-    if($is_autoconvert && $build_data[BUILD_AUTOCONVERT]) {
+    if ($is_autoconvert && $build_data[BUILD_AUTOCONVERT]) {
       $dark_matter = mrc_get_level($user, null, RES_DARK_MATTER);
-      if(mrc_get_level($user, null, RES_DARK_MATTER) < $market_get_autoconvert_cost) {
+      if (mrc_get_level($user, null, RES_DARK_MATTER) < $market_get_autoconvert_cost) {
         throw new exception("{Нет хватает " . ($market_get_autoconvert_cost - $dark_matter) . "ТМ на постройки с автоконвертацией ресурсов}", ERR_ERROR); // TODO EXCEPTION
       }
 
@@ -203,7 +203,7 @@ 
       $resource_exchange_rates = array();
       $resource_diff = array();
       $all_positive = true;
-      foreach($resources_loot as $resource_id) {
+      foreach ($resources_loot as $resource_id) {
         $resource_db_name = pname_resource_name($resource_id);
         $resource_got[$resource_id] = floor(mrc_get_level($user, $planet, $resource_id));
         $resource_exchange_rates[$resource_id] = classSupernova::$config->__get("rpg_exchange_{$resource_db_name}");
@@ -211,15 +211,15 @@ 
         $all_positive = $all_positive && ($resource_diff[$resource_id] > 0);
       }
       // Нужна автоконвертация
-      if($all_positive) {
+      if ($all_positive) {
         $is_autoconvert = false;
       } else {
-        foreach($resource_diff as $resource_diff_id => &$resource_diff_amount) {
-          if($resource_diff_amount >= 0) {
+        foreach ($resource_diff as $resource_diff_id => &$resource_diff_amount) {
+          if ($resource_diff_amount >= 0) {
             continue;
           }
-          foreach($resource_diff as $resource_got_id => &$resource_got_amount) {
-            if($resource_got_amount <= 0) {
+          foreach ($resource_diff as $resource_got_id => &$resource_got_amount) {
+            if ($resource_got_amount <= 0) {
               continue;
             }
             $current_exchange = $resource_exchange_rates[$resource_got_id] / $resource_exchange_rates[$resource_diff_id];
@@ -235,14 +235,14 @@ 
         }
 
         $is_autoconvert_ok = true;
-        foreach($resource_diff as $resource_diff_amount2) {
-          if($resource_diff_amount2 < 0) {
+        foreach ($resource_diff as $resource_diff_amount2) {
+          if ($resource_diff_amount2 < 0) {
             $is_autoconvert_ok = false;
             break;
           }
         }
 
-        if($is_autoconvert_ok) {
+        if ($is_autoconvert_ok) {
           $build_data['RESULT'][$build_mode] = BUILD_ALLOWED;
           $build_data['CAN'][$build_mode] = $unit_amount;
         } else {
@@ -251,19 +251,19 @@ 
       }
     }
     $unit_amount = min($build_data['CAN'][$build_mode], $unit_amount);
-    if($unit_amount <= 0) {
+    if ($unit_amount <= 0) {
       throw new exception('{Не хватает ресурсов}', ERR_ERROR); // TODO EXCEPTION
     }
 
-    if($new_unit_level < 0) {
+    if ($new_unit_level < 0) {
       throw new exception('{Нельзя уничтожить больше юнитов, чем есть}', ERR_ERROR); // TODO EXCEPTION
     }
 
-    if($build_data['RESULT'][$build_mode] != BUILD_ALLOWED) {
+    if ($build_data['RESULT'][$build_mode] != BUILD_ALLOWED) {
       throw new exception('{Строительство блокировано}', ERR_ERROR); // TODO EXCEPTION
     }
 
-    if($is_autoconvert) {
+    if ($is_autoconvert) {
       ksort($exchange);
       ksort($resource_got);
       db_change_resources(
@@ -282,7 +282,7 @@ 
     }
 
     $unit_amount_qued = 0;
-    while($unit_amount > 0 && count($que['ques'][$que_id][$user['id']][$planet_id]) < $que_max_length) {
+    while ($unit_amount > 0 && count($que['ques'][$que_id][$user['id']][$planet_id]) < $que_max_length) {
       $place = min($unit_amount, MAX_FLEET_OR_DEFS_PER_ROW);
       que_add_unit($unit_id, $user, $planet, $build_data, $new_unit_level, $place, $build_mode);
       $unit_amount -= $place;
@@ -292,7 +292,7 @@ 
 
     sn_db_transaction_commit();
 
-    if($redirect) {
+    if ($redirect) {
       sys_redirect("{$_SERVER['PHP_SELF']}?mode=" . sys_get_param_str('mode') . "&ally_id=" . sys_get_param_id('ally_id'));
       die();
     }
@@ -301,7 +301,7 @@ 
       'STATUS'  => ERR_NONE,
       'MESSAGE' => '{Строительство начато}',
     );
-  } catch(Exception $e) {
+  } catch (Exception $e) {
     sn_db_transaction_rollback();
     $operation_result = array(
       'STATUS'  => in_array($e->getCode(), array(ERR_NONE, ERR_WARNING, ERR_ERROR)) ? $e->getCode() : ERR_ERROR,
@@ -309,7 +309,7 @@ 
     );
   }
 
-  if(!empty($operation_result['MESSAGE'])) {
+  if (!empty($operation_result['MESSAGE'])) {
     $operation_result['MESSAGE'] .= ' ' . ($unit_amount_qued ? $unit_amount_qued : $unit_amount) . 'x[' . classLocale::$lang['tech'][$unit_id] . ']';
   }
 
@@ -320,11 +320,11 @@ 
 function que_recalculate($old_que) {
   $new_que = array();
 
-  if(!is_array($old_que['items'])) {
+  if (!is_array($old_que['items'])) {
     return $new_que;
   }
-  foreach($old_que['items'] as $row) {
-    if(!isset($row) || !$row || $row['que_unit_amount'] <= 0) {
+  foreach ($old_que['items'] as $row) {
+    if (!isset($row) || !$row || $row['que_unit_amount'] <= 0) {
       continue;
     }
 
@@ -335,9 +335,9 @@ 
 
     $last_id = count($new_que['items']) - 1;
 
-    if($row['que_planet_id']) {
+    if ($row['que_planet_id']) {
       $new_que['planets'][$row['que_planet_id']][$row['que_type']][] = &$new_que['items'][$last_id];
-    } elseif($row['que_type'] == QUE_RESEARCH) {
+    } elseif ($row['que_type'] == QUE_RESEARCH) {
       $new_que['players'][$row['que_player_id']][$row['que_type']][] = &$new_que['items'][$last_id];
     }
     $new_que['ques'][$row['que_type']][$row['que_player_id']][intval($row['que_planet_id'])][] = &$new_que['items'][$last_id];
@@ -375,14 +375,14 @@ 
   $que_type = que_get_unit_que($unit_id);
   $planet_id_origin = $planet['id'] ? $planet['id'] : 'NULL';
   $planet_id = $que_type == QUE_RESEARCH ? 'NULL' : $planet_id_origin;
-  if(is_numeric($planet_id)) {
+  if (is_numeric($planet_id)) {
     DBStaticPlanet::db_planet_update_set_by_id(
       $planet_id,
       array(
         'que_processed' => SN_TIME_NOW,
       )
     );
-  } elseif(is_numeric($user['id'])) {
+  } elseif (is_numeric($user['id'])) {
     DBStaticUser::db_user_set_by_id(
       $user['id'],
       array(
@@ -417,17 +417,17 @@ 
   $planet['id'] = $planet['id'] && $que_type !== QUE_RESEARCH ? $planet['id'] : 0;
   $global_que = que_get($user['id'], $planet['id'], $que_type, true);
 
-  if(!empty($global_que['ques'][$que_type][$user['id']][$planet['id']])) {
+  if (!empty($global_que['ques'][$que_type][$user['id']][$planet['id']])) {
     $que = array_reverse($global_que['ques'][$que_type][$user['id']][$planet['id']]);
 
-    foreach($que as $que_item) {
+    foreach ($que as $que_item) {
       DBStaticQue::db_que_delete_by_id($que_item['que_id']);
 
-      if($que_item['que_planet_id_origin']) {
+      if ($que_item['que_planet_id_origin']) {
         $planet['id'] = $que_item['que_planet_id_origin'];
       }
 
-      if(!isset($planets_locked[$planet['id']])) {
+      if (!isset($planets_locked[$planet['id']])) {
         $planets_locked[$planet['id']] = $planet['id'] ? DBStaticPlanet::db_planet_by_id($planet['id'], true) : $planet;
       }
 
@@ -443,19 +443,19 @@ 
         )
       );
 
-      if(!$clear) {
+      if (!$clear) {
         break;
       }
     }
 
-    if(is_numeric($planet['id'])) {
+    if (is_numeric($planet['id'])) {
       DBStaticPlanet::db_planet_update_set_by_id(
         $planet['id'],
         array(
           'que_processed' => SN_TIME_SQL,
         )
       );
-    } elseif(is_numeric($user['id'])) {
+    } elseif (is_numeric($user['id'])) {
       DBStaticUser::db_user_set_by_id(
         $user['id'],
         array(
@@ -507,21 +507,21 @@ 
   // TODO: Переделать для $que_type === false
   $planet['id'] = $planet['id'] ? $planet['id'] : 0;
 
-  if(!is_array($que)) {
+  if (!is_array($que)) {
     $que = que_get($user['id'], $planet['id'], $que_type);
   }
 
-  if(is_array($que) && isset($que['items'])) {
+  if (is_array($que) && isset($que['items'])) {
     $que = $que['ques'][$que_type][$user['id']][$planet['id']];
   }
 
-  if($que) {
-    foreach($que as $que_element) {
+  if ($que) {
+    foreach ($que as $que_element) {
       $template->assign_block_vars('que', que_tpl_parse_element($que_element, $short_names));
     }
   }
 
-  if($que_type == QUE_RESEARCH) {
+  if ($que_type == QUE_RESEARCH) {
   }
 }
 
@@ -545,7 +545,7 @@ 
   $user = DBStaticUser::db_user_by_id($user['id'], true);
 
   $time_left[$user['id']][0] = max(0, $on_time - $user['que_processed']);
-  if($planet === null && !$time_left[$user['id']][0]) {
+  if ($planet === null && !$time_left[$user['id']][0]) {
     return $que;
   }
 
@@ -553,12 +553,12 @@ 
   $que_type_id = $planet === null ? QUE_RESEARCH : false;
   $planet = intval(is_array($planet) ? $planet['id'] : $planet); // В $planet у нас теперь только её ID или шаблон null/0/false
   $que = que_get($user['id'], $planet, $que_type_id, true);
-  if(empty($que['items'])) {
+  if (empty($que['items'])) {
     return $que;
   }
 
   $planet_list = array();
-  if($planet !== null) {
+  if ($planet !== null) {
     // Если нужно изменять данные на планетах - блокируем планеты и получаем данные о них
     // TODO - от них не надо ничего, кроме ID и que_processed
     $planet_row = DBStaticPlanet::db_planet_list_by_user_or_planet($user['id'], $planet);
@@ -567,20 +567,20 @@ 
   }
 
   // Теперь в $time_left лежит время обсчета всех очередей по каждой из планеты
-  if(array_sum($time_left[$user['id']]) == 0) {
+  if (array_sum($time_left[$user['id']]) == 0) {
     return $que;
   }
 
   $unit_changes = array();
-  foreach($que['items'] as &$que_item) {
+  foreach ($que['items'] as &$que_item) {
     $que_player_id = &$que_item['que_player_id'];
     $que_planet_id = intval($que_item['que_planet_id']);
 
     $que_time_left = &$que['time_left'][$que_player_id][$que_planet_id][$que_item['que_type']];
-    if(!isset($que_time_left)) {
+    if (!isset($que_time_left)) {
       $que_time_left = $time_left[$que_player_id][$que_planet_id];
     }
-    if($que_time_left <= 0 || $que_item['que_unit_amount'] <= 0) {
+    if ($que_time_left <= 0 || $que_item['que_unit_amount'] <= 0) {
       continue;
     }
     // Дальше мы идем, если только осталось время в очереди И юниты к постройке
@@ -593,7 +593,7 @@ 
     // Теперь работаем с остатком времени на юните. Оно не может быть равно или меньше нуля
 
     // Если времени в очереди осталось не меньше, чем время текущего юнита - значит мы достроили юнит
-    if($que_time_left >= $que_item['que_time_left']) {
+    if ($que_time_left >= $que_item['que_time_left']) {
       // Увеличиваем количество отстроенных юнитов
       $unit_processed++;
       // Вычитаем из времени очереди потраченное на постройку время
@@ -606,12 +606,12 @@ 
     $que_item['que_unit_amount'] -= $unit_processed;
 
     // Если еще остались юниты - значит ВСЁ оставшееся время приходится на достройку следующего юнита
-    if($que_item['que_unit_amount'] > 0) {
+    if ($que_item['que_unit_amount'] > 0) {
       $que_item['que_time_left'] = $que_item['que_time_left'] - $que_time_left;
       $que_time_left = 0;
     }
 
-    if($que_item['que_unit_amount'] <= 0) {
+    if ($que_item['que_unit_amount'] <= 0) {
       DBStaticQue::db_que_delete_by_id($que_item['que_id']);
     } else {
       classSupernova::$gc->cacheOperator->db_upd_record_by_id(
@@ -626,15 +626,15 @@ 
       );
     }
 
-    if($unit_processed) {
+    if ($unit_processed) {
       $unit_processed_delta = $unit_processed * ($que_item['que_unit_mode'] == BUILD_CREATE ? 1 : -1);
       $unit_changes[$que_player_id][$que_planet_id][$que_item['que_unit_id']] += $unit_processed_delta;
     }
   }
 
-  foreach($time_left as $player_id => $planet_data) {
-    foreach($planet_data as $planet_id => $time_on_planet) {
-      if($planet_id) {
+  foreach ($time_left as $player_id => $planet_data) {
+    foreach ($planet_data as $planet_id => $time_on_planet) {
+      if ($planet_id) {
         // update planet
         classSupernova::$gc->cacheOperator->db_upd_record_by_id(
           LOC_PLANET,
@@ -656,8 +656,8 @@ 
         );
       }
 
-      if(is_array($unit_changes[$player_id][$planet_id])) {
-        foreach($unit_changes[$player_id][$planet_id] as $unit_id => $unit_amount) {
+      if (is_array($unit_changes[$player_id][$planet_id])) {
+        foreach ($unit_changes[$player_id][$planet_id] as $unit_id => $unit_amount) {
           DBStaticUnit::dbUpdateOrInsertUnit($unit_id, $unit_amount, $user, $planet_id ? $planet_id : null);
         }
       }
@@ -667,38 +667,38 @@ 
   $que = que_recalculate($que);
 
   // TODO: Re-enable quests for Alliances
-  if(!empty($unit_changes) && !$user['user_as_ally']) {
+  if (!empty($unit_changes) && !$user['user_as_ally']) {
     $quest_list = qst_get_quests($user['id']);
     $quest_triggers = qst_active_triggers($quest_list);
     $quest_rewards = array();
 
 
     $xp_incoming = array();
-    foreach($unit_changes as $user_id => $planet_changes) {
-      foreach($planet_changes as $planet_id => $changes) {
+    foreach ($unit_changes as $user_id => $planet_changes) {
+      foreach ($planet_changes as $planet_id => $changes) {
         $planet_this = $planet_id ? classSupernova::$gc->cacheOperator->db_get_record_by_id(LOC_PLANET, $planet_id) : array();
-        foreach($changes as $unit_id => $unit_value) {
+        foreach ($changes as $unit_id => $unit_value) {
           $que_id = que_get_unit_que($unit_id);
           $unit_level_new = mrc_get_level($user, $planet_this, $unit_id, false, true) + $unit_value;
-          if($que_id == QUE_STRUCTURES || $que_id == QUE_RESEARCH) {
+          if ($que_id == QUE_STRUCTURES || $que_id == QUE_RESEARCH) {
             $build_data = eco_get_build_data($user, $planet_this, $unit_id, $unit_level_new - 1);
             $build_data = $build_data[BUILD_CREATE];
-            foreach(sn_get_groups('resources_loot') as $resource_id) {
+            foreach (sn_get_groups('resources_loot') as $resource_id) {
               $xp_incoming[$que_id] += $build_data[$resource_id]; // TODO - добавить конверсию рейтов обмена
             }
           }
 
-          if(is_array($quest_triggers)) {
+          if (is_array($quest_triggers)) {
             // TODO: Check mutiply condition quests
             $quest_trigger_list = array_keys($quest_triggers, $unit_id);
-            if(is_array($quest_trigger_list)) {
-              foreach($quest_trigger_list as $quest_id) {
+            if (is_array($quest_trigger_list)) {
+              foreach ($quest_trigger_list as $quest_id) {
                 $quest_unit_level = $unit_level_new;
-                if(get_unit_param($unit_id, P_UNIT_TYPE) == UNIT_SHIPS) {
+                if (get_unit_param($unit_id, P_UNIT_TYPE) == UNIT_SHIPS) {
                   $quest_unit_level = DBStaticUnit::db_unit_count_by_user_and_type_and_snid($user_id, 0, $unit_id);
                   $quest_unit_level = $quest_unit_level[$unit_id]['qty'];
                 }
-                if($quest_list[$quest_id]['quest_status_status'] != QUEST_STATUS_COMPLETE && $quest_list[$quest_id]['quest_unit_amount'] <= $quest_unit_level) {
+                if ($quest_list[$quest_id]['quest_status_status'] != QUEST_STATUS_COMPLETE && $quest_list[$quest_id]['quest_unit_amount'] <= $quest_unit_level) {
                   $quest_rewards[$quest_id][$user_id][$planet_id] = $quest_list[$quest_id]['quest_rewards_list'];
                   $quest_list[$quest_id]['quest_status_status'] = QUEST_STATUS_COMPLETE;
                 }
@@ -711,7 +711,7 @@ 
     // TODO: Изменить начисление награды за квесты на ту планету, на которой происходил ресеч
     qst_reward($user, $quest_rewards, $quest_list);
 
-    foreach($xp_incoming as $que_id => $xp) {
+    foreach ($xp_incoming as $que_id => $xp) {
       rpg_level_up($user, $que_id == QUE_RESEARCH ? RPG_TECH : RPG_STRUCTURE, $xp / 1000);
     }
   }

includes/functions/sys_user.php

Doc Comments +3 added lines

@@ -141,6 +141,9 @@
   ");
 }
 
+/**
+ * @param string $email_unsafe
+ */
 function player_create($username_unsafe, $email_unsafe, $options) {
   sn_db_transaction_check(true);
 

Spacing +15 added lines, -15 removed lines

@@ -9,7 +9,7 @@ 
 use Vector\Vector;
 
 function sys_user_vacation($user) {
-  if(sys_get_param_str('vacation') == 'leave') {
+  if (sys_get_param_str('vacation') == 'leave') {
     if ($user['vacation'] < SN_TIME_NOW) {
       $user['vacation'] = 0;
       $user['vacation_next'] = SN_TIME_NOW + classSupernova::$config->player_vacation_timeout;
@@ -23,7 +23,7 @@ 
     }
   }
 
-  if($user['vacation']) {
+  if ($user['vacation']) {
     // sn_sys_logout(false, true);
     // core_auth::logout(false, true);
 
@@ -53,10 +53,10 @@ 
   // TODO: Full rewrite
   sn_db_transaction_start();
   $TheUser = DBStaticUser::db_user_by_id($UserID);
-  if ( $TheUser['ally_id'] != 0 ) {
+  if ($TheUser['ally_id'] != 0) {
     $TheAlly = classSupernova::$db->doSelectFetchArray("SELECT * FROM `{{alliance}}` WHERE `id` = '" . $TheUser['ally_id'] . "';");
     $TheAlly['ally_members'] -= 1;
-    if ( $TheAlly['ally_members'] > 0 ) {
+    if ($TheAlly['ally_members'] > 0) {
       classSupernova::$db->doUpdateRowSet(
         TABLE_ALLIANCE,
         array(
@@ -77,10 +77,10 @@ 
 
   classSupernova::$gc->db->doDeleteWhere(TABLE_MESSAGES, array('message_owner' => $UserID,));
   classSupernova::$gc->db->doDeleteWhere(TABLE_MESSAGES, array('message_sender' => $UserID,));
-  classSupernova::$gc->db->doDeleteWhere(TABLE_NOTES, array('owner' => $UserID ,));
+  classSupernova::$gc->db->doDeleteWhere(TABLE_NOTES, array('owner' => $UserID,));
   FleetList::db_fleet_list_delete_by_owner($UserID);
-  classSupernova::$gc->db->doDeleteWhere(TABLE_BUDDY, array('BUDDY_SENDER_ID' => $UserID ,));
-  classSupernova::$gc->db->doDeleteWhere(TABLE_BUDDY, array('BUDDY_OWNER_ID' => $UserID ,));
+  classSupernova::$gc->db->doDeleteWhere(TABLE_BUDDY, array('BUDDY_SENDER_ID' => $UserID,));
+  classSupernova::$gc->db->doDeleteWhere(TABLE_BUDDY, array('BUDDY_OWNER_ID' => $UserID,));
 
 
   classSupernova::$gc->cacheOperator->db_del_record_by_id(LOC_USER, $UserID);
@@ -191,28 +191,28 @@ 
   !empty($options['password_encoded_unsafe']) ? $field_set['password'] = $options['password_encoded_unsafe'] : false;
 
   $user_new = classSupernova::$gc->cacheOperator->db_ins_field_set(LOC_USER, $field_set);
-  if(!($options['galaxy'] && $options['system'] && $options['planet'])) {
+  if (!($options['galaxy'] && $options['system'] && $options['planet'])) {
     $options['galaxy'] = classSupernova::$config->LastSettedGalaxyPos;
     $options['system'] = classSupernova::$config->LastSettedSystemPos;
-    $segment_size = floor(Vector::$knownPlanets/ 3);
+    $segment_size = floor(Vector::$knownPlanets / 3);
     $segment = floor(classSupernova::$config->LastSettedPlanetPos / $segment_size);
     $segment++;
     $options['planet'] = mt_rand(1 + $segment * $segment_size, ($segment + 1) * $segment_size);
 
     // $new_planet_id = 0;
-    while(true) {
-      if($options['planet'] > Vector::$knownPlanets) {
+    while (true) {
+      if ($options['planet'] > Vector::$knownPlanets) {
         $options['planet'] = mt_rand(0, $segment_size - 1) + 1;
         $options['system']++;
       }
-      if($options['system'] > Vector::$knownSystems) {
+      if ($options['system'] > Vector::$knownSystems) {
         $options['system'] = 1;
         $options['galaxy']++;
       }
-      $options['galaxy'] > Vector::$knownGalaxies? $options['galaxy'] = 1 : false;
+      $options['galaxy'] > Vector::$knownGalaxies ? $options['galaxy'] = 1 : false;
 
       $galaxy_row = DBStaticPlanet::db_planet_by_gspt($options['galaxy'], $options['system'], $options['planet'], PT_PLANET, true, 'id');
-      if(!$galaxy_row['id']) {
+      if (!$galaxy_row['id']) {
         classSupernova::$config->db_saveItem(array(
           'LastSettedGalaxyPos' => $options['galaxy'],
           'LastSettedSystemPos' => $options['system'],
@@ -240,7 +240,7 @@ 
 
   db_player_name_history_replace($user_new['id'], $username_unsafe);
 
-  if(!empty($options['partner_id']) && ($referral_row = DBStaticUser::db_user_by_id($options['partner_id'], true))) {
+  if (!empty($options['partner_id']) && ($referral_row = DBStaticUser::db_user_by_id($options['partner_id'], true))) {
     db_referral_insert($options['partner_id'], $user_new['id']);
   }
 

includes/includes/flt_functions.php

Doc Comments +3 added lines

@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * @return double
+ */
 function flt_fleet_speed($user, $fleet)
 {
   if (!is_array($fleet))

Spacing +78 added lines, -78 removed lines

@@ -8,14 +8,14 @@ 
 use Vector\Vector;
 
 function flt_fleet_speed($user, $fleet) {
-  if(!is_array($fleet)) {
+  if (!is_array($fleet)) {
     $fleet = array($fleet => 1);
   }
 
   $speeds = array();
-  if(!empty($fleet)) {
-    foreach($fleet as $ship_id => $amount) {
-      if($amount && in_array($ship_id, classSupernova::$gc->groupFleetAndMissiles)) {
+  if (!empty($fleet)) {
+    foreach ($fleet as $ship_id => $amount) {
+      if ($amount && in_array($ship_id, classSupernova::$gc->groupFleetAndMissiles)) {
         $single_ship_data = get_ship_data($ship_id, $user);
         $speeds[] = $single_ship_data['speed'];
       }
@@ -47,14 +47,14 @@ 
 
   $game_fleet_speed = flt_server_flight_speed_multiplier();
   $fleet_speed = flt_fleet_speed($user_row, $fleet_array);
-  if(!empty($fleet_array) && $fleet_speed && $game_fleet_speed) {
+  if (!empty($fleet_array) && $fleet_speed && $game_fleet_speed) {
     $speed_percent = $speed_percent ? max(min($speed_percent, 10), 1) : 10;
     $real_speed = $speed_percent * sqrt($fleet_speed);
 
     $duration = max(1, round((35000 / $speed_percent * sqrt($distance * 10 / $fleet_speed) + 10) / $game_fleet_speed));
 
-    foreach($fleet_array as $ship_id => $ship_count) {
-      if(!$ship_id || !$ship_count) {
+    foreach ($fleet_array as $ship_id => $ship_count) {
+      if (!$ship_id || !$ship_count) {
         continue;
       }
 
@@ -82,19 +82,19 @@ 
 function flt_bashing_check($user, $enemy, $planet_dst, $mission, $flight_duration, $fleet_group = 0) {
   $config_bashing_attacks = classSupernova::$config->fleet_bashing_attacks;
   $config_bashing_interval = classSupernova::$config->fleet_bashing_interval;
-  if(!$config_bashing_attacks) {
+  if (!$config_bashing_attacks) {
     // Bashing allowed - protection disabled
     return FLIGHT_ALLOWED;
   }
 
   $bashing_result = FLIGHT_MISSION_ATTACK_BASHING;
-  if($user['ally_id'] && $enemy['ally_id']) {
+  if ($user['ally_id'] && $enemy['ally_id']) {
     $relations = ali_relations($user['ally_id'], $enemy['ally_id']);
-    if(!empty($relations)) {
+    if (!empty($relations)) {
       $relations = $relations[$enemy['ally_id']];
-      switch($relations['alliance_diplomacy_relation']) {
+      switch ($relations['alliance_diplomacy_relation']) {
         case ALLY_DIPLOMACY_WAR:
-          if(SN_TIME_NOW - $relations['alliance_diplomacy_time'] <= classSupernova::$config->fleet_bashing_war_delay) {
+          if (SN_TIME_NOW - $relations['alliance_diplomacy_time'] <= classSupernova::$config->fleet_bashing_war_delay) {
             $bashing_result = FLIGHT_MISSION_ATTACK_BASHING_WAR_DELAY;
           } else {
             return FLIGHT_ALLOWED;
@@ -116,9 +116,9 @@ 
 
   // Retrieving flying fleets
   $objFleetsBashing = FleetList::dbGetFleetListBashing($user['id'], $planet_dst);
-  foreach($objFleetsBashing->_container as $fleetBashing) {
+  foreach ($objFleetsBashing->_container as $fleetBashing) {
     // Checking for ACS - each ACS count only once
-    if($fleetBashing->group_id) {
+    if ($fleetBashing->group_id) {
       $bashing_list["{$user['id']}_{$fleetBashing->group_id}"] = $fleetBashing->time_arrive_to_target;
     } else {
       $bashing_list[] = $fleetBashing->time_arrive_to_target;
@@ -126,12 +126,12 @@ 
   }
 
   // Check for joining to ACS - if there are already fleets in ACS no checks should be done
-  if($mission == MT_ACS && $bashing_list["{$user['id']}_{$fleet_group}"]) {
+  if ($mission == MT_ACS && $bashing_list["{$user['id']}_{$fleet_group}"]) {
     return FLIGHT_ALLOWED;
   }
 
   $query = DBStaticFleetBashing::db_bashing_list_get($user, $planet_dst, $time_limit);
-  while($bashing_row = db_fetch($query)) {
+  while ($bashing_row = db_fetch($query)) {
     $bashing_list[] = $bashing_row['bashing_time'];
   }
 
@@ -140,9 +140,9 @@ 
   $last_attack = 0;
   $wave = 0;
   $attack = 1;
-  foreach($bashing_list as &$bash_time) {
+  foreach ($bashing_list as &$bash_time) {
     $attack++;
-    if($bash_time - $last_attack > $config_bashing_interval || $attack > $config_bashing_attacks) {
+    if ($bash_time - $last_attack > $config_bashing_interval || $attack > $config_bashing_attacks) {
       $attack = 1;
       $wave++;
     }
@@ -159,16 +159,16 @@ 
   //TODO: try..catch
   global $user;
 
-  if($user['vacation']) {
+  if ($user['vacation']) {
     return $result = FLIGHT_PLAYER_VACATION_OWN;
   }
 
-  if(empty($fleet) || !is_array($fleet)) {
+  if (empty($fleet) || !is_array($fleet)) {
     return $result = FLIGHT_SHIPS_NO_SHIPS;
   }
 
   $sn_groups_mission = sn_get_groups('missions');
-  if(!isset($sn_groups_mission[$mission])) {
+  if (!isset($sn_groups_mission[$mission])) {
     return $result = FLIGHT_MISSION_UNKNOWN;
   }
   $sn_data_mission = $sn_groups_mission[$mission];
@@ -187,32 +187,32 @@ 
   $resources = 0;
   $ship_ids = classSupernova::$gc->groupFleet;
   $resource_ids = sn_get_groups('resources_loot');
-  foreach($fleet as $ship_id => $ship_count) {
+  foreach ($fleet as $ship_id => $ship_count) {
     $is_ship = in_array($ship_id, $ship_ids);
     $is_resource = in_array($ship_id, $resource_ids);
-    if(!$is_ship && !$is_resource) {
+    if (!$is_ship && !$is_resource) {
       // TODO Спецобработчик для Капитана и модулей
 //      return FLIGHT_SHIPS_UNIT_WRONG;
     }
 
-    if($ship_count < 0) {
+    if ($ship_count < 0) {
       return $result = $is_ship ? FLIGHT_SHIPS_NEGATIVE : FLIGHT_RESOURCES_NEGATIVE;
     }
 
-    if($ship_count > mrc_get_level($user, $planet_src, $ship_id)) {
+    if ($ship_count > mrc_get_level($user, $planet_src, $ship_id)) {
       // TODO FLIGHT_MISSION_MISSILE_NO_MISSILES
       return $result = $is_ship ? FLIGHT_SHIPS_NOT_ENOUGH_OR_RESOURCES : FLIGHT_RESOURCES_NOT_ENOUGH;
     }
 
-    if($is_ship) {
+    if ($is_ship) {
       $single_ship_data = get_ship_data($ship_id, $user);
-      if($single_ship_data[P_SPEED] <= 0) {
+      if ($single_ship_data[P_SPEED] <= 0) {
         return $result = FLIGHT_SHIPS_UNMOVABLE;
       }
       $ships += $ship_count;
       $recyclers += in_array($ship_id, classSupernova::$gc->groupRecyclers) ? $ship_count : 0;
       $spies += $ship_id == SHIP_SPY ? $ship_count : 0;
-    } elseif($is_resource) {
+    } elseif ($is_resource) {
       $resources += $ship_count;
     }
   }
@@ -223,7 +223,7 @@ 
     }
   */
 
-  if(isset($options['resources']) && $options['resources'] > 0 && !(isset($sn_data_mission['transport']) && $sn_data_mission['transport'])) {
+  if (isset($options['resources']) && $options['resources'] > 0 && !(isset($sn_data_mission['transport']) && $sn_data_mission['transport'])) {
     return $result = FLIGHT_RESOURCES_FORBIDDEN;
   }
 
@@ -235,78 +235,78 @@ 
   */
 
   $speed = $options['fleet_speed_percent'];
-  if($speed && ($speed != intval($speed) || $speed < 1 || $speed > 10)) {
+  if ($speed && ($speed != intval($speed) || $speed < 1 || $speed > 10)) {
     return $result = FLIGHT_FLEET_SPEED_WRONG;
   }
 
   $travel_data = flt_travel_data($user, $planet_src, $planet_dst, $fleet, $options['fleet_speed_percent']);
 
 
-  if(mrc_get_level($user, $planet_src, RES_DEUTERIUM) < $fleet[RES_DEUTERIUM] + $travel_data['consumption']) {
+  if (mrc_get_level($user, $planet_src, RES_DEUTERIUM) < $fleet[RES_DEUTERIUM] + $travel_data['consumption']) {
     return $result = FLIGHT_RESOURCES_FUEL_NOT_ENOUGH;
   }
 
-  if($travel_data['consumption'] > $travel_data['capacity']) {
+  if ($travel_data['consumption'] > $travel_data['capacity']) {
     return $result = FLIGHT_FLEET_TOO_FAR;
   }
 
-  if($travel_data['hold'] < $resources) {
+  if ($travel_data['hold'] < $resources) {
     return $result = FLIGHT_FLEET_OVERLOAD;
   }
 
   $fleet_start_time = SN_TIME_NOW + $travel_data['duration'];
 
   $fleet_group = $options['fleet_group'];
-  if($fleet_group) {
-    if($mission != MT_ACS) {
+  if ($fleet_group) {
+    if ($mission != MT_ACS) {
       return $result = FLIGHT_MISSION_IMPOSSIBLE;
     };
 
     $acs = DBStaticFleetACS::db_acs_get_by_group_id($fleet_group);
-    if(!$acs['id']) {
+    if (!$acs['id']) {
       return $result = FLIGHT_MISSION_ACS_NOT_EXISTS;
     }
 
-    if($planet_dst['galaxy'] != $acs['galaxy'] || $planet_dst['system'] != $acs['system'] || $planet_dst['planet'] != $acs['planet'] || $planet_dst['planet_type'] != $acs['planet_type']) {
+    if ($planet_dst['galaxy'] != $acs['galaxy'] || $planet_dst['system'] != $acs['system'] || $planet_dst['planet'] != $acs['planet'] || $planet_dst['planet_type'] != $acs['planet_type']) {
       return $result = FLIGHT_MISSION_ACS_WRONG_TARGET;
     }
 
-    if($fleet_start_time > $acs['ankunft']) {
+    if ($fleet_start_time > $acs['ankunft']) {
       return $result = FLIGHT_MISSION_ACS_TOO_LATE;
     }
   }
 
   $flying_fleets = $options['flying_fleets'];
-  if(!$flying_fleets) {
+  if (!$flying_fleets) {
     $flying_fleets = FleetList::fleet_count_flying($user['id']);
   }
-  if(GetMaxFleets($user) <= $flying_fleets && $mission != MT_MISSILE) {
+  if (GetMaxFleets($user) <= $flying_fleets && $mission != MT_MISSILE) {
     return $result = FLIGHT_FLEET_NO_SLOTS;
   }
 
   // В одиночку шпионские зонды могут летать только в миссии Шпионаж, Передислокация и Транспорт
-  if($ships && $spies && $spies == $ships && !($mission == MT_SPY || $mission == MT_RELOCATE || $mission == MT_TRANSPORT)) {
+  if ($ships && $spies && $spies == $ships && !($mission == MT_SPY || $mission == MT_RELOCATE || $mission == MT_TRANSPORT)) {
     return $result = FLIGHT_SHIPS_NOT_ONLY_SPIES;
   }
 
   // Checking for no planet
-  if(!$planet_dst['id_owner']) {
-    if($mission == MT_COLONIZE && !$fleet[SHIP_COLONIZER]) {
+  if (!$planet_dst['id_owner']) {
+    if ($mission == MT_COLONIZE && !$fleet[SHIP_COLONIZER]) {
       return $result = FLIGHT_SHIPS_NO_COLONIZER;
     }
 
-    if($mission == MT_EXPLORE || $mission == MT_COLONIZE) {
+    if ($mission == MT_EXPLORE || $mission == MT_COLONIZE) {
       return $result = FLIGHT_ALLOWED;
     }
 
     return $result = FLIGHT_VECTOR_NO_TARGET;
   }
 
-  if($mission == MT_RECYCLE) {
-    if($planet_dst['debris_metal'] + $planet_dst['debris_crystal'] <= 0) {
+  if ($mission == MT_RECYCLE) {
+    if ($planet_dst['debris_metal'] + $planet_dst['debris_crystal'] <= 0) {
       return $result = FLIGHT_MISSION_RECYCLE_NO_DEBRIS;
     }
-    if($recyclers <= 0) {
+    if ($recyclers <= 0) {
       return $result = FLIGHT_SHIPS_NO_RECYCLERS;
     }
 
@@ -314,8 +314,8 @@ 
   }
 
   // Got planet. Checking if it is ours
-  if($planet_dst['id_owner'] == $user['id']) {
-    if($mission == MT_TRANSPORT || $mission == MT_RELOCATE) {
+  if ($planet_dst['id_owner'] == $user['id']) {
+    if ($mission == MT_TRANSPORT || $mission == MT_RELOCATE) {
       return $result = FLIGHT_ALLOWED;
     }
 
@@ -323,19 +323,19 @@ 
   }
 
   // No, planet not ours. Cutting mission that can't be send to not-ours planet
-  if($mission == MT_RELOCATE || $mission == MT_COLONIZE || $mission == MT_EXPLORE) {
+  if ($mission == MT_RELOCATE || $mission == MT_COLONIZE || $mission == MT_EXPLORE) {
     return $result = FLIGHT_MISSION_IMPOSSIBLE;
   }
 
   $enemy = DBStaticUser::db_user_by_id($planet_dst['id_owner']);
   // We cannot attack or send resource to users in VACATION mode
-  if($enemy['vacation'] && $mission != MT_RECYCLE) {
+  if ($enemy['vacation'] && $mission != MT_RECYCLE) {
     return $result = FLIGHT_PLAYER_VACATION;
   }
 
   // Multi IP protection
   // TODO: Here we need a procedure to check proxies
-  if(sys_is_multiaccount($user, $enemy)) {
+  if (sys_is_multiaccount($user, $enemy)) {
     return $result = FLIGHT_PLAYER_SAME_IP;
   }
 
@@ -343,8 +343,8 @@ 
   $enemy_points = $enemy['total_points'];
 
   // Is it transport? If yes - checking for buffing to prevent mega-alliance destroyer
-  if($mission == MT_TRANSPORT) {
-    if($user_points >= $enemy_points || classSupernova::$config->allow_buffing) {
+  if ($mission == MT_TRANSPORT) {
+    if ($user_points >= $enemy_points || classSupernova::$config->allow_buffing) {
       return $result = FLIGHT_ALLOWED;
     } else {
       return $result = FLIGHT_PLAYER_BUFFING;
@@ -354,66 +354,66 @@ 
   // Only aggresive missions passed to this point. HOLD counts as passive but aggresive
 
   // Is it admin with planet protection?
-  if($planet_dst['id_level'] > $user['authlevel']) {
+  if ($planet_dst['id_level'] > $user['authlevel']) {
     return $result = FLIGHT_PLAYER_ADMIN;
   }
 
   // Okay. Now skipping protection checks for inactive longer then 1 week
-  if(!$enemy['onlinetime'] || $enemy['onlinetime'] >= (SN_TIME_NOW - 60 * 60 * 24 * 7)) {
-    if(
+  if (!$enemy['onlinetime'] || $enemy['onlinetime'] >= (SN_TIME_NOW - 60 * 60 * 24 * 7)) {
+    if (
       ($enemy_points <= classSupernova::$config->game_noob_points && $user_points > classSupernova::$config->game_noob_points)
       ||
       (classSupernova::$config->game_noob_factor && $user_points > $enemy_points * classSupernova::$config->game_noob_factor)
     ) {
-      if($mission != MT_HOLD) {
+      if ($mission != MT_HOLD) {
         return $result = FLIGHT_PLAYER_NOOB;
       }
-      if($mission == MT_HOLD && !($user['ally_id'] && $user['ally_id'] == $enemy['ally_id'] && classSupernova::$config->ally_help_weak)) {
+      if ($mission == MT_HOLD && !($user['ally_id'] && $user['ally_id'] == $enemy['ally_id'] && classSupernova::$config->ally_help_weak)) {
         return $result = FLIGHT_PLAYER_NOOB;
       }
     }
   }
 
   // Is it HOLD mission? If yes - there should be ally deposit
-  if($mission == MT_HOLD) {
-    if(mrc_get_level($user, $planet_dst, STRUC_ALLY_DEPOSIT)) {
+  if ($mission == MT_HOLD) {
+    if (mrc_get_level($user, $planet_dst, STRUC_ALLY_DEPOSIT)) {
       return $result = FLIGHT_ALLOWED;
     }
 
     return $result = FLIGHT_MISSION_HOLD_NO_ALLY_DEPOSIT;
   }
 
-  if($mission == MT_SPY) {
+  if ($mission == MT_SPY) {
     return $result = $spies >= 1 ? FLIGHT_ALLOWED : FLIGHT_MISSION_SPY_NO_SPIES;
   }
 
   // Is it MISSILE mission?
-  if($mission == MT_MISSILE) {
+  if ($mission == MT_MISSILE) {
     $sn_data_mip = get_unit_param(UNIT_DEF_MISSILE_INTERPLANET);
-    if(mrc_get_level($user, $planet_src, STRUC_SILO) < $sn_data_mip[P_REQUIRE][STRUC_SILO]) {
+    if (mrc_get_level($user, $planet_src, STRUC_SILO) < $sn_data_mip[P_REQUIRE][STRUC_SILO]) {
       return $result = FLIGHT_MISSION_MISSILE_NO_SILO;
     }
 
-    if(!$fleet[UNIT_DEF_MISSILE_INTERPLANET]) {
+    if (!$fleet[UNIT_DEF_MISSILE_INTERPLANET]) {
       return $result = FLIGHT_MISSION_MISSILE_NO_MISSILES;
     }
 
     $distance = abs($planet_dst['system'] - $planet_src['system']);
     $mip_range = flt_get_missile_range($user);
-    if($distance > $mip_range || $planet_dst['galaxy'] != $planet_src['galaxy']) {
+    if ($distance > $mip_range || $planet_dst['galaxy'] != $planet_src['galaxy']) {
       return $result = FLIGHT_MISSION_MISSILE_TOO_FAR;
     }
 
-    if(isset($options['target_structure']) && $options['target_structure'] && !in_array($options['target_structure'], sn_get_groups('defense_active'))) {
+    if (isset($options['target_structure']) && $options['target_structure'] && !in_array($options['target_structure'], sn_get_groups('defense_active'))) {
       return $result = FLIGHT_MISSION_MISSILE_WRONG_STRUCTURE;
     }
   }
 
-  if($mission == MT_DESTROY && $planet_dst['planet_type'] != PT_MOON) {
+  if ($mission == MT_DESTROY && $planet_dst['planet_type'] != PT_MOON) {
     return $result = FLIGHT_MISSION_IMPOSSIBLE;
   }
 
-  if($mission == MT_ATTACK || $mission == MT_ACS || $mission == MT_DESTROY) {
+  if ($mission == MT_ATTACK || $mission == MT_ACS || $mission == MT_DESTROY) {
     return $result = flt_bashing_check($user, $enemy, $planet_dst, $mission, $travel_data['duration'], $fleet_group);
   }
 
@@ -440,7 +440,7 @@ 
   $from = $from['planet'];
 
   $can_attack = flt_can_attack($from, $to, $fleet_REAL_array, $mission, $options);
-  if($can_attack != FLIGHT_ALLOWED) {
+  if ($can_attack != FLIGHT_ALLOWED) {
     $internal_transaction ? sn_db_transaction_rollback() : false;
 
     return $can_attack;
@@ -451,7 +451,7 @@ 
   $travel_data = flt_travel_data($user, $from, $to, $fleet_REAL_array, $options['fleet_speed_percent']);
 
   $time_on_mission = 0;
-  if($mission == MT_EXPLORE || $mission == MT_HOLD) {
+  if ($mission == MT_EXPLORE || $mission == MT_HOLD) {
     // TODO - include some checks about maximum and minumum stay_duration
     $time_on_mission = $options['stay_time'] * 3600;
   }
@@ -473,14 +473,14 @@ 
   $sn_group_fleet = classSupernova::$gc->groupFleet;
   $sn_group_resources_loot = sn_get_groups('resources_loot');
   $planetRowFieldChanges = array();
-  foreach($fleet_REAL_array as $unit_id => $amount) {
-    if(!$amount || !$unit_id) {
+  foreach ($fleet_REAL_array as $unit_id => $amount) {
+    if (!$amount || !$unit_id) {
       continue;
     }
 
-    if(in_array($unit_id, $sn_group_fleet)) {
+    if (in_array($unit_id, $sn_group_fleet)) {
       DBStaticUnit::dbUpdateOrInsertUnit($unit_id, -$amount, $user, $from['id']);
-    } elseif(in_array($unit_id, $sn_group_resources_loot)) {
+    } elseif (in_array($unit_id, $sn_group_resources_loot)) {
       $planetRowFieldChanges[$unit_id] -= $amount;
     }
   }
@@ -512,16 +512,16 @@ 
 
   $ship_data = array();
   $fleet_array = array();
-  foreach($ship_list as $transport_id => $cork) {
+  foreach ($ship_list as $transport_id => $cork) {
     $ship_data[$transport_id] = flt_travel_data($user, $from, $to, array($transport_id => 1), 10);
   }
   uasort($ship_data, 'flt_calculate_ship_to_transport_sort');
 
   $fleet_capacity = 0;
   $fuel_total = $fuel_left = mrc_get_level($user, $from, RES_DEUTERIUM);
-  foreach($ship_data as $transport_id => &$ship_info) {
+  foreach ($ship_data as $transport_id => &$ship_info) {
     $ship_loaded = min($ship_list[$transport_id], ceil($resource_amount / $ship_info['hold']), floor($fuel_left / $ship_info['consumption']));
-    if($ship_loaded) {
+    if ($ship_loaded) {
       $fleet_array[$transport_id] = $ship_loaded;
       $resource_amount -= min($resource_amount, $ship_info['hold'] * $ship_loaded);
       $fuel_left -= $ship_info['consumption'] * $ship_loaded;

includes/includes/flt_mission_spy.php

Doc Comments +3 added lines

@@ -29,6 +29,9 @@
   }
 }
 
+/**
+ * @param string $group_name
+ */
 function flt_spy_scan($target_planet, $group_name, $section_title, $target_user = array())
 {
   global $lang;

Spacing +14 added lines, -14 removed lines

@@ -15,8 +15,8 @@ 
  */
 // ----------------------------------------------------------------------------------------------------------------
 function coe_compress_add_units($unit_group, $target_planet, &$compress_data, $target_user = array()) {
-  foreach($unit_group as $unit_id) {
-    if(($unit_count = mrc_get_level($target_user, $target_planet, $unit_id, false, true)) > 0) {
+  foreach ($unit_group as $unit_id) {
+    if (($unit_count = mrc_get_level($target_user, $target_planet, $unit_id, false, true)) > 0) {
       $compress_data[$unit_id] = $unit_count;
     }
   }
@@ -26,8 +26,8 @@ 
   $classLocale = classLocale::$lang;
 
   $result = "<tr><td class=\"c\" colspan=\"4\">{$section_title}</td></tr>";
-  foreach(sn_get_groups($group_name) as $unit_id) {
-    if(($unit_amount = mrc_get_level($target_user, $target_planet, $unit_id, false, true)) > 0) {
+  foreach (sn_get_groups($group_name) as $unit_id) {
+    if (($unit_amount = mrc_get_level($target_user, $target_planet, $unit_id, false, true)) > 0) {
       $result .= "<tr><td align=\"left\" colspan=\"3\">{$classLocale['tech'][$unit_id]}</td><td align=\"right\">{$unit_amount}</td></tr>";
     }
 
@@ -56,14 +56,14 @@ 
 
   $objFleet = $mission_data->fleet;
 
-  if(empty($target_user_row['id']) || empty($spying_user_row['id'])) {
+  if (empty($target_user_row['id']) || empty($spying_user_row['id'])) {
     $objFleet->markReturnedAndSave();
 
     return;
   }
 
   $spy_probes = $objFleet->shipsGetTotalById(SHIP_SPY);
-  if($spy_probes > 0) {
+  if ($spy_probes > 0) {
     $TargetSpyLvl = GetSpyLevel($target_user_row);
     $CurrentSpyLvl = GetSpyLevel($spying_user_row);
     $spy_diff_empire = $CurrentSpyLvl - $TargetSpyLvl;
@@ -87,19 +87,19 @@ 
     $spy_message .= "<td width=220>{$classLocale['sys_deuterium']}</td><td width=220 align=right>" . pretty_number($target_planet_row['deuterium']) . "</td>";
     $spy_message .= "<td width=220>{$classLocale['sys_energy']}</td><td width=220 align=right>" . pretty_number($target_planet_row['energy_max']) . "</td>";
     $spy_message .= "</tr>";
-    if($spy_diff >= 2) {
+    if ($spy_diff >= 2) {
       $spy_message .= "<div class='spy_medium'>" . flt_spy_scan($target_planet_row, 'fleet', classLocale::$lang['tech'][UNIT_SHIPS], $target_user_row) . "</div>";
       coe_compress_add_units(classSupernova::$gc->groupFleet, $target_planet_row, $combat_pack[0]);
     }
-    if($spy_diff >= 3) {
+    if ($spy_diff >= 3) {
       $spy_message .= "<div class='spy_medium'>" . flt_spy_scan($target_planet_row, 'defense', classLocale::$lang['tech'][UNIT_DEFENCE], $target_user_row) . "</div>";
       coe_compress_add_units(sn_get_groups('defense_active'), $target_planet_row, $combat_pack[0]);
     }
-    if($spy_diff >= 5) {
+    if ($spy_diff >= 5) {
       $spy_message .= "<div class='spy_long'>" . flt_spy_scan($target_planet_row, 'structures', classLocale::$lang['tech'][UNIT_STRUCTURES], $target_user_row) . "</div>";
     }
 
-    if($spy_diff_empire >= 0) {
+    if ($spy_diff_empire >= 0) {
       $spy_message .= "<div class='spy_long'>" . flt_spy_scan($target_planet_row, 'tech', classLocale::$lang['tech'][UNIT_TECHNOLOGIES], $target_user_row) . "</div>";
       coe_compress_add_units(array(TECH_WEAPON, TECH_SHIELD, TECH_ARMOR), $target_planet_row, $combat_pack[0], $target_user_row);
     }
@@ -108,13 +108,13 @@ 
     $simulator_link = sn_ube_simulator_encode_replay($combat_pack, 'D');
 
     $target_unit_list = 0;
-    foreach(classSupernova::$gc->groupFleet as $unit_id) {
+    foreach (classSupernova::$gc->groupFleet as $unit_id) {
       $target_unit_list += max(0, mrc_get_level($target_user_row, $target_planet_row, $unit_id, false, true));
     }
 
     $spy_detected = $spy_probes * $target_unit_list / 4 * pow(2, $TargetSpyLvl - $CurrentSpyLvl);
 
-    if(mt_rand(0, 99) > $spy_detected) {
+    if (mt_rand(0, 99) > $spy_detected) {
       $spy_outcome_str = sprintf(classLocale::$lang['sys_mess_spy_detect_chance'], $spy_detected);
       $spy_detected = false;
     } else {
@@ -134,7 +134,7 @@ 
     $target_message = "{$classLocale['sys_mess_spy_ennemyfleet']} {$spying_planet_row['name']} " . uni_render_coordinates_href($spying_planet_row, '', 3);
     $target_message .= " {$classLocale['sys_mess_spy_seen_at']} {$target_planet_row['name']} " . uni_render_coordinates($target_planet_row);
 
-    if($spy_detected) {
+    if ($spy_detected) {
       $debris_planet_id = $target_planet_row['planet_type'] == PT_PLANET ? $target_planet_row['id'] : $target_planet_row['parent_planet'];
 
       $spy_cost = get_unit_param(SHIP_SPY, P_COST);
@@ -156,7 +156,7 @@ 
     DBStaticMessages::msg_send_simple_message($objFleet->target_owner_id, '', $objFleet->time_arrive_to_target, MSG_TYPE_SPY, classLocale::$lang['sys_mess_spy_control'], classLocale::$lang['sys_mess_spy_activity'], $target_message);
   }
 
-  if($spy_detected) {
+  if ($spy_detected) {
     $objFleet->dbDelete();
   } else {
     $objFleet->markReturnedAndSave();

includes/includes/mrc_mercenary.php

Doc Comments +4 added lines

@@ -26,6 +26,10 @@
   return true;
 }
 
+/**
+ * @param integer $mode
+ * @param integer $mercenary_id
+ */
 function mrc_mercenary_hire($mode, $user, $mercenary_id) {
   global $config, $lang, $sn_powerup_buy_discounts;
 

Spacing +24 added lines, -24 removed lines

@@ -4,13 +4,13 @@ 
 
 function mrc_officer_accessible(&$user, $mercenary_id) {
   $mercenary_info = get_unit_param($mercenary_id);
-  if(classSupernova::$config->empire_mercenary_temporary || $mercenary_info[P_UNIT_TYPE] == UNIT_PLANS) {
+  if (classSupernova::$config->empire_mercenary_temporary || $mercenary_info[P_UNIT_TYPE] == UNIT_PLANS) {
     return true;
   }
 
-  if(isset($mercenary_info[P_REQUIRE])) {
-    foreach($mercenary_info[P_REQUIRE] as $unit_id => $unit_level) {
-      if(mrc_get_level($user, null, $unit_id) < $unit_level) {
+  if (isset($mercenary_info[P_REQUIRE])) {
+    foreach ($mercenary_info[P_REQUIRE] as $unit_id => $unit_level) {
+      if (mrc_get_level($user, null, $unit_id) < $unit_level) {
         return false;
       }
     }
@@ -26,35 +26,35 @@ 
     $is_permanent = $mode == UNIT_PLANS || !classSupernova::$config->empire_mercenary_temporary;
     $cost_alliance_multiplyer = (SN_IN_ALLY === true && $mode == UNIT_PLANS ? classSupernova::$config->ali_bonus_members : 1);
     $cost_alliance_multiplyer = $cost_alliance_multiplyer >= 1 ? $cost_alliance_multiplyer : 1;
-    if(!in_array($mercenary_id, sn_get_groups($mode == UNIT_PLANS ? 'plans' : 'mercenaries'))) {
+    if (!in_array($mercenary_id, sn_get_groups($mode == UNIT_PLANS ? 'plans' : 'mercenaries'))) {
       throw new Exception(classLocale::$lang['mrc_msg_error_wrong_mercenary'], ERR_ERROR);
     }
 
-    if(!mrc_officer_accessible($user, $mercenary_id)) {
+    if (!mrc_officer_accessible($user, $mercenary_id)) {
       throw new Exception(classLocale::$lang['mrc_msg_error_requirements'], ERR_ERROR);
     }
 
     $mercenary_level = sys_get_param_int('mercenary_level');
-    if($mercenary_level < 0 || $mercenary_level > get_unit_param($mercenary_id, P_MAX_STACK)) {
+    if ($mercenary_level < 0 || $mercenary_level > get_unit_param($mercenary_id, P_MAX_STACK)) {
       throw new Exception(classLocale::$lang['mrc_msg_error_wrong_level'], ERR_ERROR);
     }
 
-    if($mercenary_level && !array_key_exists($mercenary_period = sys_get_param_int('mercenary_period'), $sn_powerup_buy_discounts)) {
+    if ($mercenary_level && !array_key_exists($mercenary_period = sys_get_param_int('mercenary_period'), $sn_powerup_buy_discounts)) {
       throw new Exception(classLocale::$lang['mrc_msg_error_wrong_period'], ERR_ERROR);
     }
 
     sn_db_transaction_start();
 
     $mercenary_level_old = mrc_get_level($user, $planetrow, $mercenary_id, true, true);
-    if(classSupernova::$config->empire_mercenary_temporary && $mercenary_level_old && $mercenary_level) {
+    if (classSupernova::$config->empire_mercenary_temporary && $mercenary_level_old && $mercenary_level) {
       throw new Exception(classLocale::$lang['mrc_msg_error_already_hired'], ERR_ERROR); // Can't hire already hired temp mercenary - dismiss first
-    } elseif(classSupernova::$config->empire_mercenary_temporary && !$mercenary_level_old && !$mercenary_level) {
+    } elseif (classSupernova::$config->empire_mercenary_temporary && !$mercenary_level_old && !$mercenary_level) {
       throw new Exception('', ERR_NONE); // Can't dismiss (!$mercenary_level) not hired (!$mercenary_level_old) temp mercenary. But no error
     }
 
-    if($mercenary_level) {
+    if ($mercenary_level) {
       $darkmater_cost = eco_get_total_cost($mercenary_id, $mercenary_level);
-      if(!classSupernova::$config->empire_mercenary_temporary && $mercenary_level_old) {
+      if (!classSupernova::$config->empire_mercenary_temporary && $mercenary_level_old) {
         $darkmater_cost_old = eco_get_total_cost($mercenary_id, $mercenary_level_old);
         $darkmater_cost[BUILD_CREATE][RES_DARK_MATTER] -= $darkmater_cost_old[BUILD_CREATE][RES_DARK_MATTER];
       }
@@ -64,13 +64,13 @@ 
     }
     $darkmater_cost *= $cost_alliance_multiplyer;
 
-    if(mrc_get_level($user, null, RES_DARK_MATTER) < $darkmater_cost) {
+    if (mrc_get_level($user, null, RES_DARK_MATTER) < $darkmater_cost) {
       throw new Exception(classLocale::$lang['mrc_msg_error_no_resource'], ERR_ERROR);
     }
 
-    if(($darkmater_cost && $mercenary_level) || !$is_permanent) {
+    if (($darkmater_cost && $mercenary_level) || !$is_permanent) {
       $unit_row = db_unit_by_location($user['id'], LOC_USER, $user['id'], $mercenary_id);
-      if(is_array($unit_row) && ($dismiss_left_days = floor((strtotime($unit_row['unit_time_finish']) - SN_TIME_NOW) / PERIOD_DAY))) {
+      if (is_array($unit_row) && ($dismiss_left_days = floor((strtotime($unit_row['unit_time_finish']) - SN_TIME_NOW) / PERIOD_DAY))) {
         $dismiss_full_cost = eco_get_total_cost($mercenary_id, $unit_row['unit_level']);
         $dismiss_full_cost = $dismiss_full_cost[BUILD_CREATE][RES_DARK_MATTER];
 
@@ -83,7 +83,7 @@ 
       db_unit_list_delete($user['id'], LOC_USER, $user['id'], $mercenary_id);
     }
 
-    if($darkmater_cost && $mercenary_level) {
+    if ($darkmater_cost && $mercenary_level) {
       db_unit_set_insert(
         "unit_player_id = {$user['id']},
         unit_location_type = " . LOC_USER . ",
@@ -100,7 +100,7 @@ 
     }
     sn_db_transaction_commit();
     sys_redirect($_SERVER['REQUEST_URI']);
-  } catch(Exception $e) {
+  } catch (Exception $e) {
     sn_db_transaction_rollback();
     $operation_result = array(
       'STATUS'  => in_array($e->getCode(), array(ERR_NONE, ERR_WARNING, ERR_ERROR)) ? $e->getCode() : ERR_ERROR,
@@ -118,7 +118,7 @@ 
   $mode = in_array($mode, array(UNIT_MERCENARIES, UNIT_PLANS)) ? $mode : UNIT_MERCENARIES;
   $is_permanent = $mode == UNIT_PLANS || !classSupernova::$config->empire_mercenary_temporary;
 
-  if($mercenary_id = sys_get_param_int('mercenary_id')) {
+  if ($mercenary_id = sys_get_param_int('mercenary_id')) {
     $operation_result = mrc_mercenary_hire($mode, $user, $mercenary_id);
   }
 
@@ -126,11 +126,11 @@ 
 
   $template = gettemplate('mrc_mercenary_hire', true);
 
-  if(!empty($operation_result)) {
+  if (!empty($operation_result)) {
     $template->assign_block_vars('result', $operation_result);
   }
 
-  foreach($sn_powerup_buy_discounts as $hire_period => $hire_discount) {
+  foreach ($sn_powerup_buy_discounts as $hire_period => $hire_discount) {
     $template->assign_block_vars('period', array(
       'LENGTH'   => $hire_period,
       'TEXT'     => classLocale::$lang['mrc_period_list'][$hire_period],
@@ -142,12 +142,12 @@ 
   $user_dark_matter = mrc_get_level($user, null, RES_DARK_MATTER);
   $cost_alliance_multiplyer = (SN_IN_ALLY === true && $mode == UNIT_PLANS ? classSupernova::$config->ali_bonus_members : 1);
   $cost_alliance_multiplyer = $cost_alliance_multiplyer >= 1 ? $cost_alliance_multiplyer : 1;
-  foreach(sn_get_groups($mode == UNIT_PLANS ? 'plans' : 'mercenaries') as $mercenary_id) {
+  foreach (sn_get_groups($mode == UNIT_PLANS ? 'plans' : 'mercenaries') as $mercenary_id) {
     {
       $mercenary = get_unit_param($mercenary_id);
       $mercenary_bonus = $mercenary['bonus'];
       $mercenary_bonus = $mercenary_bonus >= 0 ? "+{$mercenary_bonus}" : "{$mercenary_bonus}";
-      switch($mercenary['bonus_type']) {
+      switch ($mercenary['bonus_type']) {
         case BONUS_PERCENT:
           $mercenary_bonus = "{$mercenary_bonus}% ";
         break;
@@ -164,7 +164,7 @@ 
       $mercenary_level = mrc_get_level($user, null, $mercenary_id, false, true);
       $mercenary_level_bonus = max(0, mrc_get_level($user, null, $mercenary_id) - $mercenary_level);
       $total_cost_old = 0;
-      if($is_permanent) {
+      if ($is_permanent) {
         $total_cost_old = eco_get_total_cost($mercenary_id, $mercenary_level);
         $total_cost_old = $total_cost_old[BUILD_CREATE][RES_DARK_MATTER] * $cost_alliance_multiplyer;
       }
@@ -193,7 +193,7 @@ 
       ));
 
       $upgrade_cost = 1;
-      for($i = classSupernova::$config->empire_mercenary_temporary ? 1 : $mercenary_level + 1; $mercenary['max'] ? ($i <= $mercenary['max']) : $upgrade_cost <= $user_dark_matter; $i++) {
+      for ($i = classSupernova::$config->empire_mercenary_temporary ? 1 : $mercenary_level + 1; $mercenary['max'] ? ($i <= $mercenary['max']) : $upgrade_cost <= $user_dark_matter; $i++) {
         $total_cost = eco_get_total_cost($mercenary_id, $i);
         $total_cost[BUILD_CREATE][RES_DARK_MATTER] *= $cost_alliance_multiplyer;
         $upgrade_cost = $total_cost[BUILD_CREATE][RES_DARK_MATTER] - $total_cost_old;

admin/add_moon.php

Spacing +2 added lines, -2 removed lines

@@ -14,14 +14,14 @@
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
 
 // if ($user['authlevel'] < 2)
-if($user['authlevel'] < 3)
+if ($user['authlevel'] < 3)
 {
   AdminMessage($lang['adm_err_denied']);
 }
 
 $template = gettemplate("admin/add_moon", true);
 
-if(sys_get_param_str('mode') == 'addit')
+if (sys_get_param_str('mode') == 'addit')
 {
   $PlanetID = sys_get_param_id('user');
   $MoonName = sys_get_param_str('name');

admin/sxd/tmpl.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 // Templates
-function sxd_tpl_page(){
+function sxd_tpl_page() {
 global $SXD;
 return <<<HTML
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
@@ -291,7 +291,7 @@ 
 HTML;
 }
 
-function sxd_tpl_auth($error = ''){
+function sxd_tpl_auth($error = '') {
 global $SXD;
 return <<<HTML
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">