supernova-ws / SuperNova

admin/banned.php

Braces +2 added lines, -4 removed lines

@@ -54,15 +54,13 @@
     }
 
     $DoneMessage .= $lang['adm_bn_plnt'];
-  }
-  else
+  } else
   {
     $DoneMessage = sprintf($lang['adm_bn_errr'], $name_output);
   }
 
   AdminMessage($DoneMessage, $lang['adm_ban_title']);
-}
-elseif($mode == 'unbanit' && $action)
+} elseif($mode == 'unbanit' && $action)
 {
   sys_admin_player_ban_unset($user, $player_banned_row, ($reason = sys_get_param_str('why')) ? $reason : $lang['sys_unbanned']);
 

admin/tools.php

Braces +1 added lines, -2 removed lines

@@ -28,8 +28,7 @@
     if($config->game_watchlist)
     {
       $config->game_watchlist_array = explode(';', $config->game_watchlist);
-    }
-    else
+    } else
     {
       unset($config->game_watchlist_array);
     }

admin/sxd/index.php

Braces +290 added lines, -163 removed lines

@@ -14,7 +14,9 @@ 
 header("Content-Type: text/html; charset=utf-8");
 //error_reporting(E_ALL);
 error_reporting(0);
-if (!ini_get('zlib.output_compression') && function_exists('ob_gzhandler')) ob_start('ob_gzhandler');
+if (!ini_get('zlib.output_compression') && function_exists('ob_gzhandler')) {
+  ob_start('ob_gzhandler');
+}
 set_error_handler('sxd_error_handler');
 register_shutdown_function('sxd_shutdown');
 $SXD = new Sypex_Dumper();
@@ -47,8 +49,11 @@ 
 				}
 			}
 		}
-		if(file_exists("lang/lng_{$lng_name}.php")) include("lang/lng_{$lng_name}.php");
-		else include("lang/lng_en.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;
@@ -59,8 +64,11 @@ 
 		}
 		include('cfg.php');
 		$this->loadLang($CFG['lang']);
-		if (!ini_get('safe_mode') && function_exists('set_time_limit') && strpos(ini_get('disable_functions'), 'set_time_limit') === false) @set_time_limit($CFG['time_web']);
-		elseif (ini_get('max_execution_time') < $CFG['time_web']) $CFG['time_web'] = ini_get('max_execution_time');
+		if (!ini_get('safe_mode') && function_exists('set_time_limit') && strpos(ini_get('disable_functions'), 'set_time_limit') === false) {
+		  @set_time_limit($CFG['time_web']);
+		} elseif (ini_get('max_execution_time') < $CFG['time_web']) {
+		  $CFG['time_web'] = ini_get('max_execution_time');
+		}
 		$this->CFG = &$CFG;
 		$this->try = false;
 		$this->virtualize = false;
@@ -93,13 +101,17 @@ 
 		    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';
 		    }
-		    else echo 'Auth error';
 		    exit;
-		}
-		elseif(!empty($this->CFG['auth'])){ // Авторизация
+		} elseif(!empty($this->CFG['auth'])){ // Авторизация
 			$auth = false;
 			$sfile = 'ses.php';
 			
@@ -129,18 +141,25 @@ 
 										$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());
 					$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);
-					else setcookie('sxd', $key, !empty($_POST['save']) ? time() + 31536000 : 0, '', '', false);
+					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;
 				}
@@ -164,9 +183,15 @@ 
 				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){
 		$fp = fopen($name, "w");
@@ -183,11 +208,13 @@ 
 			$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();
-			else mysql_query('SET NAMES utf8') or sxd_my_error();
+			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()));
-		}
-		else {
+		} else {
 			define('V_MYSQL', 0); 
 			$this->error = "sxd.actions.tab_connects();alert(" . sxd_esc(mysql_error()) . ");";
 		}	
@@ -240,7 +267,9 @@ 
 			$this->addCombo('db_charset', 0, 9, 'collation', $this->getCollationList()) .
 			$this->addCombo('db_charset_col', 0, 15, 'collation:db_charset')
 		;
-		if (!V_MYSQL) $this->VAR['combos'] .= $this->error;
+		if (!V_MYSQL) {
+		  $this->VAR['combos'] .= $this->error;
+		}
 		$this->VAR['combos']   .= $this->getSavedJobs() . "sxd.confirms = {$this->CFG['confirm']};sxd.actions.dblist();";
 		$this->LNG['del_date']  = sprintf($this->LNG['del_date'], '<input type="text" id="del_time" class=txt style="width:24px;" maxlength="3">');
 		$this->LNG['del_count'] = sprintf($this->LNG['del_count'], '<input id="del_count" type="text" class=txt style="width:18px;" maxlength="2">');
@@ -298,7 +327,9 @@ 
 			case 'delete_file':
 				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;
@@ -329,7 +360,9 @@ 
 	}
 	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';
@@ -339,9 +372,9 @@ 
 		$r = mysql_query('DROP DATABASE `' . sxd_esc($name, false) . '`') or sxd_my_error();
 		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()) . ");";
+		} else {
+                	echo "alert(" . sxd_esc(mysql_error()) . ");";
+        }
 	}
 	function cfg2js($cfg){
 		foreach($cfg AS $k => $v){
@@ -351,16 +384,19 @@ 
 	}
 	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)
-        	echo "sxd.addOpt(" . sxd_php2json(array('db' => array($req['name'] => "{$req['name']} (0)"))) . ");";
-        else
-        	 sxd_my_error();
+        if($r) {
+                	echo "sxd.addOpt(" . sxd_php2json(array('db' => array($req['name'] => "{$req['name']} (0)"))) . ");";
+        } else {
+                	 sxd_my_error();
+        }
 	}
 	function saveConnect($req){
 		$this->CFG['my_host'] = $req['host'];
 		$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();
@@ -372,8 +408,7 @@ 
         		'collation' => $this->getCollationList()
 			);
 	        echo "sxd.clearOpt('db');sxd.clearOpt('charset');sxd.clearOpt('collation');sxd.addOpt(" . sxd_php2json($tmp) . ");sxd.combos.backup_db.select(0,'-');sxd.combos.restore_db.select(0,'-');sxd.combos.services_db.select(0,'-');sxd.combos.backup_charset.select(0,'-');sxd.combos.services_db.select(0,'-');sxd.combos.db_charset.select(0,'-');";
-		}
-		else {
+		} else {
 			 echo $this->error;
 		}
 	}
@@ -406,11 +441,17 @@ 
 			$filter = $object = array();
 			$this->createFilters($job['obj'], $filter, $object);
 			$r = mysql_query('SHOW TABLE STATUS') or sxd_my_error();
-			if (!$r) return;
+			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']}`";
+				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);
 			
@@ -419,7 +460,9 @@ 
 			}
 			
 			$r = mysql_query($sql) or sxd_my_error();
-			if (!$r) return;
+			if (!$r) {
+			  return;
+			}
 			$res = array();
 			while($item = mysql_fetch_row($r)){
 				$res[] = $item;
@@ -436,8 +479,7 @@ 
 				foreach($obj[$type] AS $v){
 					if(strpos($v, '*') !== false) {
 						$filter[$type][] = str_replace('*', '.*?', $v); 
-					}
-					else {
+					} else {
 						$object[$type][$v] = true;
 					}
 				}
@@ -460,14 +502,15 @@ 
 		$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)){
 			$this->rtl = explode("\t", $t);	
-		}
-		else {
+		} else {
 			$this->addLog($this->LNG['not_found_rtl']);
 			exit;
 		}
@@ -477,8 +520,11 @@ 
 		$this->rtl[1] = time();
 		$this->rtl[9] = 0;
 		fwrite($this->fh_rtl, implode("\t", $this->rtl));
-		if ($this->JOB['act'] == 'backup') $this->runBackupJob(true);
-		elseif ($this->JOB['act'] == 'restore') $this->runRestoreJob(true);
+		if ($this->JOB['act'] == 'backup') {
+		  $this->runBackupJob(true);
+		} elseif ($this->JOB['act'] == 'restore') {
+		  $this->runRestoreJob(true);
+		}
 	}
 	function addRestoreJob($job) {
 		$this->closeConnect();
@@ -493,9 +539,10 @@ 
 		$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;}
-			if (empty($list)) continue;
+			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){
@@ -503,11 +550,11 @@ 
 						$type = '';
 						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;
 						}
-						else continue;
 						$todo['TA'][]   = array($type, $item[0], $item[1], $item[2]);
 						$rows += $type == 'TA' ? $item[1] : 0;
 					break;
@@ -522,15 +569,21 @@ 
 		$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'])) {
 			$s = fread($this->fh_tmp, 2048);
-			if(strpos($s, "\r\n")) $this->JOB['eol'] = "\r\n";
-			elseif(strpos($s, "\n")) $this->JOB['eol'] = "\n";
-			else $this->JOB['eol'] = "\r";
+			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);
 		}
@@ -548,11 +601,17 @@ 
 		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 = '';
@@ -583,8 +642,12 @@ 
 		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 = '';
@@ -648,13 +711,16 @@ 
 				case 'C':
 					$ex = 1;
 					if (preg_match('/^CREATE TABLE `/', $q)) {
-						if($this->JOB['strategy'] != 0 && isset($tab_exists[$this->rtl[5]])) $ex = 0;
-						else {
+						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']))){
 								$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]) . ')' : '';
@@ -675,11 +741,9 @@ 
 							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 {
+						} else {
 							$this->rtl[4] = $m[1];
 							$this->rtl[5] = $m[2];
 							$this->rtl[7] = 0;
@@ -704,8 +768,7 @@ 
 					if($insert) {
 						$c = 1;
 					}
-				}
-				else {
+				} else {
 					error_log(date('r') . "\n----------\n{$q}\n", 3, "backup/sql_error.log");
 					sxd_my_error();
 				}
@@ -731,7 +794,9 @@ 
 		$this->rtl[7] = 0;
 		$this->rtl[8] = 0;
 		foreach($this->JOB['todo']['TA'] AS $tab){
-			if ($tab[0] == 'TC') continue;
+			if ($tab[0] == 'TC') {
+			  continue;
+			}
 			mysql_query("ALTER TABLE `{$tab[1]}` ENABLE KEYS") or sxd_my_error();
 			$this->rtl[1] = time();
 			$this->rtl[5] = $tab[1];
@@ -770,7 +835,9 @@ 
 		$delimiter = ";";
 		while($q = sxd_read_sql($this->fh_tmp, $seek, $ei, $delimiter, $this->JOB['eol'])){
 			$q = ltrim($q);
-			if(empty($q)) break;
+			if(empty($q)) {
+			  break;
+			}
 			if($time_old < time()) {
 				if(file_exists($this->JOB['file_stp'])){
 					$type = file_get_contents($this->JOB['file_stp']);
@@ -829,8 +896,7 @@ 
 							//mysql_query("DROP TABLE IF EXISTS `{$tab}`");
 							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'])){
+							} elseif(empty($this->JOB['charset'])){
 								if(preg_match("/(CHARACTER SET|CHARSET)[=\s]+(\w+)/i", $q, $charset)){
 									$this->setNames($charset[2]);
 								}
@@ -849,8 +915,9 @@ 
 							$this->JOB['charset'] = $m[1];
 							$this->setNames($this->JOB['charset']);
 							$ex = 0;
+						} else {
+						  $ex = 1;
 						}
-						else $ex = 1;
 					break;
 					default: 
 						$insert = '';
@@ -868,8 +935,7 @@ 
 					if($insert) {
 						$c = 1;
 					}
-				}
-				else {
+				} else {
 					error_log("-----------------\n{$q}\n", 3, "error.log");
 					sxd_my_error();
 				}
@@ -914,17 +980,22 @@ 
 			$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){
 			$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;
+			if (!$r) {
+			  continue;
+			}
 			$todo[$t] = array();
 			$header[$t] = array();
 			
@@ -939,16 +1010,15 @@ 
 								$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'] = '';
+						} else {
+						  continue;
 						}
-						else continue;
 						$todo['TA'][]   = array($t, $n, !empty($item['Collation']) ? $item['Collation'] : '', $item['Auto_increment'], $item['Rows'], $item['Data_length']);
 						$header['TA'][] = "{$n}`{$item['Rows']}`{$item['Data_length']}";
 						$tabs++;
@@ -979,7 +1049,9 @@ 
 				foreach($views AS $n => $view) {
 					$can_dumped = true;
 					foreach($view AS $k) {
-						if (isset($views[$k]) && !isset($dumped[$k])) $can_dumped = false;	
+						if (isset($views[$k]) && !isset($dumped[$k])) {
+						  $can_dumped = false;
+						}
 					}
 					if ($can_dumped) {
 						if(sxd_check($n, $object['VI'], $filter['VI'])){
@@ -999,7 +1071,9 @@ 
 		$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'];
@@ -1007,7 +1081,9 @@ 
 		$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){
-			if (!empty($o)) $fcache .= "#{$t} " . implode('|', $o) . "\n";	
+			if (!empty($o)) {
+			  $fcache .= "#{$t} " . implode('|', $o) . "\n";
+			}
 		}
 		$this->fh_rtl = fopen($this->JOB['file_rtl'], 'wb');
 		$this->fh_log = fopen($this->JOB['file_log'], 'wb');
@@ -1027,20 +1103,26 @@ 
 		$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){
-			if (empty($this->rtl[4])) $this->rtl[4] = $t;
-			elseif ($this->rtl[4] != $t) continue;
+			if (empty($this->rtl[4])) {
+			  $this->rtl[4] = $t;
+			} elseif ($this->rtl[4] != $t) {
+			  continue;
+			}
 			foreach($o AS $n){ 
 				if (empty($this->rtl[5])) {
 					$this->rtl[5] = $n[1];
 					$this->rtl[7] = 0;
 					$this->rtl[8] = !empty($n[4]) ? $n[4] : 0;
+				} elseif ($this->rtl[5] != $n[1]) {
+				  continue;
 				}
-				elseif ($this->rtl[5] != $n[1]) continue;
 				// Делаем бэкап
 				switch($n[0]){
 					case 'TC':
@@ -1054,11 +1136,12 @@ 
 						    $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";
-						}
-						else {
+						} else {
 							$from = " LIMIT {$this->rtl[7]}, {$this->rtl[8]}";
 							$this->addLog(sprintf("{$this->LNG['backup_TC']} {$this->LNG['continue_from']}", $n[1], $this->rtl[7]));
 						}
@@ -1101,8 +1184,7 @@ 
 								$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: Потестить скорость эскэйпинга строк
+								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]++;  
@@ -1119,8 +1201,7 @@ 
 							$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);
 							$fcache .= "#\tTR`{$n[1]}`{$n[2]}\t;\nCREATE TRIGGER `{$item['TRIGGER_NAME']}` {$item['ACTION_TIMING']} {$item['EVENT_MANIPULATION']} ON `{$item['EVENT_OBJECT_TABLE']}` FOR EACH ROW {$item['ACTION_STATEMENT']}\t;\n";
-						}
-						else {
+						} else {
 							$this->addLog(sprintf($this->LNG['backup_' . $n[0]], $n[1]));
 							$r = mysql_query("SHOW CREATE {$types[$n[0]]} `{$n[1]}`") or sxd_my_error();
 							$item = mysql_fetch_assoc($r);
@@ -1141,7 +1222,9 @@ 
 		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 = '';
@@ -1155,11 +1238,13 @@ 
                 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));
-                            else  $this->addLog(sprintf($this->LNG['del_fail'], $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);
@@ -1169,20 +1254,27 @@ 
                     $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));
-                            else  $this->addLog(sprintf($this->LNG['del_fail'], $file));
+                        	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(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));
@@ -1201,7 +1293,9 @@ 
 	}
 	function getDBList(){
 		$dbs = $items = array();
-        if (!V_MYSQL) return $dbs; 
+        if (!V_MYSQL) {
+          return $dbs;
+        }
         $qq = (V_MYSQL < 50000) ? '' : '\'';
 		if ($this->CFG['my_db']) {
 			$tmp = explode(',', $this->CFG['my_db']);
@@ -1210,11 +1304,12 @@ 
 				$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;
+    			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)";
     		}	
@@ -1227,12 +1322,13 @@ 
     	  			$dbs[$item] = "{$item} ({$tabs})";
     	  		}
 			}
-		}
-		else {
+		} 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;
+    			if($item[0] == 'information_schema' || $item[0] == 'mysql' || $item[0] == 'performance_schema') {
+    			  continue;
+    			}
     			$dbs[$item[0]] = "{$item[0]} ({$item[1]})";
     		}
 		}
@@ -1240,7 +1336,9 @@ 
 	}
 	function getCharsetList(){
 		$tmp = array(0 => '- auto -');
-		if (!V_MYSQL) return $tmp; 
+		if (!V_MYSQL) {
+		  return $tmp;
+		}
 		if(V_MYSQL > 40101) {
 			$def_charsets = '';
 			if(!empty($this->CFG['charsets'])){
@@ -1249,7 +1347,10 @@ 
     		$r = mysql_query("SHOW CHARACTER SET") or sxd_my_error(); 
     		if ($r) {
     			while($item = mysql_fetch_assoc($r)){
-    	  			if (empty($def_charsets) || preg_match($def_charsets, $item['Charset'])) $tmp[$item['Charset']] = "{$item['Charset']}"; // ({$item['Description']})
+    	  			if (empty($def_charsets) || preg_match($def_charsets, $item['Charset'])) {
+    	  			  $tmp[$item['Charset']] = "{$item['Charset']}";
+    	  			}
+    	  			// ({$item['Description']})
     			}
 			}
 		}
@@ -1257,7 +1358,9 @@ 
 	}
 	function getCollationList(){
 		$tmp = array(); 
-		if (!V_MYSQL) return $tmp; 
+		if (!V_MYSQL) {
+		  return $tmp;
+		}
 		if(V_MYSQL > 40101) {
 			$def_charsets = '';
 			if(!empty($this->CFG['charsets'])){
@@ -1266,7 +1369,9 @@ 
     		$r = mysql_query("SHOW COLLATION") or sxd_my_error(); 
     		if ($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; 
+    	  			if (empty($def_charsets) || preg_match($def_charsets, $item['Charset'])) {
+    	  			  $tmp[$item['Charset']][$item['Collation']] = $item['Default'] == 'Yes' ? 1 : 0;
+    	  			}
     			}
 			}
 		}
@@ -1282,8 +1387,7 @@ 
 			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,7 +1398,9 @@ 
 					"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++){
 					$r = mysql_query('SHOW ' . $shows[$i]);
@@ -1306,8 +1412,7 @@ 
 						}
 					}
 				}
-			}
-			else {
+			} else {
 				$objects['VI'] = array();
 			}
 		}
@@ -1316,7 +1421,9 @@ 
 	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'))";}
 		$fp   = $this->openFile($name, 'r');
@@ -1332,8 +1439,7 @@ 
 			for($i = 0, $l = count($objects['TA']); $i < $l; $i++){
 				$objects['TA'][$i] = explode('`', $objects['TA'][$i]);
 			}
-		}
-		else {
+		} 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;
@@ -1355,14 +1461,18 @@ 
 			$t = $objects['TA'][$i];
 			$tab_prefix = preg_match("/^([a-z0-9]+_)/", $t[0], $m) ? $m[1] : '*';
 			if ($tab_prefix != $tab_prefix_last) {
-				if ($tab_prefix != '*') $objects['TA']['*'][] = $tab_prefix;
+				if ($tab_prefix != '*') {
+				  $objects['TA']['*'][] = $tab_prefix;
+				}
 				$tab_prefix_last = $tab_prefix;
 			}
 			$objects['TA'][$tab_prefix][] = $t;
 			unset($objects['TA'][$i]);
 		}
 		foreach($objects AS $type => $o){
-			if(!count($o)) continue;
+			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],";
@@ -1377,8 +1487,7 @@ 
 								$obj .= "[{$row},{$pid}," . sxd_esc($o[$value][$i][0]) . ",2,{$checked},{$o[$value][$i][2]}],";
 								$row++;
 							}
-						}
-						else {
+						} else {
 							$value = $o[$value][0];	
 						}
 					}
@@ -1389,8 +1498,7 @@ 
 						$row++;	
 					}
 				}
-			}
-			else {
+			} else {
 				$obj .= "[{$row},0," . sxd_esc($info[$type][0]) . ",{$info[$type][1]},1,1],";
 				$pid = $row++;
 				$info[$type][1]++;
@@ -1402,7 +1510,9 @@ 
 			} 
 		}
 		$add = '';
-		if($tree == 'restore') $add = "z('autoinc').disabled = z('restore_type').disabled = " . ($obj ? 'false' : 'true') . ";";
+		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(){
@@ -1431,14 +1541,12 @@ 
         }
         if(count($sj['sj_backup']) > 0){
         	ksort($sj['sj_backup']);	
-		}
-        else {
+		} else {
         	$sj['sj_backup'] = array(0 => '<b>No Saved Jobs</b><br>' . $this->LNG['no_saved']);	
 		}
 		if(count($sj['sj_restore']) > 0){
         	ksort($sj['sj_restore']);	
-		}
-        else {
+		} else {
         	$sj['sj_restore'] = array(0 => '<b>No Saved Jobs</b><br>' . $this->LNG['no_saved']);	
 		}
 		return "sxd.clearOpt('sj_backup');sxd.clearOpt('sj_restore');sxd.addOpt(" . sxd_php2json($sj) . ");";
@@ -1454,12 +1562,10 @@ 
                     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);	
-					}
-					else {
+					} else {
 						$files[] = array($file, '-', $ext, '-', '-', filesize($this->CFG['backup_path'] . $file), '', $file);
 					}
                 }
@@ -1477,9 +1583,10 @@ 
 	}
 	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{
+			if(preg_match('/\.(sql|sql\.bz2|sql\.gz)$/i', $name, $m)) {
+			  $this->JOB['file_ext'] = strtolower($m[1]);
+			}
+		} else{
 			switch($this->JOB['zip']) {
 				case 0 : $this->JOB['file_ext'] = 'sql'; break;
 				case 10: $this->JOB['file_ext'] = 'sql.bz2'; break;
@@ -1506,7 +1613,9 @@ 
 	$fs = ftell($f);
 	$delim_len = strlen($delimiter . $eol);
 	while($r || $s = fread($f, 61440)){
-		if(!$r) $l .= $s;
+		if(!$r) {
+		  $l .= $s;
+		}
 		$pos = strpos($l, $delimiter . $eol);
 		if ($pos !== false) {
 			// Есть окончание запроса
@@ -1538,16 +1647,24 @@ 
 	return isset($obj[$n]) || ($filt && preg_match($filt, $n));
 }
 function sxd_php2json($obj){
-	if(count($obj) == 0) return '[]';
+	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);
-        elseif (is_null($value))    $str .= 'null';
-        elseif (is_bool($value))    $str .= $value ? 'true' : 'false';
-		elseif (is_numeric($value)) $str .= $value;
-		else                        $str .= "'" . addcslashes($value, "\n\r\t'\\/") . "'";
+        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;
+		} else {
+		  $str .= "'" . addcslashes($value, "\n\r\t'\\/") . "'";
+		}
 		$str .= ',';
     }
 	return  substr_replace($str, $is_obj ? '}' : ']', -1);
@@ -1557,25 +1674,34 @@ 
 }
 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 (!$SXD->fh_log && !$SXD->fh_rtl) echo isset($_POST['ajax']) ? "alert('" . ($str) . "');" : $str;
-    	else {
+    	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 {
+    	if (!$SXD->fh_log && !$SXD->fh_rtl) {
+    	  echo isset($_POST['ajax']) ? "alert('" . ($str) . "');" : $str;
+    	} else {
     		$SXD->rtl[1] = time();
     		$SXD->rtl[9] = 5;
     		fseek($SXD->fh_rtl, 0);
@@ -1600,8 +1726,9 @@ 
 		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;
+		} else {
+		  $SXD->rtl[9] = 5;
 		}
-		else $SXD->rtl[9] = 5;
 		fseek($SXD->fh_rtl, 0);
 		fwrite($SXD->fh_rtl, implode("\t", $SXD->rtl));
 	}

admin/sxd/info.php

Braces +55 added lines, -25 removed lines

@@ -20,15 +20,21 @@ 
 	$job_name = $_POST['ajax']['job'];
 	$log_seek = !empty($_POST['ajax']['lseek']) ? (int) $_POST['ajax']['lseek'] : 0;
 	$job_file = "{$CFG['backup_path']}{$job_name}.job.php";
-	if (!file_exists($job_file)) exit;
+	if (!file_exists($job_file)) {
+	  exit;
+	}
 	include($job_file);
 	switch($_POST['ajax']['act']) {
 		case 'info':
-			if (!file_exists($JOB['file_rtl'])) exit;
+			if (!file_exists($JOB['file_rtl'])) {
+			  exit;
+			}
 			$fh = fopen($JOB['file_rtl'], 'r+b');
 			$time = time();
 			$f = explode("\t", fgets($fh));
-			if(empty($f[0])) $f[0] = $time;
+			if(empty($f[0])) {
+			  $f[0] = $time;
+			}
 			$pt = !empty($f[2]) ? round(100 * $f[10] / $f[2], 2) : 100;
 			$pc = !empty($f[8]) ? round(100 * $f[7] / $f[8], 2) : 100;
 			$lh = fopen($JOB['file_log'], 'rb');
@@ -40,17 +46,25 @@ 
 			if(!empty($rawlog)){
 				$temp = explode("\n", $rawlog);
 				foreach($temp AS $l){
-					if(empty($l)) continue;
+					if(empty($l)) {
+					  continue;
+					}
 					$t = explode("\t", $l);
-					if(count($t) < 3) continue;
+					if(count($t) < 3) {
+					  continue;
+					}
 					if($t[0] != $old_time){
-						if(!empty($logs)) $log .= "sxd.log.add('{$old_time}',[" . implode(',', $logs) . "]);";
+						if(!empty($logs)) {
+						  $log .= "sxd.log.add('{$old_time}',[" . implode(',', $logs) . "]);";
+						}
 						$old_time = $t[0];
 						$logs = array();
 					}
 					$logs[] = esc($t[2]);	
 				}
-				if(!empty($logs)) $log .= "sxd.log.add('{$old_time}',[" . implode(',', $logs) . "]);";
+				if(!empty($logs)) {
+				  $log .= "sxd.log.add('{$old_time}',[" . implode(',', $logs) . "]);";
+				}
 			}
 			$log_seek = ftell($lh);
 			echo $log . "sxd.job.log_seek = {$log_seek};";
@@ -59,22 +73,29 @@ 
 				$pt = $pc = 100; 
 				fclose($lh);
 				fclose($fh);
-				if (function_exists('usleep')) usleep(400000);
-				else sleep(1);
-				if($JOB['act'] == 'backup') $f[3] = filesize(file_exists($JOB['file_name']) ? $JOB['file_name'] : $JOB['file_tmp']);
+				if (function_exists('usleep')) {
+				  usleep(400000);
+				} else {
+				  sleep(1);
+				}
+				if($JOB['act'] == 'backup') {
+				  $f[3] = filesize(file_exists($JOB['file_name']) ? $JOB['file_name'] : $JOB['file_tmp']);
+				}
 				// Обновляем список файлов
-				if($JOB['act'] == 'backup') print "sxd.actions.filelist(); z('btn_down').file = '{$JOB['file']}'; z('btn_down').style.display = '';";
+				if($JOB['act'] == 'backup') {
+				  print "sxd.actions.filelist(); z('btn_down').file = '{$JOB['file']}'; z('btn_down').style.display = '';";
+				}
 				echo "sxd.timer.set({$f[0]},{$f[1]},{$pt});sxd.progress.current.set({$pc}, 0, {$f[8]}, {$f[8]});sxd.progress.total.set({$pt},{$f[3]});";
 				echo "sxd.log.add({$d},['{$LNG['job_done']}', '{$LNG['js']['records']}: {$f[10]}', '{$LNG['file_size']}: ' + sxd.formatSize({$f[3]},2), '{$LNG['job_time']}: {$f[5]} {$LNG['seconds']}']);sxd.hideLoading();";
 				unlink($JOB['file_log']);
 				unlink($JOB['file_rtl']);
 				unlink($job_file);
-			}
-			else if($f[9] > 0){
+			} else if($f[9] > 0){
 				echo "sxd.log.add({$d},[" . esc($LNG['stop_' . $f[9]]) . "]);" . (($f[9] == 3 || $f[9] == 4) ? 'sxd.resumeJob();' : 'sxd.hideLoading();');
-			}
-			else{
-				if($JOB['act'] == 'backup') $f[3] = filesize(file_exists($JOB['file_name']) ? $JOB['file_name'] : $JOB['file_tmp']);
+			} else{
+				if($JOB['act'] == 'backup') {
+				  $f[3] = filesize(file_exists($JOB['file_name']) ? $JOB['file_name'] : $JOB['file_tmp']);
+				}
 				if($f[4] != 'EK' && time() > $f[1] + 45) {
 					fopen($JOB['file_stp'],'w');
 					$f[9] = 0;
@@ -95,8 +116,9 @@ 
 			echo "sxd.log.add({$d},[" . esc($LNG['stop_job']) . "]);";
 		break;
 	}
+} else {
+  echo "sxd.hideLoading();";
 }
-else echo "sxd.hideLoading();";	
 
 function load_lang($lng_name = 'auto'){
 	if($lng_name == 'auto'){
@@ -111,26 +133,34 @@ 
 			}
 		}
 	}
-	if(file_exists("lang/lng_{$lng_name}.php")) return "lang/lng_{$lng_name}.php";
-	else return "lang/lng_en.php";
-}
+	if(file_exists("lang/lng_{$lng_name}.php")) {
+	  return "lang/lng_{$lng_name}.php";
+	} else {
+	  return "lang/lng_en.php";
+	}
+	}
 function esc($str){
 	return "'" . addcslashes($str, "\\\0\n\r\t\'") . "'";
 }
 
 function sxd_error($errno, $errmsg, $filename, $linenum, $vars){
 	global $JOB;
-	if($errno == 8192) return;
-	if(strpos($errmsg, 'timezone settings')) return;
-	if(!empty($JOB['file_stp'])) fopen($JOB['file_stp'],'w');
+	if($errno == 8192) {
+	  return;
+	}
+	if(strpos($errmsg, 'timezone settings')) {
+	  return;
+	}
+	if(!empty($JOB['file_stp'])) {
+	  fopen($JOB['file_stp'],'w');
+	}
 	$errortype = array(1 => 'Error', 2 => 'Warning', 4 => 'Parsing Error', 8 => 'Notice', 16 => 'Core Error', 32 => 'Core Warning', 64 => 'Compile Error', 
 					   128 => 'Compile Warning', 256 => 'User Error', 512 => 'User Warning', 1024 => 'User Notice');
 	$str = "{$errortype[$errno]}: {$errmsg} ({$filename}:{$linenum})";
 	//error_log("[info.php]\n{$str}\n", 3, "error.log"); 
     if($errno == 8 || $errno == 1024) {
     	echo "sxd.log.add('" . date("Y.m.d H:i:s") . "',[" . esc($str) . "], 4);sxd.hideLoading();";
-	}
-    elseif($errno < 1024) {
+	} elseif($errno < 1024) {
     	echo "sxd.log.add('" . date("Y.m.d H:i:s") . "',[" . esc($str) . "], 4);sxd.hideLoading();";
     	die;
 	}

admin/sxd/load.php

Braces +14 added lines, -6 removed lines

@@ -27,16 +27,24 @@
 	}
 }
 function sxd_php2json($obj){
-	if(count($obj) == 0) return '[]';
+	if(count($obj) == 0) {
+	  return '[]';
+	}
 	$is_obj = 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);
-        elseif (is_null($value))    $str .= 'null';
-        elseif (is_bool($value))    $str .= $value ? 'true' : 'false';
-		elseif (is_numeric($value)) $str .= $value;
-		else                        $str .= "'" . addcslashes($value, "\n\r\t'\\/") . "'";
+        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;
+		} else {
+		  $str .= "'" . addcslashes($value, "\n\r\t'\\/") . "'";
+		}
 		$str .= ',';
     }
 	return  substr_replace($str, $is_obj ? '}' : ']', -1);

admin/adm_log_main.php

Braces +3 added lines, -6 removed lines

@@ -22,12 +22,10 @@ 
 if($delete = sys_get_param_id('delete'))
 {
   doquery("DELETE FROM `{{logs}}` WHERE `log_id` = {$delete} LIMIT 1;");
-}
-elseif(sys_get_param_str('delete_update_info'))
+} elseif(sys_get_param_str('delete_update_info'))
 {
   doquery("DELETE FROM `{{logs}}` WHERE `log_code` in (103, 180, 191);");
-}
-elseif(sys_get_param_str('deleteall') == 'yes')
+} elseif(sys_get_param_str('deleteall') == 'yes')
 {
 //  doquery("TRUNCATE TABLE `{{logs}}`");
 }
@@ -51,8 +49,7 @@ 
     }
   }
   $template->assign_vars($errorInfo);
-}
-else
+} else
 {
   $template = gettemplate('admin/adm_log_main', true);
 

admin/adm_message_list.php

Braces +1 added lines, -2 removed lines

@@ -72,8 +72,7 @@
 if(sys_get_param('page_prev') && $int_page_current > 1)
 {
   $int_page_current--;
-}
-elseif(sys_get_param('page_next') && $int_page_current < $page_max)
+} elseif(sys_get_param('page_next') && $int_page_current < $page_max)
 {
   $int_page_current++;
 }

admin/includes/admin_planet_edit.inc.php

Braces +1 added lines, -2 removed lines

@@ -50,8 +50,7 @@
     $unit_amount = round($unit_amount);
     $unit_name = get_unit_param($unit_id, P_NAME);
     $result = "{$unit_name} = GREATEST(0, {$unit_name} + ({$unit_amount}))";
-  }
-  else
+  } else
   {
     $result = '';
   }

admin/planet_compensate.php

Braces +1 added lines, -2 removed lines

@@ -75,8 +75,7 @@
         'TEXT' => $error,
       ));
     }
-  }
-  else
+  } else
   {
     $template->assign_var('CHECK', 1);