Project

General

Profile

« Previous | Next » 

Revision 405dfaad

Added by Phil Davis over 8 years ago

Handle widgets having no items selected for display

View differences:

src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php
125 125
	if (is_array($_POST['show'])) {
126 126
		$user_settings['widgets']['dyn_dns_status']['filter'] = implode(',', array_diff($validNames, $_POST['show']));
127 127
	} else {
128
		$user_settings['widgets']['dyn_dns_status']['filter'] = "";
128
		$user_settings['widgets']['dyn_dns_status']['filter'] = implode(',', $validNames);
129 129
	}
130 130

  
131 131
	save_widget_settings($_SESSION['Username'], $user_settings["widgets"], gettext("Saved Dynamic DNS Filter via Dashboard."));
......
204 204
		</td>
205 205
	</tr>
206 206
	<?php endforeach;?>
207
	<?php if ($rowid == -1):?>
208
	<tr>
209
		<td colspan="4" class="text-center">
210
			<?=gettext('All Dyn DNS entries are hidden.');?>
211
		</td>
212
	</tr>
213
	<?php endif;?>
207 214
	</tbody>
208 215
</table>
209 216
</div>
src/usr/local/www/widgets/widgets/gateways.widget.php
48 48
		$user_settings["widgets"]["gateways_widget"]["display_type"] = $_POST["display_type"];
49 49
	}
50 50

  
51
	if (is_array($_POST['show'])) {
52
		$validNames = array();
53
		$a_gateways = return_gateways_array();
51
	$validNames = array();
52
	$a_gateways = return_gateways_array();
54 53

  
55
		foreach ($a_gateways as $gname => $gateway) {
56
			array_push($validNames, $gname);
57
		}
54
	foreach ($a_gateways as $gname => $gateway) {
55
		array_push($validNames, $gname);
56
	}
58 57

  
58
	if (is_array($_POST['show'])) {
59 59
		$user_settings["widgets"]["gateways_widget"]["gatewaysfilter"] = implode(',', array_diff($validNames, $_POST['show']));
60 60
	} else {
61
		$user_settings["widgets"]["gateways_widget"]["gatewaysfilter"] = "";
61
		$user_settings["widgets"]["gateways_widget"]["gatewaysfilter"] = implode(',', $validNames);
62 62
	}
63 63

  
64 64
	save_widget_settings($_SESSION['Username'], $user_settings["widgets"], gettext("Updated gateways widget settings via dashboard."));
......
319 319

  
320 320
	if (!$gw_displayed) {
321 321
		$rtnstr .= '<tr>';
322
		$rtnstr .= 	'<td colspan="5">';
322
		$rtnstr .= 	'<td colspan="5" class="text-center">';
323 323
		if (count($a_gateways)) {
324 324
			$rtnstr .= gettext('All gateways are hidden.');
325 325
		} else {
src/usr/local/www/widgets/widgets/interface_statistics.widget.php
49 49
	);
50 50

  
51 51
	$skipinterfaces = explode(",", $user_settings['widgets']['interface_statistics']['iffilter']);
52
	$interface_is_displayed = false;
52 53

  
53 54
	print("<thead>");
54 55
	print(	"<tr>");
......
57 58
	foreach ($ifdescrs as $ifdescr => $ifname) {
58 59
		if (!in_array($ifdescr, $skipinterfaces)) {
59 60
			print(		"<th>" . $ifname . "</th>");
61
			$interface_is_displayed = true;
60 62
		}
61 63
	}
62 64

  
65
	if (!$interface_is_displayed) {
66
		print("<th>" . gettext('All interfaces are hidden.') . "</th>");
67
	}
68

  
63 69
	print(		"</tr>");
64 70
	print(	"</thead>");
65 71
	print(	"<tbody>");
......
101 107
	if (is_array($_POST['show'])) {
102 108
		$user_settings['widgets']['interface_statistics']['iffilter'] = implode(',', array_diff($validNames, $_POST['show']));
103 109
	} else {
104
		$user_settings['widgets']['interface_statistics']['iffilter'] = "";
110
		$user_settings['widgets']['interface_statistics']['iffilter'] = implode(',', $validNames);
105 111
	}
106 112

  
107 113
	save_widget_settings($_SESSION['Username'], $user_settings["widgets"], gettext("Saved Interface Statistics Filter via Dashboard."));
src/usr/local/www/widgets/widgets/interfaces.widget.php
40 40
	if (is_array($_POST['show'])) {
41 41
		$user_settings['widgets']['interfaces']['iffilter'] = implode(',', array_diff($validNames, $_POST['show']));
42 42
	} else {
43
		$user_settings['widgets']['interfaces']['iffilter'] = "";
43
		$user_settings['widgets']['interfaces']['iffilter'] = implode(',', $validNames);
44 44
	}
45 45

  
46 46
	save_widget_settings($_SESSION['Username'], $user_settings["widgets"], gettext("Saved Interfaces Filter via Dashboard."));
......
54 54
		<tbody>
55 55
<?php
56 56
$skipinterfaces = explode(",", $user_settings['widgets']['interfaces']['iffilter']);
57
$interface_is_displayed = false;
57 58

  
58 59
foreach ($ifdescrs as $ifdescr => $ifname):
59 60
	if (in_array($ifdescr, $skipinterfaces)) {
60 61
		continue;
61 62
	}
62 63

  
64
	$interface_is_displayed = true;
63 65
	$ifinfo = get_interface_info($ifdescr);
64 66
	if ($ifinfo['pppoelink'] || $ifinfo['pptplink'] || $ifinfo['l2tplink']) {
65 67
		/* PPP link (non-cell) - looks like a modem */
......
127 129
	</tr>
128 130
<?php
129 131
endforeach;
132
if (!$interface_is_displayed):
133
?>
134
	<tr>
135
		<td class="text-center">
136
			<?=gettext('All interfaces are hidden.');?>
137
		</td>
138
	</tr>
139

  
140
<?php
141
endif;
130 142
?>
131 143
		</tbody>
132 144
	</table>
src/usr/local/www/widgets/widgets/openvpn.widget.php
65 65
	if (is_array($_POST['show'])) {
66 66
		$user_settings['widgets']['openvpn']['filter'] = implode(',', array_diff($validNames, $_POST['show']));
67 67
	} else {
68
		$user_settings['widgets']['openvpn']['filter'] = "";
68
		$user_settings['widgets']['openvpn']['filter'] = implode(',', $validNames);
69 69
	}
70 70

  
71 71
	save_widget_settings($_SESSION['Username'], $user_settings["widgets"], gettext("Saved OpenVPN Filter via Dashboard."));
......
83 83
	$skipovpns = explode(",", $user_settings['widgets']['openvpn']['filter']);
84 84

  
85 85
	$opstring = "";
86
	$got_ovpn_server = false;
86 87

  
87 88
	foreach ($servers as $server):
88 89
		if (in_array($server['vpnid'], $skipovpns)) {
89 90
			continue;
90 91
		}
91 92

  
93
		$got_ovpn_server = true;
94

  
92 95
	$opstring .= "<div class=\"widget panel panel-default\">";
93 96
	$opstring .=	"<div class=\"panel-heading\"><h2 class=\"panel-title\">" . htmlspecialchars($server['name']) . "</h2></div>";
94 97
	$opstring .=	"<div class=\"table-responsive\">";
......
302 305
	endif;
303 306

  
304 307
	if ((empty($clients)) && (empty($servers)) && (empty($sk_servers))) {
305
		print(gettext("No OpenVPN instances defined"));
308
		$none_to_display_text = gettext("No OpenVPN instances defined");
309
	} else if (!$got_ovpn_server && !$got_sk_server && !$got_ovpn_client) {
310
		$none_to_display_text = gettext("All OpenVPN instances are hidden");
311
	} else {
312
		$none_to_display_text = "";
313
	}
314
	
315
	if (strlen($none_to_display_text) > 0) {
316
		print('<table class="table"><tbody><td class="text-center">' . $none_to_display_text . '</td></tbody></table>');
306 317
	}
307 318
}
308 319

  
src/usr/local/www/widgets/widgets/services_status.widget.php
59 59
	if (is_array($_POST['show'])) {
60 60
		$user_settings['widgets']['servicestatusfilter'] = implode(',', array_diff($validNames, $_POST['show']));
61 61
	} else {
62
		$user_settings['widgets']['servicestatusfilter'] = "";
62
		$user_settings['widgets']['servicestatusfilter'] = implode(',', $validNames);
63 63
	}
64 64

  
65 65
	save_widget_settings($_SESSION['Username'], $user_settings["widgets"], gettext("Saved Service Status Filter via Dashboard."));
......
83 83

  
84 84
if (count($services) > 0) {
85 85
	uasort($services, "service_dispname_compare");
86
	$service_is_displayed = false;
86 87

  
87 88
	foreach ($services as $service) {
88 89
		if ((!$service['dispname']) || (in_array($service['dispname'], $skipservices)) || (!is_service_enabled($service['dispname']))) {
89 90
			continue;
90 91
		}
91 92

  
93
		$service_is_displayed = true;
94

  
92 95
		if (empty($service['description'])) {
93 96
			$service['description'] = get_pkg_descr($service['name']);
94 97
		}
......
103 106
			</tr>
104 107
<?php
105 108
	}
109

  
110
	if (!$service_is_displayed) {
111
		echo "<tr><td colspan=\"4\" class=\"text-center\">" . gettext("All services are hidden") . ". </td></tr>\n";
112
	}
106 113
} else {
107
	echo "<tr><td colspan=\"3\" class=\"text-center\">" . gettext("No services found") . ". </td></tr>\n";
114
	echo "<tr><td colspan=\"4\" class=\"text-center\">" . gettext("No services found") . ". </td></tr>\n";
108 115
}
109 116
?>
110 117
		</tbody>
src/usr/local/www/widgets/widgets/smart_status.widget.php
47 47
	if (is_array($_POST['show'])) {
48 48
		$user_settings['widgets']['smart_status']['filter'] = implode(',', array_diff($validNames, $_POST['show']));
49 49
	} else {
50
		$user_settings['widgets']['smart_status']['filter'] = "";
50
		$user_settings['widgets']['smart_status']['filter'] = implode(',', $validNames);
51 51
	}
52 52

  
53 53
	save_widget_settings($_SESSION['Username'], $user_settings["widgets"], gettext("Saved SMART Status Filter via Dashboard."));
......
69 69
	<tbody>
70 70
<?php
71 71
$skipsmart = explode(",", $user_settings['widgets']['smart_status']['filter']);
72
$smartdrive_is_displayed = false;
72 73

  
73 74
if (count($devs) > 0)  {
74 75
	foreach ($devs as $dev)  { ## for each found drive do
......
76 77
			continue;
77 78
		}
78 79

  
80
		$smartdrive_is_displayed = true;
79 81
		$dev_ident = exec("diskinfo -v /dev/$dev | grep ident   | awk '{print $1}'"); ## get identifier from drive
80 82
		$dev_state = trim(exec("smartctl -H /dev/$dev | awk -F: '/^SMART overall-health self-assessment test result/ {print $2;exit}
81 83
/^SMART Health Status/ {print $2;exit}'")); ## get SMART state from drive
......
102 104
			<td><?=$dev_ident?></td>
103 105
			<td><?=ucfirst($dev_state)?></td>
104 106
		</tr>
107
<?php
108
	}
109

  
110
	if (!$smartdrive_is_displayed) {
111
?>
112
		<tr>
113
			<td colspan="4" class="text-center">
114
				<?=gettext('All SMART drives are hidden.');?>
115
			</td>
116
		</tr>
105 117
<?php
106 118
	}
107 119
}
src/usr/local/www/widgets/widgets/system_information.widget.php
107 107
	if (is_array($_POST['show'])) {
108 108
		$user_settings['widgets']['system_information']['filter'] = implode(',', array_diff($validNames, $_POST['show']));
109 109
	} else {
110
		$user_settings['widgets']['system_information']['filter'] = "";
110
		$user_settings['widgets']['system_information']['filter'] = implode(',', $validNames);
111 111
	}
112 112

  
113 113
	save_widget_settings($_SESSION['Username'], $user_settings["widgets"], gettext("Saved System Information Widget Filter via Dashboard."));
......
123 123
$filesystems = get_mounted_filesystems();
124 124

  
125 125
$skipsysinfoitems = explode(",", $user_settings['widgets']['system_information']['filter']);
126
$rows_displayed = false;
126 127
?>
127 128

  
128 129
<div class="table-responsive">
......
130 131
	<tbody>
131 132
<?php
132 133
	if (!in_array('name', $skipsysinfoitems)):
134
		$rows_displayed = true;
133 135
?>
134 136
		<tr>
135 137
			<th><?=gettext("Name");?></th>
......
138 140
<?php
139 141
	endif;
140 142
	if (!in_array('system', $skipsysinfoitems)):
143
		$rows_displayed = true;
141 144
?>
142 145
		<tr>
143 146
			<th><?=gettext("System");?></th>
......
157 160
<?php
158 161
	endif;
159 162
	if (!in_array('version', $skipsysinfoitems)):
163
		$rows_displayed = true;
160 164
?>
161 165
		<tr>
162 166
			<th><?=gettext("Version");?></th>
......
178 182
<?php
179 183
	endif;
180 184
	if (!in_array('cpu_type', $skipsysinfoitems)):
185
		$rows_displayed = true;
181 186
?>
182 187
		<tr>
183 188
			<th><?=gettext("CPU Type");?></th>
......
195 200
<?php
196 201
	endif;
197 202
	if (!in_array('hwcrypto', $skipsysinfoitems)):
203
		$rows_displayed = true;
198 204
?>
199 205
		<?php if ($hwcrypto): ?>
200 206
		<tr>
......
205 211
<?php
206 212
	endif;
207 213
	if (!in_array('uptime', $skipsysinfoitems)):
214
		$rows_displayed = true;
208 215
?>
209 216
		<tr>
210 217
			<th><?=gettext("Uptime");?></th>
......
213 220
<?php
214 221
	endif;
215 222
	if (!in_array('current_datetime', $skipsysinfoitems)):
223
		$rows_displayed = true;
216 224
?>
217 225
		<tr>
218 226
			<th><?=gettext("Current date/time");?></th>
......
221 229
<?php
222 230
	endif;
223 231
	if (!in_array('dns_servers', $skipsysinfoitems)):
232
		$rows_displayed = true;
224 233
?>
225 234
		<tr>
226 235
			<th><?=gettext("DNS server(s)");?></th>
......
238 247
<?php
239 248
	endif;
240 249
	if (!in_array('last_config_change', $skipsysinfoitems)):
250
		$rows_displayed = true;
241 251
?>
242 252
		<?php if ($config['revision']): ?>
243 253
		<tr>
......
248 258
<?php
249 259
	endif;
250 260
	if (!in_array('state_table_size', $skipsysinfoitems)):
261
		$rows_displayed = true;
251 262
?>
252 263
		<tr>
253 264
			<th><?=gettext("State table size");?></th>
......
266 277
<?php
267 278
	endif;
268 279
	if (!in_array('mbuf_usage', $skipsysinfoitems)):
280
		$rows_displayed = true;
269 281
?>
270 282
		<tr>
271 283
			<th><?=gettext("MBUF Usage");?></th>
......
284 296
<?php
285 297
	endif;
286 298
	if (!in_array('temperature', $skipsysinfoitems)):
299
		$rows_displayed = true;
287 300
?>
288 301
		<?php if (get_temp() != ""): ?>
289 302
		<tr>
......
301 314
<?php
302 315
	endif;
303 316
	if (!in_array('load_average', $skipsysinfoitems)):
317
		$rows_displayed = true;
304 318
?>
305 319
		<tr>
306 320
			<th><?=gettext("Load average");?></th>
......
311 325
<?php
312 326
	endif;
313 327
	if (!in_array('cpu_usage', $skipsysinfoitems)):
328
		$rows_displayed = true;
314 329
?>
315 330
		<tr>
316 331
			<th><?=gettext("CPU usage");?></th>
......
326 341
<?php
327 342
	endif;
328 343
	if (!in_array('memory_usage', $skipsysinfoitems)):
344
		$rows_displayed = true;
329 345
?>
330 346
		<tr>
331 347
			<th><?=gettext("Memory usage");?></th>
......
342 358
<?php
343 359
	endif;
344 360
	if (!in_array('swap_usage', $skipsysinfoitems)):
361
		$rows_displayed = true;
345 362
?>
346 363
		<?php if ($showswap == true): ?>
347 364
		<tr>
......
360 377
<?php
361 378
	endif;
362 379
	if (!in_array('disk_usage', $skipsysinfoitems)):
380
		$rows_displayed = true;
363 381
		$diskidx = 0;
364 382
		foreach ($filesystems as $fs):
365 383
?>
......
377 395
			$diskidx++;
378 396
		endforeach;
379 397
	endif;
398
	if (!$rows_displayed):
399
?>
400
		<tr>
401
			<td class="text-center">
402
				<?=gettext('All System Information items are hidden.');?>
403
			</td>
404
		</tr>
405
<?php
406
	endif;
380 407
?>
381 408

  
382 409
	</tbody>
src/usr/local/www/widgets/widgets/wake_on_lan.widget.php
47 47
	if (is_array($_POST['show'])) {
48 48
		$user_settings['widgets']['wol']['filter'] = implode(',', array_diff($validNames, $_POST['show']));
49 49
	} else {
50
		$user_settings['widgets']['wol']['filter'] = "";
50
		$user_settings['widgets']['wol']['filter'] = implode(',', $validNames);
51 51
	}
52 52

  
53 53
	save_widget_settings($_SESSION['Username'], $user_settings["widgets"], gettext("Saved Wake on LAN Filter via Dashboard."));
......
70 70
$skipwols = explode(",", $user_settings['widgets']['wol']['filter']);
71 71

  
72 72
if (count($wolcomputers) > 0):
73
	$wol_entry_is_displayed = false;
74

  
73 75
	foreach ($wolcomputers as $wolent):
74 76
		if (in_array(get_wolent_key($wolent), $skipwols)) {
75 77
			continue;
76 78
		}
77 79

  
80
		$wol_entry_is_displayed = true;
78 81
		$is_active = exec("/usr/sbin/arp -an |/usr/bin/grep {$wolent['mac']}| /usr/bin/wc -l|/usr/bin/awk '{print $1;}'");
79 82
		$status = exec("/usr/sbin/arp -an | /usr/bin/awk '$4 == \"{$wolent['mac']}\" { print $7 }'");
80 83
		?>
......
101 104
				</a>
102 105
			</td>
103 106
		</tr>
104
<?php	endforeach;
105
else: ?>
107
<?php
108
	endforeach;
109
	if (!$wol_entry_is_displayed):
110
?>
111
		<tr><td colspan="4" class="text-center"><?=gettext("All WoL entries are hidden.")?></td></tr>
112
<?php
113
	endif;
114
else:
115
?>
106 116
	<tr><td colspan="4" class="text-center"><?= gettext("No saved WoL addresses") ?></td></tr>
107 117
<?php
108 118
endif;

Also available in: Unified diff