Merge pull request #2 from OpenGamePanel/master

Updating

lang/Arabic/modules/cron.php

@@ -41,8 +41,8 @@ define('OGP_LANG_scheduled_jobs', "المهام المجدولة");
 define('OGP_LANG_there_are_no_scheduled_jobs', "لا توجد أية مهام مجدولة");
 define('OGP_LANG_cron_events', "أحداث الCron");
 define('OGP_LANG_refresh_interval', "الفاصل الزمني للتحديث");
-define('OGP_LANG_cron_no_servers_tied_to_account', "لا توجد خوادم لعبة تعيين مباشرة إلى حسابك.");
+define('OGP_LANG_cron_no_servers_tied_to_account', "There are no servers directly assigned to your account.");
 define('OGP_LANG_cron_admin_link_display_text', "إدارة كرون (جميع الخوادم)");
-define('OGP_LANG_cron_admin_no_ogp_servers_to_display', "ليست هناك أي ملقمات اللعبة التي تم تكوينها حاليا في أوبن قيم بانل");
+define('OGP_LANG_cron_admin_no_ogp_servers_to_display', "There aren't any servers currently configured in OGP.");
 define('OGP_LANG_bad_inputs', "يحتوي الوقت المقرر على أحرف غير صالحة.");
 ?>

lang/Czech(CzechRepublic)/modules/cron.php

@@ -41,8 +41,8 @@ define('OGP_LANG_scheduled_jobs', "plánované úlohy");
 define('OGP_LANG_there_are_no_scheduled_jobs', "Neexistují žádné naplánované úlohy");
 define('OGP_LANG_cron_events', "cron Ulohy");
 define('OGP_LANG_refresh_interval', "Interval obnovení");
-define('OGP_LANG_cron_no_servers_tied_to_account', "Na váš účet nejsou přímo přiřazeny žádné herní servery.");
+define('OGP_LANG_cron_no_servers_tied_to_account', "There are no servers directly assigned to your account.");
 define('OGP_LANG_cron_admin_link_display_text', "Cron Administrace (všechny servery)");
-define('OGP_LANG_cron_admin_no_ogp_servers_to_display', "V OGP nejsou aktuálně nakonfigurovány žádné herní servery.");
+define('OGP_LANG_cron_admin_no_ogp_servers_to_display', "There aren't any servers currently configured in OGP.");
 define('OGP_LANG_bad_inputs', "Plánovaný čas obsahuje neplatné znaky.");
 ?>

lang/Danish/modules/cron.php

@@ -41,8 +41,8 @@ define('OGP_LANG_scheduled_jobs', "Scheduled jobs");
 define('OGP_LANG_there_are_no_scheduled_jobs', "There are no scheduled jobs");
 define('OGP_LANG_cron_events', "Cron Events");
 define('OGP_LANG_refresh_interval', "Refresh Interval");
-define('OGP_LANG_cron_no_servers_tied_to_account', "There are no game servers directly assigned to your account.");
+define('OGP_LANG_cron_no_servers_tied_to_account', "There are no servers directly assigned to your account.");
 define('OGP_LANG_cron_admin_link_display_text', "Cron Administration (All Servers)");
-define('OGP_LANG_cron_admin_no_ogp_servers_to_display', "There aren't any game servers currently configured in OGP.");
+define('OGP_LANG_cron_admin_no_ogp_servers_to_display', "There aren't any servers currently configured in OGP.");
 define('OGP_LANG_bad_inputs', "Scheduled time contains invalid characters.");
 ?>

lang/French/modules/cron.php

@@ -43,6 +43,6 @@ define('OGP_LANG_cron_events', "Logs des Événements Planifiés");
 define('OGP_LANG_refresh_interval', "Intervalle d'actualisation");
 define('OGP_LANG_cron_no_servers_tied_to_account', "Il n'y a pas de serveur assigné sur votre compte.");
 define('OGP_LANG_cron_admin_link_display_text', "Administration Cron (Tous les Serveurs)");
-define('OGP_LANG_cron_admin_no_ogp_servers_to_display', "Il n'y a pas de serveur de jeu configuré dans OGP.");
+define('OGP_LANG_cron_admin_no_ogp_servers_to_display', "Il n'y a pas de serveur configuré dans OGP.");
 define('OGP_LANG_bad_inputs', "Le temps programmé contient des caractères invalides.");
 ?>

lang/German/modules/cron.php

@@ -41,8 +41,8 @@ define('OGP_LANG_scheduled_jobs', "Geplante Aufgaben");
 define('OGP_LANG_there_are_no_scheduled_jobs', "Es gibt keine geplanten Aufgaben");
 define('OGP_LANG_cron_events', "Cron Ereignisse");
 define('OGP_LANG_refresh_interval', "Aktualisierungsinterval");
-define('OGP_LANG_cron_no_servers_tied_to_account', "Ihrem Konto sind keine Spieleserver direkt zugeordnet.");
+define('OGP_LANG_cron_no_servers_tied_to_account', "Es sind keine Server dem Account zugewiesen.");
 define('OGP_LANG_cron_admin_link_display_text', "Cron Administration (Alle Server)");
-define('OGP_LANG_cron_admin_no_ogp_servers_to_display', "Derzeit sind keine Spieleserver in OGP konfiguriert.");
+define('OGP_LANG_cron_admin_no_ogp_servers_to_display', "Es sind zur Zeit keine Server in OGP konfiguriert.");
 define('OGP_LANG_bad_inputs', "Geplante Zeit enthält ungültige Zeichen.");
 ?>

lang/Hungarian/modules/cron.php

@@ -41,8 +41,8 @@ define('OGP_LANG_scheduled_jobs', "Ütemezett feladatok");
 define('OGP_LANG_there_are_no_scheduled_jobs', "Nincsenek ütemezett feladatok");
 define('OGP_LANG_cron_events', "Cron események");
 define('OGP_LANG_refresh_interval', "Frissítési intervallum");
-define('OGP_LANG_cron_no_servers_tied_to_account', "Nincsenek játékszerverek közvetlenül hozzárendelve a fiókodhoz.");
+define('OGP_LANG_cron_no_servers_tied_to_account', "Nincsenek szerverek közvetlenül a fiókodhoz hozzárendelve.");
 define('OGP_LANG_cron_admin_link_display_text', "Cron adminisztráció (minden szerver)");
-define('OGP_LANG_cron_admin_no_ogp_servers_to_display', "Jelenleg nincsenek játékszerverek beállítva az OGP-ben.");
-define('OGP_LANG_bad_inputs', "Scheduled time contains invalid characters.");
+define('OGP_LANG_cron_admin_no_ogp_servers_to_display', "Az OGP-ben jelenleg nincsenek beállítva szerverek.");
+define('OGP_LANG_bad_inputs', "Az ütemezett idő érvénytelen karaktereket tartalmaz.");
 ?>

lang/Italian/modules/cron.php

@@ -41,8 +41,8 @@ define('OGP_LANG_scheduled_jobs', "Scheduled jobs");
 define('OGP_LANG_there_are_no_scheduled_jobs', "There are no scheduled jobs");
 define('OGP_LANG_cron_events', "Cron Events");
 define('OGP_LANG_refresh_interval', "Refresh Interval");
-define('OGP_LANG_cron_no_servers_tied_to_account', "There are no game servers directly assigned to your account.");
+define('OGP_LANG_cron_no_servers_tied_to_account', "There are no servers directly assigned to your account.");
 define('OGP_LANG_cron_admin_link_display_text', "Cron Administration (All Servers)");
-define('OGP_LANG_cron_admin_no_ogp_servers_to_display', "There aren't any game servers currently configured in OGP.");
+define('OGP_LANG_cron_admin_no_ogp_servers_to_display', "There aren't any servers currently configured in OGP.");
 define('OGP_LANG_bad_inputs', "Scheduled time contains invalid characters.");
 ?>

lang/Persian/modules/cron.php

@@ -41,8 +41,8 @@ define('OGP_LANG_scheduled_jobs', "Scheduled jobs");
 define('OGP_LANG_there_are_no_scheduled_jobs', "There are no scheduled jobs");
 define('OGP_LANG_cron_events', "رویداد های Cron");
 define('OGP_LANG_refresh_interval', "Refresh Interval");
-define('OGP_LANG_cron_no_servers_tied_to_account', "There are no game servers directly assigned to your account.");
+define('OGP_LANG_cron_no_servers_tied_to_account', "There are no servers directly assigned to your account.");
 define('OGP_LANG_cron_admin_link_display_text', "Cron Administration (All Servers)");
-define('OGP_LANG_cron_admin_no_ogp_servers_to_display', "There aren't any game servers currently configured in OGP.");
+define('OGP_LANG_cron_admin_no_ogp_servers_to_display', "There aren't any servers currently configured in OGP.");
 define('OGP_LANG_bad_inputs', "Scheduled time contains invalid characters.");
 ?>

lang/Polish/modules/cron.php

@@ -41,8 +41,8 @@ define('OGP_LANG_scheduled_jobs', "Zaplanowane zadania");
 define('OGP_LANG_there_are_no_scheduled_jobs', "Brak zaplanowanych zadań");
 define('OGP_LANG_cron_events', "Wydarzenia Cron");
 define('OGP_LANG_refresh_interval', "Powtórne Odświeżenie");
-define('OGP_LANG_cron_no_servers_tied_to_account', "There are no game servers directly assigned to your account.");
+define('OGP_LANG_cron_no_servers_tied_to_account', "There are no servers directly assigned to your account.");
 define('OGP_LANG_cron_admin_link_display_text', "Cron Administration (All Servers)");
-define('OGP_LANG_cron_admin_no_ogp_servers_to_display', "There aren't any game servers currently configured in OGP.");
+define('OGP_LANG_cron_admin_no_ogp_servers_to_display', "There aren't any servers currently configured in OGP.");
 define('OGP_LANG_bad_inputs', "Scheduled time contains invalid characters.");
 ?>

lang/Portuguese(Brazil)/modules/cron.php

@@ -41,8 +41,8 @@ define('OGP_LANG_scheduled_jobs', "Trabalhos agendados");
 define('OGP_LANG_there_are_no_scheduled_jobs', "Não existem trabalhos agendados");
 define('OGP_LANG_cron_events', "Tarefas Cron");
 define('OGP_LANG_refresh_interval', "Intervalo de atualização");
-define('OGP_LANG_cron_no_servers_tied_to_account', "Não há servidores de jogos diretamente atribuídos à sua conta.");
+define('OGP_LANG_cron_no_servers_tied_to_account', "There are no servers directly assigned to your account.");
 define('OGP_LANG_cron_admin_link_display_text', "Administração de Cron (todos os servers)");
-define('OGP_LANG_cron_admin_no_ogp_servers_to_display', "Não há nenhum servidor de jogos atualmente configurado no painel.");
+define('OGP_LANG_cron_admin_no_ogp_servers_to_display', "There aren't any servers currently configured in OGP.");
 define('OGP_LANG_bad_inputs', "Scheduled time contains invalid characters.");
 ?>

lang/Portuguese/modules/cron.php

@@ -41,8 +41,8 @@ define('OGP_LANG_scheduled_jobs', "Tarefas programadas");
 define('OGP_LANG_there_are_no_scheduled_jobs', "Não existem tarefas programadas");
 define('OGP_LANG_cron_events', "Tarefas Cron \"agendada de trabalho com base no tempo\"");
 define('OGP_LANG_refresh_interval', "Intervalo de actualização");
-define('OGP_LANG_cron_no_servers_tied_to_account', "Ups... Não há servidores de jogos directamente ainda atribuídos à sua conta.");
+define('OGP_LANG_cron_no_servers_tied_to_account', "There are no servers directly assigned to your account.");
 define('OGP_LANG_cron_admin_link_display_text', "Administração de tarefas Cron (todos os servers)");
-define('OGP_LANG_cron_admin_no_ogp_servers_to_display', "Não há nenhum servidor de jogos actualmente configurado no painel.");
+define('OGP_LANG_cron_admin_no_ogp_servers_to_display', "There aren't any servers currently configured in OGP.");
 define('OGP_LANG_bad_inputs', "O tempo agendado contém caracteres inválidos.");
 ?>

lang/Romanian(Romania)/modules/cron.php

@@ -41,7 +41,8 @@ define('OGP_LANG_scheduled_jobs', "Scheduled jobs");
 define('OGP_LANG_there_are_no_scheduled_jobs', "There are no scheduled jobs");
 define('OGP_LANG_cron_events', "Cron Events");
 define('OGP_LANG_refresh_interval', "Refresh Interval");
-define('OGP_LANG_cron_no_servers_tied_to_account', "There are no game servers directly assigned to your account.");
+define('OGP_LANG_cron_no_servers_tied_to_account', "There are no servers directly assigned to your account.");
 define('OGP_LANG_cron_admin_link_display_text', "Cron Administration (All Servers)");
-define('OGP_LANG_cron_admin_no_ogp_servers_to_display', "There aren't any game servers currently configured in OGP.");
-?>
+define('OGP_LANG_cron_admin_no_ogp_servers_to_display', "There aren't any servers currently configured in OGP.");
+define('OGP_LANG_bad_inputs', "Scheduled time contains invalid characters.");
+?>

lang/Russian/modules/cron.php

@@ -41,8 +41,8 @@ define('OGP_LANG_scheduled_jobs', "Запланированные задания
 define('OGP_LANG_there_are_no_scheduled_jobs', "Запланированных заданий нет");
 define('OGP_LANG_cron_events', "События задания");
 define('OGP_LANG_refresh_interval', "Интервал обновления консоли");
-define('OGP_LANG_cron_no_servers_tied_to_account', "Для вашей учетной записи не назначен ни один игровой сервер.");
+define('OGP_LANG_cron_no_servers_tied_to_account', "There are no servers directly assigned to your account.");
 define('OGP_LANG_cron_admin_link_display_text', "Администрирование Планировщика (все сервера)");
-define('OGP_LANG_cron_admin_no_ogp_servers_to_display', "Нет ни одного игрового сервер в конфигурации OGP.");
+define('OGP_LANG_cron_admin_no_ogp_servers_to_display', "There aren't any servers currently configured in OGP.");
 define('OGP_LANG_bad_inputs', "Поле запланированного времени содержит недопустимые символы.");
 ?>

lang/Spanish/modules/cron.php

@@ -28,7 +28,7 @@ define('OGP_LANG_day', "Día");
 define('OGP_LANG_month', "Mes");
 define('OGP_LANG_day_of_the_week', "D/Semana");
 define('OGP_LANG_action', "Acción");
-define('OGP_LANG_steam_auto_update', "Steam Auto Update");
+define('OGP_LANG_steam_auto_update', "Actualización automática de Steam");
 define('OGP_LANG_stop', "Parar");
 define('OGP_LANG_start', "Iniciar");
 define('OGP_LANG_restart', "Reiniciar");
@@ -41,8 +41,8 @@ define('OGP_LANG_scheduled_jobs', "Tareas programadas");
 define('OGP_LANG_there_are_no_scheduled_jobs', "No hay tareas programadas");
 define('OGP_LANG_cron_events', "Eventos de Cron");
 define('OGP_LANG_refresh_interval', "Intervalo de refresco");
-define('OGP_LANG_cron_no_servers_tied_to_account', "No hay servidores de juego directamente asignados a su cuenta.");
+define('OGP_LANG_cron_no_servers_tied_to_account', "No hay servidores directamente asignados a tu cuenta.");
 define('OGP_LANG_cron_admin_link_display_text', "Administración de Cron (todos los servidores)");
 define('OGP_LANG_cron_admin_no_ogp_servers_to_display', "No hay ningún servidor de juego actualmente configurado en OGP.");
-define('OGP_LANG_bad_inputs', "Scheduled time contains invalid characters.");
+define('OGP_LANG_bad_inputs', "La tarea programada contiene caracteres no válidos.");
 ?>

lang/Swedish(Sweden)/modules/cron.php

@@ -41,8 +41,8 @@ define('OGP_LANG_scheduled_jobs', "Schemalagda jobb");
 define('OGP_LANG_there_are_no_scheduled_jobs', "Det finns inga schemalagda jobb");
 define('OGP_LANG_cron_events', "Cron händelser");
 define('OGP_LANG_refresh_interval', "Uppdaterinsintervall");
-define('OGP_LANG_cron_no_servers_tied_to_account', "Det finns inga spelservrar direkt tilldelade till ditt konto.");
+define('OGP_LANG_cron_no_servers_tied_to_account', "There are no servers directly assigned to your account.");
 define('OGP_LANG_cron_admin_link_display_text', "Cron administration (Alla Servrar)");
-define('OGP_LANG_cron_admin_no_ogp_servers_to_display', "Det finns just nu inga spelservrar konfigurerade i OGP.");
+define('OGP_LANG_cron_admin_no_ogp_servers_to_display', "There aren't any servers currently configured in OGP.");
 define('OGP_LANG_bad_inputs', "Scheduled time contains invalid characters.");
 ?>

lang/Turkish(Turkey)/modules/cron.php

@@ -41,8 +41,8 @@ define('OGP_LANG_scheduled_jobs', "Scheduled jobs");
 define('OGP_LANG_there_are_no_scheduled_jobs', "There are no scheduled jobs");
 define('OGP_LANG_cron_events', "Cron Events");
 define('OGP_LANG_refresh_interval', "Refresh Interval");
-define('OGP_LANG_cron_no_servers_tied_to_account', "There are no game servers directly assigned to your account.");
+define('OGP_LANG_cron_no_servers_tied_to_account', "There are no servers directly assigned to your account.");
 define('OGP_LANG_cron_admin_link_display_text', "Cron Administration (All Servers)");
-define('OGP_LANG_cron_admin_no_ogp_servers_to_display', "There aren't any game servers currently configured in OGP.");
+define('OGP_LANG_cron_admin_no_ogp_servers_to_display', "There aren't any servers currently configured in OGP.");
 define('OGP_LANG_bad_inputs', "Scheduled time contains invalid characters.");
 ?>

modules/cron/shared_cron_functions.php

@@ -21,8 +21,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  */
-function reloadJobs($server_homes, $remote_servers)
+function reloadJobs($server_homes, $remote_servers, $getAllJobs = true)
 {
+	global $db;
 	$remote_servers_offline = array();
 	$jobsArray = array();
 	foreach( $remote_servers as $remote_server )
@@ -71,6 +72,12 @@ function reloadJobs($server_homes, $remote_servers)
 								break;
 						}
 						if(!isset($server_homes[$home_id."_".$ip."_".$port])) continue;
+						
+						if(!$getAllJobs && !hasAccessToCronjobHomeId($home_id)){
+							continue;
+						}
+						
+						
 						$jobsArray[$rhost_id][$jobId] = array( 'job' => $job, 
 															   'minute' => $minute, 
 															   'hour' => $hour, 
@@ -84,6 +91,9 @@ function reloadJobs($server_homes, $remote_servers)
 					}
 					else if(getURLParam("homeid=", $command) !== false){
 						$homeId = getURLParam("homeid=", $command);
+						if(!$getAllJobs && !hasAccessToCronjobHomeId($homeId)){
+							continue;
+						}
 						
 						$action = getURLParam("action=", $command);
 						if($action == "autoUpdateSteamHome"){
@@ -96,6 +106,8 @@ function reloadJobs($server_homes, $remote_servers)
 							$action = "restart";
 						}
 						
+						
+						
 						$jobsArray[$rhost_id][$jobId] = array( 'job' => $job, 
 															   'minute' => $minute, 
 															   'hour' => $hour, 
@@ -108,6 +120,10 @@ function reloadJobs($server_homes, $remote_servers)
 					}
 					else
 					{	
+						if(!$getAllJobs && !$db->isAdmin($_SESSION['user_id'])){
+							continue;
+						}			
+						
 						$jobsArray[$rhost_id][$jobId] = array( 'job' => $job, 
 															   'minute' => $minute, 
 															   'hour' => $hour, 
@@ -265,4 +281,10 @@ function checkCronInput($min, $hour, $day, $month, $dayOfWeek) {
     return (empty($returns) ? true : false);
 }
 
+function hasAccessToCronjobHomeId($home_id){
+	global $db;
+	$hasAccess = ($db->isAdmin($_SESSION['user_id'])) ? true : $db->getUserGameHome($_SESSION['user_id'], $home_id);
+	return $hasAccess;
+}
+
 ?>

modules/cron/user_cron.php

@@ -62,7 +62,7 @@ function exec_ogp_module()
 											"ftp_ip" => $home['ftp_ip']);
 	}
 	
-	list($jobsArray, $remote_servers_offline) = reloadJobs($server_homes, $remote_servers);
+	list($jobsArray, $remote_servers_offline) = reloadJobs($server_homes, $remote_servers, false);
 	
 	if( isset($_POST['addJob']) or isset($_POST['editJob']) )
 	{
@@ -138,7 +138,7 @@ function exec_ogp_module()
 				$remote->scheduler_edit_task($_POST['job_id'], $job);
 			elseif( isset($_POST['addJob']) ) 
 				$remote->scheduler_add_task($job);
-			list($jobsArray, $remote_servers_offline) = reloadJobs($server_homes, $remote_servers);
+			list($jobsArray, $remote_servers_offline) = reloadJobs($server_homes, $remote_servers, false);
 		}
 	}
 	elseif( isset($_POST['removeJob']) and isset($remote_servers[$_POST['r_server_id']]) and isset($jobsArray[$_POST['r_server_id']][$_POST['job_id']]) )
@@ -148,7 +148,7 @@ function exec_ogp_module()
 										$remote_servers[$_POST['r_server_id']]['encryption_key'],
 										$remote_servers[$_POST['r_server_id']]['timeout'] );
 		$remote->scheduler_del_task($_POST['job_id']);
-		list($jobsArray, $remote_servers_offline) = reloadJobs($server_homes, $remote_servers);
+		list($jobsArray, $remote_servers_offline) = reloadJobs($server_homes, $remote_servers, false);
 	}	
 
 	echo "<h2>" . get_lang("schedule_new_job") . "</h2>";
@@ -311,4 +311,4 @@ $(document).ready(function()
 </script>
 <?php
 }
-?>
+?>