tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed errors 

Former-commit-id: 813a875e0f3d0dc3c1097ced987a5a45e8051046
This commit is contained in:
daniel 2019-01-11 08:45:12 +01:00
parent ea34cc3b16
commit b963395d01
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pandora_console/include/functions_os.php
View File

@ -67,12 +67,21 @@ function os_get_name($id_os) {
} }
function os_get_os() { function os_get_os($hash = false) {
$result = array();
$op_systems = db_get_all_rows_in_table('tconfig_os'); $op_systems = db_get_all_rows_in_table('tconfig_os');
if (empty($op_systems)) if (empty($op_systems))
$op_systems = array(); $op_systems = array();
return $op_systems; if ($hash) {
foreach ($op_systems as $key => $value) {
$result[$value['id_os']] = $value['name'];
}
} else {
$result = $op_systems;
}
return $result;
} }
function os_get_icon($id_os) { function os_get_icon($id_os) {

4
pandora_console/include/functions_ui.php
View File

@ -1584,8 +1584,8 @@ $config['css']['dialog'] = "include/javascript/introjs.css";
//End load JQuery //End load JQuery
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
include_once($config["homedir"] . '/include/graphs/functions_flot.php'); include_once (__DIR__ . '/graphs/functions_flot.php');
$output .= include_javascript_dependencies_flot_graph(true); $output .= include_javascript_dependencies_flot_graph (true);
$output .= '<!--[if gte IE 6]> $output .= '<!--[if gte IE 6]>
<link rel="stylesheet" href="include/styles/ie.css" type="text/css"/> <link rel="stylesheet" href="include/styles/ie.css" type="text/css"/>