+
Index: plugins/Live/templates/visitorLog.tpl
===================================================================
--- plugins/Live/templates/visitorLog.tpl (revision 0)
+++ plugins/Live/templates/visitorLog.tpl (revision 0)
@@ -0,0 +1,136 @@
+
+
Besucherverlauf
+
+
+
+{if isset($arrayDataTable.result) and $arrayDataTable.result == 'error'}
+ {$arrayDataTable.message}
+ {else}
+ {if count($arrayDataTable) == 0}
+
+
{'CoreHome_ThereIsNoDataForThisReport'|translate}
+ {else}
+
+
+
+
+
+ |
+
+ |
+
+ {'General_Visitors'|translate} |
+
+ {'Live_Referrer_URL'|translate} |
+
+ {'General_ColumnNbActions'|translate} |
+
+
+
+
+{foreach from=$arrayDataTable item=visitor}
+
+ |
+
+
+ {$visitor.columns.serverDatePretty} - {$visitor.columns.serverTimePretty}
+ {if isset($visitor.columns.ip)}
IP: {$visitor.columns.ip}{/if}
+ {if (isset($visitor.columns.provider)&&$visitor.columns.provider!='IP')}
+
+ {'Provider_ColumnProvider'|translate}:
+
+ {$visitor.columns.provider}
+
+ {/if}
+
+ |
+
+ 
+ 
+ 
+ {if $visitor.columns.isVisitorGoalConverted} {/if}
+ {if $visitor.columns.isVisitorReturning}
+ 
+ {/if}
+
+ {if count($visitor.columns.pluginIcons) > 0}
+
+ {'UserSettings_Plugins'|translate}:
+ {foreach from=$visitor.columns.pluginIcons item=pluginIcon}
+ 
+ {/foreach}
+ {/if}
+ |
+
+
+
+ |
+
+ {$visitor.columns.actionDetails|@count} {'Actions_Actions'|translate} - {$visitor.columns.visitLengthPretty}
+
+
+ {foreach from=$visitor.columns.actionDetails item=action}
+ -
+
+ {$action.pageUrl|truncate:80:"...":true}
+
+
+ {/foreach}
+
+ |
+
+{/foreach}
+
+
+
+ {/if}
+ {if $properties.show_footer}
+ {include file="CoreHome/templates/datatable_footer.tpl"}
+ {/if}
+ {include file="CoreHome/templates/datatable_js.tpl"}
+ {/if}
+
+
+{literal}
+
+{/literal}
+
\ No newline at end of file
Index: lang/en.php
===================================================================
--- lang/en.php (revision 2731)
+++ lang/en.php (working copy)
@@ -577,6 +577,7 @@
'LanguagesManager_PluginDescription' => 'This plugin will display a list of the available languages for the Piwik interface. The language selected will be saved in the preferences for each user.',
'LanguagesManager_AboutPiwikTranslations' => 'About Piwik translations',
'Live_PluginDescription' => 'Spy on your visitors, live, in real-time!',
+ 'Live_LinkVisitorLog' => 'View detailed visitor log',
'Live_VisitorLog' => 'Visitor Log',
'Live_Date' => 'Date',
'Live_Time' => 'Time',
Index: plugins/Live/Controller.php
===================================================================
--- plugins/Live/Controller.php (revision 2731)
+++ plugins/Live/Controller.php (working copy)
@@ -30,7 +30,7 @@
public function widget($fetch = false)
{
$view = Piwik_View::factory('index');
- $view->idSite = Piwik_Common::getRequestVar('idSite');
+ $view->idSite = Piwik_Common::getRequestVar('idSite');
$view->visitorsCountHalfHour = $this->getUsersInLastXMin(30);
$view->visitorsCountToday = $this->getUsersInLastXDays(1);
$view->pisHalfhour = $this->getPageImpressionsInLastXMin(30);
@@ -42,55 +42,24 @@
public function getLastVisitsDetails($fetch = false)
{
- $view = Piwik_ViewDataTable::factory('');
+ $view = Piwik_ViewDataTable::factory();
$view->init( $this->pluginName,
__FUNCTION__,
- 'Live.getLastVisitsDetails',
- 'getPagesFromVisitId');
-// All colomns in DB which could be shown
-//'ip', 'idVisit', 'countActions', 'isVisitorReturning', 'country', 'countryFlag', 'continent', 'provider', 'providerUrl', 'idSite',
-//'serverDate', 'visitLength', 'visitLengthPretty', 'firstActionTimestamp', 'lastActionTimestamp', 'refererType', 'refererName',
-//'keywords', 'refererUrl', 'searchEngineUrl', 'searchEngineIcon', 'operatingSystem', 'operatingSystemShortName', 'operatingSystemIcon',
-//'browserFamily', 'browserFamilyDescription', 'browser', 'browserIcon', 'screen', 'resolution', 'screenIcon', 'plugins', 'lastActionDateTime',
-//'serverDatePretty', 'serverTimePretty', 'actionDetails'
+ 'Live.getLastVisitsDetails');
- $view->setColumnsToDisplay(array(
- 'idVisit',
- 'serverDatePretty',
- 'serverTimePretty',
- 'ip',
- 'countActions',
- 'visitLengthPretty',
- 'keywords',
- 'refererUrl',
- 'operatingSystemShortName',
- 'browser',
- 'screen',
- 'resolution',
- 'plugins',
- ));
+ // All colomns in DB which could be shown
+ //'ip', 'idVisit', 'countActions', 'isVisitorReturning', 'country', 'countryFlag', 'continent', 'provider', 'providerUrl', 'idSite',
+ //'serverDate', 'visitLength', 'visitLengthPretty', 'firstActionTimestamp', 'lastActionTimestamp', 'refererType', 'refererName',
+ //'keywords', 'refererUrl', 'searchEngineUrl', 'searchEngineIcon', 'operatingSystem', 'operatingSystemShortName', 'operatingSystemIcon',
+ //'browserFamily', 'browserFamilyDescription', 'browser', 'browserIcon', 'screen', 'resolution', 'screenIcon', 'plugins', 'lastActionDateTime',
+ //'serverDatePretty', 'serverTimePretty', 'actionDetails'
- $view->setColumnsTranslations(array(
- 'idVisit' => Piwik_Translate(''),
- 'serverDatePretty' => Piwik_Translate('Live_Date'),
- 'serverTimePretty' => Piwik_Translate('Live_Time'),
- 'ip' => 'IP',
- 'countActions' => Piwik_Translate('VisitorInterest_ColumnPagesPerVisit'),
- 'visitLengthPretty' => Piwik_Translate('VisitorInterest_ColumnVisitDuration'),
- 'keywords' => Piwik_Translate('Referers_ColumnKeyword'),
- 'refererUrl' => Piwik_Translate('Live_Referrer_URL'),
- 'operatingSystemShortName' => Piwik_Translate('UserSettings_ColumnOperatingSystem'),
- 'browser' => Piwik_Translate('UserSettings_ColumnBrowser'),
- 'screen' => Piwik_Translate('UserSettings_ColumnTypeOfScreen'),
- 'resolution' => Piwik_Translate('UserSettings_ColumnResolution'),
- 'plugins' => Piwik_Translate('UserSettings_ColumnPlugin'),
- ));
-
$view->disableSort();
- $view->setLimit(10);
- $view->disableExcludeLowPopulation();
+ $view->setLimit(20);
+ $view->setTemplate("Live/templates/visitorLog.tpl");
$view->setSortedColumn('idVisit', 'ASC');
$view->disableSearchBox();
+ $view->disableOffsetInformation();
// "Include low population" link won't be displayed under this table
$view->disableExcludeLowPopulation();
// disable the tag cloud, pie charts, bar chart icons
@@ -101,22 +70,11 @@
return $this->renderView($view, $fetch);
}
- function getPagesFromVisitId( $fetch = false)
- {
- $view = Piwik_ViewDataTable::factory('');
- $view->init( $this->pluginName,
- __FUNCTION__,
- 'Live.getLastVisitsForVisitor',
- 'getPagesFromVisitId');
-
- return $this->renderView($view, $fetch);
- }
-
public function getLastVisitsStart($fetch = false)
{
$view = Piwik_View::factory('lastVisits');
- $view->idSite = Piwik_Common::getRequestVar('idSite');
-
+ $view->idSite = Piwik_Common::getRequestVar('idSite');
+
$view->visitors = $this->getLastVisits(10);
$rendered = $view->render($fetch);
@@ -167,7 +125,7 @@
public function ajaxTotalVisitors($fetch = false)
{
$view = Piwik_View::factory('totalVisits');
- $view->idSite = Piwik_Common::getRequestVar('idSite');
+ $view->idSite = Piwik_Common::getRequestVar('idSite');
$view->visitorsCountHalfHour = $this->getUsersInLastXMin(30);
$view->visitorsCountToday = $this->getUsersInLastXDays(1);
$view->pisHalfhour = $this->getPageImpressionsInLastXMin(30);
@@ -179,6 +137,6 @@
{
return $rendered;
}
- echo $rendered;
+ echo $rendered;
}
}
Index: plugins/Live/Visitor.php
===================================================================
--- plugins/Live/Visitor.php (revision 2731)
+++ plugins/Live/Visitor.php (working copy)
@@ -28,6 +28,8 @@
*/
class Piwik_Live_Visitor
{
+ const DELIMITER_PLUGIN_NAME = ", ";
+
function __construct($visitorRawData)
{
$this->details = $visitorRawData;
@@ -71,6 +73,7 @@
'resolution' => $this->getResolution(),
'screenIcon' => $this->getScreenTypeIcon(),
'plugins' => $this->getPlugins(),
+ 'pluginIcons' => $this->getPluginIcons(),
'lastActionDateTime' => $this->getDateTimeLastAction(),
'isVisitorGoalConverted' => $this->isVisitorGoalConverted(),
'goalIcon' => $this->getGoalIcon(),
@@ -80,7 +83,7 @@
function getServerDate()
{
- return date('Y-m-d', strtotime($this->details['visit_last_action_time']));
+ return date('Y-m-d', strtotime($this->details['visit_last_action_time']));
}
function getIp()
@@ -150,10 +153,10 @@
function getRefererType()
{
$map = array(
- Piwik_Common::REFERER_TYPE_SEARCH_ENGINE => 'searchEngine',
- Piwik_Common::REFERER_TYPE_WEBSITE => 'website',
- Piwik_Common::REFERER_TYPE_DIRECT_ENTRY => 'directEntry',
- Piwik_Common::REFERER_TYPE_CAMPAIGN => 'campaign',
+ Piwik_Common::REFERER_TYPE_SEARCH_ENGINE => 'searchEngine',
+ Piwik_Common::REFERER_TYPE_WEBSITE => 'website',
+ Piwik_Common::REFERER_TYPE_DIRECT_ENTRY => 'directEntry',
+ Piwik_Common::REFERER_TYPE_CAMPAIGN => 'campaign',
);
if(isset($map[$this->details['referer_type']]))
{
@@ -185,7 +188,7 @@
function getSearchEngineUrl()
{
if($this->getRefererType() == 'searchEngine'
- && !empty($this->details['referer_name']))
+ && !empty($this->details['referer_name']))
{
return Piwik_getSearchEngineUrlFromName($this->details['referer_name']);
}
@@ -215,18 +218,34 @@
'config_gears',
'config_silverlight',
);
- $return = array();
+ $pluginShortNames = array();
foreach($plugins as $plugin)
{
if($this->details[$plugin] == 1)
{
$pluginShortName = substr($plugin, 7);
- $return[] = $pluginShortName;
+ $pluginShortNames[] = $pluginShortName;
}
}
- return implode(", ", $return);
+ return implode(self::DELIMITER_PLUGIN_NAME, $pluginShortNames);
}
+ function getPluginIcons()
+ {
+ $pluginNames = $this->getPlugins();
+ if( !empty($pluginNames) )
+ {
+ $pluginNames = explode(self::DELIMITER_PLUGIN_NAME, $pluginNames);
+ $pluginIcons = array();
+
+ foreach($pluginNames as $plugin) {
+ $pluginIcons[] = array("pluginIcon" =>Piwik_getPluginsLogo($plugin), "pluginName" =>$plugin);
+ }
+ return $pluginIcons;
+ }
+ return null;
+ }
+
function getOperatingSystem()
{
return Piwik_getOSLabel($this->details['config_os']);
@@ -310,15 +329,15 @@
if(isset($this->details['match_attribute'])){
$goalicon = "";
switch ($this->details['match_attribute']) {
- case "url":
- $goalicon = "plugins/Live/templates/images/goal.png";
- break;
- case "file":
- $goalicon = "plugins/Live/templates/images/download.png";
- break;
- case "external_website":
- $goalicon = "plugins/Live/templates/images/outboundlink.png";
- break;
+ case "url":
+ $goalicon = "plugins/Live/templates/images/goal.png";
+ break;
+ case "file":
+ $goalicon = "plugins/Live/templates/images/download.png";
+ break;
+ case "external_website":
+ $goalicon = "plugins/Live/templates/images/outboundlink.png";
+ break;
}
return $goalicon;
}
