1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 20:30:39 +02:00

Change default IPV4 display format, admin log date/time display format

This commit is contained in:
e107steved
2008-11-23 20:26:23 +00:00
parent 741a2cf061
commit 513d704890
2 changed files with 8 additions and 7 deletions

View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_admin/admin_log.php,v $ | $Source: /cvs_backup/e107_0.8/e107_admin/admin_log.php,v $
| $Revision: 1.18 $ | $Revision: 1.19 $
| $Date: 2008-11-22 12:57:25 $ | $Date: 2008-11-23 20:26:23 $
| $Author: e107steved $ | $Author: e107steved $
| |
| Preferences: | Preferences:
@@ -41,6 +41,7 @@ unset($qs);
require_once(e_ADMIN."auth.php"); require_once(e_ADMIN."auth.php");
define ('AL_DATE_TIME_FORMAT', 'y-m-d H:i:s');
if (isset($_POST['setoptions'])) if (isset($_POST['setoptions']))
{ {
@@ -884,7 +885,7 @@ function log_process($matches)
switch ($cf) switch ($cf)
{ {
case 'cf_datestring' : case 'cf_datestring' :
$val = date("d-m-y H:i:s",$row['dblog_datestamp']); $val = date(AL_DATE_TIME_FORMAT,$row['dblog_datestamp']);
break; break;
case 'cf_microtime' : case 'cf_microtime' :
$val = date("H:i:s",intval($row['dblog_time']) % 86400).'.'.str_pad(100000*round($row['dblog_time']-floor($row['dblog_time']),6),6,'0'); $val = date("H:i:s",intval($row['dblog_time']) % 86400).'.'.str_pad(100000*round($row['dblog_time']-floor($row['dblog_time']),6),6,'0');

View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_handlers/e107_class.php,v $ | $Source: /cvs_backup/e107_0.8/e107_handlers/e107_class.php,v $
| $Revision: 1.20 $ | $Revision: 1.21 $
| $Date: 2008-11-22 12:57:25 $ | $Date: 2008-11-23 20:26:23 $
| $Author: e107steved $ | $Author: e107steved $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -417,9 +417,9 @@ class e107
// Takes an encoded IP address - returns a displayable one // Takes an encoded IP address - returns a displayable one
// Set $IP4Legacy TRUE to display 'old' (IPv4) addresses in the familiar dotted format // Set $IP4Legacy TRUE to display 'old' (IPv4) addresses in the familiar dotted format, FALSE to display in standard IPV6 format
// Should handle most things that can be thrown at it. // Should handle most things that can be thrown at it.
function ipDecode($ip, $IP4Legacy = FALSE) function ipDecode($ip, $IP4Legacy = TRUE)
{ {
if (strstr($ip,'.')) if (strstr($ip,'.'))
{ {