Apply automated PHP8 safety transforms
Agent-Logs-Url: https://github.com/GameServerPanel/GSP/sessions/89922108-1604-44ae-949d-358d32b9d70a Co-authored-by: iaretechnician <2749183+iaretechnician@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
GitHub
parent
aca850b6cd
commit
e44519c030
465 changed files with 1716 additions and 1716 deletions
|
|
@ -35,14 +35,14 @@ function exec_ogp_module()
|
|||
return 0;
|
||||
}
|
||||
|
||||
foreach( $homes as $home )
|
||||
foreach ((array)$homes as $home)
|
||||
{
|
||||
$home['access_rights'] = "ufpet";
|
||||
$id = $home['home_id']."_".$home['ip']."_".$home['port'];
|
||||
$server_homes[$id] = $home;
|
||||
}
|
||||
|
||||
foreach($r_servers as $r_server)
|
||||
foreach ((array)$r_servers as $r_server)
|
||||
{
|
||||
$id = $r_server['remote_server_id'];
|
||||
$remote_servers[$id] = $r_server;
|
||||
|
|
@ -134,7 +134,7 @@ function exec_ogp_module()
|
|||
$refresh = new refreshed();
|
||||
if( isset($_POST['r_server_id']) )
|
||||
{
|
||||
foreach($server_homes as $key => $server_home)
|
||||
foreach ((array)$server_homes as $key => $server_home)
|
||||
{
|
||||
if($server_home['remote_server_id'] == $_POST['r_server_id'])
|
||||
{
|
||||
|
|
@ -265,7 +265,7 @@ function exec_ogp_module()
|
|||
if ( !empty($remote_servers_offline) )
|
||||
{
|
||||
$offline_servers = server . " (" . offline . "):";
|
||||
foreach($remote_servers_offline as $remote_server_offline)
|
||||
foreach ((array)$remote_servers_offline as $remote_server_offline)
|
||||
{
|
||||
$offline_servers .= " " . $remote_server_offline['remote_server_name'] . ",";
|
||||
}
|
||||
|
|
@ -310,12 +310,12 @@ function exec_ogp_module()
|
|||
</tr>
|
||||
<?php
|
||||
$user_jobs = "";
|
||||
foreach( $jobsArray as $remote_server_id => $jobs )
|
||||
foreach ((array)$jobsArray as $remote_server_id => $jobs )
|
||||
{
|
||||
foreach($jobs as $jobId => $job)
|
||||
foreach ((array)$jobs as $jobId => $job)
|
||||
{
|
||||
if(isset($job['action'])){
|
||||
if(array_key_exists('home_id', $job) && array_key_exists('ip', $job) && array_key_exists('port', $job) && hasValue($job['home_id']) && hasValue($job['ip']) && hasValue($job['port'])){
|
||||
if(array_key_exists('home_id', (array)$job) && array_key_exists('ip', (array)$job) && array_key_exists('port', (array)$job) && hasValue($job['home_id']) && hasValue($job['ip']) && hasValue($job['port'])){
|
||||
$idStr = $job['home_id']."_".$job['ip']."_".$job['port'];
|
||||
}else{
|
||||
$idStr = false;
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ function exec_ogp_module()
|
|||
get_lang('refresh_interval').
|
||||
':<select name="setInterval" onchange="this.form.submit();">';
|
||||
|
||||
foreach ($intervals as $interval => $value )
|
||||
foreach ((array)$intervals as $interval => $value )
|
||||
{
|
||||
$selected = "";
|
||||
if ( isset( $_GET['setInterval'] ) AND $_GET['setInterval'] == $value )
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ function reloadJobs($server_homes, $remote_servers, $getAllJobs = true)
|
|||
global $db;
|
||||
$remote_servers_offline = array();
|
||||
$jobsArray = array();
|
||||
foreach( $remote_servers as $rhost_id => $remote_server )
|
||||
foreach ((array)$remote_servers as $rhost_id => $remote_server )
|
||||
{
|
||||
$remote = new OGPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout']);
|
||||
if($remote->status_chk() != 1)
|
||||
|
|
@ -39,7 +39,7 @@ function reloadJobs($server_homes, $remote_servers, $getAllJobs = true)
|
|||
$jobs = $remote->scheduler_list_tasks();
|
||||
if($jobs != -1)
|
||||
{
|
||||
foreach($jobs as $jobId => $job)
|
||||
foreach ((array)$jobs as $jobId => $job)
|
||||
{
|
||||
list($minute,$hour,$dayOfTheMonth,$month,$dayOfTheWeek,$command) = explode(" ", $job, 6);
|
||||
if(preg_match('/'.preg_quote('wget -qO- "','/').'([^"]+)'.preg_quote('" --no-check-certificate > /dev/null 2>&1','/').'/', $command))
|
||||
|
|
@ -102,11 +102,11 @@ function reloadJobs($server_homes, $remote_servers, $getAllJobs = true)
|
|||
function updateCronJobTokens($old_token, $token){
|
||||
global $db;
|
||||
$remote_servers = $db->getRemoteServers();
|
||||
foreach($remote_servers as $remote_server)
|
||||
foreach ((array)$remote_servers as $remote_server)
|
||||
{
|
||||
$remote = new OGPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout']);
|
||||
$jobs = $remote->scheduler_list_tasks();
|
||||
foreach($jobs as $job_id => $job)
|
||||
foreach ((array)$jobs as $job_id => $job)
|
||||
{
|
||||
if(strstr($job, $old_token))
|
||||
{
|
||||
|
|
@ -122,11 +122,11 @@ function deleteJobsByHomeServerID($home_id){
|
|||
$homeInfo = $db->getGameHome($home_id, true);
|
||||
if($homeInfo){
|
||||
$remote_servers = $db->getRemoteServers();
|
||||
foreach($remote_servers as $remote_server)
|
||||
foreach ((array)$remote_servers as $remote_server)
|
||||
{
|
||||
$remote = new OGPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout']);
|
||||
$jobs = $remote->scheduler_list_tasks();
|
||||
foreach($jobs as $job_id => $job)
|
||||
foreach ((array)$jobs as $job_id => $job)
|
||||
{
|
||||
if(strstr($job, "homeid=" . $home_id))
|
||||
{
|
||||
|
|
@ -138,7 +138,7 @@ function deleteJobsByHomeServerID($home_id){
|
|||
}
|
||||
}
|
||||
|
||||
if(is_array($jobIdsToDel) && count($jobIdsToDel) > 0){
|
||||
if(is_array($jobIdsToDel) && count((array)$jobIdsToDel) > 0){
|
||||
// Only make one call
|
||||
$remote->scheduler_del_task(implode(",", $jobIdsToDel));
|
||||
}
|
||||
|
|
@ -153,7 +153,7 @@ function get_action_selector($action = false, $server_homes = false, $homeid_ip_
|
|||
$server_actions[] = 'steam_auto_update';
|
||||
}
|
||||
$select_action = '<select name="action" style="width: 100%;">';
|
||||
foreach($server_actions as $server_action)
|
||||
foreach ((array)$server_actions as $server_action)
|
||||
{
|
||||
$selected = ($action and $action == $server_action) ? 'selected="selected"' : '';
|
||||
$select_action .= '<option value="'.$server_action.'" '.$selected.'>'.get_lang($server_action).'</option>';
|
||||
|
|
@ -166,7 +166,7 @@ function get_server_selector($server_homes, $homeid_ip_port = FALSE, $onchange =
|
|||
$select_game = "<select style='text-overflow: ellipsis; width: 100%;' name='homeid_ip_port' $onchange_this_form_submit>\n";
|
||||
if($server_homes != FALSE)
|
||||
{
|
||||
foreach ( $server_homes as $server_home )
|
||||
foreach ((array)$server_homes as $server_home)
|
||||
{
|
||||
$selected = ($homeid_ip_port and ($homeid_ip_port == $server_home['home_id']."_".$server_home['ip']."_".$server_home['port'] || trim($homeid_ip_port) == trim($server_home['home_id']))) ? 'selected="selected"' : '';
|
||||
$select_game .= "<option value='". $server_home['home_id'] . "_" . $server_home['ip'] .
|
||||
|
|
@ -186,7 +186,7 @@ function get_remote_server_selector($r_servers, $remote_servers_offline, $remote
|
|||
$onchange_this_form_submit = $onchange ? 'onchange="this.form.submit();"' : '';
|
||||
$select_rserver = "<select id='r_server_id' style='width: 100%;' name='r_server_id' $onchange_this_form_submit>\n";
|
||||
if($first_empty) $select_rserver .= '<option></option>';
|
||||
foreach ( $r_servers as $r_server )
|
||||
foreach ((array)$r_servers as $r_server)
|
||||
{
|
||||
$selected = ($remote_server_id and $remote_server_id == $r_server['remote_server_id']) ? 'selected="selected"' : '';
|
||||
$offline = isset($remote_servers_offline[$r_server['remote_server_id']]) ? ' (' . offline . ')' : '';
|
||||
|
|
@ -201,7 +201,7 @@ function checkCronInput($min, $hour, $day, $month, $dayOfWeek) {
|
|||
|
||||
$args = func_get_args();
|
||||
|
||||
foreach ($args as $k => $arg) {
|
||||
foreach ((array)$args as $k => $arg) {
|
||||
if (strlen($arg) == 0 || strpbrk($arg, $blacklist) || preg_match('/\\s/', $arg)) {
|
||||
$returns[$k] = false;
|
||||
}
|
||||
|
|
@ -231,13 +231,13 @@ function updateCronJobsToNewApi()
|
|||
$regex = '/'.preg_quote('action=','/').'([a-zA-Z]+)'.preg_quote('&homeid=','/').'([0-9]+)'.preg_quote('&controlpass=','/').'([^"]+)/';
|
||||
$token = $db->getApiToken($_SESSION['user_id']);
|
||||
$mod_key = '';
|
||||
foreach($remote_servers as $remote_server)
|
||||
foreach ((array)$remote_servers as $remote_server)
|
||||
{
|
||||
$remote = new OGPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout']);
|
||||
$jobs = $remote->scheduler_list_tasks();
|
||||
if(!is_array($jobs))
|
||||
continue;
|
||||
foreach($jobs as $job_id => $job)
|
||||
foreach ((array)$jobs as $job_id => $job)
|
||||
{
|
||||
if(preg_match($regex, $job, $matches))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ function exec_ogp_module()
|
|||
return 0;
|
||||
}
|
||||
|
||||
foreach( $homes as $home )
|
||||
foreach ((array)$homes as $home)
|
||||
{
|
||||
$server_homes[$home['home_id']."_".$home['ip']."_".$home['port']] = $home;
|
||||
$remote_servers[$home['remote_server_id']] = array( "agent_ip" => $home['agent_ip'],
|
||||
|
|
@ -224,13 +224,13 @@ You can read more on our <a href='http://wiki.iaregamer.com/doku.php?id=cron' ta
|
|||
</tr>
|
||||
<?php
|
||||
$user_jobs = "";
|
||||
foreach( $jobsArray as $remote_server_id => $jobs )
|
||||
foreach ((array)$jobsArray as $remote_server_id => $jobs )
|
||||
{
|
||||
foreach($jobs as $jobId => $job)
|
||||
foreach ((array)$jobs as $jobId => $job)
|
||||
{
|
||||
if(isset($job['action']))
|
||||
{
|
||||
if(array_key_exists('home_id', $job) && array_key_exists('ip', $job) && array_key_exists('port', $job) && hasValue($job['home_id']) && hasValue($job['ip']) && hasValue($job['port'])){
|
||||
if(array_key_exists('home_id', (array)$job) && array_key_exists('ip', (array)$job) && array_key_exists('port', (array)$job) && hasValue($job['home_id']) && hasValue($job['ip']) && hasValue($job['port'])){
|
||||
$uniqueStr = $job['home_id']."_".$job['ip']."_".$job['port'];
|
||||
}else{
|
||||
$uniqueStr = false;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue