Explorar o código

Initial Hookup / MORE TODO

own3mall %!s(int64=9) %!d(string=hai) anos
pai
achega
7d38f5c3b6

+ 15 - 0
js/modules/cron.js

@@ -0,0 +1,15 @@
+$(document).ready(function(){
+    $("select[name='homeid_ip_port']").change(function(e){
+		checkSteamSupportAutoUpdate();
+	});
+	checkSteamSupportAutoUpdate();
+});
+
+function checkSteamSupportAutoUpdate(){
+	var curOpt = $("select[name='homeid_ip_port'] option:selected");
+	if(curOpt.attr('steam')){
+		$("option[value='steam_auto_update']", $("select[name='action']")).removeAttr('disabled');
+	}else{
+		$("option[value='steam_auto_update']", $("select[name='action']")).attr('disabled','disabled');
+	}
+}

+ 0 - 0
js/new file


+ 2 - 1
lang/Danish/modules/cron.php

@@ -28,6 +28,7 @@ define('day', "Day");
 define('month', "Month");
 define('day_of_the_week', "D/Week");
 define('action', "Action");
+define('steam_auto_update', "Steam Auto Update");
 define('stop', "Stop");
 define('start', "Start");
 define('restart', "Restart");
@@ -40,4 +41,4 @@ define('scheduled_jobs', "Scheduled jobs");
 define('there_are_no_scheduled_jobs', "There are no scheduled jobs");
 define('cron_events', "Cron Events");
 define('refresh_interval', "Log genopfrisker interval");
-?>
+?>

+ 2 - 1
lang/English/modules/cron.php

@@ -28,6 +28,7 @@ define('day', "Day");
 define('month', "Month");
 define('day_of_the_week', "D/Week");
 define('action', "Action");
+define('steam_auto_update', "Steam Auto Update");
 define('stop', "Stop");
 define('start', "Start");
 define('restart', "Restart");
@@ -40,4 +41,4 @@ define('scheduled_jobs', "Scheduled jobs");
 define('there_are_no_scheduled_jobs', "There are no scheduled jobs");
 define('cron_events', "Cron Events");
 define('refresh_interval', "Refresh Interval");
-?>
+?>

+ 2 - 1
lang/French/modules/cron.php

@@ -28,6 +28,7 @@ define('day', "Jour");
 define('month', "Mois");
 define('day_of_the_week', "J/Sem");
 define('action', "Action");
+define('steam_auto_update', "Steam Auto Update");
 define('stop', "Stop");
 define('start', "Start");
 define('restart', "Restart");
@@ -40,4 +41,4 @@ define('scheduled_jobs', "Actions planifiées");
 define('there_are_no_scheduled_jobs', "Pas d'actions planifiées");
 define('cron_events', "Logs des Événements Planifiés");
 define('refresh_interval', "Intervalle d'actualisation");
-?>
+?>

+ 2 - 1
lang/German/modules/cron.php

@@ -28,6 +28,7 @@ define('day', "Tag");
 define('month', "Monat");
 define('day_of_the_week', "Tag/Woche");
 define('action', "Aktion");
+define('steam_auto_update', "Steam Auto Update");
 define('stop', "Stop");
 define('start', "Start");
 define('restart', "Neustart");
@@ -40,4 +41,4 @@ define('scheduled_jobs', "Geplante Aufgaben");
 define('there_are_no_scheduled_jobs', "Es gibt keine geplanten Aufgaben");
 define('cron_events', "Cron Ereignisse");
 define('refresh_interval', "Aktualisierungsinterval");
-?>
+?>

+ 2 - 1
lang/Hungarian/modules/cron.php

@@ -28,6 +28,7 @@ define('day', "Nap");
 define('month', "Hónap");
 define('day_of_the_week', "N/Hét");
 define('action', "Művelet");
+define('steam_auto_update', "Steam Auto Update");
 define('stop', "Leállítás");
 define('start', "Elindítás");
 define('restart', "Újraindítás");
@@ -40,4 +41,4 @@ define('scheduled_jobs', "Ütemezett feladatok");
 define('there_are_no_scheduled_jobs', "Nincsenek ütemezett feladatok");
 define('cron_events', "Cron események");
 define('refresh_interval', "Frissítési intervallum");
-?>
+?>

+ 2 - 1
lang/Polish/modules/cron.php

@@ -28,6 +28,7 @@ define('day', "Dni");
 define('month', "Miesiąc");
 define('day_of_the_week', "D/Week");
 define('action', "Akcja");
+define('steam_auto_update', "Steam Auto Update");
 define('stop', "Stop");
 define('start', "Start");
 define('restart', "Restart");
@@ -40,4 +41,4 @@ define('scheduled_jobs', "Zaplanowane zadania");
 define('there_are_no_scheduled_jobs', "Brak zaplanowanych zadań");
 define('cron_events', "Wydarzenia Cron");
 define('refresh_interval', "Powtórne Odświeżenie");
-?>
+?>

+ 2 - 1
lang/Portuguese/modules/cron.php

@@ -28,6 +28,7 @@ define('day', "Day");
 define('month', "Month");
 define('day_of_the_week', "D/Week");
 define('action', "Action");
+define('steam_auto_update', "Steam Auto Update");
 define('stop', "Stop");
 define('start', "Start");
 define('restart', "Restart");
@@ -40,4 +41,4 @@ define('scheduled_jobs', "Scheduled jobs");
 define('there_are_no_scheduled_jobs', "There are no scheduled jobs");
 define('cron_events', "Cron Events");
 define('refresh_interval', "Refresh Interval");
-?>
+?>

+ 2 - 1
lang/Russian/modules/cron.php

@@ -28,6 +28,7 @@ define('day', "Day");
 define('month', "Month");
 define('day_of_the_week', "D/Week");
 define('action', "Action");
+define('steam_auto_update', "Steam Auto Update");
 define('stop', "Stop");
 define('start', "Запуск");
 define('restart', "Restart");
@@ -40,4 +41,4 @@ define('scheduled_jobs', "Scheduled jobs");
 define('there_are_no_scheduled_jobs', "There are no scheduled jobs");
 define('cron_events', "Cron Events");
 define('refresh_interval', "Интервал обновления консоли");
-?>
+?>

+ 2 - 1
lang/Spanish/modules/cron.php

@@ -28,6 +28,7 @@ define('day', "Dia");
 define('month', "Mes");
 define('day_of_the_week', "D/Sem");
 define('action', "Acción");
+define('steam_auto_update', "Steam Auto Update");
 define('stop', "Parar");
 define('start', "Iniciar");
 define('restart', "Reiniciar");
@@ -40,4 +41,4 @@ define('scheduled_jobs', "Tareas programadas");
 define('there_are_no_scheduled_jobs', "No hay tareas programadas");
 define('cron_events', "Eventos de Cron");
 define('refresh_interval', "Intervalo de refresco");
-?>
+?>

+ 8 - 2
modules/cron/cron.php

@@ -54,7 +54,7 @@ function reloadJobs($server_homes, $remote_servers)
 					$dayOfTheWeek = $parts[4];
 					unset($parts[0],$parts[1],$parts[2],$parts[3],$parts[4]);
 					$command = implode(" ", $parts);
-					$retval = preg_match_all("/^%ACTION=(start|restart|stop)\|%\|(.*)$/", $command, $job_info );
+					$retval = preg_match_all("/^%ACTION=(start|restart|stop|steam_auto_update)\|%\|(.*)$/", $command, $job_info );
 					if($retval and !empty($job_info[1][0]))
 					{
 						//print_r($job_info);
@@ -74,6 +74,9 @@ function reloadJobs($server_homes, $remote_servers)
 								list($home_id, $ip, $port, $control_protocol, 
 									 $control_password, $control_type, $home_path) = $server_args;
 								break;
+							case 'steam_auto_update':
+								// TODO SOMETHING
+								break;
 						}
 						if(!isset($server_homes[$home_id."_".$ip."_".$port])) continue;
 						$jobsArray[$rhost_id][$jobId] = array( 'job' => $job, 
@@ -105,7 +108,7 @@ function reloadJobs($server_homes, $remote_servers)
 }
 
 function get_action_selector($action = false) {
-	$server_actions = array('restart','stop','start');
+	$server_actions = array('restart','stop','start','steam_auto_update');
 	$select_action = '<select  style="width: 100px;" name="action">';
 	foreach($server_actions as $server_action)
 	{
@@ -217,6 +220,9 @@ function exec_ogp_module()
 							   "$control_password|%|$control_type|%|$home_path|%|$server_exe|%|$run_dir|%|".
 							   "$startup_cmd|%|$cpu|%|$nice";
 					break;
+				case "steam_auto_update":
+					// TODO SOMETHING
+					break;
 			}
 		}
 		else

+ 16 - 3
modules/cron/user_cron.php

@@ -54,7 +54,7 @@ function reloadJobs($server_homes, $remote_servers)
 					$dayOfTheWeek = $parts[4];
 					unset($parts[0],$parts[1],$parts[2],$parts[3],$parts[4]);
 					$command = implode(" ", $parts);
-					$retval = preg_match_all("/^%ACTION=(start|restart|stop)\|%\|(.*)$/", $command, $job_info );
+					$retval = preg_match_all("/^%ACTION=(start|restart|stop|steam_auto_update)\|%\|(.*)$/", $command, $job_info );
 					if($retval and !empty($job_info[1][0]))
 					{
 						//print_r($job_info);
@@ -74,6 +74,9 @@ function reloadJobs($server_homes, $remote_servers)
 								list($home_id, $ip, $port, $control_protocol, 
 									 $control_password, $control_type, $home_path) = $server_args;
 								break;
+							case 'steam_auto_update':
+								// TODO Something
+								break;
 						}
 						if(!isset($server_homes[$home_id."_".$ip."_".$port])) continue;
 						$jobsArray[$rhost_id][$jobId] = array( 'job' => $job, 
@@ -95,7 +98,7 @@ function reloadJobs($server_homes, $remote_servers)
 }
 
 function get_action_selector($action = false) {
-	$server_actions = array('restart','stop','start');
+	$server_actions = array('restart','stop','start','steam_auto_update');
 	$select_action = '<select  style="width: 100px;" name="action">';
 	foreach($server_actions as $server_action)
 	{
@@ -112,9 +115,16 @@ function get_server_selector($server_homes, $homeid_ip_port = FALSE, $onchange =
 	{
 		foreach ( $server_homes as $server_home )
 		{
+			// Find out if it's a steamcmd server
+			$additionalMarkup = "";
+			$server_xml = read_server_config(SERVER_CONFIG_LOCATION."/".$server_home['home_cfg_file']);
+			if( $server_xml->installer == "steamcmd" ){
+				$additionalMarkup = 'steam="1"';
+			}			
+			
 			$selected = ($homeid_ip_port and $homeid_ip_port == $server_home['home_id']."_".$server_home['ip']."_".$server_home['port']) ? 'selected="selected"' : '';
 			$select_game .= "<option value='". $server_home['home_id'] . "_" . $server_home['ip'] .
-							"_" . $server_home['port'] . "' $selected>" . $server_home['home_name'] . 
+							"_" . $server_home['port'] . "' $selected " . $additionalMarkup . ">" . $server_home['home_name'] . 
 							" - " . $server_home['ip'] . ":" .$server_home['port'] . "</option>\n";
 		}
 	}
@@ -211,6 +221,9 @@ function exec_ogp_module()
 							   "$control_password|%|$control_type|%|$home_path|%|$server_exe|%|$run_dir|%|".
 							   "$startup_cmd|%|$cpu|%|$nice";
 					break;
+				case "steam_auto_update":
+					// TODO Something
+					break;
 			}
 			$job = $_POST['minute']." ".
 				   $_POST['hour']." ".