mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-31 01:35:36 +02:00
fixed errors
Former-commit-id: 813a875e0f3d0dc3c1097ced987a5a45e8051046
This commit is contained in:
parent
ea34cc3b16
commit
b963395d01
@ -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) {
|
||||||
|
@ -1584,7 +1584,7 @@ $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]>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user