From c9d97bfb2d2349194188d66e92e4adbafaba8b14 Mon Sep 17 00:00:00 2001
From: vogelor <vogelor@ispconfig3>
Date: Fri, 30 Apr 2010 20:19:47 -0400
Subject: [PATCH] The monitor now supports OpenVZ-Hosts and OpenVZ-VE's
---
interface/web/monitor/tools.inc.php | 532 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 281 insertions(+), 251 deletions(-)
diff --git a/interface/web/monitor/tools.inc.php b/interface/web/monitor/tools.inc.php
index 8bee86c..f407c60 100644
--- a/interface/web/monitor/tools.inc.php
+++ b/interface/web/monitor/tools.inc.php
@@ -26,21 +26,21 @@
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-function showServerLoad(){
- global $app;
+function showServerLoad() {
+ global $app;
- /* fetch the Data from the DB */
- $record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'server_load' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
+ /* fetch the Data from the DB */
+ $record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'server_load' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
- if(isset($record['data'])) {
- $data = unserialize($record['data']);
+ if(isset($record['data'])) {
+ $data = unserialize($record['data']);
- /*
+ /*
Format the data
- */
+ */
if (strlen($data['up_minutes']) == "1") $data['up_minutes'] = "0".$data['up_minutes'];
- $html =
- '<div class="systemmonitor-state state-'.$record['state'].'">
+ $html =
+ '<div class="systemmonitor-state state-'.$record['state'].'">
<div class="systemmonitor-content icons32 ico-'.$record['state'].'">
<table>
<tr>
@@ -51,7 +51,7 @@
<td>' . $app->lng("Users online").':</td>
<td>' . $data['user_online'] . '</td>
</tr>' .
- '<tr>
+ '<tr>
<td>' . $app->lng("System load 1 minute") . ':</td>
<td>' . $data['load_1'] . '</td>
</tr>
@@ -66,27 +66,27 @@
</table>
</div>
</div>';
- } else {
- $html = '<p>'.$app->lng("no_data_serverload_txt").'</p>';
- }
+ } else {
+ $html = '<p>'.$app->lng("no_data_serverload_txt").'</p>';
+ }
- return $html;
+ return $html;
}
function showDiskUsage () {
- global $app;
+ global $app;
- /* fetch the Data from the DB */
- $record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'disk_usage' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
+ /* fetch the Data from the DB */
+ $record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'disk_usage' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
- if(isset($record['data'])) {
- $data = unserialize($record['data']);
+ if(isset($record['data'])) {
+ $data = unserialize($record['data']);
- /*
+ /*
Format the data
- */
- $html =
- '<div class="systemmonitor-state state-'.$record['state'].'">
+ */
+ $html =
+ '<div class="systemmonitor-state state-'.$record['state'].'">
<div class="systemmonitor-content icons32 ico-'.$record['state'].'">
<table>
<tr>
@@ -98,359 +98,389 @@
<td>'.$app->lng("monitor_diskusage_usage_txt").'</td>
<td>'.$app->lng("monitor_diskusage_mounted_txt").'</td>
</tr>';
- foreach($data as $line) {
- $html .= '<tr>';
- foreach ($line as $item) {
- $html .= '<td>' . $item . '</td>';
- }
- $html .= '</tr>';
- }
- $html .= '</table>';
- $html .= '</div></div>';
- } else {
- $html = '<p>'.$app->lng("no_data_diskusage_txt").'</p>';
- }
+ foreach($data as $line) {
+ $html .= '<tr>';
+ foreach ($line as $item) {
+ $html .= '<td>' . $item . '</td>';
+ }
+ $html .= '</tr>';
+ }
+ $html .= '</table>';
+ $html .= '</div></div>';
+ } else {
+ $html = '<p>'.$app->lng("no_data_diskusage_txt").'</p>';
+ }
- return $html;
+ return $html;
}
function showMemUsage () {
- global $app;
+ global $app;
- /* fetch the Data from the DB */
- $record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'mem_usage' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
+ /* fetch the Data from the DB */
+ $record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'mem_usage' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
- if(isset($record['data'])) {
- $data = unserialize($record['data']);
+ if(isset($record['data'])) {
+ $data = unserialize($record['data']);
- /*
+ /*
Format the data
- */
- $html =
- '<div class="systemmonitor-state state-'.$record['state'].'">
+ */
+ $html =
+ '<div class="systemmonitor-state state-'.$record['state'].'">
<div class="systemmonitor-content icons32 ico-'.$record['state'].'">
<table>';
- foreach($data as $key => $value){
- if ($key != '') {
- $html .= '<tr>
+ foreach($data as $key => $value) {
+ if ($key != '') {
+ $html .= '<tr>
<td>' . $key . ':</td>
<td>' . $value . '</td>
</tr>';
- }
- }
- $html .= '</table>';
- $html .= '</div></div>';
+ }
+ }
+ $html .= '</table>';
+ $html .= '</div></div>';
- } else {
- $html = '<p>'.$app->lng("no_data_memusage_txt").'</p>';
- }
+ } else {
+ $html = '<p>'.$app->lng("no_data_memusage_txt").'</p>';
+ }
- return $html;
+ return $html;
}
function showCpuInfo () {
- global $app;
+ global $app;
- /* fetch the Data from the DB */
- $record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'cpu_info' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
+ /* fetch the Data from the DB */
+ $record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'cpu_info' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
- if(isset($record['data'])) {
- $data = unserialize($record['data']);
+ if(isset($record['data'])) {
+ $data = unserialize($record['data']);
- /*
+ /*
Format the data
- */
- $html =
- '<div class="systemmonitor-state state-'.$record['state'].'">
+ */
+ $html =
+ '<div class="systemmonitor-state state-'.$record['state'].'">
<div class="systemmonitor-content icons32 ico-'.$record['state'].'">
<table>';
- foreach($data as $key => $value){
- if ($key != '') {
- $html .= '<tr>
+ foreach($data as $key => $value) {
+ if ($key != '') {
+ $html .= '<tr>
<td>' . $key . ':</td>
<td>' . $value . '</td>
</tr>';
- }
- }
- $html .= '</table>';
- $html .= '</div></div>';
- } else {
- $html = '<p>'.$app->lng("no_data_cpuinfo_txt").'</p>';
- }
+ }
+ }
+ $html .= '</table>';
+ $html .= '</div></div>';
+ } else {
+ $html = '<p>'.$app->lng("no_data_cpuinfo_txt").'</p>';
+ }
- return $html;
+ return $html;
}
function showServices () {
- global $app;
+ global $app;
- /* fetch the Data from the DB */
- $record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'services' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
+ /* fetch the Data from the DB */
+ $record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'services' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
- if(isset($record['data'])) {
- $data = unserialize($record['data']);
+ if(isset($record['data'])) {
+ $data = unserialize($record['data']);
- /*
+ /*
Format the data
- */
- $html =
- '<div class="systemmonitor-state state-'.$record['state'].'">
+ */
+ $html =
+ '<div class="systemmonitor-state state-'.$record['state'].'">
<div class="systemmonitor-content icons32 ico-'.$record['state'].'">
<table>';
- if($data['webserver'] != -1) {
- if($data['webserver'] == 1) {
- $status = '<span class="online">'.$app->lng("monitor_services_online_txt").'</span>';
- } else {
- $status = '<span class="offline">'.$app->lng("monitor_services_offline_txt").'</span>';
- }
- $html .= '<tr>
+ if($data['webserver'] != -1) {
+ if($data['webserver'] == 1) {
+ $status = '<span class="online">'.$app->lng("monitor_services_online_txt").'</span>';
+ } else {
+ $status = '<span class="offline">'.$app->lng("monitor_services_offline_txt").'</span>';
+ }
+ $html .= '<tr>
<td>'.$app->lng("monitor_services_web_txt").'</td>
<td>'.$status.'</td>
</tr>';
- }
+ }
- if($data['ftpserver'] != -1) {
- if($data['ftpserver'] == 1) {
- $status = '<span class="online">'.$app->lng("monitor_services_online_txt").'</span>';
- } else {
- $status = '<span class="offline">'.$app->lng("monitor_services_offline_txt").'</span>';
- }
- $html .= '<tr>
+ if($data['ftpserver'] != -1) {
+ if($data['ftpserver'] == 1) {
+ $status = '<span class="online">'.$app->lng("monitor_services_online_txt").'</span>';
+ } else {
+ $status = '<span class="offline">'.$app->lng("monitor_services_offline_txt").'</span>';
+ }
+ $html .= '<tr>
<td>'.$app->lng("monitor_services_ftp_txt").'</td>
<td>'.$status.'</td>
</tr>';
- }
+ }
- if($data['smtpserver'] != -1) {
- if($data['smtpserver'] == 1) {
- $status = '<span class="online">'.$app->lng("monitor_services_online_txt").'</span>';
- } else {
- $status = '<span class="offline">'.$app->lng("monitor_services_offline_txt").'</span>';
- }
- $html .= '<tr>
+ if($data['smtpserver'] != -1) {
+ if($data['smtpserver'] == 1) {
+ $status = '<span class="online">'.$app->lng("monitor_services_online_txt").'</span>';
+ } else {
+ $status = '<span class="offline">'.$app->lng("monitor_services_offline_txt").'</span>';
+ }
+ $html .= '<tr>
<td>'.$app->lng("monitor_services_smtp_txt").'</td>
<td>'.$status.'</td>
</tr>';
- }
+ }
- if($data['pop3server'] != -1) {
- if($data['pop3server'] == 1) {
- $status = '<span class="online">'.$app->lng("monitor_services_online_txt").'</span>';
- } else {
- $status = '<span class="offline">'.$app->lng("monitor_services_offline_txt").'</span>';
- }
- $html .= '<tr>
+ if($data['pop3server'] != -1) {
+ if($data['pop3server'] == 1) {
+ $status = '<span class="online">'.$app->lng("monitor_services_online_txt").'</span>';
+ } else {
+ $status = '<span class="offline">'.$app->lng("monitor_services_offline_txt").'</span>';
+ }
+ $html .= '<tr>
<td>'.$app->lng("monitor_services_pop_txt").'</td>
<td>'.$status.'</td>
</tr>';
- }
+ }
- if($data['imapserver'] != -1) {
- if($data['imapserver'] == 1) {
- $status = '<span class="online">'.$app->lng("monitor_services_online_txt").'</span>';
- } else {
- $status = '<span class="offline">'.$app->lng("monitor_services_offline_txt").'</span>';
- }
- $html .= '<tr>
+ if($data['imapserver'] != -1) {
+ if($data['imapserver'] == 1) {
+ $status = '<span class="online">'.$app->lng("monitor_services_online_txt").'</span>';
+ } else {
+ $status = '<span class="offline">'.$app->lng("monitor_services_offline_txt").'</span>';
+ }
+ $html .= '<tr>
<td>'.$app->lng("monitor_services_imap_txt").'</td>
<td>'.$status.'</td>
</tr>';
- }
+ }
- if($data['bindserver'] != -1) {
- if($data['bindserver'] == 1) {
- $status = '<span class="online">'.$app->lng("monitor_services_online_txt").'</span>';
- } else {
- $status = '<span class="offline">'.$app->lng("monitor_services_offline_txt").'</span>';
- }
- $html .= '<tr>
+ if($data['bindserver'] != -1) {
+ if($data['bindserver'] == 1) {
+ $status = '<span class="online">'.$app->lng("monitor_services_online_txt").'</span>';
+ } else {
+ $status = '<span class="offline">'.$app->lng("monitor_services_offline_txt").'</span>';
+ }
+ $html .= '<tr>
<td>'.$app->lng("monitor_services_mydns_txt").'</td>
<td>'.$status.'</td>
</tr>';
- }
+ }
- if($data['mysqlserver'] != -1) {
- if($data['mysqlserver'] == 1) {
- $status = '<span class="online">'.$app->lng("monitor_services_online_txt").'</span>';
- } else {
- $status = '<span class="offline">'.$app->lng("monitor_services_offline_txt").'</span>';
- }
- $html .= '<tr>
+ if($data['mysqlserver'] != -1) {
+ if($data['mysqlserver'] == 1) {
+ $status = '<span class="online">'.$app->lng("monitor_services_online_txt").'</span>';
+ } else {
+ $status = '<span class="offline">'.$app->lng("monitor_services_offline_txt").'</span>';
+ }
+ $html .= '<tr>
<td>'.$app->lng("monitor_services_mysql_txt").'</td>
<td>'.$status.'</td>
</tr>';
- }
+ }
- $html .= '</table></div></div>';
- } else {
- $html = '<p>'.$app->lng("no_data_services_txt").'</p>';
- }
+ $html .= '</table></div></div>';
+ } else {
+ $html = '<p>'.$app->lng("no_data_services_txt").'</p>';
+ }
- return $html;
+ return $html;
}
function showSystemUpdate() {
- global $app;
+ global $app;
- /* fetch the Data from the DB */
- $record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'system_update' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
+ /* fetch the Data from the DB */
+ $record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'system_update' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
- if(isset($record['data'])) {
- $html =
- '<div class="systemmonitor-state state-'.$record['state'].'">
+ if(isset($record['data'])) {
+ $html =
+ '<div class="systemmonitor-state state-'.$record['state'].'">
<div class="systemmonitor-content icons32 ico-'.$record['state'].'">';
- /*
+ /*
* First, we have to detect, if there is any monitoring-data.
* If not (because the destribution is not supported) show this.
- */
- if ($record['state'] == 'no_state'){
- $html .= '<p>'.$app->lng("monitor_updates_nosupport_txt").'</p>';
- }
- else {
- $data = unserialize($record['data']);
- $html .= nl2br($data['output']);
- }
- $html .= '</div></div>';
- } else {
- $html = '<p>'.$app->lng("no_data_updates_txt").'</p>';
- }
+ */
+ if ($record['state'] == 'no_state') {
+ $html .= '<p>'.$app->lng("monitor_updates_nosupport_txt").'</p>';
+ }
+ else {
+ $data = unserialize($record['data']);
+ $html .= nl2br($data['output']);
+ }
+ $html .= '</div></div>';
+ } else {
+ $html = '<p>'.$app->lng("no_data_updates_txt").'</p>';
+ }
- return $html;
+ return $html;
+}
+
+
+function showOpenVzBeancounter() {
+ global $app;
+
+ /* fetch the Data from the DB */
+ $record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'openvz_beancounter' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
+
+ if(isset($record['data'])) {
+ $html =
+ '<div class="systemmonitor-state state-'.$record['state'].'">
+ <div class="systemmonitor-content icons32 ico-'.$record['state'].'">';
+ /*
+ * First, we have to detect, if there is any monitoring-data.
+ * If not (because the server is not a VE) show this.
+ */
+ $data = unserialize($record['data']);
+ if ((!isset($data)) || ($data == '')) {
+ $html .= '<p>'.$app->lng("monitor_beancounter_nosupport_txt").'</p>';
+ }
+ else {
+ $html .= '<pre>' . nl2br($data) . '</pre>';
+ }
+ $html .= '</div></div>';
+ } else {
+ $html = '<p>'.$app->lng("no_data_updates_txt").'</p>';
+ }
+
+ return $html;
}
function showRaidState() {
- global $app;
+ global $app;
- /* fetch the Data from the DB */
- $record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'raid_state' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
+ /* fetch the Data from the DB */
+ $record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'raid_state' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
- if(isset($record['data'])) {
- $html =
- '<div class="systemmonitor-state state-'.$record['state'].'">
+ if(isset($record['data'])) {
+ $html =
+ '<div class="systemmonitor-state state-'.$record['state'].'">
<div class="systemmonitor-content icons32 ico-'.$record['state'].'">';
- /*
+ /*
* First, we have to detect, if there is any monitoring-data.
* If not (because the destribution is not supported) show this.
- */
- if ($record['state'] == 'no_state'){
- $html .= '<p>'.$app->lng("monitor_nomdadm_txt").'</p>';
- }
- else {
- $data = unserialize($record['data']);
- $html .= nl2br($data['output']);
- }
- $html .= '</div></div>';
+ */
+ if ($record['state'] == 'no_state') {
+ $html .= '<p>'.$app->lng("monitor_nomdadm_txt").'</p>';
+ }
+ else {
+ $data = unserialize($record['data']);
+ $html .= nl2br($data['output']);
+ }
+ $html .= '</div></div>';
- } else {
- $html = '<p>'.$app->lng("no_data_raid_txt").'</p>';
- }
+ } else {
+ $html = '<p>'.$app->lng("no_data_raid_txt").'</p>';
+ }
- return $html;
+ return $html;
}
function showRKHunter() {
- global $app;
+ global $app;
- /* fetch the Data from the DB */
- $record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'rkhunter' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
+ /* fetch the Data from the DB */
+ $record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'rkhunter' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
- if(isset($record['data'])) {
- $html =
- '<div class="systemmonitor-state state-'.$record['state'].'">
+ if(isset($record['data'])) {
+ $html =
+ '<div class="systemmonitor-state state-'.$record['state'].'">
<div class="systemmonitor-content icons32 ico-'.$record['state'].'">';
- /*
+ /*
* First, we have to detect, if there is any monitoring-data.
* If not (because rkhunter is not installed) show this.
- */
- $data = unserialize($record['data']);
- if ($data['output'] == ''){
- $html .= '<p>'.$app->lng("monitor_norkhunter_txt").'</p>';
- }
- else {
- $html .= nl2br($data['output']);
- }
- $html .= '</div></div>';
+ */
+ $data = unserialize($record['data']);
+ if ($data['output'] == '') {
+ $html .= '<p>'.$app->lng("monitor_norkhunter_txt").'</p>';
+ }
+ else {
+ $html .= nl2br($data['output']);
+ }
+ $html .= '</div></div>';
- } else {
- $html = '<p>'.$app->lng("no_data_rkhunter_txt").'</p>';
- }
+ } else {
+ $html = '<p>'.$app->lng("no_data_rkhunter_txt").'</p>';
+ }
- return $html;
+ return $html;
}
function showFail2ban() {
- global $app;
+ global $app;
- /* fetch the Data from the DB */
- $record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'log_fail2ban' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
+ /* fetch the Data from the DB */
+ $record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'log_fail2ban' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
- if(isset($record['data'])) {
- $html =
- '<div class="systemmonitor-state state-'.$record['state'].'">
+ if(isset($record['data'])) {
+ $html =
+ '<div class="systemmonitor-state state-'.$record['state'].'">
<div class="systemmonitor-content icons32 ico-'.$record['state'].'">';
- /*
+ /*
* First, we have to detect, if there is any monitoring-data.
* If not (because fail2ban is not installed) show this.
- */
- $data = unserialize($record['data']);
- if ($data == ''){
- $html .= '<p>'.
- 'fail2ban is not installed at this server.<br />' .
- 'See more (for debian) <a href="http://www.howtoforge.com/fail2ban_debian_etch" target="htf">here...</a>'.
- '</p>';
- }
- else {
- $html .= nl2br($data);
- }
- $html .= '</div></div>';
+ */
+ $data = unserialize($record['data']);
+ if ($data == '') {
+ $html .= '<p>'.
+ 'fail2ban is not installed at this server.<br />' .
+ 'See more (for debian) <a href="http://www.howtoforge.com/fail2ban_debian_etch" target="htf">here...</a>'.
+ '</p>';
+ }
+ else {
+ $html .= nl2br($data);
+ }
+ $html .= '</div></div>';
- } else {
- $html = '<p>There is no data available at the moment.</p>';
- }
+ } else {
+ $html = '<p>There is no data available at the moment.</p>';
+ }
- return $html;
+ return $html;
}
function showMailq() {
- global $app;
+ global $app;
- /* fetch the Data from the DB */
- $record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'mailq' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
+ /* fetch the Data from the DB */
+ $record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'mailq' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
- if(isset($record['data'])) {
- $data = unserialize($record['data']);
- $html = nl2br($data['output']);
- } else {
- $html = '<p>'.$app->lng("no_data_mailq_txt").'</p>';
- }
+ if(isset($record['data'])) {
+ $data = unserialize($record['data']);
+ $html = nl2br($data['output']);
+ } else {
+ $html = '<p>'.$app->lng("no_data_mailq_txt").'</p>';
+ }
- return $html;
+ return $html;
}
function getDataTime($type) {
- global $app;
+ global $app;
- /* fetch the Data from the DB */
- $record = $app->db->queryOneRecord("SELECT created FROM monitor_data WHERE type = '" . $type . "' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
+ /* fetch the Data from the DB */
+ $record = $app->db->queryOneRecord("SELECT created FROM monitor_data WHERE type = '" . $type . "' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
- /* TODO: datetimeformat should be set somewhat other way */
- $dateTimeFormat = $app->lng("monitor_settings_datetimeformat_txt");
+ /* TODO: datetimeformat should be set somewhat other way */
+ $dateTimeFormat = $app->lng("monitor_settings_datetimeformat_txt");
- if(isset($record['created'])) {
+ if(isset($record['created'])) {
// $res = date('Y-m-d H:i', $record['created']);
- $res = date($dateTimeFormat, $record['created']);
- } else {
- $res = '????-??-?? ??:??';
- }
- return $res;
+ $res = date($dateTimeFormat, $record['created']);
+ } else {
+ $res = '????-??-?? ??:??';
+ }
+ return $res;
}
?>
--
Gitblit v1.9.1