Skip to content

Commit 6026b34

Browse files
author
redray
committed
new theme for status
1 parent 9d0fdeb commit 6026b34

File tree

1 file changed

+47
-50
lines changed

1 file changed

+47
-50
lines changed

‎interface/web/monitor/system.php‎

Lines changed: 47 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
function show_load(){
102102
global $app;
103103

104-
$html_out .= '<div align="left"><table width="400" border="0" cellspacing="1" cellpadding="4" bgcolor="#CCCCCC">';
104+
$html_out .= '<table>';
105105

106106
$fd = popen ("uptime", "r");
107107
while (!feof($fd)) {
@@ -118,35 +118,35 @@ function show_load(){
118118
$minutes = str_pad(floor(($proc_uptime-$days*86400-$hours*3600)/60), 2, "0", STR_PAD_LEFT);
119119

120120
$html_out .= '<tr>
121-
<td width="70%" bgcolor="#FFFFFF"><font face="Verdana, Arial, Helvetica, sans-serif" size="2">'.$app->lng("Server Online seit").':</font></td>
122-
<td width="30%" bgcolor="#FFFFFF"><center><font face="Verdana, Arial, Helvetica, sans-serif" size="2">'.$days.'d, '.$hours.':'.$minutes.'h</font></center></td>
121+
<td>'.$app->lng("Server online since").':</td>
122+
<td>'.$days.'d, '.$hours.':'.$minutes.'h</center></td>
123123
</tr>';
124124

125125
$html_out .= '<tr>
126-
<td width="70%" bgcolor="#FFFFFF"><font face="Verdana, Arial, Helvetica, sans-serif" size="2">'.$app->lng("User Online").':</font></td>
127-
<td width="30%" bgcolor="#FFFFFF"><center><font face="Verdana, Arial, Helvetica, sans-serif" size="2">'.strrev($uptime[3]).'</font></center></td>
126+
<td>'.$app->lng("Users online").':</td>
127+
<td>'.strrev($uptime[3]).'</td>
128128
</tr>';
129129

130130
$ausl = split(":",strrev($uptime[2]));
131131
$ausl1 = $ausl[1];
132132

133133

134134
$html_out .= '<tr>
135-
<td width="70%" bgcolor="#FFFFFF"><font face="Verdana, Arial, Helvetica, sans-serif" size="2">'.$app->lng("System Load 1 Minute").':</font></td>
136-
<td width="30%" bgcolor="#FFFFFF"><center><font face="Verdana, Arial, Helvetica, sans-serif" size="2">'.$ausl1.'</font></center></td>
135+
<td>'.$app->lng("System load 1 minute").':</td>
136+
<td>'.$ausl1.'</td>
137137
</tr>';
138138

139139
$html_out .= '<tr>
140-
<td width="70%" bgcolor="#FFFFFF"><font face="Verdana, Arial, Helvetica, sans-serif" size="2">'.$app->lng("System Load 5 Minuten").':</font></td>
141-
<td width="30%" bgcolor="#FFFFFF"><center><font face="Verdana, Arial, Helvetica, sans-serif" size="2">'.strrev($uptime[1]).'</font></center></td>
140+
<td>'.$app->lng("System load 5 minutes").':</td>
141+
<td>'.strrev($uptime[1]).'</td>
142142
</tr>';
143143

144144
$html_out .= '<tr>
145-
<td width="70%" bgcolor="#FFFFFF"><font face="Verdana, Arial, Helvetica, sans-serif" size="2">'.$app->lng("System Load 15 Minuten").':</font></td>
146-
<td width="30%" bgcolor="#FFFFFF"><center><font face="Verdana, Arial, Helvetica, sans-serif" size="2">'.strrev($uptime[0]).'</font></center></td>
145+
<td>'.$app->lng("System load 15 minutes").':</td>
146+
<td>'.strrev($uptime[0]).'</td>
147147
</tr>';
148148

149-
$html_out .= '</table></div>';
149+
$html_out .= '</table>';
150150

151151

152152
return $html_out;
@@ -156,7 +156,7 @@ function show_disk () {
156156
global $app;
157157

158158

159-
$html_out .= '<div align="left"><table width="400" border="0" cellspacing="1" cellpadding="4" bgcolor="#CCCCCC">';
159+
$html_out .= '<table>';
160160

161161
$fd = popen ("df -h", "r");
162162
while (!feof($fd)) {
@@ -179,12 +179,9 @@ function show_disk () {
179179
foreach($df_out as $df_line) {
180180
$values = preg_split ("/[\s]+/", $df_line);
181181
$mln = 0;
182-
$font_class = 'normal_bold';
183-
if($mrow > 0) $font_class = 'normal';
184182
foreach($values as $value) {
185183
$align = 'left';
186-
if($mln > 0 and $mln < 5) $align = 'right';
187-
if($mln < 6 and $value != "") $html_out .= '<td bgcolor="#FFFFFF" class="frmText11" align="'.$align.'">'.$value.'</td>';
184+
if($mln < 6 and $value != "") $html_out .= '<td>'.$value.'</td>';
188185
$mln++;
189186
}
190187
$mrow++;
@@ -193,7 +190,7 @@ function show_disk () {
193190
}
194191

195192

196-
$html_out .= '</table></div>';
193+
$html_out .= '</table>';
197194

198195

199196
return $html_out;
@@ -204,7 +201,7 @@ function show_memusage ()
204201
{
205202
global $app;
206203

207-
$html_out .= '<div align="left"><table width="400" border="0" cellspacing="1" cellpadding="4" bgcolor="#CCCCCC">';
204+
$html_out .= '<table>';
208205

209206
$fd = fopen ("/proc/meminfo", "r");
210207
while (!feof($fd)) {
@@ -220,22 +217,22 @@ function show_memusage ()
220217
$mpart = split(":",$mline);
221218

222219
$html_out .= '<tr>
223-
<td width="70%" bgcolor="#FFFFFF"><font face="Verdana, Arial, Helvetica, sans-serif" size="2">'.$mpart[0].':</font></td>
224-
<td width="30%" bgcolor="#FFFFFF" align="right"><font face="Verdana, Arial, Helvetica, sans-serif" size="2">'.$mpart[1].'</font></td>
220+
<td>'.$mpart[0].':</td>
221+
<td>'.$mpart[1].'</td>
225222
</tr>';
226223
}
227224

228225
$x++;
229226
}
230-
$html_out .= '</table></div>';
227+
$html_out .= '</table>';
231228
return $html_out;
232229
}
233230

234231
function show_cpu ()
235232
{
236233
global $app;
237234

238-
$html_out .= '<div align="left"><table width="400" border="0" cellspacing="1" cellpadding="4" bgcolor="#CCCCCC">';
235+
$html_out .= '<table>';
239236

240237
$n = 0;
241238
if(is_readable("/proc/cpuinfo")) {
@@ -258,8 +255,8 @@ function show_cpu ()
258255
$mpart = split(":",$mline);
259256

260257
$html_out .= '<tr>
261-
<td width="70%" bgcolor="#FFFFFF"><font face="Verdana, Arial, Helvetica, sans-serif" size="2">'.$mpart[0].':</font></td>
262-
<td width="30%" bgcolor="#FFFFFF" align="center"><font face="Verdana, Arial, Helvetica, sans-serif" size="2">'.$mpart[1].'</font></td>
258+
<td>'.$mpart[0].':</td>
259+
<td>'.$mpart[1].'</td>
263260
</tr>';
264261
}
265262
}
@@ -276,73 +273,73 @@ function show_services ()
276273
{
277274
global $app;
278275

279-
$html_out .= '<div align="left"><table width="400" border="0" cellspacing="1" cellpadding="4" bgcolor="#CCCCCC">';
276+
$html_out .= '<table>';
280277

281278
// Checke Webserver
282279
if(_check_tcp('localhost',80)) {
283-
$status = '<font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#006600"><b>Online</b></font>';
280+
$status = '<span class="online">Online</span>';
284281
} else {
285-
$status = '<font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#FF0000"><b>Offline</b></font>';
282+
$status = '<span class="offline">Offline</span>';
286283
}
287284
$html_out .= '<tr>
288-
<td width="70%" bgcolor="#FFFFFF"><font face="Verdana, Arial, Helvetica, sans-serif" size="2">Web-Server:</font></td>
289-
<td width="30%" bgcolor="#FFFFFF"><center>'.$status.'</center></td>
285+
<td>Web-Server:</td>
286+
<td>'.$status.'</td>
290287
</tr>';
291288

292289

293290
// Checke FTP-Server
294291
if(_check_ftp('localhost',21)) {
295-
$status = '<font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#006600"><b>Online</b></font>';
292+
$status = '<span class="online">Online</span>';
296293
} else {
297-
$status = '<font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#FF0000"><b>Offline</b></font>';
294+
$status = '<span class="offline">Offline</span>';
298295
}
299296
$html_out .= '<tr>
300-
<td width="70%" bgcolor="#FFFFFF"><font face="Verdana, Arial, Helvetica, sans-serif" size="2">FTP-Server:</font></td>
301-
<td width="30%" bgcolor="#FFFFFF"><center>'.$status.'</center></td>
297+
<td>FTP-Server:</td>
298+
<td>'.$status.'</td>
302299
</tr>';
303300

304301
// Checke SMTP-Server
305302
if(_check_tcp('localhost',25)) {
306-
$status = '<font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#006600"><b>Online</b></font>';
303+
$status = '<span class="online">Online</span>';
307304
} else {
308-
$status = '<font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#FF0000"><b>Offline</b></font>';
305+
$status = '<span class="offline">Offline</span>';
309306
}
310307
$html_out .= '<tr>
311-
<td width="70%" bgcolor="#FFFFFF"><font face="Verdana, Arial, Helvetica, sans-serif" size="2">SMTP-Server:</font></td>
312-
<td width="30%" bgcolor="#FFFFFF"><center>'.$status.'</center></td>
308+
<td>SMTP-Server:</td>
309+
<td>'.$status.'</td>
313310
</tr>';
314311

315312
// Checke POP3-Server
316313
if(_check_tcp('localhost',110)) {
317-
$status = '<font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#006600"><b>Online</b></font>';
314+
$status = '<span class="online">Online</span>';
318315
} else {
319-
$status = '<font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#FF0000"><b>Offline</b></font>';
316+
$status = '<span class="offline">Offline</span>';
320317
}
321318
$html_out .= '<tr>
322-
<td width="70%" bgcolor="#FFFFFF"><font face="Verdana, Arial, Helvetica, sans-serif" size="2">POP3-Server:</font></td>
323-
<td width="30%" bgcolor="#FFFFFF"><center>'.$status.'</center></td>
319+
<td>POP3-Server:</td>
320+
<td>'.$status.'</td>
324321
</tr>';
325322

326323
// Checke BIND-Server
327324
if(_check_tcp('localhost',53)) {
328-
$status = '<font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#006600"><b>Online</b></font>';
325+
$status = '<span class="online">Online</span>';
329326
} else {
330-
$status = '<font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#FF0000"><b>Offline</b></font>';
327+
$status = '<span class="offline">Offline</span>';
331328
}
332329
$html_out .= '<tr>
333-
<td width="70%" bgcolor="#FFFFFF"><font face="Verdana, Arial, Helvetica, sans-serif" size="2">DNS-Server:</font></td>
334-
<td width="30%" bgcolor="#FFFFFF"><center>'.$status.'</center></td>
330+
<td>DNS-Server:</td>
331+
<td>'.$status.'</td>
335332
</tr>';
336333

337334
// Checke MYSQL-Server
338335
//if($this->_check_tcp('localhost',3306)) {
339-
$status = '<font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#006600"><b>Online</b></font>';
336+
$status = '<span class="online">Online</span>';
340337
//} else {
341-
//$status = '<font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#FF0000"><b>Offline</b></font>';
338+
//$status = '<span class="offline">Offline</span>';
342339
//}
343340
$html_out .= '<tr>
344-
<td width="70%" bgcolor="#FFFFFF"><font face="Verdana, Arial, Helvetica, sans-serif" size="2">mySQL-Server:</font></td>
345-
<td width="30%" bgcolor="#FFFFFF"><center>'.$status.'</center></td>
341+
<td>mySQL-Server:</td>
342+
<td>'.$status.'</td>
346343
</tr>';
347344

348345

0 commit comments

Comments
 (0)