supernova-ws / SuperNova

admin/sxd/info.php

Indentation +119 added lines, -119 removed lines

@@ -4,134 +4,134 @@
 error_reporting(0);
 set_error_handler("sxd_error");
 if(!empty($_POST['ajax']['job']) && preg_match("/^[\w-]+$/", $_POST['ajax']['job'])){
-	$d = date("'Y.m.d H:i:s'");
-	if(!empty($_COOKIE['sxd'])) {
-		include('ses.php');
-		if(!empty($SES[$_COOKIE['sxd']])) {
-			$CFG = &$SES[$_COOKIE['sxd']]['cfg'];
-			include(load_lang($SES[$_COOKIE['sxd']]['lng']));
-		}
-	}
-	if(empty($LNG)) {
-		include('cfg.php');
-		include(load_lang($CFG['lang']));
-		if(!empty($CFG['auth'])) {echo "sxd.log.add({$d},[" . esc($LNG['stop_5']) . " (1)]);sxd.hideLoading();"; exit;}
-	} 
-	$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;
-	include($job_file);
-	switch($_POST['ajax']['act']) {
-		case 'info':
-			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;
-			$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');
-			fseek($lh, $log_seek);
-			$rawlog = fread($lh, 8192);
-			$log = '';
-			$old_time = '';
-			$logs = array();
-			if(!empty($rawlog)){
-				$temp = explode("\n", $rawlog);
-				foreach($temp AS $l){
-					if(empty($l)) continue;
-					$t = explode("\t", $l);
-					if(count($t) < 3) continue;
-					if($t[0] != $old_time){
-						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) . "]);";
-			}
-			$log_seek = ftell($lh);
-			echo $log . "sxd.job.log_seek = {$log_seek};";
-			// Читаем лог
-			if($f[4] == 'EOJ') {
-				$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($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){
-				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']);
-				if($f[4] != 'EK' && time() > $f[1] + 45) {
-					fopen($JOB['file_stp'],'w');
-					$f[9] = 0;
-					$f[1] = $time;
-					fwrite($fh, implode("\t", $f) . "\n");
-					echo "sxd.log.add({$d},[" . esc($LNG['job_freeze']) . "]);sxd.hideLoading();z('btn_resume').style.display = '';z('btn_pause').style.display = 'none';";
-				}
-				echo "sxd.timer.set({$f[0]},{$time},{$pt});sxd.progress.current.set({$pc},0,{$f[7]}, {$f[8]});sxd.progress.total.set({$pt},{$f[3]});";	
-			}
-		break;
-		case 'stop': 
-			$fs = fopen($JOB['file_stp'],'w');
-			fwrite($fs, 1);
-			echo "sxd.log.add({$d},[" . esc($LNG['stop_job']) . "]);";
-		break;
-		case 'pause': 
-			fopen($JOB['file_stp'],'w');
-			echo "sxd.log.add({$d},[" . esc($LNG['stop_job']) . "]);";
-		break;
-	}
+  $d = date("'Y.m.d H:i:s'");
+  if(!empty($_COOKIE['sxd'])) {
+    include('ses.php');
+    if(!empty($SES[$_COOKIE['sxd']])) {
+      $CFG = &$SES[$_COOKIE['sxd']]['cfg'];
+      include(load_lang($SES[$_COOKIE['sxd']]['lng']));
+    }
+  }
+  if(empty($LNG)) {
+    include('cfg.php');
+    include(load_lang($CFG['lang']));
+    if(!empty($CFG['auth'])) {echo "sxd.log.add({$d},[" . esc($LNG['stop_5']) . " (1)]);sxd.hideLoading();"; exit;}
+  } 
+  $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;
+  include($job_file);
+  switch($_POST['ajax']['act']) {
+    case 'info':
+      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;
+      $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');
+      fseek($lh, $log_seek);
+      $rawlog = fread($lh, 8192);
+      $log = '';
+      $old_time = '';
+      $logs = array();
+      if(!empty($rawlog)){
+        $temp = explode("\n", $rawlog);
+        foreach($temp AS $l){
+          if(empty($l)) continue;
+          $t = explode("\t", $l);
+          if(count($t) < 3) continue;
+          if($t[0] != $old_time){
+            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) . "]);";
+      }
+      $log_seek = ftell($lh);
+      echo $log . "sxd.job.log_seek = {$log_seek};";
+      // Читаем лог
+      if($f[4] == 'EOJ') {
+        $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($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){
+        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']);
+        if($f[4] != 'EK' && time() > $f[1] + 45) {
+          fopen($JOB['file_stp'],'w');
+          $f[9] = 0;
+          $f[1] = $time;
+          fwrite($fh, implode("\t", $f) . "\n");
+          echo "sxd.log.add({$d},[" . esc($LNG['job_freeze']) . "]);sxd.hideLoading();z('btn_resume').style.display = '';z('btn_pause').style.display = 'none';";
+        }
+        echo "sxd.timer.set({$f[0]},{$time},{$pt});sxd.progress.current.set({$pc},0,{$f[7]}, {$f[8]});sxd.progress.total.set({$pt},{$f[3]});";	
+      }
+    break;
+    case 'stop': 
+      $fs = fopen($JOB['file_stp'],'w');
+      fwrite($fs, 1);
+      echo "sxd.log.add({$d},[" . esc($LNG['stop_job']) . "]);";
+    break;
+    case 'pause': 
+      fopen($JOB['file_stp'],'w');
+      echo "sxd.log.add({$d},[" . esc($LNG['stop_job']) . "]);";
+    break;
+  }
 }
 else echo "sxd.hideLoading();";	
 
 function load_lang($lng_name = 'auto'){
-	if($lng_name == 'auto'){
-		include('lang/list.php');
-		$lng = 'en';
-		if(preg_match_all('/[a-z]{2}(-[a-z]{2})?/', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $m)) {
-			foreach($m[0] AS $l){
-				if(isset($langs[$l])){
-					$lng_name = $l;
-					break;
-				}
-			}
-		}
-	}
-	if(file_exists("lang/lng_{$lng_name}.php")) return "lang/lng_{$lng_name}.php";
-	else return "lang/lng_en.php";
+  if($lng_name == 'auto'){
+    include('lang/list.php');
+    $lng = 'en';
+    if(preg_match_all('/[a-z]{2}(-[a-z]{2})?/', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $m)) {
+      foreach($m[0] AS $l){
+        if(isset($langs[$l])){
+          $lng_name = $l;
+          break;
+        }
+      }
+    }
+  }
+  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\'") . "'";
+  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');
-	$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"); 
+  global $JOB;
+  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();";
-	}
+      echo "sxd.log.add('" . date("Y.m.d H:i:s") . "',[" . esc($str) . "], 4);sxd.hideLoading();";
+  }
     elseif($errno < 1024) {
-    	echo "sxd.log.add('" . date("Y.m.d H:i:s") . "',[" . esc($str) . "], 4);sxd.hideLoading();";
-    	die;
-	}
+      echo "sxd.log.add('" . date("Y.m.d H:i:s") . "',[" . esc($str) . "], 4);sxd.hideLoading();";
+      die;
+  }
 }
\ No newline at end of file

Spacing +37 added lines, -37 removed lines

@@ -3,32 +3,32 @@ 
 header("Content-Type: text/html; charset=utf-8");
 error_reporting(0);
 set_error_handler("sxd_error");
-if(!empty($_POST['ajax']['job']) && preg_match("/^[\w-]+$/", $_POST['ajax']['job'])){
+if (!empty($_POST['ajax']['job']) && preg_match("/^[\w-]+$/", $_POST['ajax']['job'])) {
 	$d = date("'Y.m.d H:i:s'");
-	if(!empty($_COOKIE['sxd'])) {
+	if (!empty($_COOKIE['sxd'])) {
 		include('ses.php');
-		if(!empty($SES[$_COOKIE['sxd']])) {
+		if (!empty($SES[$_COOKIE['sxd']])) {
 			$CFG = &$SES[$_COOKIE['sxd']]['cfg'];
 			include(load_lang($SES[$_COOKIE['sxd']]['lng']));
 		}
 	}
-	if(empty($LNG)) {
+	if (empty($LNG)) {
 		include('cfg.php');
 		include(load_lang($CFG['lang']));
-		if(!empty($CFG['auth'])) {echo "sxd.log.add({$d},[" . esc($LNG['stop_5']) . " (1)]);sxd.hideLoading();"; exit;}
+		if (!empty($CFG['auth'])) {echo "sxd.log.add({$d},[" . esc($LNG['stop_5']) . " (1)]);sxd.hideLoading();"; exit; }
 	} 
 	$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;
 	include($job_file);
-	switch($_POST['ajax']['act']) {
+	switch ($_POST['ajax']['act']) {
 		case 'info':
 			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');
@@ -37,46 +37,46 @@ 
 			$log = '';
 			$old_time = '';
 			$logs = array();
-			if(!empty($rawlog)){
+			if (!empty($rawlog)) {
 				$temp = explode("\n", $rawlog);
-				foreach($temp AS $l){
-					if(empty($l)) continue;
+				foreach ($temp AS $l) {
+					if (empty($l)) continue;
 					$t = explode("\t", $l);
-					if(count($t) < 3) continue;
-					if($t[0] != $old_time){
-						if(!empty($logs)) $log .= "sxd.log.add('{$old_time}',[" . implode(',', $logs) . "]);";
+					if (count($t) < 3) continue;
+					if ($t[0] != $old_time) {
+						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};";
 			// Читаем лог
-			if($f[4] == 'EOJ') {
+			if ($f[4] == 'EOJ') {
 				$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 ($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']);
-				if($f[4] != 'EK' && time() > $f[1] + 45) {
-					fopen($JOB['file_stp'],'w');
+			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;
 					$f[1] = $time;
 					fwrite($fh, implode("\t", $f) . "\n");
@@ -86,51 +86,51 @@ 
 			}
 		break;
 		case 'stop': 
-			$fs = fopen($JOB['file_stp'],'w');
+			$fs = fopen($JOB['file_stp'], 'w');
 			fwrite($fs, 1);
 			echo "sxd.log.add({$d},[" . esc($LNG['stop_job']) . "]);";
 		break;
 		case 'pause': 
-			fopen($JOB['file_stp'],'w');
+			fopen($JOB['file_stp'], 'w');
 			echo "sxd.log.add({$d},[" . esc($LNG['stop_job']) . "]);";
 		break;
 	}
 }
 else echo "sxd.hideLoading();";	
 
-function load_lang($lng_name = 'auto'){
-	if($lng_name == 'auto'){
+function load_lang($lng_name = 'auto') {
+	if ($lng_name == 'auto') {
 		include('lang/list.php');
 		$lng = 'en';
-		if(preg_match_all('/[a-z]{2}(-[a-z]{2})?/', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $m)) {
-			foreach($m[0] AS $l){
-				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")) return "lang/lng_{$lng_name}.php";
+	if (file_exists("lang/lng_{$lng_name}.php")) return "lang/lng_{$lng_name}.php";
 	else return "lang/lng_en.php";
 }
-function esc($str){
+function esc($str) {
 	return "'" . addcslashes($str, "\\\0\n\r\t\'") . "'";
 }
 
-function sxd_error($errno, $errmsg, $filename, $linenum, $vars){
+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) {
+    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;
 	}

Braces +58 added lines, -28 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,10 +116,11 @@ 
 			echo "sxd.log.add({$d},[" . esc($LNG['stop_job']) . "]);";
 		break;
 	}
+} else {
+  echo "sxd.hideLoading();";
 }
-else echo "sxd.hideLoading();";	
 
-function load_lang($lng_name = 'auto'){
+function load_lang($lng_name = 'auto') {
 	if($lng_name == 'auto'){
 		include('lang/list.php');
 		$lng = 'en';
@@ -111,26 +133,34 @@ 
 			}
 		}
 	}
-	if(file_exists("lang/lng_{$lng_name}.php")) return "lang/lng_{$lng_name}.php";
-	else return "lang/lng_en.php";
-}
-function esc($str){
+	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){
+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;
 	}

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

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

admin/sxd/cfg.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-$CFG = array (
+$CFG = array(
   'charsets' => 'cp1251 utf8 latin1',
   'lang' => 'auto',
   'time_web' => '600',

admin/sxd/load.php

Indentation +32 added lines, -32 removed lines

@@ -1,43 +1,43 @@
 <?php
 error_reporting(0);
 if(!empty($_SERVER['QUERY_STRING']) && preg_match("/^(\w+)(\.v\d+)?(pro)?\.(lng\.js|js|css|gif|png|ico)$/", $_SERVER['QUERY_STRING'], $m)){
-	$compress = true;
-	$skin = '';
-	$file = $skin;
-	header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 1209600) . ' GMT');
-	header('Cache-Control: max-age=1209600, public');
-	switch($m[4]) {
-		case 'css': $type = 'text/css; charset=UTF-8'; break;
-		case 'js':  $type = 'application/x-javascript; charset=UTF-8'; break;
-		case 'lng.js': 
-			header('Content-Type: application/x-javascript; charset=UTF-8');
-			//if(!ini_get('zlib.output_compression') && function_exists('ob_gzhandler')) ob_start('ob_gzhandler');
-			include("lang/lng_{$m[1]}.php");
-			echo 'sxdlng = ' . sxd_php2json($LNG['js']) . ';';
-			exit;
-		case 'png': $file = 'img/'; $type = 'image/png';$compress = false; break;
-		case 'gif': $file = 'img/'; $type = 'image/gif';$compress = false; break;
-		case 'ico': $file = ''; $type = 'image/x-icon';$compress = false; break;
-	}	
-	$file .= $m[1] . '.' . $m[4];
-	if(is_file($file)){
-		//if($compress) if(!ini_get('zlib.output_compression') && function_exists('ob_gzhandler')) ob_start('ob_gzhandler');
-		header('Content-Type: ' . $type);
-		readfile($file);exit;
-	}
+  $compress = true;
+  $skin = '';
+  $file = $skin;
+  header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 1209600) . ' GMT');
+  header('Cache-Control: max-age=1209600, public');
+  switch($m[4]) {
+    case 'css': $type = 'text/css; charset=UTF-8'; break;
+    case 'js':  $type = 'application/x-javascript; charset=UTF-8'; break;
+    case 'lng.js': 
+      header('Content-Type: application/x-javascript; charset=UTF-8');
+      //if(!ini_get('zlib.output_compression') && function_exists('ob_gzhandler')) ob_start('ob_gzhandler');
+      include("lang/lng_{$m[1]}.php");
+      echo 'sxdlng = ' . sxd_php2json($LNG['js']) . ';';
+      exit;
+    case 'png': $file = 'img/'; $type = 'image/png';$compress = false; break;
+    case 'gif': $file = 'img/'; $type = 'image/gif';$compress = false; break;
+    case 'ico': $file = ''; $type = 'image/x-icon';$compress = false; break;
+  }	
+  $file .= $m[1] . '.' . $m[4];
+  if(is_file($file)){
+    //if($compress) if(!ini_get('zlib.output_compression') && function_exists('ob_gzhandler')) ob_start('ob_gzhandler');
+    header('Content-Type: ' . $type);
+    readfile($file);exit;
+  }
 }
 function sxd_php2json($obj){
-	if(count($obj) == 0) return '[]';
-	$is_obj = isset($obj[count($obj) - 1]) ? false : true;
-	$str = $is_obj ? '{' : '[';
+  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'\\/") . "'" . ':' : ''; 
+      $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'\\/") . "'";
-		$str .= ',';
+    elseif (is_numeric($value)) $str .= $value;
+    else                        $str .= "'" . addcslashes($value, "\n\r\t'\\/") . "'";
+    $str .= ',';
     }
-	return  substr_replace($str, $is_obj ? '}' : ']', -1);
+  return  substr_replace($str, $is_obj ? '}' : ']', -1);
 }

Spacing +10 added lines, -10 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 error_reporting(0);
-if(!empty($_SERVER['QUERY_STRING']) && preg_match("/^(\w+)(\.v\d+)?(pro)?\.(lng\.js|js|css|gif|png|ico)$/", $_SERVER['QUERY_STRING'], $m)){
+if (!empty($_SERVER['QUERY_STRING']) && preg_match("/^(\w+)(\.v\d+)?(pro)?\.(lng\.js|js|css|gif|png|ico)$/", $_SERVER['QUERY_STRING'], $m)) {
 	$compress = true;
 	$skin = '';
 	$file = $skin;
 	header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 1209600) . ' GMT');
 	header('Cache-Control: max-age=1209600, public');
-	switch($m[4]) {
+	switch ($m[4]) {
 		case 'css': $type = 'text/css; charset=UTF-8'; break;
 		case 'js':  $type = 'application/x-javascript; charset=UTF-8'; break;
 		case 'lng.js': 
@@ -15,24 +15,24 @@ 
 			include("lang/lng_{$m[1]}.php");
 			echo 'sxdlng = ' . sxd_php2json($LNG['js']) . ';';
 			exit;
-		case 'png': $file = 'img/'; $type = 'image/png';$compress = false; break;
-		case 'gif': $file = 'img/'; $type = 'image/gif';$compress = false; break;
-		case 'ico': $file = ''; $type = 'image/x-icon';$compress = false; break;
+		case 'png': $file = 'img/'; $type = 'image/png'; $compress = false; break;
+		case 'gif': $file = 'img/'; $type = 'image/gif'; $compress = false; break;
+		case 'ico': $file = ''; $type = 'image/x-icon'; $compress = false; break;
 	}	
 	$file .= $m[1] . '.' . $m[4];
-	if(is_file($file)){
+	if (is_file($file)) {
 		//if($compress) if(!ini_get('zlib.output_compression') && function_exists('ob_gzhandler')) ob_start('ob_gzhandler');
 		header('Content-Type: ' . $type);
-		readfile($file);exit;
+		readfile($file); exit;
 	}
 }
-function sxd_php2json($obj){
-	if(count($obj) == 0) return '[]';
+function sxd_php2json($obj) {
+	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);
+        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;

Braces +15 added lines, -7 removed lines

@@ -26,17 +26,25 @@
 		readfile($file);exit;
 	}
 }
-function sxd_php2json($obj){
-	if(count($obj) == 0) return '[]';
+function sxd_php2json($obj) {
+	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);

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

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

admin/planet_edit.php

Spacing +7 added lines, -7 removed lines

@@ -7,7 +7,7 @@ 
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
 
 // if($user['authlevel'] < 2)
-if($user['authlevel'] < 3)
+if ($user['authlevel'] < 3)
 {
   AdminMessage($lang['adm_err_denied']);
 }
@@ -21,30 +21,30 @@ 
 $planet_id = sys_get_param_id('planet_id');
 
 $unit_list = sys_get_param('unit_list');
-if(sys_get_param('change_data') && !empty($unit_list))
+if (sys_get_param('change_data') && !empty($unit_list))
 {
   $query_string = array();
-  foreach($unit_list as $unit_id => $unit_amount)
+  foreach ($unit_list as $unit_id => $unit_amount)
   {
-    if($unit_query_string = admin_planet_edit_query_string($unit_id, $unit_amount, $mode))
+    if ($unit_query_string = admin_planet_edit_query_string($unit_id, $unit_amount, $mode))
     {
       $query_string[] = $unit_query_string;
     }
   }
 
-  if(!empty($query_string))
+  if (!empty($query_string))
   {
     db_planet_set_by_id($planet_id, implode(', ', $query_string));
   }
 }
 
-if($planet_id)
+if ($planet_id)
 {
   $edit_planet_row = db_planet_by_id($planet_id);
   admin_planet_edit_template($template, $edit_planet_row, $mode);
 }
 
-foreach($admin_planet_edit_mode_list as $page_mode => $mode_locale)
+foreach ($admin_planet_edit_mode_list as $page_mode => $mode_locale)
 {
   $template->assign_block_vars('page_menu', array(
     'ID' => $page_mode,

admin/adm_quest.php

Spacing +4 added lines, -4 removed lines

@@ -7,13 +7,13 @@
  *
  */
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN'  , true);
+define('INSIDE', true);
+define('INSTALL', false);
+define('IN_ADMIN', true);
 
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < 2)
+if ($user['authlevel'] < 2)
 {
   AdminMessage($lang['adm_err_denied']);
 }

admin/admin_locale.php

Spacing +30 added lines, -30 removed lines

@@ -7,25 +7,25 @@ 
  *
  */
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN'  , true);
+define('INSIDE', true);
+define('INSTALL', false);
+define('IN_ADMIN', true);
 
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < 3) {
+if ($user['authlevel'] < 3) {
   AdminMessage($lang['adm_err_denied']);
 }
 
 function adm_lng_assign_string($lang_id, $locale_string_name, $value) {
   global $locale_string_template, $languages_info, $languages, $domain;
 
-  if(is_array($value)) {
-    foreach($value as $sub_key => $sub_value) {
+  if (is_array($value)) {
+    foreach ($value as $sub_key => $sub_value) {
       adm_lng_assign_string($lang_id, "{$locale_string_name}[{$sub_key}]", $sub_value);
     }
-  } elseif($value) {
-    if(!isset($locale_string_template[$locale_string_name])) {
+  } elseif ($value) {
+    if (!isset($locale_string_template[$locale_string_name])) {
       $locale_string_template[$locale_string_name] = array();
     }
     $locale_string_template[$locale_string_name] = array_merge($locale_string_template[$locale_string_name], array("[{$lang_id}]" => htmlentities($value, ENT_COMPAT, 'utf-8')));
@@ -46,11 +46,11 @@ 
   global $domain, $lang_id;
 
   $return = "{$ident}'{$string_name}' => ";
-  if(isset($string_value[$lang_id]) && !is_array($string_value[$lang_id])) {
+  if (isset($string_value[$lang_id]) && !is_array($string_value[$lang_id])) {
     $return .= "'" . str_replace(array("\\", "'"), array('\\\\', "\\'"), $string_value[$lang_id]) . "',";
   } else {
     $return .= "array(\r\n";
-    foreach($string_value as $arr_name => $arr_data) {
+    foreach ($string_value as $arr_name => $arr_data) {
       $return .= adm_lng_parse_string($arr_name, $arr_data, $ident . '  ');
     }
     $return .= "{$ident}),\r\n";
@@ -103,12 +103,12 @@ 
 
   $string_name_new = false;
 
-  if(isset($honor_constants[$domain][$string_name_prefix])) {
+  if (isset($honor_constants[$domain][$string_name_prefix])) {
     $found_constants = array_keys($constants, $string_name);
-    foreach($found_constants as $constant_name) {
+    foreach ($found_constants as $constant_name) {
       $honor_prefix_list = is_array($honor_constants[$domain][$string_name_prefix]) ? $honor_constants[$domain][$string_name_prefix] : array($honor_constants[$domain][$string_name_prefix]);
-      foreach($honor_prefix_list as $honor_prefix) {
-        if(strpos($constant_name, $honor_prefix) === 0) {
+      foreach ($honor_prefix_list as $honor_prefix) {
+        if (strpos($constant_name, $honor_prefix) === 0) {
           $string_name_new = $constant_name;
           break;
         }
@@ -118,12 +118,12 @@ 
 
   $string_name_new = $string_name_new ? $string_name_new : "'{$string_name}'";
   fwrite($file_handler, "{$ident}{$string_name_new} => ");
-  if(isset($string_value[$lang_id]) && !is_array($string_value[$lang_id])) {
+  if (isset($string_value[$lang_id]) && !is_array($string_value[$lang_id])) {
     fwrite($file_handler, "'" . str_replace(array("\\", "'"), array('\\\\', "\\'"), $string_value[$lang_id]) . "',");
   } else {
     $string_name_prefix = $string_name_prefix . "[{$string_name}]";
     fwrite($file_handler, "array(\r\n");
-    foreach($string_value as $arr_name => $arr_data) {
+    foreach ($string_value as $arr_name => $arr_data) {
       adm_lng_write_string($arr_name, $arr_data, $ident . '  ', $string_name_prefix);
     }
     fwrite($file_handler, "{$ident}),\r\n");
@@ -143,13 +143,13 @@ 
 $languages_info = lng_get_list();
 $domain = sys_get_param_str('domain');
 
-if($domain) {
+if ($domain) {
   $lang_new = sys_get_param('lang_new');
-  if(!empty($lang_new)) {
+  if (!empty($lang_new)) {
     $constants = get_defined_constants(true);
     $constants = $constants['user'];
     ksort($constants);
-    foreach($languages_info as $lang_id => $land_data) {
+    foreach ($languages_info as $lang_id => $land_data) {
       $file_handler = fopen(SN_ROOT_PHYSICAL . "language/{$lang_id}/{$domain}.mo.php.new", 'w');
       fwrite($file_handler, "<?php\r\n\r\n/*\r\n#############################################################################
 #  Filename: {$domain}.mo.php
@@ -157,7 +157,7 @@ 
 #  Website: http://www.supernova.ws
 #  Description: Massive Multiplayer Online Browser Space Startegy Game\r\n#\r\n");
 
-      foreach($land_data['LANG_COPYRIGHT'] as $lang_copyright) {
+      foreach ($land_data['LANG_COPYRIGHT'] as $lang_copyright) {
         $lang_copyright = str_replace(array('&copy;', '&quot;', '&lt;', '&gt;'), array('©', '"', '<', '>'), $lang_copyright);
         fwrite($file_handler, "#  {$lang_copyright}\r\n");
       }
@@ -165,7 +165,7 @@ 
 /**\r\n*\r\n* @package language\r\n* @system [{$land_data['LANG_NAME_ENGLISH']}]\r\n* @version " . SN_VERSION . "\r\n*\r\n*/\r\n
 /**\r\n* DO NOT CHANGE\r\n*/\r\n\r\nif (!defined('INSIDE')) die();\r\n
 \$a_lang_array = array(\r\n");
-      foreach($lang_new as $string_name => $string_value) {
+      foreach ($lang_new as $string_name => $string_value) {
         adm_lng_write_string($string_name, $string_value);
       }
       fwrite($file_handler, ");\r\n");
@@ -176,21 +176,21 @@ 
     die();
   }
 
-  foreach($languages_info as $lang_id => $lang_data) {
+  foreach ($languages_info as $lang_id => $lang_data) {
     $template->assign_block_vars('language', $lang_data);
     $full_filename = SN_ROOT_PHYSICAL . "language/{$lang_id}/{$domain}.mo.php";
     $languages[$lang_id] = adm_lng_load($full_filename . (file_exists($full_filename . '.new') ? '.new' : ''));
-    foreach($languages[$lang_id] as $locale_string_name => $cork) {
+    foreach ($languages[$lang_id] as $locale_string_name => $cork) {
       adm_lng_assign_string($lang_id, "[{$locale_string_name}]", $languages[$lang_id][$locale_string_name]);
     }
   }
 
-  foreach($locale_string_template as $locale_string_name => $locale_string_list) {
+  foreach ($locale_string_template as $locale_string_name => $locale_string_list) {
     $template->assign_block_vars('string', array(
       'NAME' => $locale_string_name,
     ));
 
-    foreach($languages_info as $lang_id => $cork2) {
+    foreach ($languages_info as $lang_id => $cork2) {
       $template->assign_block_vars('string.locale', array(
         'LANG' => $lang_id,
         'VALUE' => $locale_string_list["[{$lang_id}]"],
@@ -206,17 +206,17 @@ 
   $dir = dir($path);
   while (false !== ($lang_id = $dir->read())) {
     $full_path = $path . $lang_id;
-    if($lang_id[0] != "." && is_dir($full_path)) {
+    if ($lang_id[0] != "." && is_dir($full_path)) {
       $lang_file_list = dir($full_path);
       while (false !== ($filename = $lang_file_list->read())) {
         $lang_domain = strtolower(substr($filename, 0, strpos($filename, '.')));
-        if(!$lang_domain) {
+        if (!$lang_domain) {
           continue;
         }
 
         $file_ext = strtolower(substr($filename, strpos($filename, '.')));
-        if($lang_domain != 'language') {
-          if($file_ext == '.mo.php.new' || ($file_ext == '.mo.php' && empty($languages[$lang_id][$lang_domain]))) {
+        if ($lang_domain != 'language') {
+          if ($file_ext == '.mo.php.new' || ($file_ext == '.mo.php' && empty($languages[$lang_id][$lang_domain]))) {
             $language_domains[$lang_domain] = $lang_domain;
             $languages[$lang_id][$lang_domain] = $lang_domain;
           }
@@ -226,7 +226,7 @@ 
   }
   $dir->close();
 
-  foreach($language_domains as $lang_domain) {
+  foreach ($language_domains as $lang_domain) {
     $template->assign_block_vars('domain', array(
       'NAME' => $lang_domain,
     ));

admin/admin_darkmatter.php

Spacing +9 added lines, -9 removed lines

@@ -15,7 +15,7 @@ 
 
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < 3) {
+if ($user['authlevel'] < 3) {
   AdminMessage($lang['adm_err_denied']);
 }
 
@@ -24,16 +24,16 @@ 
 $message = '';
 $message_status = ERR_ERROR;
 
-if($points = sys_get_param_float('points')) {
+if ($points = sys_get_param_float('points')) {
 // If points not empty...
-  if($username = sys_get_param_str_unsafe('id_user')) {
+  if ($username = sys_get_param_str_unsafe('id_user')) {
     $row = db_user_by_id($username, false, 'id, username', true, true);
-    if(!isset($row['id'])) {
+    if (!isset($row['id'])) {
       $row = db_user_by_username($username, false, 'id, username', true, true);
     }
-    if(is_array($row) && isset($row['id'])) {
+    if (is_array($row) && isset($row['id'])) {
       // Does anything post to DB?
-      if(rpg_points_change(
+      if (rpg_points_change(
         $row['id'],
         RPG_ADMIN,
         $points,
@@ -51,12 +51,12 @@ 
     // Points not empty but destination is not set - this means error
     $message = $lang['adm_dm_no_dest'];
   }
-} elseif($id_user) {
+} elseif ($id_user) {
   // Points is empty but destination is set - this again means error
   $message = $lang['adm_dm_no_quant'];
 }
 
-if(!$isNoError) {
+if (!$isNoError) {
   $template->assign_vars(array(
     'ID_USER' => $id_user,
     'POINTS' => $points,
@@ -64,7 +64,7 @@ 
   ));
 };
 
-if($message) {
+if ($message) {
   $template->assign_block_vars('result', array('MESSAGE' => $message, 'STATUS' => $message_status ? $message_status : ERR_NONE));
 }
 

time_probe.php

Spacing +4 added lines, -4 removed lines

@@ -13,11 +13,11 @@ 
 $time_server = $time_local  - $time_diff
 */
 
-if($font_size = sys_get_param_str('font_size')) {
-  if(strpos($font_size, '%') !== false) {
+if ($font_size = sys_get_param_str('font_size')) {
+  if (strpos($font_size, '%') !== false) {
     // Размер шрифта в процентах
     $font_size = min(max(floatval($font_size), FONT_SIZE_PERCENT_MIN), FONT_SIZE_PERCENT_MAX) . '%';
-  } elseif(strpos($font_size, 'px') !== false) {
+  } elseif (strpos($font_size, 'px') !== false) {
     // Размер шрифта в пикселях
     $font_size = min(max(floatval($font_size), FONT_SIZE_PIXELS_MIN), FONT_SIZE_PIXELS_MAX) . 'px';
   } else {
@@ -29,7 +29,7 @@ 
   classSupernova::$user_options[PLAYER_OPTION_BASE_FONT_SIZE] = $font_size;
 } else {
   $user_time_diff = playerTimeDiff::user_time_diff_get();
-  if($user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
+  if ($user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
     $time_diff = intval($user_time_diff[PLAYER_OPTION_TIME_DIFF]);
   } else {
     $user_time_diff = playerTimeDiff::user_time_diff_probe();

docs/txt2html.php

Spacing +58 added lines, -58 removed lines

@@ -1,52 +1,52 @@ 
 <?php
 
-function dump($value,$varname = "",$level=0,$dumper = "")
+function dump($value, $varname = "", $level = 0, $dumper = "")
 {
   if ($varname) $varname .= " = ";
 
-  if ($level==-1)
+  if ($level == -1)
   {
-    $trans[' ']='&there4;';
-    $trans["\t"]='&rArr;';
-    $trans["\n"]='&para;;';
-    $trans["\r"]='&lArr;';
-    $trans["\0"]='&oplus;';
-    return strtr(htmlspecialchars($value),$trans);
+    $trans[' '] = '&there4;';
+    $trans["\t"] = '&rArr;';
+    $trans["\n"] = '&para;;';
+    $trans["\r"] = '&lArr;';
+    $trans["\0"] = '&oplus;';
+    return strtr(htmlspecialchars($value), $trans);
   }
-  if ($level==0) $dumper = '<pre>' . $varname;
+  if ($level == 0) $dumper = '<pre>' . $varname;
 
   $type = gettype($value);
   $dumper .= $type;
 
-  if ($type=='string')
+  if ($type == 'string')
   {
-    $dumper .= '('.strlen($value).')';
-    $value = dump($value,"",-1);
+    $dumper .= '(' . strlen($value) . ')';
+    $value = dump($value, "", -1);
   }
-  elseif ($type=='boolean') $value= ($value?'true':'false');
-  elseif ($type=='object')
+  elseif ($type == 'boolean') $value = ($value ? 'true' : 'false');
+  elseif ($type == 'object')
   {
-    $props= get_class_vars(get_class($value));
-    $dumper .= '('.count($props).') <u>'.get_class($value).'</u>';
-    foreach($props as $key=>$val)
+    $props = get_class_vars(get_class($value));
+    $dumper .= '(' . count($props) . ') <u>' . get_class($value) . '</u>';
+    foreach ($props as $key=>$val)
     {
-      $dumper .= "\n".str_repeat("\t",$level+1).$key.' => ';
-      $dumper .= dump($value->$key,"",$level+1);
+      $dumper .= "\n" . str_repeat("\t", $level + 1) . $key . ' => ';
+      $dumper .= dump($value->$key, "", $level + 1);
     }
-    $value= '';
+    $value = '';
   }
-  elseif ($type=='array')
+  elseif ($type == 'array')
   {
-    $dumper .= '('.count($value).')';
-    foreach($value as $key=>$val)
+    $dumper .= '(' . count($value) . ')';
+    foreach ($value as $key=>$val)
     {
-      $dumper .= "\n".str_repeat("\t",$level+1).dump($key,"",-1).' => ';
-      $dumper .= dump($val,"",$level+1);
+      $dumper .= "\n" . str_repeat("\t", $level + 1) . dump($key, "", -1) . ' => ';
+      $dumper .= dump($val, "", $level + 1);
     }
-    $value= '';
+    $value = '';
   }
   $dumper .= " <b>$value</b>";
-  if ($level==0) $dumper .= '</pre>';
+  if ($level == 0) $dumper .= '</pre>';
   return $dumper;
 }
 
@@ -67,7 +67,7 @@ 
   $output_buffer .= $string;
 }
 
-if(substr(getcwd(), -4) != 'docs')
+if (substr(getcwd(), -4) != 'docs')
 {
   $path_prefix = 'docs/';
 }
@@ -80,22 +80,22 @@ 
 
 $filename = 'changelog';
 
-$input =  file_get_contents($path_prefix . $filename . '.txt');
+$input = file_get_contents($path_prefix . $filename . '.txt');
 //$input = iconv('CP1251', 'UTF-8', $input);
 
 $input = preg_replace("/\r\n\d\d\d\d\-\d\d\-\d\d\ \d\d\:\d\d/", "[D] $0", $input);
 
-while(strpos($input, "\r\n\r\n") !== false)
+while (strpos($input, "\r\n\r\n") !== false)
 {
   $input = str_replace("\r\n\r\n", "\r\n", $input);
 }
-while(strpos($input, "~~~") !== false)
+while (strpos($input, "~~~") !== false)
 {
   $input = str_replace("~~~", "~~", $input);
 }
 $input = str_replace("\r\n~~", "~~", $input);
 
-while(strpos($input, "===") !== false)
+while (strpos($input, "===") !== false)
 {
   $input = str_replace("===", "==", $input);
 }
@@ -106,13 +106,13 @@ 
 $prev_chapter_is_header = false;
 $output = array();
 $buffer = array();
-foreach($input as &$chapter)
+foreach ($input as &$chapter)
 {
   $chapter = preg_split("/(\r\n[\[])/", $chapter, -1, PREG_SPLIT_NO_EMPTY); // , PREG_SPLIT_DELIM_CAPTURE
 
-  if(count($chapter) == 1 && !$prev_chapter_is_header)
+  if (count($chapter) == 1 && !$prev_chapter_is_header)
   {
-    if(!empty($chapter))
+    if (!empty($chapter))
     {
       $output[] = $buffer;
       $buffer = array();
@@ -123,7 +123,7 @@ 
   else
   {
     $prev_chapter_is_header = false;
-    foreach($chapter as &$note)
+    foreach ($chapter as &$note)
     {
       $note = explode("\r\n", $note);
       $new_note = true;
@@ -131,13 +131,13 @@ 
 
       $note_out = array();
 
-      foreach($note as &$line)
+      foreach ($note as &$line)
       {
-        if(!$line)
+        if (!$line)
         {
           continue;
         }
-        if($new_note)
+        if ($new_note)
         {
           // 78 - 3 = 75
           $note_out['style'] = $line[0];
@@ -145,9 +145,9 @@ 
         }
 
         $buf_str .= $line;
-        if(mb_strlen($line, 'utf-8') < ($new_note ? 75 : 79))
+        if (mb_strlen($line, 'utf-8') < ($new_note ? 75 : 79))
         {
-          if(!isset($note_out['name']))
+          if (!isset($note_out['name']))
           {
             $note_out['name'] = $buf_str;
           }
@@ -201,31 +201,31 @@ 
   'D' => 'date',
 );
 
-foreach($output as $chapter)
+foreach ($output as $chapter)
 {
-  if(!$chapter)
+  if (!$chapter)
   {
     continue;
   }
 
   buf_print("<h1>{$chapter['name']}</h1>\r\n");
-  foreach($chapter['content'] as $block)
+  foreach ($chapter['content'] as $block)
   {
     buf_print("<div class=\"{$styles[$block['style']]}\">" . ($block['style'] != 'D' ? "[{$block['style']}]&nbsp;" : ''));
     buf_print(preg_replace("/\s{2,10}/", " ", $block['name']) . '<br />');
-    if(isset($block['lines']))
+    if (isset($block['lines']))
     {
       $last_spaces = '';
       $depth = array();
-      foreach($block['lines'] as $line)
+      foreach ($block['lines'] as $line)
       {
-        if(preg_match("/^(\s+)(\d*|\s)\.*\s*(.*)/", $line, $matches))
+        if (preg_match("/^(\s+)(\d*|\s)\.*\s*(.*)/", $line, $matches))
         {
           //$line = strlen($matches[1]) . '/' . $matches[2] . '/' . $matches[3];
           $line = $matches[3];
-          if(strlen($matches[1]) > strlen($last_spaces))
+          if (strlen($matches[1]) > strlen($last_spaces))
           {
-            if($matches[2])
+            if ($matches[2])
             {
               buf_print("<ol>\r\n");
             }
@@ -237,9 +237,9 @@ 
             $last_spaces = $matches[1];
             $depth[] = $matches[2];
           }
-          elseif(strlen($matches[1]) < strlen($last_spaces) && count($depth))
+          elseif (strlen($matches[1]) < strlen($last_spaces) && count($depth))
           {
-            if(array_pop($depth))
+            if (array_pop($depth))
             {
               buf_print("</ol>\r\n");
             }
@@ -250,14 +250,14 @@ 
             $last_spaces = $matches[1];
             buf_print('<li>');
           }
-          elseif(strlen($last_spaces) == strlen($matches[1]))
+          elseif (strlen($last_spaces) == strlen($matches[1]))
           {
-            if($matches[2] == '' && $depth[count($depth) - 1] != '')
+            if ($matches[2] == '' && $depth[count($depth) - 1] != '')
             {
               buf_print("</ol>\r\n");
               buf_print("<ul>\r\n");
             }
-            elseif($matches[2] != '' && $depth[count($depth) - 1] == '')
+            elseif ($matches[2] != '' && $depth[count($depth) - 1] == '')
             {
               buf_print("</ul>\r\n");
               buf_print("<ol>\r\n");
@@ -269,9 +269,9 @@ 
         $line = preg_replace("/\s{2,10}/", " ", $line);
         buf_print($line . "<br />\r\n");
       }
-      while(count($depth))
+      while (count($depth))
       {
-        if(array_pop($depth))
+        if (array_pop($depth))
         {
           buf_print("</ol>\r\n");
         }
@@ -287,10 +287,10 @@ 
 buf_print("</body>\r\n</html>\r\n");
 
 $html = file_get_contents($path_prefix . 'html/' . $filename . '.html');
-if($html != $output_buffer)
+if ($html != $output_buffer)
 {
   file_put_contents($path_prefix . 'html/' . $filename . '.html', $output_buffer);
-  if(!$path_prefix)
+  if (!$path_prefix)
   {
     print($output_buffer);
   }

Braces +26 added lines, -34 removed lines

@@ -1,8 +1,9 @@ 
 <?php
 
-function dump($value,$varname = "",$level=0,$dumper = "")
-{
-  if ($varname) $varname .= " = ";
+function dump($value,$varname = "",$level=0,$dumper = "") {
+  if ($varname) {
+    $varname .= " = ";
+  }
 
   if ($level==-1)
   {
@@ -13,7 +14,9 @@ 
     $trans["\0"]='&oplus;';
     return strtr(htmlspecialchars($value),$trans);
   }
-  if ($level==0) $dumper = '<pre>' . $varname;
+  if ($level==0) {
+    $dumper = '<pre>' . $varname;
+  }
 
   $type = gettype($value);
   $dumper .= $type;
@@ -22,9 +25,9 @@ 
   {
     $dumper .= '('.strlen($value).')';
     $value = dump($value,"",-1);
-  }
-  elseif ($type=='boolean') $value= ($value?'true':'false');
-  elseif ($type=='object')
+  } elseif ($type=='boolean') {
+    $value= ($value?'true':'false');
+  } elseif ($type=='object')
   {
     $props= get_class_vars(get_class($value));
     $dumper .= '('.count($props).') <u>'.get_class($value).'</u>';
@@ -34,8 +37,7 @@ 
       $dumper .= dump($value->$key,"",$level+1);
     }
     $value= '';
-  }
-  elseif ($type=='array')
+  } elseif ($type=='array')
   {
     $dumper .= '('.count($value).')';
     foreach($value as $key=>$val)
@@ -46,22 +48,21 @@ 
     $value= '';
   }
   $dumper .= " <b>$value</b>";
-  if ($level==0) $dumper .= '</pre>';
+  if ($level==0) {
+    $dumper .= '</pre>';
+  }
   return $dumper;
 }
 
-function pdump($value, $varname = '')
-{
+function pdump($value, $varname = '') {
   print('<span style="text-align: left">' . dump($value, $varname) . '</span>');
 }
 
-function debug($value, $varname = '')
-{
+function debug($value, $varname = '') {
   return pdump($value, $varname);
 }
 
-function buf_print($string)
-{
+function buf_print($string) {
   global $output_buffer;
 
   $output_buffer .= $string;
@@ -70,8 +71,7 @@ 
 if(substr(getcwd(), -4) != 'docs')
 {
   $path_prefix = 'docs/';
-}
-else
+} else
 {
   $path_prefix = '';
 }
@@ -119,8 +119,7 @@ 
       $buffer['name'] = $chapter[0];
     }
     $prev_chapter_is_header = true;
-  }
-  else
+  } else
   {
     $prev_chapter_is_header = false;
     foreach($chapter as &$note)
@@ -150,8 +149,7 @@ 
           if(!isset($note_out['name']))
           {
             $note_out['name'] = $buf_str;
-          }
-          else
+          } else
           {
             $note_out['lines'][] = $buf_str;
           }
@@ -228,36 +226,31 @@ 
             if($matches[2])
             {
               buf_print("<ol>\r\n");
-            }
-            else
+            } else
             {
               buf_print("<ul>\r\n");
             }
             buf_print('<li>');
             $last_spaces = $matches[1];
             $depth[] = $matches[2];
-          }
-          elseif(strlen($matches[1]) < strlen($last_spaces) && count($depth))
+          } elseif(strlen($matches[1]) < strlen($last_spaces) && count($depth))
           {
             if(array_pop($depth))
             {
               buf_print("</ol>\r\n");
-            }
-            else
+            } else
             {
               buf_print("</ul>\r\n");
             }
             $last_spaces = $matches[1];
             buf_print('<li>');
-          }
-          elseif(strlen($last_spaces) == strlen($matches[1]))
+          } elseif(strlen($last_spaces) == strlen($matches[1]))
           {
             if($matches[2] == '' && $depth[count($depth) - 1] != '')
             {
               buf_print("</ol>\r\n");
               buf_print("<ul>\r\n");
-            }
-            elseif($matches[2] != '' && $depth[count($depth) - 1] == '')
+            } elseif($matches[2] != '' && $depth[count($depth) - 1] == '')
             {
               buf_print("</ul>\r\n");
               buf_print("<ol>\r\n");
@@ -274,8 +267,7 @@ 
         if(array_pop($depth))
         {
           buf_print("</ol>\r\n");
-        }
-        else
+        } else
         {
           buf_print("</ul>\r\n");
         }