tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-8730-problema-notificacion-consola-con-parches-soporte' into 'develop'

Browse Source 
some fixes in version control and php memory usage

See merge request artica/pandorafms!4803
This commit is contained in:
Daniel Rodriguez 2022-06-20 15:07:01 +00:00
commit 8fb54be1bb
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pandora_console/godmode/um_client/index.php
View File

@ -203,20 +203,22 @@ if (is_ajax() !== true) {
var clientMode = '<?php echo $mode; ?>'; var clientMode = '<?php echo $mode; ?>';
</script> </script>
<?php <?php
$server_version = (string) db_get_value_sql( if (function_exists('db_get_value_sql') === true) {
'SELECT `version` FROM `tserver` ORDER BY `master` DESC' $server_version = (string) db_get_value_sql(
); 'SELECT `version` FROM `tserver` ORDER BY `master` DESC'
if ($server_version !== false );
&& preg_match('/NG\.(\d\.*\d*?) /', $server_version, $matches) > 0 if ($server_version !== false
) { && preg_match('/NG\.(\d\.*\d*?) /', $server_version, $matches) > 0
if ((float) $matches[1] !== (float) $current_package) { ) {
ui_print_warning_message( if ((float) $matches[1] !== floor((float) $current_package)) {
__( ui_print_warning_message(
'Master server version %s does not match console version %s.', __(
(float) $matches[1], 'Master server version %s does not match console version %s.',
(float) $current_package (float) $matches[1],
) (float) $current_package
); )
);
}
} }
} }

6
pandora_console/include/class/ConsoleSupervisor.php
View File

@ -1528,7 +1528,7 @@ class ConsoleSupervisor
$this->cleanNotifications('NOTIF.PHP.UPLOAD_MAX_FILESIZE'); $this->cleanNotifications('NOTIF.PHP.UPLOAD_MAX_FILESIZE');
} }
if ($PHPmemory_limit < $PHPmemory_limit_min && $PHPmemory_limit !== '-1') { if ($PHPmemory_limit < $PHPmemory_limit_min && (int) $PHPmemory_limit !== -1) {
$url = 'http://php.net/manual/en/ini.core.php#ini.memory-limit'; $url = 'http://php.net/manual/en/ini.core.php#ini.memory-limit';
if ($config['language'] == 'es') { if ($config['language'] == 'es') {
$url = 'http://php.net/manual/es/ini.core.php#ini.memory-limit'; $url = 'http://php.net/manual/es/ini.core.php#ini.memory-limit';
@ -2490,7 +2490,7 @@ class ConsoleSupervisor
foreach ($server_version_list as $server) { foreach ($server_version_list as $server) {
if (strpos( if (strpos(
$server['version'], $server['version'],
$config['current_package'] (string) floor($config['current_package'])
) === false ) === false
) { ) {
$missed++; $missed++;
@ -2511,6 +2511,8 @@ class ConsoleSupervisor
'url' => '__url__/index.php?sec=messages&sec2=godmode/update_manager/update_manager&tab=online', 'url' => '__url__/index.php?sec=messages&sec2=godmode/update_manager/update_manager&tab=online',
] ]
); );
break;
} }
} }
} }