nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-30 16:14:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Do not use var_isset and fix if-then-else-codestyle

Browse Source
This commit is contained in:
Mark Schouten
2015-08-31 16:40:53 +02:00
parent 8543ca3d46
commit 73e4dd178f
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/functions.inc.php
-5
View File
@@ -12,11 +12,6 @@
* @copyright (C) 2013 LibreNMS Group * @copyright (C) 2013 LibreNMS Group
*/ */
function var_isset($v) {
global $vars;
return isset($vars[$v]);
}
function var_eq($v, $t) { function var_eq($v, $t) {
global $vars; global $vars;
if (isset($vars[$v]) && $vars[$v] == $t) { if (isset($vars[$v]) && $vars[$v] == $t) {
html/pages/apps/proxmox.inc.php
+5 -3
View File
@@ -34,20 +34,22 @@ foreach ($pmxcl as $pmxc) {
print_optionbar_end(); print_optionbar_end();
if (!var_isset('instance')) { if (!isset($vars['instance'])) {
echo 'Select a cluster:'; echo 'Select a cluster:';
echo '<ul>'; echo '<ul>';
foreach ($pmxcl as $pmxc) { foreach ($pmxcl as $pmxc) {
echo '<li>'.generate_link(nicecase($pmxc['app_instance']), array('page' => 'apps', 'app' => 'proxmox', 'instance' => $pmxc['app_instance'])).'</li>'; echo '<li>'.generate_link(nicecase($pmxc['app_instance']), array('page' => 'apps', 'app' => 'proxmox', 'instance' => $pmxc['app_instance'])).'</li>';
} }
echo '</ul>'; echo '</ul>';
} elseif (!var_isset('vmid')) { }
elseif (!isset($vars['vmid'])) {
echo '<ul>'; echo '<ul>';
foreach (proxmox_cluster_vms(var_get('instance')) as $pmxvm) { foreach (proxmox_cluster_vms(var_get('instance')) as $pmxvm) {
echo '<li>'.generate_link($pmxvm['vmid']." (".$pmxvm['description'].")", array('page' => 'apps', 'app' => 'proxmox', 'instance' => var_get('instance'), 'vmid' => $pmxvm['vmid'])).'</li>'; echo '<li>'.generate_link($pmxvm['vmid']." (".$pmxvm['description'].")", array('page' => 'apps', 'app' => 'proxmox', 'instance' => var_get('instance'), 'vmid' => $pmxvm['vmid'])).'</li>';
} }
echo '</ul>'; echo '</ul>';
} else { }
else {
include("pages/apps/proxmox/vm.inc.php"); include("pages/apps/proxmox/vm.inc.php");
} }