Author: ornicar2
Date: 2010-01-27 14:18:35 +0100 (Wed, 27 Jan 2010)
New Revision: 27245
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/lib/log/dmEventLogView.php
plugins/diemPlugin/trunk/dmAdminPlugin/lib/log/dmRequestLogView.php
plugins/diemPlugin/trunk/dmAdminPlugin/lib/view/html/log/dmLogView.php
Log:
[Diem]
- propagated show_ip option to the event log
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/lib/log/dmEventLogView.php
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/lib/log/dmEventLogView.php
2010-01-27 12:45:08 UTC (rev 27244)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/lib/log/dmEventLogView.php
2010-01-27 13:18:35 UTC (rev 27245)
@@ -19,7 +19,7 @@
return sprintf('%s%s<br /><span class=light>%s</span>',
($username = $entry->get('username')) ? sprintf('<strong
class="mr10">%s</strong>', $username) : '',
$entry->get('ip'),
- $entry->get('session_id')
+ $this->renderIp($entry->get('session_id'))
);
}
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/lib/log/dmRequestLogView.php
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/lib/log/dmRequestLogView.php
2010-01-27 12:45:08 UTC (rev 27244)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/lib/log/dmRequestLogView.php
2010-01-27 13:18:35 UTC (rev 27245)
@@ -22,17 +22,6 @@
$this->renderIp($entry->get('ip'))
);
}
-
- protected function renderIp($ip)
- {
- if ($this->getOption('show_ip'))
- {
- return $ip;
- }
-
- $ipParts = explode('.', $ip);
- return 4 === count($ipParts) ? $ipParts[0].'.'.$ipParts[1].'.xx.xx' : $ip;
- }
protected function renderBrowser(dmRequestLogEntry $entry)
{
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/lib/view/html/log/dmLogView.php
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/lib/view/html/log/dmLogView.php
2010-01-27 12:45:08 UTC (rev 27244)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/lib/view/html/log/dmLogView.php
2010-01-27 13:18:35 UTC (rev 27245)
@@ -84,6 +84,17 @@
return $html;
}
+
+ protected function renderIp($ip)
+ {
+ if ($this->getOption('show_ip'))
+ {
+ return $ip;
+ }
+
+ $ipParts = explode('.', $ip);
+ return 4 === count($ipParts) ? $ipParts[0].'.'.$ipParts[1].'.xx.xx' : $ip;
+ }
protected function getEntries(array $options = array())
{
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
