ACPSession uses IPv6, but displays as IPv4 if possible

Fixes #954

diff --git a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
index e6047105e865e5db1913a45287a23444ca202513..76ff4a572666c77ec483183620e63f6f392fb255 100644 (file)
--- a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
+++ b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
@@ -43,7 +43,7 @@
                                        {foreach from=$objects item=sessionAccessLog}
                                                <tr>
                                                        <td class="columnID columnSessionAccessLogID"><p>{@$sessionAccessLog->sessionAccessLogID}</p></td>
-                                                       <td class="columnURL columnIpAddress{if $sessionAccessLog->ipAddress != $sessionLog->ipAddress} hot{/if}"><p>{$sessionAccessLog->ipAddress}</p></td>
+                                                       <td class="columnURL columnIpAddress{if $sessionAccessLog->ipAddress != $sessionLog->ipAddress} hot{/if}"><p>{$sessionAccessLog->getIpAddress()}</p></td>
                                                        <td class="columnDate columnTime"><p>{@$sessionAccessLog->time|time}</p></td>
                                                        <td class="columnText columnClassName"><p>{$sessionAccessLog->className}</p></td>
                                                        <td class="columnURL columnRequestURI" title="{$sessionAccessLog->requestURI}"><p>{if !$sessionAccessLog->hasProtectedURI()}<a href="{$sessionAccessLog->requestURI}{@SID_ARG_2ND}">{$sessionAccessLog->requestURI|truncate:50}</a>{else}{$sessionAccessLog->requestURI|truncate:50}{/if}</p></td>

diff --git a/wcfsetup/install/files/lib/data/acp/session/access/log/ACPSessionAccessLog.class.php b/wcfsetup/install/files/lib/data/acp/session/access/log/ACPSessionAccessLog.class.php
index 18c7f82ac739c69f36dfdb2f8a1f344ef3b5676c..7f13cd9dc2413db99894bdb8a3646b125aeceffc 100644 (file)
--- a/wcfsetup/install/files/lib/data/acp/session/access/log/ACPSessionAccessLog.class.php
+++ b/wcfsetup/install/files/lib/data/acp/session/access/log/ACPSessionAccessLog.class.php
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\data\acp\session\access\log;
 use wcf\data\DatabaseObject;
+use wcf\util\UserUtil;
 
 /**
  * Represents a session access log entry.
@@ -35,4 +36,13 @@ class ACPSessionAccessLog extends DatabaseObject {
                
                return false;
        }
+       
+       /**
+        * Returns the ip address and attempts to convert into IPv4.
+        *
+        * @return      string
+        */
+       public function getIpAddress() {
+               return UserUtil::convertIPv6To4($this->ipAddress);
+       }
 }