[Piwik-svn] r415 - in trunk: . libs/Zend modules plugins/Actions plugins/Referers

[svnmaster at piwik.org]

Author: matt
Date: 2008-03-28 02:12:36 +0100 (Fri, 28 Mar 2008)
New Revision: 415

Modified:
   trunk/TODO
   trunk/index.php
   trunk/libs/Zend/Registry.php
   trunk/modules/ErrorHandler.php
   trunk/modules/FrontController.php
   trunk/plugins/Actions/Actions.php
   trunk/plugins/Referers/Controller.php
Log:
- fixing small bug in zend Registry
- trying to fix #157

Modified: trunk/TODO
===================================================================
--- trunk/TODO	2008-03-28 00:43:23 UTC (rev 414)
+++ trunk/TODO	2008-03-28 01:12:36 UTC (rev 415)
@@ -18,3 +18,6 @@
 - edited zend_log and changed attr to protected
 - fixed bug fwrite in zend_log stream writer
 - fixed PEAR so that it works under PHP5 with STRICT MODE enabled
+- edited line 145 registry.php from require_once 'Zend/Exception.php'; to require_once 'Exception.php';
+
+

Modified: trunk/index.php
===================================================================
--- trunk/index.php	2008-03-28 00:43:23 UTC (rev 414)
+++ trunk/index.php	2008-03-28 01:12:36 UTC (rev 415)
@@ -36,9 +36,6 @@
 					. PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/modules/'
 					. PATH_SEPARATOR . get_include_path());
 
-if(!defined('E_STRICT'))            define('E_STRICT', 2048);
-if(!defined('E_RECOVERABLE_ERROR')) define('E_RECOVERABLE_ERROR', 4096);
-if(!defined('E_EXCEPTION')) 		define('E_EXCEPTION', 8192);
 
 /**
  * Error / exception handling functions

Modified: trunk/libs/Zend/Registry.php
===================================================================
--- trunk/libs/Zend/Registry.php	2008-03-28 00:43:23 UTC (rev 414)
+++ trunk/libs/Zend/Registry.php	2008-03-28 01:12:36 UTC (rev 415)
@@ -142,7 +142,7 @@
         $instance = self::getInstance();
 
         if (!$instance->offsetExists($index)) {
-            require_once 'Zend/Exception.php';
+            require_once 'Exception.php';
             throw new Zend_Exception("No entry is registered for key '$index'");
         }
 

Modified: trunk/modules/ErrorHandler.php
===================================================================
--- trunk/modules/ErrorHandler.php	2008-03-28 00:43:23 UTC (rev 414)
+++ trunk/modules/ErrorHandler.php	2008-03-28 01:12:36 UTC (rev 415)
@@ -10,6 +10,10 @@
  */
 
 require_once "Zend/Registry.php"; 
+
+if(!defined('E_STRICT'))            define('E_STRICT', 2048);
+if(!defined('E_RECOVERABLE_ERROR')) define('E_RECOVERABLE_ERROR', 4096);
+if(!defined('E_EXCEPTION')) 		define('E_EXCEPTION', 8192);
 
 /**
  * Error handler used to display nicely errors in Piwik

Modified: trunk/modules/FrontController.php
===================================================================
--- trunk/modules/FrontController.php	2008-03-28 00:43:23 UTC (rev 414)
+++ trunk/modules/FrontController.php	2008-03-28 01:12:36 UTC (rev 415)
@@ -14,6 +14,7 @@
  * Zend classes
  */
 require_once "Zend/Exception.php";
+require_once "Zend/Loader.php"; 
 require_once "Zend/Auth.php";
 require_once "Zend/Auth/Adapter/DbTable.php";
 

Modified: trunk/plugins/Actions/Actions.php
===================================================================
--- trunk/plugins/Actions/Actions.php	2008-03-28 00:43:23 UTC (rev 414)
+++ trunk/plugins/Actions/Actions.php	2008-03-28 01:12:36 UTC (rev 415)
@@ -193,7 +193,7 @@
 		$dataTable = Piwik_ArchiveProcessing_Day::generateDataTable($this->actionsTablesByType[Piwik_LogStats_Action::TYPE_OUTLINK]);
 		$s = $dataTable->getSerialized();
 		$record = new Piwik_ArchiveProcessing_Record_BlobArray('Actions_outlink', $s);
-		
+//		echo $dataTable;
 		unset($this->actionsTablesByType);
 	}
 
@@ -204,7 +204,9 @@
 		$n = preg_match("#://[^/]+(/)#",$url, $matches, PREG_OFFSET_CAPTURE);
 		if( $n )
 		{
-			$split_arr = array(substr($url, 0, $matches[1][1]), substr($url, $matches[1][1]));
+			$host = substr($url, 0, $matches[1][1]);
+			
+			$split_arr = array($host, $url);
 		}
 		else
 		{

Modified: trunk/plugins/Referers/Controller.php
===================================================================
--- trunk/plugins/Referers/Controller.php	2008-03-28 00:43:23 UTC (rev 414)
+++ trunk/plugins/Referers/Controller.php	2008-03-28 01:12:36 UTC (rev 415)
@@ -24,7 +24,7 @@
 		
 		$nameValues = $this->getReferersVisitorsByType();
 		foreach($nameValues as $name => $value)
-		{
+		{	
 			$view->$name = $value;
 		}
 		// sparkline for the historical data of the above values