[Piwik-svn] r416 - trunk/plugins/Actions

[svnmaster at piwik.org]

Author: matt
Date: 2008-03-28 02:47:10 +0100 (Fri, 28 Mar 2008)
New Revision: 416

Modified:
   trunk/plugins/Actions/API.php
Log:
- test fix

Modified: trunk/plugins/Actions/API.php
===================================================================
--- trunk/plugins/Actions/API.php	2008-03-28 01:12:36 UTC (rev 415)
+++ trunk/plugins/Actions/API.php	2008-03-28 01:47:10 UTC (rev 416)
@@ -67,6 +67,8 @@
 	{
 		$dataTable = $this->getDataTable('Actions_downloads', $idSite, $period, $date, $expanded, $idSubtable );
 		$dataTable->queueFilter('Piwik_DataTable_Filter_ColumnCallbackAddDetail', array('label', 'url', create_function('$url', 'return $url;')));
+		$dataTable->queueFilter('Piwik_DataTable_Filter_ColumnCallbackReplace', array('label', 'Piwik_getPathFromActionsUrl'));
+		
 		return $dataTable;
 	}
 
@@ -74,8 +76,37 @@
 	{
 		$dataTable = $this->getDataTable('Actions_outlink', $idSite, $period, $date, $expanded, $idSubtable );
 		$dataTable->queueFilter('Piwik_DataTable_Filter_ColumnCallbackAddDetail', array('label', 'url', create_function('$url', 'return $url;')));
+		$dataTable->queueFilter('Piwik_DataTable_Filter_ColumnCallbackReplace', array('label', 'Piwik_getPathFromActionsUrl'));
 		return $dataTable;
 	}
 }
 
+/**
+ * returns /Y in http://X/Y
+ *
+ * @param string $url
+ * @return string
+ */
+function Piwik_getPathFromActionsUrl($url)
+{
+	$n = preg_match("#://[^/]+(/)#",$url, $matches, PREG_OFFSET_CAPTURE);
+	if($n)
+	{
+		$returned = substr($url, $matches[1][1]);
+		return $returned;
+	}
+	
+	return $url;
+}
 
+function Piwik_truncatePath( $path )
+{
+	$limit = 27;
+	$path = htmlspecialchars_decode($path);
+	$len = strlen($path);
+	if($len > $limit)
+	{
+		$path = substr($path, 0, $limit-3) . "...";
+	}
+	return htmlspecialchars($path);
+}