[libvirt] [libvirt-php][PATCH 2/8] examples: Resolve some warnings
Michal Privoznik
mprivozn at redhat.com
Thu Oct 1 14:14:43 UTC 2015
So, I have a couple of networks and while testing the examples
I've noticed that there are some warnings being printed out:
[Wed Sep 30 15:53:13 2015] PHP Notice: Undefined index: forward_dev in /home/zippy/work/libvirt/libvirt-php.git/examples/index.php on line 283
[Wed Sep 30 15:53:13 2015] PHP Notice: Undefined index: forward_dev in /home/zippy/work/libvirt/libvirt-php.git/examples/index.php on line 283
[Wed Sep 30 15:53:13 2015] PHP Notice: Undefined index: forward_dev in /home/zippy/work/libvirt/libvirt-php.git/examples/index.php on line 283
[Wed Sep 30 15:53:13 2015] PHP Notice: Undefined index: ip in /home/zippy/work/libvirt/libvirt-php.git/examples/index.php on line 303
[Wed Sep 30 15:53:13 2015] PHP Notice: Undefined index: ip_range in /home/zippy/work/libvirt/libvirt-php.git/examples/index.php on line 304
Make the code work with missing info
Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
examples/index.php | 43 +++++++++++++++++++++++++++----------------
1 file changed, 27 insertions(+), 16 deletions(-)
diff --git a/examples/index.php b/examples/index.php
index 874803d..94badb6 100644
--- a/examples/index.php
+++ b/examples/index.php
@@ -279,32 +279,43 @@
for ($i = 0; $i < sizeof($tmp); $i++) {
$tmp2 = $lv->get_network_information($tmp[$i]);
- if ($tmp2['forwarding'] != 'None')
- $forward = $tmp2['forwarding'].' to '.$tmp2['forward_dev'];
- else
- $forward = 'None';
+ $ip = '';
+ $ip_range = '';
+ $activity = $tmp2['active'] ? 'Active' : 'Inactive';
+ $dhcp = 'Disabled';
+ $forward = 'None';
+ if (array_key_exists('forwarding', $tmp2) && $tmp2['forwarding'] != 'None') {
+ if (array_key_exists('forward_dev', $tmp2))
+ $forward = $tmp2['forwarding'].' to '.$tmp2['forward_dev'];
+ else
+ $forward = $tmp2['forwarding'];
+ }
+
if (array_key_exists('dhcp_start', $tmp2) && array_key_exists('dhcp_end', $tmp2))
$dhcp = $tmp2['dhcp_start'].' - '.$tmp2['dhcp_end'];
- else
- $dhcp = 'Disabled';
- $activity = $tmp2['active'] ? 'Active' : 'Inactive';
- $act = !$tmp2['active'] ? "<a href=\"?action={$_GET['action']}&subaction=start&name={$tmp2['name']}\">Start network</a>" :
- "<a href=\"?action={$_GET['action']}&subaction=stop&name={$tmp2['name']}\">Stop network</a>";
- $act .= " | <a href=\"?action={$_GET['action']}&subaction=dumpxml&name={$tmp2['name']}\">Dump network XML</a>";
- if (!$tmp2['active']) {
- $act .= ' | <a href="?action='.$_GET['action'].'&subaction=edit&name='.$tmp2['name'].'">Edit network</a>';
- }
+ if (array_key_exists('ip', $tmp2))
+ $ip = $tmp2['ip'];
+
+ if (array_key_exists('ip_range', $tmp2))
+ $ip_range = $tmp2['ip_range'];
+
+ $act = "<a href=\"?action={$_GET['action']}&subaction=" . ($tmp2['active'] ? "stop" : "start");
+ $act .= "&name=" . urlencode($tmp2['name']) . "\">";
+ $act .= ($tmp2['active'] ? "Stop" : "Start") . " network</a>";
+ $act .= " | <a href=\"?action={$_GET['action']}&subaction=dumpxml&name=" . urlencode($tmp2['name']) . "\">Dump network XML</a>";
+ if (!$tmp2['active'])
+ $act .= ' | <a href="?action='.$_GET['action'].'&subaction=edit&name='. urlencode($tmp2['name']) . '">Edit network</a>';
echo "<tr>
<td>$spaces{$tmp2['name']}$spaces</td>
<td align=\"center\">$spaces$activity$spaces</td>
- <td align=\"center\">$spaces{$tmp2['ip']}$spaces</td>
- <td align=\"center\">$spaces{$tmp2['ip_range']}$spaces</td>
+ <td align=\"center\">$spaces$ip$spaces</td>
+ <td align=\"center\">$spaces$ip_range$spaces</td>
<td align=\"center\">$spaces$forward$spaces</td>
<td align=\"center\">$spaces$dhcp$spaces</td>
<td align=\"center\">$spaces$act$spaces</td>
- </tr>";
+ </tr>";
}
echo "</table>";
--
2.4.9
More information about the libvir-list
mailing list