Skip to content
Browse files

Update date with timezone; Show server address outside tep_get_system…

…_information()
  • Loading branch information...
1 parent f58590f commit a9d0425f76c941c813b0c930f685602f9f76c8ea @haraldpdl haraldpdl committed Aug 29, 2010
Showing with 5 additions and 4 deletions.
  1. +2 −2 catalog/admin/includes/functions/general.php
  2. +3 −2 catalog/admin/server_info.php
View
4 catalog/admin/includes/functions/general.php
@@ -817,14 +817,14 @@ function tep_get_system_information() {
$data['oscommerce'] = array('version' => tep_get_version());
- $data['system'] = array('date' => tep_datetime_short(date('Y-m-d H:i:s')),
+ $data['system'] = array('date' => date('Y-m-d H:i:s O T'),
'os' => PHP_OS,
'kernel' => $kernel,
'uptime' => @exec('uptime'),
'http_server' => $HTTP_SERVER_VARS['SERVER_SOFTWARE']);
$data['mysql'] = array('version' => 'MySQL ' . (function_exists('mysql_get_server_info') ? mysql_get_server_info() : ''),
- 'date' => tep_datetime_short($db['datetime']));
+ 'date' => $db['datetime']);
$data['php'] = array('version' => PHP_VERSION,
'zend' => zend_version(),
View
5 catalog/admin/server_info.php
@@ -141,16 +141,17 @@
</tr>
<?php
} else {
+ $server = parse_url(HTTP_SERVER);
?>
<tr>
<td><table border="0" width="100%" cellspacing="0" cellpadding="2">
<tr>
<td><table border="0" cellspacing="0" cellpadding="3">
<tr>
<td class="smallText"><b><?php echo TITLE_SERVER_HOST; ?></b></td>
- <td class="smallText"><?php echo $info['system']['host'] . ' (' . $info['system']['ip'] . ')'; ?></td>
+ <td class="smallText"><?php echo $server['host'] . ' (' . gethostbyname($server['host']) . ')'; ?></td>
<td class="smallText">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<b><?php echo TITLE_DATABASE_HOST; ?></b></td>
- <td class="smallText"><?php echo $info['mysql']['server'] . ' (' . $info['mysql']['ip'] . ')'; ?></td>
+ <td class="smallText"><?php echo DB_SERVER . ' (' . gethostbyname(DB_SERVER) . ')'; ?></td>
</tr>
<tr>
<td class="smallText"><b><?php echo TITLE_SERVER_OS; ?></b></td>

0 comments on commit a9d0425

Please sign in to comment.
Something went wrong with that request. Please try again.