Uncaught exception: " , $exception->getMessage(), "\n";
- print( $exception->__toString() );
- echo "";
- exit;
+function Piwik_ExceptionHandler(Exception $exception)
+{
+ try {
+ Zend_Registry::get('logger_exception')->log($exception);
+ } catch(Exception $e) {
+ print("
Exception: '". $exception->getMessage()."'
");
+
+ print("Backtrace:
");
+ print($exception->getTraceAsString());
+ print("");
+ print("
--------------------------
+ This exception occured and also raised this exception: ");
+ print("'" . $e->getMessage()."'");
+
+ }
}
?>
Index: /trunk/modules/UsersManager.php
===================================================================
--- /trunk/modules/UsersManager.php (revision 18)
+++ /trunk/modules/UsersManager.php (revision 22)
@@ -305,5 +305,5 @@
if(!self::userExists($userLogin))
{
- throw new Exception("User $userLogin doesn't exist therefore it can't be deleted.");
+ throw new Exception("User '$userLogin' doesn't exist therefore it can't be deleted.");
}
self::deleteUserOnly( $userLogin );
Index: /trunk/modules/LogStats.php
===================================================================
--- /trunk/modules/LogStats.php (revision 30)
+++ /trunk/modules/LogStats.php (revision 30)
@@ -0,0 +1,203 @@
+ ip lookup ]
+ * [ - precise country detection plugin ]
+ *
+ * We could also imagine a batch system that would read a log file every 5min,
+ * and which prepares the file containg the rows to insert, then we load DATA INFILE
+ *
+ */
+
+/**
+ * Configuration options for the statsLogEngine module:
+ * - use_cookie ; defines if we try to get/set a cookie to help recognize a unique visitor
+ */
+
+
+class Piwik_LogStats
+{
+ private $stateValid;
+
+ private $urlToRedirect;
+
+ private $db = null;
+
+ const STATE_NOTHING_TO_NOTICE = 1;
+ const STATE_TO_REDIRECT_URL = 2;
+ const STATE_LOGGING_DISABLE = 10;
+ const STATE_NO_GET_VARIABLE = 11;
+
+ const COOKIE_INDEX_IDVISITOR = 1;
+ const COOKIE_INDEX_TIMESTAMP_LAST_ACTION = 2;
+ const COOKIE_INDEX_TIMESTAMP_FIRST_ACTION = 3;
+ const COOKIE_INDEX_ID_VISIT = 4;
+ const COOKIE_INDEX_ID_LAST_ACTION = 5;
+
+ const VISIT_STANDARD_LENGTH = 1800;
+
+ public function __construct()
+ {
+ $this->stateValid = self::STATE_NOTHING_TO_NOTICE;
+ }
+
+ // create the database object
+ function connectDatabase()
+ {
+ $configDb = Piwik_LogStats_Config::getInstance()->database;
+ $this->db = new Piwik_LogStats_Db( $configDb['host'],
+ $configDb['username'],
+ $configDb['password'],
+ $configDb['dbname']
+ );
+ $this->db->connect();
+ }
+
+ private function initProcess()
+ {
+ $saveStats = Piwik_LogStats_Config::getInstance()->LogStats['record_statistics'];
+
+ if($saveStats == 0)
+ {
+ $this->setState(self::STATE_LOGGING_DISABLE);
+ }
+
+ if( count($_GET) == 0)
+ {
+ $this->setState(self::STATE_NO_GET_VARIABLE);
+ }
+
+ $downloadVariableName = Piwik_LogStats_Config::getInstance()->LogStats['download_url_var_name'];
+ $urlDownload = Piwik_Common::getRequestVar( $downloadVariableName, '', 'string');
+
+ if( !empty($urlDownload) )
+ {
+ $this->setState( self::STATE_TO_REDIRECT_URL );
+ $this->setUrlToRedirect ( $urlDownload);
+ }
+
+ $outlinkVariableName = Piwik_LogStats_Config::getInstance()->LogStats['outlink_url_var_name'];
+ $urlOutlink = Piwik_Common::getRequestVar( $outlinkVariableName, '', 'string');
+
+ if( !empty($urlOutlink) )
+ {
+ $this->setState( self::STATE_TO_REDIRECT_URL );
+ $this->setUrlToRedirect ( $urlOutlink);
+ }
+ }
+
+ private function processVisit()
+ {
+ return $this->stateValid !== self::STATE_LOGGING_DISABLE
+ && $this->stateValid !== self::STATE_NO_GET_VARIABLE;
+ }
+ private function getState()
+ {
+ return $this->stateValid;
+ }
+
+ private function setUrlToRedirect( $url )
+ {
+ $this->urlToRedirect = $url;
+ }
+ private function getUrlToRedirect()
+ {
+ return $this->urlToRedirect;
+ }
+ private function setState( $value )
+ {
+ $this->stateValid = $value;
+ }
+
+ // main algorithm
+ // => input : variables filtered
+ // => action : read cookie, read database, database logging, cookie writing
+ function main( $class_LogStats_Visit = "Piwik_LogStats_Visit")
+ {
+ $this->initProcess();
+
+ if( $this->processVisit() )
+ {
+ $this->connectDatabase();
+ $visit = new $class_LogStats_Visit( $this->db );
+ $visit->handle();
+ }
+ $this->endProcess();
+ }
+
+ // display the logo or pixel 1*1 GIF
+ // or a marketing page if no parameters in the url
+ // or redirect to a url (transmit the cookie as well)
+ // or load a URL (rss feed) (transmit the cookie as well)
+ private function endProcess()
+ {
+ switch($this->getState())
+ {
+ case self::STATE_LOGGING_DISABLE:
+ printDebug("Logging disabled, display transparent logo");
+ break;
+
+ case self::STATE_NO_GET_VARIABLE:
+ printDebug("No get variables => piwik page");
+ break;
+
+
+ case self::STATE_TO_REDIRECT_URL:
+ $this->sendHeader('Location: ' . $this->getUrlToRedirect());
+ break;
+
+
+ case self::STATE_NOTHING_TO_NOTICE:
+ default:
+ printDebug("Nothing to notice => default behaviour");
+ break;
+ }
+ printDebug("End of the page.");
+ }
+
+ protected function sendHeader($header)
+ {
+ header($header);
+ }
+}
+
+
+
+function printDebug( $info = '' )
+{
+ if(isset($GLOBALS['DEBUGPIWIK']) && $GLOBALS['DEBUGPIWIK'])
+ {
+ if(is_array($info))
+ {
+ print("");
+ print(var_export($info,true));
+ print("");
+ }
+ else
+ {
+ print($info . "
\n");
+ }
+ }
+}
+?>
Index: /trunk/modules/Auth.php
===================================================================
--- /trunk/modules/Auth.php (revision 19)
+++ /trunk/modules/Auth.php (revision 22)
@@ -40,5 +40,5 @@
// if not then we return the result of the database authentification provided by zend
- $this->authenticate();
+ return parent::authenticate();
}
Index: /trunk/modules/Access.php
===================================================================
--- /trunk/modules/Access.php (revision 19)
+++ /trunk/modules/Access.php (revision 22)
@@ -100,6 +100,4 @@
public function checkUserHasSomeAdminAccess()
{
- if(!$this->isSuperUser)
- {
$idSitesAccessible = $this->getSitesIdWithAdminAccess();
if(count($idSitesAccessible) == 0)
@@ -107,5 +105,4 @@
throw new Exception("You can't access this resource as it requires an 'admin' access for at least one website.");
}
- }
}
public function checkUserHasAdminAccess( $idSites )
@@ -115,6 +112,4 @@
$idSites = array($idSites);
}
- if(!$this->isSuperUser)
- {
$idSitesAccessible = $this->getSitesIdWithAdminAccess();
foreach($idSites as $idsite)
@@ -125,5 +120,4 @@
}
}
- }
}
@@ -134,6 +128,4 @@
$idSites = array($idSites);
}
- if(!$this->isSuperUser)
- {
$idSitesAccessible = $this->getSitesIdWithAtLeastViewAccess();
foreach($idSites as $idsite)
@@ -144,5 +136,4 @@
}
}
- }
}
}
Index: /trunk/modules/Config.php
===================================================================
--- /trunk/modules/Config.php (revision 19)
+++ /trunk/modules/Config.php (revision 30)
@@ -2,8 +2,10 @@
class Piwik_Config extends Zend_Config_Ini
{
- function __construct()
+ function __construct($pathIniFile = null)
{
- $pathIniFile = PIWIK_INCLUDE_PATH . '/config/config.ini.php';
-
+ if(is_null($pathIniFile))
+ {
+ $pathIniFile = PIWIK_INCLUDE_PATH . '/config/config.ini.php';
+ }
parent::__construct($pathIniFile, null, true);
@@ -16,4 +18,5 @@
{
$this->database = $this->database_tests;
+ $this->log = $this->log_tests;
$this->setPrefixTables();
}
Index: /trunk/modules/DataFiles/Countries.php
===================================================================
--- /trunk/modules/DataFiles/Countries.php (revision 25)
+++ /trunk/modules/DataFiles/Countries.php (revision 25)
@@ -0,0 +1,225 @@
+ array('unk'),
+ 'ac' => array('afr'),
+ 'ad' => array('eur'),
+ 'ae' => array('asi'),
+ 'af' => array('asi'),
+ 'ag' => array('ams'),
+ 'ai' => array('ams'),
+ 'al' => array('eur'),
+ 'am' => array('asi'),
+ 'an' => array('ams'),
+ 'ao' => array('afr'),
+ 'aq' => array('aut'),
+ 'ar' => array('ams'),
+ 'as' => array('oce'),
+ 'at' => array('eur'),
+ 'au' => array('oce'),
+ 'aw' => array('ams'),
+ 'az' => array('asi'),
+ 'ba' => array('eur'),
+ 'bb' => array('ams'),
+ 'bd' => array('asi'),
+ 'be' => array('eur'),
+ 'bf' => array('afr'),
+ 'bg' => array('eur'),
+ 'bh' => array('asi'),
+ 'bi' => array('afr'),
+ 'bj' => array('afr'),
+ 'bm' => array('ams'),
+ 'bn' => array('asi'),
+ 'bo' => array('ams'),
+ 'br' => array('ams'),
+ 'bs' => array('ams'),
+ 'bt' => array('asi'),
+ 'bw' => array('afr'),
+ 'by' => array('eur'),
+ 'bz' => array('ams'),
+ 'ca' => array('amn'),
+ 'cc' => array('oce'),
+ 'cd' => array('afr'),
+ 'cf' => array('afr'),
+ 'cg' => array('afr'),
+ 'ch' => array('eur'),
+ 'ci' => array('afr'),
+ 'ck' => array('asi'),
+ 'cl' => array('ams'),
+ 'cm' => array('afr'),
+ 'cn' => array('asi'),
+ 'co' => array('ams'),
+ 'cs' => array('eur'),
+ 'cr' => array('ams'),
+ 'cu' => array('ams'),
+ 'cv' => array('afr'),
+ 'cy' => array('eur'),
+ 'cz' => array('eur'),
+ 'de' => array('eur'),
+ 'dj' => array('afr'),
+ 'dk' => array('eur'),
+ 'dm' => array('ams'),
+ 'do' => array('ams'),
+ 'dz' => array('afr'),
+ 'ec' => array('ams'),
+ 'ee' => array('eur'),
+ 'eg' => array('afr'),
+ 'eh' => array('afr'),
+ 'er' => array('afr'),
+ 'es' => array('eur'),
+ 'et' => array('afr'),
+ 'fi' => array('eur'),
+ 'fj' => array('oce'),
+ 'fk' => array('ams'),
+ 'fm' => array('oce'),
+ 'fr' => array('eur'),
+ 'ga' => array('afr'),
+ 'gb' => array('eur'),
+ 'gd' => array('ams'),
+ 'ge' => array('asi'),
+ 'gf' => array('ams'),
+ 'gg' => array('eur'),
+ 'gh' => array('afr'),
+ 'gi' => array('afr'),
+ 'gl' => array('amn'),
+ 'gm' => array('afr'),
+ 'gn' => array('afr'),
+ 'gp' => array('ams'),
+ 'gq' => array('afr'),
+ 'gr' => array('eur'),
+ 'gs' => array('eur'),
+ 'gt' => array('ams'),
+ 'gw' => array('afr'),
+ 'gy' => array('ams'),
+ 'hk' => array('asi'),
+ 'hn' => array('ams'),
+ 'hr' => array('eur'),
+ 'ht' => array('ams'),
+ 'hu' => array('eur'),
+ 'id' => array('asi'),
+ 'ie' => array('eur'),
+ 'il' => array('asi'),
+ 'in' => array('asi'),
+ 'iq' => array('asi'),
+ 'ir' => array('asi'),
+ 'is' => array('eur'),
+ 'it' => array('eur'),
+ 'jm' => array('ams'),
+ 'jo' => array('asi'),
+ 'jp' => array('asi'),
+ 'ke' => array('afr'),
+ 'kg' => array('asi'),
+ 'kh' => array('asi'),
+ 'ki' => array('oce'),
+ 'km' => array('afr'),
+ 'kp' => array('asi'),
+ 'kr' => array('asi'),
+ 'kw' => array('asi'),
+ 'ky' => array('ams'),
+ 'kz' => array('asi'),
+ 'la' => array('asi'),
+ 'lb' => array('asi'),
+ 'li' => array('eur'),
+ 'lk' => array('asi'),
+ 'lr' => array('afr'),
+ 'ls' => array('afr'),
+ 'lt' => array('eur'),
+ 'lu' => array('eur'),
+ 'lv' => array('eur'),
+ 'ly' => array('afr'),
+ 'ma' => array('afr'),
+ 'mc' => array('eur'),
+ 'md' => array('eur'),
+ 'mg' => array('afr'),
+ 'mh' => array('oce'),
+ 'mk' => array('eur'),
+ 'ml' => array('afr'),
+ 'mm' => array('asi'),
+ 'mn' => array('asi'),
+ 'mo' => array('asi'),
+ 'mq' => array('ams'),
+ 'mr' => array('afr'),
+ 'mt' => array('eur'),
+ 'mu' => array('afr'),
+ 'mv' => array('asi'),
+ 'mw' => array('afr'),
+ 'mx' => array('ams'),
+ 'my' => array('asi'),
+ 'mz' => array('afr'),
+ 'na' => array('afr'),
+ 'nc' => array('oce'),
+ 'ne' => array('afr'),
+ 'ng' => array('afr'),
+ 'ni' => array('ams'),
+ 'nl' => array('eur'),
+ 'no' => array('eur'),
+ 'np' => array('asi'),
+ 'nr' => array('oce'),
+ 'nz' => array('oce'),
+ 'om' => array('asi'),
+ 'pa' => array('ams'),
+ 'pe' => array('ams'),
+ 'pf' => array('oce'),
+ 'pg' => array('oce'),
+ 'ph' => array('asi'),
+ 'pk' => array('asi'),
+ 'pl' => array('eur'),
+ 'pm' => array('amn'),
+ 'pr' => array('ams'),
+ 'pt' => array('eur'),
+ 'pw' => array('oce'),
+ 'py' => array('ams'),
+ 'qa' => array('asi'),
+ 're' => array('afr'),
+ 'ro' => array('eur'),
+ 'ru' => array('asi'),
+ 'rs' => array('asi'),
+ 'rw' => array('afr'),
+ 'sa' => array('asi'),
+ 'sb' => array('oce'),
+ 'sc' => array('afr'),
+ 'sd' => array('afr'),
+ 'se' => array('eur'),
+ 'sg' => array('asi'),
+ 'si' => array('eur'),
+ 'sk' => array('eur'),
+ 'sl' => array('afr'),
+ 'sm' => array('eur'),
+ 'sn' => array('afr'),
+ 'so' => array('afr'),
+ 'sr' => array('ams'),
+ 'sv' => array('ams'),
+ 'sy' => array('asi'),
+ 'sz' => array('afr'),
+ 'td' => array('afr'),
+ 'tg' => array('afr'),
+ 'th' => array('asi'),
+ 'tj' => array('asi'),
+ 'tm' => array('asi'),
+ 'tn' => array('afr'),
+ 'to' => array('oce'),
+ 'tp' => array('oce'),
+ 'tr' => array('eur'),
+ 'tt' => array('ams'),
+ 'tw' => array('asi'),
+ 'tz' => array('afr'),
+ 'ua' => array('eur'),
+ 'ug' => array('afr'),
+ 'uk' => array('eur'),
+ 'us' => array('amn'),
+ 'uy' => array('ams'),
+ 'uz' => array('asi'),
+ 'va' => array('eur'),
+ 've' => array('ams'),
+ 'vn' => array('asi'),
+ 'vu' => array('oce'),
+ 'wf' => array('oce'),
+ 'ye' => array('asi'),
+ 'yu' => array('eur'),
+ 'za' => array('afr'),
+ 'zm' => array('afr'),
+ 'zw' => array('afr'),
+ );
+}
+?>
Index: /trunk/modules/DataFiles/SearchEngines.php
===================================================================
--- /trunk/modules/DataFiles/SearchEngines.php (revision 29)
+++ /trunk/modules/DataFiles/SearchEngines.php (revision 29)
@@ -0,0 +1,1040 @@
+ array(" ", " " [, " "]),
+
+ // 1
+ "1.cz" => array("1.cz", "q", "iso-8859-2"),
+ "www.1.cz" => array("1.cz", "q", "iso-8859-2"),
+
+ // 1und1
+ "portal.1und1.de" => array("1und1", "search"),
+
+ // 3271
+ "nmsearch.3721.com" => array("3271", "p"),
+ "seek.3721.com" => array("3271", "p"),
+
+ // A9
+ "www.a9.com" => array("A9", ""),
+ "a9.com" => array("A9", ""),
+
+ // Abacho
+ "search.abacho.com" => array("Abacho", "q"),
+
+ // about
+ "search.about.com" => array("About", "terms"),
+
+ //Acoon
+ "www.acoon.de" => array("Acoon", "begriff"),
+
+ //Acont
+ "acont.de" => array("Acont", "query"),
+
+ //Alexa
+ "www.alexa.com" => array("Alexa", "q"),
+ "alexa.com" => array("Alexa", "q"),
+
+ //Alice Adsl
+ "rechercher.aliceadsl.fr" => array("Alice Adsl", "qs"),
+ "search.alice.it" => array("Alice (Virgilio)", "qt"),
+
+ //Allesklar
+ "www.allesklar.de" => array("Allesklar", "words"),
+
+ // AllTheWeb
+ "www.alltheweb.com" => array("AllTheWeb", "q"),
+
+ // all.by
+ "all.by" => array("All.by", "query"),
+
+ // Altavista
+ "listings.altavista.com" => array("AltaVista", "q"),
+ "www.altavista.de" => array("AltaVista", "q"),
+ "altavista.fr" => array("AltaVista", "q"),
+ "de.altavista.com" => array("AltaVista", "q"),
+ "fr.altavista.com" => array("AltaVista", "q"),
+ "es.altavista.com" => array("AltaVista", "q"),
+ "www.altavista.fr" => array("AltaVista", "q"),
+ "search.altavista.com" => array("AltaVista", "q"),
+ "search.fr.altavista.com" => array("AltaVista", "q"),
+ "se.altavista.com" => array("AltaVista", "q"),
+ "be-nl.altavista.com" => array("AltaVista", "q"),
+ "be-fr.altavista.com" => array("AltaVista", "q"),
+ "it.altavista.com" => array("AltaVista", "q"),
+ "us.altavista.com" => array("AltaVista", "q"),
+ "nl.altavista.com" => array("Altavista", "q"),
+ "ch.altavista.com" => array("AltaVista", "q"),
+ "www.altavista.com" => array("AltaVista", "q"),
+
+ // APOLLO7
+ "www.apollo7.de" => array("Apollo7", "query"),
+ "apollo7.de" => array("Apollo7", "query"),
+
+ // AOL
+ "www.aolrecherche.aol.fr" => array("AOL", "q"),
+ "www.aolrecherches.aol.fr" => array("AOL", "query"),
+ "www.aolimages.aol.fr" => array("AOL", "query"),
+ "www.recherche.aol.fr" => array("AOL", "q"),
+ "aolsearch.aol.com" => array("AOL", "query"),
+ "aolsearcht.aol.com" => array("AOL", "query"),
+ "find.web.aol.com" => array("AOL", "query"),
+ "recherche.aol.ca" => array("AOL", "query"),
+ "aolsearch.aol.co.uk" => array("AOL", "query"),
+ "search.aol.co.uk" => array("AOL", "query"),
+ "aolrecherche.aol.fr" => array("AOL", "q"),
+ "sucheaol.aol.de" => array("AOL", "q"),
+ "suche.aol.de" => array("AOL", "q"),
+
+ "aolbusqueda.aol.com.mx" => array("AOL", "query"),
+ "search.aol.com" => array("AOL", "query"),
+
+ // Aport
+ "sm.aport.ru" => array("Aport", "r"),
+
+ // Arcor
+ "www.arcor.de" => array("Arcor", "Keywords"),
+
+ // Arianna (Libero.it)
+ "arianna.libero.it" => array("Arianna", "query"),
+
+ // Ask
+ "web.ask.com" => array("Ask", "ask"),
+ "www.ask.co.uk" => array("Ask", "q"),
+ "uk.ask.com" => array("Ask", "q"),
+ "fr.ask.com" => array("Ask", "q"),
+ "de.ask.com" => array("Ask", "q"),
+ "es.ask.com" => array("Ask", "q"),
+ "it.ask.com" => array("Ask", "q"),
+ "nl.ask.com" => array("Ask", "q"),
+ "ask.jp" => array("Ask", "q"),
+ "www.ask.com" => array("Ask", "ask"),
+
+ // Atlas
+ "search.atlas.cz" => array("Atlas", "q", "windows-1250"),
+
+ // Austronaut
+ "www2.austronaut.at" => array("Austronaut", "begriff"),
+
+ // Baidu
+ "www1.baidu.com" => array("Baidu", "wd"),
+ "www.baidu.com" => array("Baidu", "wd"),
+
+ // BBC
+ "search.bbc.co.uk" => array("BBC", "q"),
+
+ // Bellnet
+ "www.suchmaschine.com" => array("Bellnet", "suchstr"),
+
+ // Biglobe
+ "cgi.search.biglobe.ne.jp" => array("Biglobe", "q"),
+
+ // Bild
+ "www.bild.t-online.de" => array("Bild.de (enhanced by Google)", "query"),
+
+ //Blogdigger
+ "www.blogdigger.com" => array("Blogdigger","q"),
+
+ //Bloglines
+ "www.bloglines.com" => array("Bloglines","q"),
+
+ //Blogpulse
+ "www.blogpulse.com" => array("Blogpulse","query"),
+
+ //Bluewin
+ "search.bluewin.ch" => array("Bluewin","query"),
+
+ // Caloweb
+ "www.caloweb.de" => array("Caloweb", "q"),
+
+ // Cegetel (Google)
+ "www.cegetel.net" => array("Cegetel (Google)", "q"),
+
+ // Centrum
+ "fulltext.centrum.cz" => array("Centrum", "q", "windows-1250"),
+ "morfeo.centrum.cz" => array("Centrum", "q", "windows-1250"),
+ "search.centrum.cz" => array("Centrum", "q", "windows-1250"),
+
+ // Chello
+ "www.chello.fr" => array("Chello", "q1"),
+
+ // Club Internet
+ "recherche.club-internet.fr" => array("Club Internet", "q"),
+
+ // Comcast
+ "www.comcast.net" => array("Comcast", "query"),
+
+ // Comet systems
+ "search.cometsystems.com" => array("CometSystems", "q"),
+
+ // Compuserve
+ "suche.compuserve.de" => array("Compuserve.de (Powered by Google)", "q"),
+ "websearch.cs.com" => array("Compuserve.com (Enhanced by Google)", "query"),
+
+ // Copernic
+ "metaresults.copernic.com" => array("Copernic", " "),
+
+ // DasOertliche
+ "www.dasoertliche.de" => array("DasOertliche", "kw"),
+
+ // DasTelefonbuch
+ "www.4call.dastelefonbuch.de" => array("DasTelefonbuch", "kw"),
+
+ // Defind.de
+ "suche.defind.de" => array("Defind.de", "search"),
+
+ // Deskfeeds
+ "www.deskfeeds.com" => array("Deskfeeds", "sx"),
+
+ // Dino
+ "www.dino-online.de" => array("Dino", "query"),
+
+ // dir.com
+ "fr.dir.com" => array("dir.com", "req"),
+
+ // dmoz
+ "editors.dmoz.org" => array("dmoz", "search"),
+ "search.dmoz.org" => array("dmoz", "search"),
+ "www.dmoz.org" => array("dmoz", "search"),
+ "dmoz.org" => array("dmoz", "search"),
+
+ // Dogpile
+ "search.dogpile.com" => array("Dogpile", "q"),
+ "nbci.dogpile.com" => array("Dogpile", "q"),
+
+ // earthlink
+ "search.earthlink.net" => array("Earthlink", "q"),
+
+ // Eniro
+ "www.eniro.se" => array("Eniro", "q"),
+
+ // Espotting
+ "affiliate.espotting.fr" => array("Espotting", "keyword"),
+
+ // Eudip
+ "www.eudip.com" => array("Eudip", " "),
+
+ // Eurip
+ "www.eurip.com" => array("Eurip", "q"),
+
+ // Euroseek
+ "www.euroseek.com" => array("Euroseek", "string"),
+
+ // Excite
+ "www.excite.it" => array("Excite", "q"),
+ "msxml.excite.com" => array("Excite", "qkw"),
+ "www.excite.fr" => array("Excite", "search"),
+
+ // Exalead
+ "www.exalead.fr" => array("Exalead", "q"),
+ "www.exalead.com" => array("Exalead", "q"),
+
+ // eo
+ "eo.st" => array("eo", "q"),
+
+ // Feedminer
+ "www.feedminer.com" => array("Feedminer", "q"),
+
+ // Feedster
+ "www.feedster.com" => array("Feedster", ""),
+
+ // Francite
+ "antisearch.francite.com" => array("Francite", "KEYWORDS"),
+ "recherche.francite.com" => array("Francite", "name"),
+
+ // Fireball
+ "suche.fireball.de" => array("Fireball", "query"),
+
+
+ // Firstfind
+ "www.firstsfind.com" => array("Firstsfind", "qry"),
+
+ // Fixsuche
+ "www.fixsuche.de" => array("Fixsuche", "q"),
+
+ // Flix
+ "www.flix.de" => array("Flix.de", "keyword"),
+
+ // Free
+ "search1-2.free.fr" => array("Free", "q"),
+ "search1-1.free.fr" => array("Free", "q"),
+ "search.free.fr" => array("Free", "q"),
+
+ // Freenet
+ "suche.freenet.de" => array("Freenet", "query"),
+
+ //Froogle
+ "froogle.google.de" => array("Google (Froogle)", "q"),
+ "froogle.google.com" => array("Google (Froogle)", "q"),
+ "froogle.google.co.uk" => array("Google (Froogle)", "q"),
+
+ //GAIS
+ "gais.cs.ccu.edu.tw" => array("GAIS)", "query"),
+
+ // Gigablast
+ "www.gigablast.com" => array("Gigablast", "q"),
+ "blogs.gigablast.com" => array("Gigablast (Blogs)", "q"),
+ "travel.gigablast.com" => array("Gigablast (Travel)", "q"),
+ "dir.gigablast.com" => array("Gigablast (Directory)", "q"),
+ "gov.gigablast.com" => array("Gigablast (Gov)", "q"),
+
+ // GMX
+ "suche.gmx.net" => array("GMX", "su"),
+ "www.gmx.net" => array("GMX", "su"),
+
+ // goo
+ "search.goo.ne.jp" => array("goo", "mt"),
+ "ocnsearch.goo.ne.jp" => array("goo", "mt"),
+
+
+ // Powered by Google (add or not?)
+ "www.charter.net" => array("Google", "q"),
+ "brisbane.t-online.de" => array("Google", "q"),
+ "www.eniro.se" => array("Google", "q"),
+ "www.eniro.no" => array("Google", "q"),
+ "miportal.bellsouth.net" => array("Google", "string"),
+ "home.bellsouth.net" => array("Google", "string"),
+ "pesquisa.clix.pt" => array("Google", "q"),
+ "google.startsiden.no" => array("Google", "q"),
+ "arianna.libero.it" => array("Google", "query"),
+ "google.startpagina.nl" => array("Google", "q"),
+ "search.peoplepc.com" => array("Google", "q"),
+ "www.google.interia.pl" => array("Google", "q"),
+ "buscador.terra.es" => array("Google", "query"),
+ "buscador.terra.cl" => array("Google", "query"),
+ "buscador.terra.com.br" => array("Google", "query"),
+ "www.icq.com" => array("Google", "q"),
+ "www.adelphia.net" => array("Google", "q"),
+ "www.comcast.net" => array("Google", "query"),
+ "so.qq.com" => array("Google", "word"),
+ "misc.skynet.be" => array("Google", "keywords"),
+ "www.start.no" => array("Google", "q"),
+ "verden.abcsok.no" => array("Google", "q"),
+ "search.sweetim.com" => array("Google", "q"),
+
+ // Google
+ "gogole.fr" => array("Google", "q"),
+ "www.gogole.fr" => array("Google", "q"),
+ "wwwgoogle.fr" => array("Google", "q"),
+ "ww.google.fr" => array("Google", "q"),
+ "w.google.fr" => array("Google", "q"),
+ "www.google.fr" => array("Google", "q"),
+ "www.google.fr." => array("Google", "q"),
+ "google.fr" => array("Google", "q"),
+ "www2.google.com" => array("Google", "q"),
+ "w.google.com" => array("Google", "q"),
+ "ww.google.com" => array("Google", "q"),
+ "wwwgoogle.com" => array("Google", "q"),
+ "www.gogole.com" => array("Google", "q"),
+ "www.gppgle.com" => array("Google", "q"),
+ "go.google.com" => array("Google", "q"),
+ "www.google.ae" => array("Google", "q"),
+ "www.google.as" => array("Google", "q"),
+ "www.google.at" => array("Google", "q"),
+ "wwwgoogle.at" => array("Google", "q"),
+ "ww.google.at" => array("Google", "q"),
+ "w.google.at" => array("Google", "q"),
+ "www.google.az" => array("Google", "q"),
+ "www.google.be" => array("Google", "q"),
+ "www.google.bg" => array("Google", "q"),
+ "www.google.ba" => array("Google", "q"),
+ "google.bg" => array("Google", "q"),
+ "www.google.bi" => array("Google", "q"),
+ "www.google.ca" => array("Google", "q"),
+ "ww.google.ca" => array("Google", "q"),
+ "w.google.ca" => array("Google", "q"),
+ "www.google.cc" => array("Google", "q"),
+ "www.google.cd" => array("Google", "q"),
+ "www.google.cg" => array("Google", "q"),
+ "www.google.ch" => array("Google", "q"),
+ "ww.google.ch" => array("Google", "q"),
+ "w.google.ch" => array("Google", "q"),
+ "www.google.ci" => array("Google", "q"),
+ "www.google.cl" => array("Google", "q"),
+ "www.google.cn" => array("Google", "q"),
+ "www.google.co" => array("Google", "q"),
+ "www.google.cz" => array("Google", "q"),
+ "wwwgoogle.cz" => array("Google", "q"),
+ "www.google.de" => array("Google", "q"),
+ "ww.google.de" => array("Google", "q"),
+ "w.google.de" => array("Google", "q"),
+ "wwwgoogle.de" => array("Google", "q"),
+ "www.googleearth.de" => array("Google", "q"),
+ "googleearth.de" => array("Google", "q"),
+ "google.gr" => array("Google", "q"),
+ "google.hr" => array("Google", "q"),
+ "www.google.dj" => array("Google", "q"),
+ "www.google.dk" => array("Google", "q"),
+ "www.google.es" => array("Google", "q"),
+ "www.google.fi" => array("Google", "q"),
+ "www.google.fm" => array("Google", "q"),
+ "www.google.gg" => array("Google", "q"),
+ "www.googel.fi" => array("Google", "q"),
+ "www.googleearth.fr" => array("Google", "q"),
+ "www.google.gl" => array("Google", "q"),
+ "www.google.gm" => array("Google", "q"),
+ "www.google.gr" => array("Google", "q"),
+ "www.google.hn" => array("Google", "q"),
+ "www.google.hr" => array("Google", "q"),
+ "www.google.hu" => array("Google", "q"),
+ "www.google.ie" => array("Google", "q"),
+ "www.google.is" => array("Google", "q"),
+ "www.google.it" => array("Google", "q"),
+ "www.google.jo" => array("Google", "q"),
+ "www.google.kz" => array("Google", "q"),
+ "www.google.li" => array("Google", "q"),
+ "www.google.lt" => array("Google", "q"),
+ "www.google.lu" => array("Google", "q"),
+ "www.google.lv" => array("Google", "q"),
+ "www.google.ms" => array("Google", "q"),
+ "www.google.mu" => array("Google", "q"),
+ "www.google.mw" => array("Google", "q"),
+ "www.google.md" => array("Google", "q"),
+ "www.google.nl" => array("Google", "q"),
+ "www.google.no" => array("Google", "q"),
+ "www.google.pl" => array("Google", "q"),
+ "www.google.sk" => array("Google", "q"),
+ "www.google.pn" => array("Google", "q"),
+ "www.google.pt" => array("Google", "q"),
+ "www.google.dk" => array("Google", "q"),
+ "www.google.ro" => array("Google", "q"),
+ "www.google.ru" => array("Google", "q"),
+ "www.google.rw" => array("Google", "q"),
+ "www.google.se" => array("Google", "q"),
+ "www.google.sn" => array("Google", "q"),
+ "www.google.sh" => array("Google", "q"),
+ "www.google.si" => array("Google", "q"),
+ "www.google.sm" => array("Google", "q"),
+ "www.google.td" => array("Google", "q"),
+ "www.google.tt" => array("Google", "q"),
+ "www.google.uz" => array("Google", "q"),
+ "www.google.vg" => array("Google", "q"),
+ "www.google.com.ar" => array("Google", "q"),
+ "www.google.com.au" => array("Google", "q"),
+ "www.google.com.bo" => array("Google", "q"),
+ "www.google.com.br" => array("Google", "q"),
+ "www.google.com.co" => array("Google", "q"),
+ "www.google.com.cu" => array("Google", "q"),
+ "www.google.com.ec" => array("Google", "q"),
+ "www.google.com.eg" => array("Google", "q"),
+ "www.google.com.do" => array("Google", "q"),
+ "www.google.com.fj" => array("Google", "q"),
+ "www.google.com.gr" => array("Google", "q"),
+ "www.google.com.gt" => array("Google", "q"),
+ "www.google.com.hk" => array("Google", "q"),
+ "www.google.com.ly" => array("Google", "q"),
+ "www.google.com.mt" => array("Google", "q"),
+ "www.google.com.mx" => array("Google", "q"),
+ "www.google.com.my" => array("Google", "q"),
+ "www.google.com.nf" => array("Google", "q"),
+ "www.google.com.ni" => array("Google", "q"),
+ "www.google.com.np" => array("Google", "q"),
+ "www.google.com.pa" => array("Google", "q"),
+ "www.google.com.pe" => array("Google", "q"),
+ "www.google.com.ph" => array("Google", "q"),
+ "www.google.com.pk" => array("Google", "q"),
+ "www.google.com.pl" => array("Google", "q"),
+ "www.google.com.pr" => array("Google", "q"),
+ "www.google.com.py" => array("Google", "q"),
+ "www.google.com.qa" => array("Google", "q"),
+ "www.google.com.om" => array("Google", "q"),
+ "www.google.com.ru" => array("Google", "q"),
+ "www.google.com.sg" => array("Google", "q"),
+ "www.google.com.sa" => array("Google", "q"),
+ "www.google.com.sv" => array("Google", "q"),
+ "www.google.com.tr" => array("Google", "q"),
+ "www.google.com.tw" => array("Google", "q"),
+ "www.google.com.ua" => array("Google", "q"),
+ "www.google.com.uy" => array("Google", "q"),
+ "www.google.com.vc" => array("Google", "q"),
+ "www.google.com.vn" => array("Google", "q"),
+ "www.google.co.cr" => array("Google", "q"),
+ "www.google.co.gg" => array("Google", "q"),
+ "www.google.co.hu" => array("Google", "q"),
+ "www.google.co.id" => array("Google", "q"),
+ "www.google.co.il" => array("Google", "q"),
+ "www.google.co.in" => array("Google", "q"),
+ "www.google.co.je" => array("Google", "q"),
+ "www.google.co.jp" => array("Google", "q"),
+ "www.google.co.ls" => array("Google", "q"),
+ "www.google.co.ke" => array("Google", "q"),
+ "www.google.co.kr" => array("Google", "q"),
+ "www.google.co.nz" => array("Google", "q"),
+ "www.google.co.th" => array("Google", "q"),
+ "www.google.co.uk" => array("Google", "q"),
+ "www.google.co.ve" => array("Google", "q"),
+ "www.google.co.za" => array("Google", "q"),
+ "www.google.co.ma" => array("Google", "q"),
+ "www.goggle.com" => array("Google", "q"),
+ "www.google.com" => array("Google", "q"),
+
+ //Google Blogsearch
+ "blogsearch.google.de" => array("Google Blogsearch", "q"),
+ "blogsearch.google.fr" => array("Google Blogsearch", "q"),
+ "blogsearch.google.co.uk" => array("Google Blogsearch", "q"),
+ "blogsearch.google.it" => array("Google Blogsearch", "q"),
+ "blogsearch.google.net" => array("Google Blogsearch", "q"),
+ "blogsearch.google.es" => array("Google Blogsearch", "q"),
+ "blogsearch.google.ru" => array("Google Blogsearch", "q"),
+ "blogsearch.google.be" => array("Google Blogsearch", "q"),
+ "blogsearch.google.nl" => array("Google Blogsearch", "q"),
+ "blogsearch.google.at" => array("Google Blogsearch", "q"),
+ "blogsearch.google.ch" => array("Google Blogsearch", "q"),
+ "blogsearch.google.pl" => array("Google Blogsearch", "q"),
+ "blogsearch.google.com" => array("Google Blogsearch", "q"),
+
+
+ // Google translation
+ "translate.google.com" => array("Google Translations", "q"),
+
+ // Google Directory
+ "directory.google.com" => array("Google Directory", " "),
+
+ // Google Images
+ "images.google.fr" => array("Google Images", "q"),
+ "images.google.be" => array("Google Images", "q"),
+ "images.google.ca" => array("Google Images", "q"),
+ "images.google.co.uk" => array("Google Images", "q"),
+ "images.google.de" => array("Google Images", "q"),
+ "images.google.be" => array("Google Images", "q"),
+ "images.google.ca" => array("Google Images", "q"),
+ "images.google.it" => array("Google Images", "q"),
+ "images.google.at" => array("Google Images", "q"),
+ "images.google.bg" => array("Google Images", "q"),
+ "images.google.ch" => array("Google Images", "q"),
+ "images.google.ci" => array("Google Images", "q"),
+ "images.google.com.au" => array("Google Images", "q"),
+ "images.google.com.cu" => array("Google Images", "q"),
+ "images.google.co.id" => array("Google Images", "q"),
+ "images.google.co.il" => array("Google Images", "q"),
+ "images.google.co.in" => array("Google Images", "q"),
+ "images.google.co.jp" => array("Google Images", "q"),
+ "images.google.co.hu" => array("Google Images", "q"),
+ "images.google.co.kr" => array("Google Images", "q"),
+ "images.google.co.nz" => array("Google Images", "q"),
+ "images.google.co.th" => array("Google Images", "q"),
+ "images.google.co.tw" => array("Google Images", "q"),
+ "images.google.co.ve" => array("Google Images", "q"),
+ "images.google.com.ar" => array("Google Images", "q"),
+ "images.google.com.br" => array("Google Images", "q"),
+ "images.google.com.cu" => array("Google Images", "q"),
+ "images.google.com.do" => array("Google Images", "q"),
+ "images.google.com.gr" => array("Google Images", "q"),
+ "images.google.com.hk" => array("Google Images", "q"),
+ "images.google.com.mx" => array("Google Images", "q"),
+ "images.google.com.my" => array("Google Images", "q"),
+ "images.google.com.pe" => array("Google Images", "q"),
+ "images.google.com.tr" => array("Google Images", "q"),
+ "images.google.com.tw" => array("Google Images", "q"),
+ "images.google.com.ua" => array("Google Images", "q"),
+ "images.google.com.vn" => array("Google Images", "q"),
+ "images.google.dk" => array("Google Images", "q"),
+ "images.google.es" => array("Google Images", "q"),
+ "images.google.fi" => array("Google Images", "q"),
+ "images.google.gg" => array("Google Images", "q"),
+ "images.google.gr" => array("Google Images", "q"),
+ "images.google.it" => array("Google Images", "q"),
+ "images.google.ms" => array("Google Images", "q"),
+ "images.google.nl" => array("Google Images", "q"),
+ "images.google.no" => array("Google Images", "q"),
+ "images.google.pl" => array("Google Images", "q"),
+ "images.google.pt" => array("Google Images", "q"),
+ "images.google.ro" => array("Google Images", "q"),
+ "images.google.ru" => array("Google Images", "q"),
+ "images.google.se" => array("Google Images", "q"),
+ "images.google.sk" => array("Google Images", "q"),
+ "images.google.com" => array("Google Images", "q"),
+
+ // Google News
+ "news.google.se" => array("Google News", "q"),
+ "news.google.com" => array("Google News", "q"),
+ "news.google.es" => array("Google News", "q"),
+ "news.google.ch" => array("Google News", "q"),
+ "news.google.lt" => array("Google News", "q"),
+ "news.google.ie" => array("Google News", "q"),
+ "news.google.de" => array("Google News", "q"),
+ "news.google.cl" => array("Google News", "q"),
+ "news.google.com.ar" => array("Google News", "q"),
+ "news.google.fr" => array("Google News", "q"),
+ "news.google.ca" => array("Google News", "q"),
+ "news.google.co.uk" => array("Google News", "q"),
+ "news.google.co.jp" => array("Google News", "q"),
+ "news.google.com.pe" => array("Google News", "q"),
+ "news.google.com.au" => array("Google News", "q"),
+ "news.google.com.mx" => array("Google News", "q"),
+ "news.google.com.hk" => array("Google News", "q"),
+ "news.google.co.in" => array("Google News", "q"),
+ "news.google.at" => array("Google News", "q"),
+ "news.google.com.tw" => array("Google News", "q"),
+ "news.google.com.co" => array("Google News", "q"),
+ "news.google.co.ve" => array("Google News", "q"),
+ "news.google.lu" => array("Google News", "q"),
+ "news.google.com.ly" => array("Google News", "q"),
+ "news.google.it" => array("Google News", "q"),
+ "news.google.sm" => array("Google News", "q"),
+ "news.google.com" => array("Google News", "q"),
+
+ // Goyellow.de
+ "www.goyellow.de" => array("GoYellow.de", "MDN"),
+
+ // HighBeam
+ "www.highbeam.com" => array("HighBeam", "Q"),
+
+ // Hit-Parade
+ "recherche.hit-parade.com" => array("Hit-Parade", "p7"),
+ "class.hit-parade.com" => array("Hit-Parade", "p7"),
+
+ // Hotbot via Lycos
+ "hotbot.lycos.com" => array("Hotbot (Lycos)", "query"),
+ "search.hotbot.de" => array("Hotbot", "query"),
+ "search.hotbot.fr" => array("Hotbot", "query"),
+ "www.hotbot.com" => array("Hotbot", "query"),
+
+ // 1stekeuze
+ "zoek.1stekeuze.nl" => array("1stekeuze", "terms"),
+
+ // Infoseek
+ "search.www.infoseek.co.jp" => array("Infoseek", "qt"),
+
+ // Icerocket
+ "blogs.icerocket.com" => array("Icerocket", "qt"),
+
+ // ICQ
+ "www.icq.com" => array("ICQ", "q"),
+
+ // Ilse
+ "spsearch.ilse.nl" => array("Startpagina", "search_for"),
+ "be.ilse.nl" => array("Ilse BE", "query"),
+ "search.ilse.nl" => array("Ilse NL", "search_for"),
+
+ // Iwon
+ "search.iwon.com" => array("Iwon", "searchfor"),
+
+ // Ixquick
+ "ixquick.com" => array("Ixquick", "query"),
+ "www.eu.ixquick.com" => array("Ixquick", "query"),
+ "us.ixquick.com" => array("Ixquick", "query"),
+ "s1.us.ixquick.com" => array("Ixquick", "query"),
+ "s2.us.ixquick.com" => array("Ixquick", "query"),
+ "s3.us.ixquick.com" => array("Ixquick", "query"),
+ "s4.us.ixquick.com" => array("Ixquick", "query"),
+ "s5.us.ixquick.com" => array("Ixquick", "query"),
+ "eu.ixquick.com" => array("Ixquick","query"),
+
+ // Jyxo
+ "jyxo.cz" => array("Jyxo", "q"),
+
+ // Jungle Spider
+ "www.jungle-spider.de" => array("Jungle Spider", "qry"),
+
+ // Kartoo
+ "kartoo.com" => array("Kartoo", ""),
+ "kartoo.de" => array("Kartoo", ""),
+ "kartoo.fr" => array("Kartoo", ""),
+
+
+ // Kataweb
+ "www.kataweb.it" => array("Kataweb", "q"),
+
+ // Klug suchen
+ "www.klug-suchen.de" => array("Klug suchen!", "query"),
+
+ // La Toile Du Québec via Google
+ "google.canoe.com" => array("La Toile Du Québec (Google)", "q"),
+ "www.toile.com" => array("La Toile Du Québec (Google)", "q"),
+ "web.toile.com" => array("La Toile Du Québec (Google)", "q"),
+
+ // La Toile Du Québec
+ "recherche.toile.qc.ca" => array("La Toile Du Québec", "query"),
+
+ // Live.com
+ "www.live.com" => array("Live", "q"),
+ "beta.search.live.com" => array("Live", "q"),
+ "search.live.com" => array("Live", "q"),
+ "g.msn.com" => array("Live", " "),
+
+ // Looksmart
+ "www.looksmart.com" => array("Looksmart", "key"),
+
+ // Lycos
+ "search.lycos.com" => array("Lycos", "query"),
+ "vachercher.lycos.fr" => array("Lycos", "query"),
+ "www.lycos.fr" => array("Lycos", "query"),
+ "suche.lycos.de" => array("Lycos", "query"),
+ "search.lycos.de" => array("Lycos", "query"),
+ "sidesearch.lycos.com" => array("Lycos", "query"),
+ "www.multimania.lycos.fr" => array("Lycos", "query"),
+ "buscador.lycos.es" => array("Lycos", "query"),
+
+ // Mail.ru
+ "go.mail.ru" => array("Mailru", "q"),
+
+ // Mamma
+ "mamma.com" => array("Mamma", "query"),
+ "mamma75.mamma.com" => array("Mamma", "query"),
+ "www.mamma.com" => array("Mamma", "query"),
+
+ // Meceoo
+ "www.meceoo.fr" => array("Meceoo", "kw"),
+
+ // Mediaset
+ "servizi.mediaset.it" => array("Mediaset", "searchword"),
+
+ // Metacrawler
+ "search.metacrawler.com" => array("Metacrawler", "general"),
+
+ // Metager
+ "mserv.rrzn.uni-hannover.de" => array("Metager", "eingabe"),
+
+ // Metager2
+ "www.metager2.de" => array("Metager2", "q"),
+ "metager2.de" => array("Metager2", "q"),
+
+ // Meinestadt
+ "www.meinestadt.de" => array("Meinestadt.de", "words"),
+
+ // Monstercrawler
+ "www.monstercrawler.com" => array("Monstercrawler", "qry"),
+
+ // Mozbot
+ "www.mozbot.fr" => array("mozbot", "q"),
+ "www.mozbot.co.uk" => array("mozbot", "q"),
+ "www.mozbot.com" => array("mozbot", "q"),
+
+ // MSN
+ "beta.search.msn.fr" => array("MSN", "q"),
+ "search.msn.fr" => array("MSN", "q"),
+ "search.msn.es" => array("MSN", "q"),
+ "search.msn.se" => array("MSN", "q"),
+ "search.latam.msn.com" => array("MSN", "q"),
+ "search.msn.nl" => array("MSN", "q"),
+ "leguide.fr.msn.com" => array("MSN", "s"),
+ "leguide.msn.fr" => array("MSN", "s"),
+ "search.msn.co.jp" => array("MSN", "q"),
+ "search.msn.no" => array("MSN", "q"),
+ "search.msn.at" => array("MSN", "q"),
+ "search.msn.com.hk" => array("MSN", "q"),
+ "search.t1msn.com.mx" => array("MSN", "q"),
+ "fr.ca.search.msn.com" => array("MSN", "q"),
+ "search.msn.be" => array("MSN", "q"),
+ "search.fr.msn.be" => array("MSN", "q"),
+ "search.msn.it" => array("MSN", "q"),
+ "sea.search.msn.it" => array("MSN", "q"),
+ "sea.search.msn.fr" => array("MSN", "q"),
+ "sea.search.msn.de" => array("MSN", "q"),
+ "sea.search.msn.com" => array("MSN", "q"),
+ "sea.search.fr.msn.be" => array("MSN", "q"),
+ "search.msn.com.tw" => array("MSN", "q"),
+ "search.msn.de" => array("MSN", "q"),
+ "search.msn.co.uk" => array("MSN", "q"),
+ "search.msn.co.za" => array("MSN", "q"),
+ "search.msn.ch" => array("MSN", "q"),
+ "search.msn.es" => array("MSN", "q"),
+ "search.msn.com.br" => array("MSN", "q"),
+ "search.ninemsn.com.au" => array("MSN", "q"),
+ "search.msn.dk" => array("MSN", "q"),
+ "search.arabia.msn.com" => array("MSN", "q"),
+ "search.msn.com" => array("MSN", "q"),
+ "search.prodigy.msn.com" => array("MSN", "q"),
+
+ // El Mundo
+ "ariadna.elmundo.es" => array("El Mundo", "q"),
+
+ // MyWebSearch
+ "kf.mysearch.myway.com" => array("MyWebSearch", "searchfor"),
+ "ms114.mysearch.com" => array("MyWebSearch", "searchfor"),
+ "ms146.mysearch.com" => array("MyWebSearch", "searchfor"),
+ "mysearch.myway.com" => array("MyWebSearch", "searchfor"),
+ "searchfr.myway.com" => array("MyWebSearch", "searchfor"),
+ "ki.mysearch.myway.com" => array("MyWebSearch", "searchfor"),
+ "search.mywebsearch.com" => array("MyWebSearch", "searchfor"),
+ "www.mywebsearch.com" => array("MyWebSearch", "searchfor"),
+
+ // Najdi
+ "www.najdi.si" => array("Najdi.si", "q"),
+
+ // Needtofind
+ "ko.search.need2find.com" => array("Needtofind", "searchfor"),
+
+ // Netster
+ "www.netster.com" => array("Netster", "keywords"),
+
+ // Netscape
+ "search-intl.netscape.com" => array("Netscape", "search"),
+ "www.netscape.fr" => array("Netscape", "q"),
+ "suche.netscape.de" => array("Netscape", "q"),
+ "search.netscape.com" => array("Netscape", "query"),
+
+ // Nomade
+ "ie4.nomade.fr" => array("Nomade", "s"),
+ "rechercher.nomade.aliceadsl.fr"=> array("Nomade (AliceADSL)", "s"),
+ "rechercher.nomade.fr" => array("Nomade", "s"),
+
+ // Northern Light
+ "www.northernlight.com" => array("Northern Light", "qr"),
+
+ // Numéricable
+ "www.numericable.fr" => array("Numéricable", "query"),
+
+ // Onet
+ "szukaj.onet.pl" => array("Onet.pl", "qt"),
+
+ // Opera
+ "search.opera.com" => array("Opera", "search"),
+
+ // Openfind
+ "wps.openfind.com.tw" => array("Openfind (Websearch)", "query"),
+ "bbs2.openfind.com.tw" => array("Openfind (BBS)", "query"),
+ "news.openfind.com.tw" => array("Openfind (News)", "query"),
+
+ // Overture
+ "www.overture.com" => array("Overture", "Keywords"),
+ "www.fr.overture.com" => array("Overture", "Keywords"),
+
+ // Paperball
+ "suche.paperball.de" => array("Paperball", "query"),
+
+ // Picsearch
+ "www.picsearch.com" => array("Picsearch", "q"),
+
+ // Plazoo
+ "www.plazoo.com" => array("Plazoo", "q"),
+
+ // Postami
+ "www.postami.com" => array("Postami", "query"),
+
+ // Quick searches
+ "data.quicksearches.net" => array("QuickSearches", "q"),
+
+ // Qualigo
+ "www.qualigo.de" => array("Qualigo", "q"),
+ "www.qualigo.ch" => array("Qualigo", "q"),
+ "www.qualigo.at" => array("Qualigo", "q"),
+ "www.qualigo.nl" => array("Qualigo", "q"),
+
+ // Rambler
+ "search.rambler.ru" => array("Rambler", "words"),
+
+ // Reacteur.com
+ "www.reacteur.com" => array("Reacteur", "kw"),
+
+ // Sapo
+ "pesquisa.sapo.pt" => array("Sapo","q"),
+
+ // Search.com
+ "www.search.com" => array("Search.com", "q"),
+
+ // Search.ch
+ "www.search.ch" => array("Search.ch", "q"),
+
+ // Search a lot
+ "www.searchalot.com" => array("Searchalot", "query"),
+
+ // Seek
+ "www.seek.fr" => array("Searchalot", "qry_str"),
+
+ // Seekport
+ "www.seekport.de" => array("Seekport", "query"),
+ "www.seekport.co.uk" => array("Seekport", "query"),
+ "www.seekport.fr" => array("Seekport", "query"),
+ "www.seekport.at" => array("Seekport", "query"),
+ "www.seekport.es" => array("Seekport", "query"),
+ "www.seekport.it" => array("Seekport", "query"),
+
+ // Seekport (blogs)
+ "blogs.seekport.de" => array("Seekport (Blogs)", "query"),
+ "blogs.seekport.co.uk" => array("Seekport (Blogs)", "query"),
+ "blogs.seekport.fr" => array("Seekport (Blogs)", "query"),
+ "blogs.seekport.at" => array("Seekport (Blogs)", "query"),
+ "blogs.seekport.es" => array("Seekport (Blogs)", "query"),
+ "blogs.seekport.it" => array("Seekport (Blogs)", "query"),
+
+ // Seekport (news)
+ "news.seekport.de" => array("Seekport (News)", "query"),
+ "news.seekport.co.uk" => array("Seekport (News)", "query"),
+ "news.seekport.fr" => array("Seekport (News)", "query"),
+ "news.seekport.at" => array("Seekport (News)", "query"),
+ "news.seekport.es" => array("Seekport (News)", "query"),
+ "news.seekport.it" => array("Seekport (News)", "query"),
+
+ // Searchscout
+ "www.searchscout.com" => array("Search Scout", "gt_keywords"),
+
+ // Searchy
+ "www.searchy.co.uk" => array("Searchy", "search_term"),
+
+ // Seznam
+ "search1.seznam.cz" => array("Seznam", "w"),
+ "search2.seznam.cz" => array("Seznam", "w"),
+ "search.seznam.cz" => array("Seznam", "w"),
+
+ // Sharelook
+ "www.sharelook.fr" => array("Sharelook", "keyword"),
+ "www.sharelook.de" => array("Sharelook", "keyword"),
+
+ // Skynet
+ "search.skynet.be" => array("Skynet", "keywords"),
+
+ // Sphere
+ "www.sphere.com" => array("Sphere", "q"),
+
+ // Startpagina
+ "startgoogle.startpagina.nl" => array("Startpagina (Google)", "q"),
+
+ // Suchnase
+ "www.suchnase.de" => array("Suchnase", "qkw"),
+
+ // Supereva
+ "search.supereva.com" => array("Supereva", "q"),
+
+ // Sympatico
+ "search.sli.sympatico.ca" => array("Sympatico", "q"),
+ "search.fr.sympatico.msn.ca" => array("Sympatico", "q"),
+ "sea.search.fr.sympatico.msn.ca"=> array("Sympatico", "q"),
+ "search.sympatico.msn.ca" => array("Sympatico", "q"),
+
+ // Suchmaschine.com
+ "www.suchmaschine.com" => array("Suchmaschine.com", "suchstr"),
+
+ //Technorati
+ "www.technorati.com" => array("Technorati", " "),
+
+ // Teoma
+ "www.teoma.com" => array("Teoma", "t"),
+
+ // Tiscali
+ "rechercher.nomade.tiscali.fr" => array("Tiscali", "s"),
+ "search-dyn.tiscali.it" => array("Tiscali", "key"),
+ "www.tiscali.co.uk" => array("Tiscali", "query"),
+ "search-dyn.tiscali.de" => array("Tiscali", "key"),
+ "hledani.tiscali.cz" => array("Tiscali", "query", "windows-1250"),
+
+ // T-Online
+ "suche.t-online.de" => array("T-Online", "q"),
+
+ // Trouvez.com
+ "www.trouvez.com" => array("Trouvez.com", "query"),
+
+ // Trusted-Search
+
+ "www.trusted--search.com" => array("Trusted Search", "w"),
+
+ // Vinden
+ "zoek.vinden.nl" => array("Vinden", "query"),
+
+ // Vindex
+ "www.vindex.nl" => array("Vindex","search_for"),
+
+ // Virgilio
+ "search.virgilio.it" => array("Virgilio", "qs"),
+
+ // Voila
+ "search.ke.voila.fr" => array("Voila", "rdata"),
+ "moteur.voila.fr" => array("Voila", "kw"),
+ "search.voila.fr" => array("Voila", "kw"),
+ "beta.voila.fr" => array("Voila", "kw"),
+ "search.voila.com" => array("Voila", "kw"),
+
+ // Volny
+ "web.volny.cz" => array("Volny", "search", "windows-1250"),
+
+ // Wanadoo
+ "search.ke.wanadoo.fr" => array("Wanadoo", "kw"),
+ "busca.wanadoo.es" => array("Wanadoo", "buscar"),
+
+ // Web.de
+ "suche.web.de" => array("Web.de (Websuche)", "su"),
+ "dir.web.de" => array("Web.de (Directory)", "su"),
+
+ // Webtip
+ "www.webtip.de" => array("Webtip", "keyword"),
+
+ // X-recherche
+ "www.x-recherche.com" => array("X-Recherche", "mots"),
+
+ // Yahoo
+ "ink.yahoo.com" => array("Yahoo!", "p"),
+ "ink.yahoo.fr" => array("Yahoo!", "p"),
+ "fr.ink.yahoo.com" => array("Yahoo!", "p"),
+ "search.yahoo.co.jp" => array("Yahoo!", "p"),
+ "search.yahoo.fr" => array("Yahoo!", "p"),
+ "ar.search.yahoo.com" => array("Yahoo!", "p"),
+ "br.search.yahoo.com" => array("Yahoo!", "p"),
+ "de.search.yahoo.com" => array("Yahoo!", "p"),
+ "ca.search.yahoo.com" => array("Yahoo!", "p"),
+ "cf.search.yahoo.com" => array("Yahoo!", "p"),
+ "fr.search.yahoo.com" => array("Yahoo!", "p"),
+ "espanol.search.yahoo.com" => array("Yahoo!", "p"),
+ "es.search.yahoo.com" => array("Yahoo!", "p"),
+ "id.search.yahoo.com" => array("Yahoo!", "p"),
+ "it.search.yahoo.com" => array("Yahoo!", "p"),
+ "kr.search.yahoo.com" => array("Yahoo!", "p"),
+ "mx.search.yahoo.com" => array("Yahoo!", "p"),
+ "nl.search.yahoo.com" => array("Yahoo!", "p"),
+ "uk.search.yahoo.com" => array("Yahoo!", "p"),
+ "cade.search.yahoo.com" => array("Yahoo!", "p"),
+ "tw.search.yahoo.com" => array("Yahoo!", "p"),
+ "www.yahoo.com.cn" => array("Yahoo!", "p"),
+ "search.yahoo.com" => array("Yahoo!", "p"),
+
+ "de.dir.yahoo.com" => array("Yahoo! Webverzeichnis", ""),
+ "cf.dir.yahoo.com" => array("Yahoo! Directory", ""),
+ "fr.dir.yahoo.com" => array("Yahoo! Directory", ""),
+
+ // Yandex
+ "www.yandex.ru" => array("Yandex", "text"),
+ "yandex.ru" => array("Yandex", "text"),
+ "search.yaca.yandex.ru" => array("Yandex", "text"),
+ "ya.ru" => array("Yandex", "text"),
+ "www.ya.ru" => array("Yandex", "text"),
+ "images.yandex.ru" => array("Yandex Images","text"),
+
+ //Yellowmap
+
+ "www.yellowmap.de" => array("Yellowmap", " "),
+ "yellowmap.de" => array("Yellowmap", " "),
+
+ // Wanadoo
+ "search.ke.wanadoo.fr" => array("Wanadoo", "kw"),
+ "busca.wanadoo.es" => array("Wanadoo", "buscar"),
+
+ // Wedoo
+ "fr.wedoo.com" => array("Wedoo", "keyword"),
+
+ // Web.nl
+ "www.web.nl" => array("Web.nl","query"),
+
+ // Weborama
+ "www.weborama.fr" => array("weborama", "query"),
+
+ // WebSearch
+ "is1.websearch.com" => array("WebSearch", "qkw"),
+ "www.websearch.com" => array("WebSearch", "qkw"),
+ "websearch.cs.com" => array("WebSearch", "query"),
+
+ // Witch
+ "www.witch.de" => array("Witch", "search"),
+
+ // WXS
+ "wxsl.nl" => array("Planet Internet","q"),
+
+ // Zoek
+ "www3.zoek.nl" => array("Zoek","q"),
+
+ // Zhongsou
+ "p.zhongsou.com" => array("Zhongsou","w"),
+
+ // Zoeken
+ "www.zoeken.nl" => array("Zoeken","query"),
+
+ // Zoohoo
+ "zoohoo.cz" => array("Zoohoo", "q", "windows-1250"),
+ "www.zoohoo.cz" => array("Zoohoo", "q", "windows-1250"),
+
+ // Zoznam
+ "www.zoznam.sk" => array("Zoznam", "s"),
+ );
+}
+?>
Index: /trunk/modules/PublicAPI.php
===================================================================
--- /trunk/modules/PublicAPI.php (revision 19)
+++ /trunk/modules/PublicAPI.php (revision 22)
@@ -89,5 +89,13 @@
return "[$sParameters]";
}
-
+ /**
+ * Returns the parameters names and default values for the method $name
+ * of the class $class
+ *
+ * @return array Format array(
+ * 'parameter1Name' => 42 // default value = 42,
+ * 'date' => 'yesterday',
+ * );
+ */
private function getParametersList($class, $name)
{
@@ -144,5 +152,5 @@
}
- public function __call($methodName, $parameters )
+ public function __call($methodName, $parameterValues )
{
try {
@@ -158,17 +166,27 @@
// first check number of parameters do match
- $this->checkNumberOfParametersMatch($className, $methodName, $parameters);
+ $this->checkNumberOfParametersMatch($className, $methodName, $parameterValues);
- $args = @implode(", ", $parameters);
- Piwik::log("Calling ".self::$classCalled.".$methodName [$args]");
-
+ // start the timer
+ $timer = new Piwik_Timer;
+
// call the method
- $returnedValue = call_user_func_array(array($object, $methodName), $parameters);
+ $returnedValue = call_user_func_array(array($object, $methodName), $parameterValues);
- Piwik_Log::dump($returnedValue);
+ // log the API Call
+ $parameterNamesDefaultValues = $this->getParametersList($className, $methodName);
+ Zend_Registry::get('logger_api_call')->log(
+ self::$classCalled,
+ $methodName,
+ $parameterNamesDefaultValues,
+ $parameterValues,
+ $timer->getTimeMs(),
+ $returnedValue
+ );
}
catch( Exception $e)
{
- Piwik::log("Error during API call...
=> ". $e->getMessage());
+ Piwik::log("
\n Error during API call {$className}.{$methodName}...
+
\n => ". $e->getMessage());
}
Index: /trunk/modules/LogStats/Cookie.php
===================================================================
--- /trunk/modules/LogStats/Cookie.php (revision 30)
+++ /trunk/modules/LogStats/Cookie.php (revision 30)
@@ -0,0 +1,228 @@
+name = $cookieName;
+
+ if(is_null($expire)
+ || !is_numeric($expire)
+ || $expire <= 0)
+ {
+ $this->expire = $this->getDefaultExpire();
+ }
+
+ if($this->isCookieFound())
+ {
+ $this->loadContentFromCookie();
+ }
+ }
+
+ public function isCookieFound()
+ {
+ return isset($_COOKIE[$this->name]);
+ }
+
+ protected function getDefaultExpire()
+ {
+ return time() + 86400*365*10;
+ }
+
+ /**
+ * taken from http://usphp.com/manual/en/function.setcookie.php
+ * fix expires bug for IE users (should i say expected to fix the bug in 2.3 b2)
+ * TODO setCookie: use the other parameters of the function
+ */
+ protected function setCookie($Name, $Value, $Expires, $Path = '', $Domain = '', $Secure = false, $HTTPOnly = false)
+ {
+ if (!empty($Domain))
+ {
+ // Fix the domain to accept domains with and without 'www.'.
+ if (strtolower(substr($Domain, 0, 4)) == 'www.') $Domain = substr($Domain, 4);
+
+ $Domain = '.' . $Domain;
+
+ // Remove port information.
+ $Port = strpos($Domain, ':');
+ if ($Port !== false) $Domain = substr($Domain, 0, $Port);
+ }
+
+ $header = 'Set-Cookie: ' . rawurlencode($Name) . '=' . rawurlencode($Value)
+ . (empty($Expires) ? '' : '; expires=' . gmdate('D, d-M-Y H:i:s', $Expires) . ' GMT')
+ . (empty($Path) ? '' : '; path=' . $Path)
+ . (empty($Domain) ? '' : '; domain=' . $Domain)
+ . (!$Secure ? '' : '; secure')
+ . (!$HTTPOnly ? '' : '; HttpOnly');
+
+ header($header, false);
+ }
+
+ protected function setP3PHeader()
+ {
+ header("P3P: CP='OTI DSP COR NID STP UNI OTPa OUR'");
+ }
+
+ public function deleteCookie()
+ {
+ $this->setP3PHeader();
+ setcookie($this->name, false, time() - 86400);
+ }
+
+ public function save()
+ {
+ $this->setP3PHeader();
+ $this->setCookie( $this->name, $this->generateContentString(), $this->expire);
+ }
+
+ /**
+ * Load the cookie content into a php array
+ */
+ protected function loadContentFromCookie()
+ {
+ $cookieStr = $_COOKIE[$this->name];
+
+ $values = explode( self::VALUE_SEPARATOR, $cookieStr);
+ foreach($values as $nameValue)
+ {
+ $equalPos = strpos($nameValue, '=');
+ $varName = substr($nameValue,0,$equalPos);
+ $varValue = substr($nameValue,$equalPos+1);
+
+ // no numeric value are base64 encoded so we need to decode them
+ if(!is_numeric($varValue))
+ {
+ $varValue = base64_decode($varValue);
+
+ // some of the values may be serialized array so we try to unserialize it
+ if( ($arrayValue = @unserialize($varValue)) !== false
+ // we set the unserialized version only for arrays as you can have set a serialized string on purpose
+ && is_array($arrayValue)
+ )
+ {
+ $varValue = $arrayValue;
+ }
+ }
+
+ $this->set($varName, $varValue);
+ }
+ }
+
+ /**
+ * Returns the string to save in the cookie frpm the $this->value array of values
+ *
+ */
+ public function generateContentString()
+ {
+ $cookieStr = '';
+ foreach($this->value as $name=>$value)
+ {
+ if(is_array($value))
+ {
+ $value = base64_encode(serialize($value));
+ }
+ elseif(is_string($value))
+ {
+ $value = base64_encode($value);
+ }
+
+ $cookieStr .= "$name=$value" . self::VALUE_SEPARATOR;
+ }
+ $cookieStr = substr($cookieStr, 0, strlen($cookieStr)-1);
+ return $cookieStr;
+ }
+
+ /**
+ * Registers a new name => value association in the cookie.
+ *
+ * Registering new values is optimal if the value is a numeric value.
+ * If the value is a string, it will be saved as a base64 encoded string.
+ * If the value is an array, it will be saved as a serialized and base64 encoded
+ * string which is not very good in terms of bytes usage.
+ * You should save arrays only when you are sure about their maximum data size.
+ *
+ * @param string Name of the value to save; the name will be used to retrieve this value
+ * @param string|array|numeric Value to save
+ *
+ */
+ public function set( $name, $value )
+ {
+ $name = self::escapeValue($name);
+ $this->value[$name] = $value;
+ }
+
+ /**
+ * Returns the value defined by $name from the cookie.
+ *
+ * @param string|integer Index name of the value to return
+ * @return mixed The value if found, false if the value is not found
+ */
+ public function get( $name )
+ {
+ $name = self::escapeValue($name);
+ return isset($this->value[$name]) ? self::escapeValue($this->value[$name]) : false;
+ }
+
+ public function __toString()
+ {
+ $str = "<-- Content of the cookie '{$this->name}'
\n";
+ foreach($this->value as $name => $value )
+ {
+ $str .= $name . " = " . var_export($this->get($name), true) . "
\n";
+ }
+ $str .= "-->
\n";
+ return $str;
+ }
+
+ static protected function escapeValue( $value )
+ {
+ return Piwik_Common::sanitizeInputValues($value);
+ }
+}
+
+//
+//$c = new Piwik_LogStats_Cookie( 'piwik_logstats', 86400);
+//echo $c;
+//$c->set(1,1);
+//$c->set('test',1);
+//$c->set('test2','test=432:gea785');
+//$c->set('test3',array('test=432:gea785'));
+//$c->set('test4',array(array(0=>1),1=>'test'));
+//echo $c;
+//echo "
";
+//echo $c->generateContentString();
+//echo "
";
+//$v=$c->get('more!');
+//if(empty($v)) $c->set('more!',1);
+//$c->set('more!', array($c->get('more!')));
+//$c->save();
+//$c->deleteCookie();
+
+?>
Index: /trunk/modules/LogStats/Action.php
===================================================================
--- /trunk/modules/LogStats/Action.php (revision 30)
+++ /trunk/modules/LogStats/Action.php (revision 30)
@@ -0,0 +1,198 @@
+ name = link title anchor
+ * else name = path+query of the URL
+ * Ex: myfiles/beta.zip
+ *
+ * - External link tracking
+ *
+ * * MANUAL External link tracking
+ * outlink = http://amazon.org/test
+ * (name = the big partners / amazon)
+ *
+ * * AUTOMATIC External link tracking
+ * When a link is not detected as being part of the same website
+ * AND when the url extension is not detected as being a file download
+ * outlink = http://amazon.org/test
+ *
+ * When 'name' is not specified,
+ * if AUTOMATIC and if anchor not empty => name = link title anchor
+ * else name = URL
+ * Ex: http://amazon.org/test
+ */
+ private $actionName;
+ private $url;
+ private $defaultActionName;
+ private $nameDownloadOutlink;
+
+ const TYPE_ACTION = 1;
+ const TYPE_DOWNLOAD = 3;
+ const TYPE_OUTLINK = 2;
+
+ function __construct( $db )
+ {
+ $this->actionName = Piwik_Common::getRequestVar( 'action_name', '', 'string');
+
+ $downloadVariableName = Piwik_LogStats_Config::getInstance()->LogStats['download_url_var_name'];
+ $this->downloadUrl = Piwik_Common::getRequestVar( $downloadVariableName, '', 'string');
+
+ $outlinkVariableName = Piwik_LogStats_Config::getInstance()->LogStats['outlink_url_var_name'];
+ $this->outlinkUrl = Piwik_Common::getRequestVar( $outlinkVariableName, '', 'string');
+
+ $nameVariableName = Piwik_LogStats_Config::getInstance()->LogStats['download_outlink_name_var'];
+ $this->nameDownloadOutlink = Piwik_Common::getRequestVar( $nameVariableName, '', 'string');
+
+ $this->url = Piwik_Common::getRequestVar( 'url', '', 'string');
+ $this->db = $db;
+ $this->defaultActionName = Piwik_LogStats_Config::getInstance()->LogStats['default_action_name'];
+ }
+
+ /**
+ * About the Action concept:
+ *
+ * - An action is defined by a name.
+ * - The name can be specified in the JS Code in the variable 'action_name'
+ * - Handling UTF8 in the action name
+ * PLUGIN_IDEA - An action is associated to URLs and link to the URL from the interface
+ * PLUGIN_IDEA - An action hit by a visitor is associated to the HTML title of the page that triggered the action
+ *
+ * + If the name is not specified, we use the URL(path+query) to build a default name.
+ * For example for "http://piwik.org/test/my_page/test.html"
+ * the name would be "test/my_page/test.html"
+ *
+ * We make sure it is clean and displayable.
+ * If the name is empty we set it to a default name.
+ *
+ * TODO UTF8 handling to test
+ *
+ */
+ private function generateInfo()
+ {
+ if(!empty($this->downloadUrl))
+ {
+ $this->actionType = self::TYPE_DOWNLOAD;
+ $url = $this->downloadUrl;
+ $actionName = $this->nameDownloadOutlink;
+ }
+ elseif(!empty($this->outlinkUrl))
+ {
+ $this->actionType = self::TYPE_OUTLINK;
+ $url = $this->outlinkUrl;
+ $actionName = $this->nameDownloadOutlink;
+ if( empty($actionName) )
+ {
+ $actionName = $url;
+ }
+ }
+ else
+ {
+ $this->actionType = self::TYPE_ACTION;
+ $url = $this->url;
+ $actionName = $this->actionName;
+ }
+
+ // the ActionName wasn't specified
+ if( empty($actionName) )
+ {
+ $parsedUrl = parse_url( $url );
+
+ $actionName = '';
+
+ if(isset($parsedUrl['path']))
+ {
+ $actionName .= substr($parsedUrl['path'], 1);
+ }
+
+ if(isset($parsedUrl['query']))
+ {
+ $actionName .= '?'.$parsedUrl['query'];
+ }
+ }
+
+ // clean the name
+ $actionName = str_replace(array("\n", "\r"), '', $actionName);
+
+ if(empty($actionName))
+ {
+ $actionName = $this->defaultActionName;
+ }
+
+ $this->finalActionName = $actionName;
+ }
+
+ /**
+ * Returns the idaction of the current action name.
+ * This idaction is used in the visitor logging table to link the visit information
+ * (entry action, exit action) to the actions.
+ * This idaction is also used in the table that links the visits and their actions.
+ *
+ * The methods takes care of creating a new record in the action table if the existing
+ * action name doesn't exist yet.
+ *
+ * @return int Id action
+ */
+ function getActionId()
+ {
+ $this->loadActionId();
+ return $this->idAction;
+ }
+
+ /**
+ * @see getActionId()
+ */
+ private function loadActionId()
+ {
+ $this->generateInfo();
+
+ $name = $this->finalActionName;
+ $type = $this->actionType;
+
+ $idAction = $this->db->fetch(" SELECT idaction
+ FROM ".$this->db->prefixTable('log_action')
+ ." WHERE name = ? AND type = ?", array($name, $type) );
+
+ // the action name has not been found, create it
+ if($idAction === false)
+ {
+ $this->db->query("INSERT INTO ". $this->db->prefixTable('log_action'). "( name, type )
+ VALUES (?,?)",array($name,$type) );
+ $idAction = $this->db->lastInsertId();
+ }
+ else
+ {
+ $idAction = $idAction['idaction'];
+ }
+
+ $this->idAction = $idAction;
+ }
+
+ /**
+ * Records in the DB the association between the visit and this action.
+ */
+ public function record( $idVisit, $idRefererAction, $timeSpentRefererAction)
+ {
+ $this->db->query("INSERT INTO ".$this->db->prefixTable('log_link_visit_action')
+ ." (idvisit, idaction, idaction_ref, time_spent_ref_action) VALUES (?,?,?,?)",
+ array($idVisit, $this->idAction, $idRefererAction, $timeSpentRefererAction)
+ );
+ }
+}
+
+?>
Index: /trunk/modules/LogStats/Visit.php
===================================================================
--- /trunk/modules/LogStats/Visit.php (revision 30)
+++ /trunk/modules/LogStats/Visit.php (revision 30)
@@ -0,0 +1,749 @@
+db = $db;
+
+ $idsite = Piwik_Common::getRequestVar('idsite', 0, 'int');
+ if($idsite <= 0)
+ {
+ throw new Exception("The 'idsite' in the request is invalide.");
+ }
+
+ $this->idsite = $idsite;
+ }
+
+ protected function getCurrentDate( $format = "Y-m-d")
+ {
+ return date($format, $this->getCurrentTimestamp() );
+ }
+
+ protected function getCurrentTimestamp()
+ {
+ return time();
+ }
+
+ protected function getDatetimeFromTimestamp($timestamp)
+ {
+ return date("Y-m-d H:i:s",$timestamp);
+ }
+
+
+
+ // test if the visitor is excluded because of
+ // - IP
+ // - cookie
+ // - configuration option?
+ private function isExcluded()
+ {
+ $excluded = 0;
+
+ if($excluded)
+ {
+ printDebug("Visitor excluded.");
+ return true;
+ }
+
+ return false;
+ }
+
+ private function getCookieName()
+ {
+ return Piwik_LogStats_Config::getInstance()->LogStats['cookie_name'] . $this->idsite;
+ }
+
+
+ /**
+ * This methods tries to see if the visitor has visited the website before.
+ *
+ * We have to split the visitor into one of the category
+ * - Known visitor
+ * - New visitor
+ *
+ * A known visitor is a visitor that has already visited the website in the current month.
+ * We define a known visitor using the algorithm:
+ *
+ * 1) Checking if a cookie contains
+ * // a unique id for the visitor
+ * - id_visitor
+ *
+ * // the timestamp of the last action in the most recent visit
+ * - timestamp_last_action
+ *
+ * // the timestamp of the first action in the most recent visit
+ * - timestamp_first_action
+ *
+ * // the ID of the most recent visit (which could be in the past or the current visit)
+ * - id_visit
+ *
+ * // the ID of the most recent action
+ * - id_last_action
+ *
+ * 2) If the visitor doesn't have a cookie, we try to look for a similar visitor configuration.
+ * We search for a visitor with the same plugins/OS/Browser/Resolution for today for this website.
+ */
+ private function recognizeTheVisitor()
+ {
+ $this->visitorKnown = false;
+
+ $this->cookieLog = new Piwik_LogStats_Cookie( $this->getCookieName() );
+ /*
+ * Case the visitor has the piwik cookie.
+ * We make sure all the data that should saved in the cookie is available.
+ */
+
+ if( false !== ($idVisitor = $this->cookieLog->get( Piwik_LogStats::COOKIE_INDEX_IDVISITOR )) )
+ {
+ $timestampLastAction = $this->cookieLog->get( Piwik_LogStats::COOKIE_INDEX_TIMESTAMP_LAST_ACTION );
+ $timestampFirstAction = $this->cookieLog->get( Piwik_LogStats::COOKIE_INDEX_TIMESTAMP_FIRST_ACTION );
+ $idVisit = $this->cookieLog->get( Piwik_LogStats::COOKIE_INDEX_ID_VISIT );
+ $idLastAction = $this->cookieLog->get( Piwik_LogStats::COOKIE_INDEX_ID_LAST_ACTION );
+
+ if( $timestampLastAction !== false && is_numeric($timestampLastAction)
+ && $timestampFirstAction !== false && is_numeric($timestampFirstAction)
+ && $idVisit !== false && is_numeric($idVisit)
+ && $idLastAction !== false && is_numeric($idLastAction)
+ )
+ {
+ $this->visitorInfo['visitor_idcookie'] = $idVisitor;
+ $this->visitorInfo['visit_last_action_time'] = $timestampLastAction;
+ $this->visitorInfo['visit_first_action_time'] = $timestampFirstAction;
+ $this->visitorInfo['idvisit'] = $idVisit;
+ $this->visitorInfo['visit_exit_idaction'] = $idLastAction;
+
+ $this->visitorKnown = true;
+
+ printDebug("The visitor is known because he has the piwik cookie (idcookie = {$this->visitorInfo['visitor_idcookie']}, idvisit = {$this->visitorInfo['idvisit']}, last action = ".date("r", $this->visitorInfo['visit_last_action_time']).") ");
+ }
+ }
+
+ /*
+ * If the visitor doesn't have the piwik cookie, we look for a visitor that has exactly the same configuration
+ * and that visited the website today.
+ */
+ if( !$this->visitorKnown )
+ {
+ $userInfo = $this->getUserSettingsInformation();
+ $md5Config = $userInfo['config_md5config'];
+
+ $visitRow = $this->db->fetch(
+ " SELECT visitor_idcookie,
+ UNIX_TIMESTAMP(visit_last_action_time) as visit_last_action_time,
+ UNIX_TIMESTAMP(visit_first_action_time) as visit_first_action_time,
+ idvisit,
+ visit_exit_idaction
+ FROM ".$this->db->prefixTable('log_visit').
+ " WHERE visit_server_date = ?
+ AND idsite = ?
+ AND config_md5config = ?
+ ORDER BY visit_last_action_time DESC
+ LIMIT 1",
+ array( $this->getCurrentDate(), $this->idsite, $md5Config));
+ if($visitRow
+ && count($visitRow) > 0)
+ {
+ $this->visitorInfo['visitor_idcookie'] = $visitRow['visitor_idcookie'];
+ $this->visitorInfo['visit_last_action_time'] = $visitRow['visit_last_action_time'];
+ $this->visitorInfo['visit_first_action_time'] = $visitRow['visit_first_action_time'];
+ $this->visitorInfo['idvisit'] = $visitRow['idvisit'];
+ $this->visitorInfo['visit_exit_idaction'] = $visitRow['visit_exit_idaction'];
+
+ $this->visitorKnown = true;
+
+ printDebug("The visitor is known because of his userSettings+IP (idcookie = {$visitRow['visitor_idcookie']}, idvisit = {$this->visitorInfo['idvisit']}, last action = ".date("r", $this->visitorInfo['visit_last_action_time']).") ");
+ }
+ }
+ }
+
+ private function getUserSettingsInformation()
+ {
+ // we already called this method before, simply returns the result
+ if(is_array($this->userSettingsInformation))
+ {
+ return $this->userSettingsInformation;
+ }
+
+
+ $plugin_Flash = Piwik_Common::getRequestVar( 'fla', 0, 'int');
+ $plugin_Director = Piwik_Common::getRequestVar( 'dir', 0, 'int');
+ $plugin_Quicktime = Piwik_Common::getRequestVar( 'qt', 0, 'int');
+ $plugin_RealPlayer = Piwik_Common::getRequestVar( 'realp', 0, 'int');
+ $plugin_Pdf = Piwik_Common::getRequestVar( 'pdf', 0, 'int');
+ $plugin_WindowsMedia = Piwik_Common::getRequestVar( 'wma', 0, 'int');
+ $plugin_Java = Piwik_Common::getRequestVar( 'java', 0, 'int');
+ $plugin_Cookie = Piwik_Common::getRequestVar( 'cookie', 0, 'int');
+
+ $userAgent = Piwik_Common::sanitizeInputValues(@$_SERVER['HTTP_USER_AGENT']);
+ $aBrowserInfo = Piwik_Common::getBrowserInfo($userAgent);
+ $browserName = $aBrowserInfo['name'];
+ $browserVersion = $aBrowserInfo['version'];
+
+ $os = Piwik_Common::getOs($userAgent);
+
+ $resolution = Piwik_Common::getRequestVar('res', 'unknown', 'string');
+ $colorDepth = Piwik_Common::getRequestVar('col', 32, 'numeric');
+
+
+ $ip = Piwik_Common::getIp();
+ $ip = ip2long($ip);
+
+ $browserLang = Piwik_Common::sanitizeInputValues(@$_SERVER['HTTP_ACCEPT_LANGUAGE']);
+ if(is_null($browserLang))
+ {
+ $browserLang = '';
+ }
+
+
+ $configurationHash = $this->getConfigHash(
+ $os,
+ $browserName,
+ $browserVersion,
+ $resolution,
+ $colorDepth,
+ $plugin_Flash,
+ $plugin_Director,
+ $plugin_RealPlayer,
+ $plugin_Pdf,
+ $plugin_WindowsMedia,
+ $plugin_Java,
+ $plugin_Cookie,
+ $ip,
+ $browserLang);
+
+ $this->userSettingsInformation = array(
+ 'config_md5config' => $configurationHash,
+ 'config_os' => $os,
+ 'config_browser_name' => $browserName,
+ 'config_browser_version' => $browserVersion,
+ 'config_resolution' => $resolution,
+ 'config_color_depth' => $colorDepth,
+ 'config_pdf' => $plugin_Pdf,
+ 'config_flash' => $plugin_Flash,
+ 'config_java' => $plugin_Java,
+ 'config_director' => $plugin_Director,
+ 'config_quicktime' => $plugin_Quicktime,
+ 'config_realplayer' => $plugin_RealPlayer,
+ 'config_windowsmedia' => $plugin_WindowsMedia,
+ 'config_cookie' => $plugin_RealPlayer,
+ 'location_ip' => $ip,
+ 'location_browser_lang' => $browserLang,
+ );
+
+ return $this->userSettingsInformation;
+ }
+
+ /**
+ * Returns true if the last action was done during the last 30 minutes
+ */
+ private function isLastActionInTheSameVisit()
+ {
+ return $this->visitorInfo['visit_last_action_time']
+ >= ($this->getCurrentTimestamp() - Piwik_LogStats::VISIT_STANDARD_LENGTH);
+ }
+
+ private function isVisitorKnown()
+ {
+ return $this->visitorKnown === true;
+ }
+
+ /**
+ * Once we have the visitor information, we have to define if the visit is a new or a known visit.
+ *
+ * 1) When the last action was done more than 30min ago,
+ * or if the visitor is new, then this is a new visit.
+ *
+ * 2) If the last action is less than 30min ago, then the same visit is going on.
+ * Because the visit goes on, we can get the time spent during the last action.
+ *
+ * NB:
+ * - In the case of a new visit, then the time spent
+ * during the last action of the previous visit is unknown.
+ *
+ * - In the case of a new visit but with a known visitor,
+ * we can set the 'returning visitor' flag.
+ *
+ */
+
+ /**
+ * In all the cases we set a cookie to the visitor with the new information.
+ */
+ public function handle()
+ {
+ if(!$this->isExcluded())
+ {
+ $this->recognizeTheVisitor();
+
+ // known visitor
+ if($this->isVisitorKnown())
+ {
+ // the same visit is going on
+ if($this->isLastActionInTheSameVisit())
+ {
+ $this->handleKnownVisit();
+ }
+ // new visit
+ else
+ {
+ $this->handleNewVisit();
+ }
+ }
+ // new visitor => new visit
+ else
+ {
+ $this->handleNewVisit();
+ }
+
+ // we update the cookie with the new visit information
+ $this->updateCookie();
+
+ }
+ }
+
+ private function updateCookie()
+ {
+ printDebug("We manage the cookie...");
+
+ // idcookie has been generated in handleNewVisit or we simply propagate the old value
+ $this->cookieLog->set( Piwik_LogStats::COOKIE_INDEX_IDVISITOR,
+ $this->visitorInfo['visitor_idcookie'] );
+
+ // the last action timestamp is the current timestamp
+ $this->cookieLog->set( Piwik_LogStats::COOKIE_INDEX_TIMESTAMP_LAST_ACTION,
+ $this->visitorInfo['visit_last_action_time'] );
+
+ // the first action timestamp is the timestamp of the first action of the current visit
+ $this->cookieLog->set( Piwik_LogStats::COOKIE_INDEX_TIMESTAMP_FIRST_ACTION,
+ $this->visitorInfo['visit_first_action_time'] );
+
+ // the idvisit has been generated by mysql in handleNewVisit or simply propagated here
+ $this->cookieLog->set( Piwik_LogStats::COOKIE_INDEX_ID_VISIT,
+ $this->visitorInfo['idvisit'] );
+
+ // the last action ID is the current exit idaction
+ $this->cookieLog->set( Piwik_LogStats::COOKIE_INDEX_ID_LAST_ACTION,
+ $this->visitorInfo['visit_exit_idaction'] );
+
+ $this->cookieLog->save();
+ }
+
+
+ /**
+ * In the case of a known visit, we have to do the following actions:
+ *
+ * 1) Insert the new action
+ *
+ * 2) Update the visit information
+ */
+ private function handleKnownVisit()
+ {
+ printDebug("Visit known.");
+
+ /**
+ * Init the action
+ */
+ $action = new Piwik_LogStats_Action( $this->db );
+
+ $actionId = $action->getActionId();
+
+ printDebug("idAction = $actionId");
+
+ $serverTime = $this->getCurrentTimestamp();
+ $datetimeServer = $this->getDatetimeFromTimestamp($serverTime);
+
+ $this->db->query("UPDATE ". $this->db->prefixTable('log_visit')."
+ SET visit_last_action_time = ?,
+ visit_exit_idaction = ?,
+ visit_total_actions = visit_total_actions + 1,
+ visit_total_time = UNIX_TIMESTAMP(visit_last_action_time) - UNIX_TIMESTAMP(visit_first_action_time)
+ WHERE idvisit = ?
+ LIMIT 1",
+ array( $datetimeServer,
+ $actionId,
+ $this->visitorInfo['idvisit'] )
+ );
+ /**
+ * Save the action
+ */
+ $timespentLastAction = $serverTime - $this->visitorInfo['visit_last_action_time'];
+
+ $action->record( $this->visitorInfo['idvisit'],
+ $this->visitorInfo['visit_exit_idaction'],
+ $timespentLastAction
+ );
+
+
+ /**
+ * Cookie fields to be updated
+ */
+ $this->visitorInfo['visit_last_action_time'] = $serverTime;
+ $this->visitorInfo['visit_exit_idaction'] = $actionId;
+
+
+ }
+
+ /**
+ * In the case of a new visit, we have to do the following actions:
+ *
+ * 1) Insert the new action
+ *
+ * 2) Insert the visit information
+ */
+ private function handleNewVisit()
+ {
+ printDebug("New Visit.");
+
+ /**
+ * Get the variables from the REQUEST
+ */
+
+ // Configuration settings
+ $userInfo = $this->getUserSettingsInformation();
+
+ // General information
+ $localTime = Piwik_Common::getRequestVar( 'h', $this->getCurrentDate("H"), 'numeric')
+ .':'. Piwik_Common::getRequestVar( 'm', $this->getCurrentDate("i"), 'numeric')
+ .':'. Piwik_Common::getRequestVar( 's', $this->getCurrentDate("s"), 'numeric');
+ $serverDate = $this->getCurrentDate();
+ $serverTime = $this->getCurrentTimestamp();
+
+ if($this->isVisitorKnown())
+ {
+ $idcookie = $this->visitorInfo['visitor_idcookie'];
+ $returningVisitor = 1;
+ }
+ else
+ {
+ $idcookie = $this->getVisitorUniqueId();
+ $returningVisitor = 0;
+ }
+
+ $defaultTimeOnePageVisit = Piwik_LogStats_Config::getInstance()->LogStats['default_time_one_page_visit'];
+
+ // Location information
+ $country = Piwik_Common::getCountry($userInfo['location_browser_lang']);
+ $continent = Piwik_Common::getContinent( $country );
+
+ //Referer information
+ $refererInfo = $this->getRefererInformation();
+
+ /**
+ * Init the action
+ */
+ $action = new Piwik_LogStats_Action( $this->db );
+
+ $actionId = $action->getActionId();
+
+ printDebug("idAction = $actionId");
+
+
+ /**
+ * Save the visitor
+ */
+ $informationToSave = array(
+ //'idvisit' => ,
+ 'idsite' => $this->idsite,
+ 'visitor_localtime' => $localTime,
+ 'visitor_idcookie' => $idcookie,
+ 'visitor_returning' => $returningVisitor,
+ 'visit_first_action_time' => $this->getDatetimeFromTimestamp($serverTime),
+ 'visit_last_action_time' => $this->getDatetimeFromTimestamp($serverTime),
+ 'visit_server_date' => $serverDate,
+ 'visit_entry_idaction' => $actionId,
+ 'visit_exit_idaction' => $actionId,
+ 'visit_total_actions' => 1,
+ 'visit_total_time' => $defaultTimeOnePageVisit,
+ 'referer_type' => $refererInfo['referer_type'],
+ 'referer_name' => $refererInfo['referer_name'],
+ 'referer_url' => $refererInfo['referer_url'],
+ 'referer_keyword' => $refererInfo['referer_keyword'],
+ 'config_md5config' => $userInfo['config_md5config'],
+ 'config_os' => $userInfo['config_os'],
+ 'config_browser_name' => $userInfo['config_browser_name'],
+ 'config_browser_version' => $userInfo['config_browser_version'],
+ 'config_resolution' => $userInfo['config_resolution'],
+ 'config_color_depth' => $userInfo['config_color_depth'],
+ 'config_pdf' => $userInfo['config_pdf'],
+ 'config_flash' => $userInfo['config_flash'],
+ 'config_java' => $userInfo['config_java'],
+ 'config_director' => $userInfo['config_director'],
+ 'config_quicktime' => $userInfo['config_quicktime'],
+ 'config_realplayer' => $userInfo['config_realplayer'],
+ 'config_windowsmedia' => $userInfo['config_windowsmedia'],
+ 'config_cookie' => $userInfo['config_cookie'],
+ 'location_ip' => $userInfo['location_ip'],
+ 'location_browser_lang' => $userInfo['location_browser_lang'],
+ 'location_country' => $country,
+ 'location_continent' => $continent,
+ );
+
+
+ $fields = implode(", ", array_keys($informationToSave));
+ $values = substr(str_repeat( "?,",count($informationToSave)),0,-1);
+
+ $this->db->query( "INSERT INTO ".$this->db->prefixTable('log_visit').
+ " ($fields) VALUES ($values)", array_values($informationToSave));
+
+ $idVisit = $this->db->lastInsertId();
+
+ // Update the visitor information attribute with this information array
+ $this->visitorInfo = $informationToSave;
+ $this->visitorInfo['idvisit'] = $idVisit;
+
+ // we have to save timestamp in the object properties, whereas mysql eats some other datetime format
+ $this->visitorInfo['visit_first_action_time'] = $serverTime;
+ $this->visitorInfo['visit_last_action_time'] = $serverTime;
+
+ /**
+ * Save the action
+ */
+ $action->record( $idVisit, 0, 0 );
+
+ }
+
+ /**
+ * Returns an array containing the following information:
+ * - referer_type
+ * - direct -- absence of referer URL OR referer URL has the same host
+ * - site -- based on the referer URL
+ * - search_engine -- based on the referer URL
+ * - campaign -- based on campaign URL parameter
+ * - newsletter -- based on newsletter URL parameter
+ * - partner -- based on partner URL parameter
+ *
+ * - referer_name
+ * - ()
+ * - piwik.net -- site host name
+ * - google.fr -- search engine host name
+ * - adwords-search -- campaign name
+ * - beta-release -- newsletter name
+ * - my-nice-partner -- partner name
+ *
+ * - referer_keyword
+ * - ()
+ * - ()
+ * - my keyword
+ * - my paid keyword
+ * - ()
+ * - ()
+ *
+ * - referer_url : the same for all the referer types
+ *
+ */
+ private function getRefererInformation()
+ {
+ // bool that says if the referer detection is done
+ $refererAnalyzed = false;
+ $typeRefererAnalyzed = Piwik_Common::REFERER_TYPE_DIRECT_ENTRY;
+ $nameRefererAnalyzed = '';
+ $keywordRefererAnalyzed = '';
+
+ $refererUrl = Piwik_Common::getRequestVar( 'urlref', '', 'string');
+ $currentUrl = Piwik_Common::getRequestVar( 'url', '', 'string');
+
+ $refererUrlParse = @parse_url($refererUrl);
+ $currentUrlParse = @parse_url($currentUrl);
+
+ if(isset($refererUrlParse['host'])
+ && !empty($refererUrlParse['host']))
+ {
+
+ $refererHost = $refererUrlParse['host'];
+ $refererSH = $refererUrlParse['scheme'].'://'.$refererUrlParse['host'];
+
+ /*
+ * Search engine detection
+ */
+ if( !$refererAnalyzed )
+ {
+ /*
+ * A referer is a search engine if the URL's host is in the SearchEngines array
+ * and if we found the keyword in the URL.
+ *
+ * For example if someone comes from http://www.google.com/partners.html this will not
+ * be counted as a search engines, but as a website referer from google.com (because the
+ * keyword couldn't be found in the URL)
+ */
+ require_once PIWIK_DATAFILES_INCLUDE_PATH . "/SearchEngines.php";
+
+ if(array_key_exists($refererHost, $GLOBALS['Piwik_SearchEngines']))
+ {
+ // which search engine ?
+ $searchEngineName = $GLOBALS['Piwik_SearchEngines'][$refererHost][0];
+ $variableName = $GLOBALS['Piwik_SearchEngines'][$refererHost][1];
+
+ // if there is a query, there may be a keyword...
+ if(isset($refererUrlParse['query']))
+ {
+ $query = $refererUrlParse['query'];
+
+ //TODO: change the search engine file and use REGEXP; performance downside?
+ //TODO: port the phpmyvisites google-images hack here
+
+ // search for keywords now &vname=keyword
+ $key = strtolower(Piwik_Common::getParameterFromQueryString($query, $variableName));
+
+ //TODO test the search engine non-utf8 support
+ // for search engines that don't use utf-8
+ if((function_exists('iconv'))
+ && (isset($GLOBALS['Piwik_SearchEngines'][$refererHost][2])))
+ {
+ $charset = trim($GLOBALS['searchEngines'][$refererHost][2]);
+
+ if(!empty($charset))
+ {
+ $key = htmlspecialchars(
+ @iconv( $charset,
+ 'utf-8//TRANSLIT',
+ htmlspecialchars_decode($key, Piwik_Common::HTML_ENCODING_QUOTE_STYLE))
+ , Piwik_Common::HTML_ENCODING_QUOTE_STYLE);
+ }
+ }
+
+
+ if(!empty($key))
+ {
+ $refererAnalyzed = true;
+ $typeRefererAnalyzed = Piwik_Common::REFERER_TYPE_SEARCH_ENGINE;
+ $nameRefererAnalyzed = $searchEngineName;
+ $keywordRefererAnalyzed = $key;
+ }
+ }
+ }
+ }
+
+ /*
+ * Newsletter analysis
+ */
+ if( !$refererAnalyzed )
+ {
+ if(isset($currentUrlParse['query']))
+ {
+ $newsletterVariableName = Piwik_LogStats_Config::getInstance()->LogStats['newsletter_var_name'];
+ $newsletterVar = Piwik_Common::getParameterFromQueryString( $currentUrlParse['query'], $newsletterVariableName);
+
+ if($newsletterVar !== false && !empty($newsletterVar))
+ {
+ $refererAnalyzed = true;
+ $typeRefererAnalyzed = Piwik_Common::REFERER_TYPE_NEWSLETTER;
+ $nameRefererAnalyzed = $newsletterVar;
+ }
+ }
+ }
+
+ /*
+ * Partner analysis
+ */
+ //TODO handle partner from a list of known partner URLs
+ if( !$refererAnalyzed )
+ {
+ if(isset($currentUrlParse['query']))
+ {
+ $partnerVariableName = Piwik_LogStats_Config::getInstance()->LogStats['partner_var_name'];
+ $partnerVar = Piwik_Common::getParameterFromQueryString($currentUrlParse['query'], $partnerVariableName);
+
+ if($partnerVar !== false && !empty($partnerVar))
+ {
+ $refererAnalyzed = true;
+ $typeRefererAnalyzed = Piwik_Common::REFERER_TYPE_PARTNER;
+ $nameRefererAnalyzed = $partnerVar;
+ }
+ }
+ }
+
+ /*
+ * Campaign analysis
+ */
+ if( !$refererAnalyzed )
+ {
+ if(isset($currentUrlParse['query']))
+ {
+ $campaignVariableName = Piwik_LogStats_Config::getInstance()->LogStats['campaign_var_name'];
+ $campaignName = Piwik_Common::getParameterFromQueryString($currentUrlParse['query'], $campaignVariableName);
+
+ if( $campaignName !== false && !empty($campaignName))
+ {
+ $campaignKeywordVariableName = Piwik_LogStats_Config::getInstance()->LogStats['campaign_keyword_var_name'];
+ $campaignKeyword = Piwik_Common::getParameterFromQueryString($currentUrlParse['query'], $campaignKeywordVariableName);
+
+ $refererAnalyzed = true;
+ $typeRefererAnalyzed = Piwik_Common::REFERER_TYPE_CAMPAIGN;
+ $nameRefererAnalyzed = $campaignName;
+
+ if(!empty($campaignKeyword))
+ {
+ $keywordRefererAnalyzed = $campaignKeyword;
+ }
+ }
+ }
+ }
+
+ /*
+ * Direct entry (referer host is similar to current host)
+ * And we have previously tried to detect the newsletter/partner/campaign variables in the URL
+ * so it can only be a direct access
+ */
+ if( !$refererAnalyzed )
+ {
+ $currentUrlParse = @parse_url($currentUrl);
+
+ if(isset($currentUrlParse['host']))
+ {
+ $currentHost = $currentUrlParse['host'];
+ $currentSH = $currentUrlParse['scheme'].'://'.$currentUrlParse['host'];
+
+ if($currentHost == $refererHost)
+ {
+ $refererAnalyzed = true;
+ $typeRefererAnalyzed = Piwik_Common::REFERER_TYPE_DIRECT_ENTRY;
+ }
+ }
+
+ }
+
+ /*
+ * Normal website referer
+ */
+ if( !$refererAnalyzed )
+ {
+ $refererAnalyzed = true;
+ $typeRefererAnalyzed = Piwik_Common::REFERER_TYPE_WEBSITE;
+ $nameRefererAnalyzed = $refererHost;
+ }
+ }
+
+
+ $refererInformation = array(
+ 'referer_type' => $typeRefererAnalyzed,
+ 'referer_name' => $nameRefererAnalyzed,
+ 'referer_keyword' => $keywordRefererAnalyzed,
+ 'referer_url' => $refererUrl,
+ );
+
+ return $refererInformation;
+ }
+
+ private function getConfigHash( $os, $browserName, $browserVersion, $resolution, $colorDepth, $plugin_Flash, $plugin_Director, $plugin_RealPlayer, $plugin_Pdf, $plugin_WindowsMedia, $plugin_Java, $plugin_Cookie, $ip, $browserLang)
+ {
+ return md5( $os . $browserName . $browserVersion . $resolution . $colorDepth . $plugin_Flash . $plugin_Director . $plugin_RealPlayer . $plugin_Pdf . $plugin_WindowsMedia . $plugin_Java . $plugin_Cookie . $ip . $browserLang );
+ }
+
+ private function getVisitorUniqueId()
+ {
+ if($this->isVisitorKnown())
+ {
+ return -1;
+ }
+ else
+ {
+ return Piwik_Common::generateUniqId();
+ }
+ }
+
+}
+?>
Index: /trunk/modules/LogStats/Plugins.php
===================================================================
--- /trunk/modules/LogStats/Plugins.php (revision 28)
+++ /trunk/modules/LogStats/Plugins.php (revision 28)
@@ -0,0 +1,52 @@
+ 'LogProvider',
+ 'description' => 'Log in the DB the hostname looked up from the IP',
+ 'author' => 'Piwik',
+ 'homepage' => 'http://piwik.org/plugins/LogProvider',
+ 'version' => '0.1',
+ );
+
+ return $info;
+ }
+
+ function install()
+ {
+ // add column hostname / hostname ext in the visit table
+ }
+
+ function uninstall()
+ {
+ // add column hostname / hostname ext in the visit table
+ }
+
+ function getListHooksRegistered()
+ {
+ $hooks = array(
+ 'LogsStats.NewVisitor' => 'detectHostname'
+ );
+ return $hooks;
+ }
+
+ function detectHostname( $notification )
+ {
+ $object = $notification->getNotificationObject();
+ printDebug();
+ }
+}
+/*
+class Piwik_Plugin_LogStats_UserSettings extends Piwik_Plugin
+{
+
+}*/
+
+?>
Index: /trunk/modules/LogStats/Config.php
===================================================================
--- /trunk/modules/LogStats/Config.php (revision 30)
+++ /trunk/modules/LogStats/Config.php (revision 30)
@@ -0,0 +1,41 @@
+config = parse_ini_file($pathIniFile, true);
+ }
+
+ public function __get( $name )
+ {
+ if(isset($this->config[$name]))
+ {
+ return $this->config[$name];
+ }
+ else
+ {
+ throw new Exception("The config element $name is not available in the configuration (check the configuration file).");
+ }
+ }
+}
+
+?>
Index: /trunk/modules/LogStats/Db.php
===================================================================
--- /trunk/modules/LogStats/Db.php (revision 30)
+++ /trunk/modules/LogStats/Db.php (revision 30)
@@ -0,0 +1,74 @@
+dsn = "mysql:dbname=$dbname;host=$host";
+ $this->username = $username;
+ $this->password = $password;
+ }
+
+ public function connect()
+ {
+ try {
+ $pdoConnect = new PDO($this->dsn, $this->username, $this->password);
+ $pdoConnect->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+ $this->connection = $pdoConnect;
+ } catch (PDOException $e) {
+ throw new Exception("Error connecting database: ".$e->getMessage());
+ }
+ }
+
+ public function prefixTable( $suffix )
+ {
+ $prefix = Piwik_LogStats_Config::getInstance()->database['tables_prefix'];
+
+ return $prefix . $suffix;
+ }
+
+ public function fetchAll( $query, $parameters )
+ {
+ try {
+ $sth = $this->query( $query, $parameters );
+ return $sth->fetchAll(PDO::FETCH_ASSOC);
+ } catch (PDOException $e) {
+ throw new Exception("Error query: ".$e->getMessage());
+ }
+ }
+
+ public function fetch( $query, $parameters )
+ {
+ try {
+ $sth = $this->query( $query, $parameters );
+ return $sth->fetch(PDO::FETCH_ASSOC);
+ } catch (PDOException $e) {
+ throw new Exception("Error query: ".$e->getMessage());
+ }
+ }
+
+ public function query($query, $parameters = array())
+ {
+ try {
+ $sth = $this->connection->prepare($query);
+ $sth->execute( $parameters );
+ return $sth;
+ } catch (PDOException $e) {
+ throw new Exception("Error query: ".$e->getMessage());
+ }
+ }
+
+ public function lastInsertId()
+ {
+ return $this->connection->lastInsertId();
+ }
+}
+?>
Index: /trunk/modules/TablePartitioning.php
===================================================================
--- /trunk/modules/TablePartitioning.php (revision 30)
+++ /trunk/modules/TablePartitioning.php (revision 30)
@@ -0,0 +1,100 @@
+tableName = $tableName;
+ }
+
+ abstract protected function generateTableName() ;
+
+
+ public function setDate( $timestamp )
+ {
+ $this->timestamp = $timestamp;
+ $this->generatedTableName = null;
+ }
+
+ public function getTableName()
+ {
+ // table name already processed
+ if(!is_null($this->generatedTableName))
+ {
+ return $this->generatedTableName;
+ }
+
+ if(is_null($this->timestamp))
+ {
+ throw new Exception("You have to specify a timestamp for a Table Partitioning by date.");
+ }
+
+ // generate table name
+ $this->generatedTableName = $this->generateTableName();
+
+ // we make sure the table already exists
+ $this->checkTableExists();
+ }
+
+ protected function checkTableExists()
+ {
+ $tablesAlreadyInstalled = Piwik::getTablesInstalled();
+
+ if(!in_array($this->generatedTableName, $tablesAlreadyInstalled))
+ {
+ $db = Zend_Registry::get('db');
+ $sql = Piwik::getTableCreateSql($this->tableName);
+
+ $config = Zend_Registry::get('config');
+ $prefixTables = $config->database->tables_prefix;
+ $sql = str_replace( $prefixTables . $this->tableName, $this->generatedTableName, $sql);
+
+ $db->query( $sql );
+ }
+ }
+
+ protected function __toString()
+ {
+ return $this->getTableName();
+ }
+}
+
+class Piwik_TablePartitioning_Monthly extends Piwik_TablePartitioning
+{
+ public function __construct( $tableName )
+ {
+ parent::__construct($tableName);
+ }
+ protected function generateTableName()
+ {
+ $config = Zend_Registry::get('config');
+ $prefixTables = $config->database->tables_prefix;
+
+ $date = date("Y_m", $this->timestamp);
+
+ return $prefixTables . $this->tableName . "_" . $date;
+ }
+
+}
+class Piwik_TablePartitioning_Daily extends Piwik_TablePartitioning
+{
+ public function __construct( $tableName )
+ {
+ parent::__construct($tableName);
+ }
+ protected function generateTableName()
+ {
+ $config = Zend_Registry::get('config');
+ $prefixTables = $config->database->tables_prefix;
+
+ $date = date("Y_m_d", $this->timestamp);
+
+ return $prefixTables . $this->tableName . "_" . $date;
+ }
+
+}
+?>
Index: /trunk/modules/Timer.php
===================================================================
--- /trunk/modules/Timer.php (revision 29)
+++ /trunk/modules/Timer.php (revision 29)
@@ -0,0 +1,37 @@
+m_Start = 0.0;
+ $this->init();
+ }
+
+ private function getMicrotime()
+ {
+ list($micro_seconds, $seconds) = explode(" ", microtime());
+ return ((float)$micro_seconds + (float)$seconds);
+ }
+
+ public function init()
+ {
+ $this->m_Start = $this->getMicrotime();
+ }
+
+ public function getTime($decimals = 2)
+ {
+ return number_format($this->getMicrotime() - $this->m_Start, $decimals, '.', '');
+ }
+ public function getTimeMs($decimals = 2)
+ {
+ return number_format(1000*($this->getMicrotime() - $this->m_Start), $decimals, '.', '');
+ }
+
+ public function __toString()
+ {
+ return "Time elapsed: ". $this->getTime() ."s";
+ }
+}
+?>
Index: /trunk/modules/Log.php
===================================================================
--- /trunk/modules/Log.php (revision 20)
+++ /trunk/modules/Log.php (revision 30)
@@ -1,4 +1,3 @@
logToFileFilename = $logToFileFilename;
+
+ $this->logToFileFilename = Zend_Registry::get('config')->path->log . $logToFileFilename;
$this->fileFormatter = $fileFormatter;
$this->screenFormatter = $screenFormatter;
- $this->logToDatabaseTableName = $logToDatabaseTableName;
+ $this->logToDatabaseTableName = Piwik::prefixTable($logToDatabaseTableName);
$this->logToDatabaseColumnMapping = $logToDatabaseColumnMapping;
}
@@ -32,5 +32,5 @@
static public function dump($var, $label=null)
{
- Zend_Registry::get('LoggerMessages')->log(Zend_Debug::dump($var, $label, false), Piwik_Log::DEBUG);
+ Zend_Registry::get('logger_message')->log(Zend_Debug::dump($var, $label, false), Piwik_Log::DEBUG);
}
@@ -38,6 +38,13 @@
{
$writerFile = new Zend_Log_Writer_Stream($this->logToFileFilename);
+ Piwik::mkdir(Zend_Registry::get('config')->path->log);
$writerFile->setFormatter( $this->fileFormatter );
$this->addWriter($writerFile);
+ }
+
+ function addWriteToNull()
+ {
+ Zend_Loader::loadClass('Zend_Log_Writer_Null');
+ $this->addWriter( new Zend_Log_Writer_Null );
}
@@ -59,4 +66,9 @@
}
+ public function getWritersCount()
+ {
+ return count($this->_writers);
+ }
+
/**
* Log an event
@@ -69,10 +81,5 @@
throw new Zend_Log_Exception('No writers were added');
}
- if(isset($event['priority']))
- {
- if (! isset($this->_priorities[$event['priority']])) {
- throw new Zend_Log_Exception('Bad log priority');
- }
- }
+
$event['timestamp'] = date('c');
@@ -105,10 +112,15 @@
public function format($event)
{
- $str = implode(" ", $event);
+ foreach($event as &$value)
+ {
+ $value = str_replace("\n", '\n', $value);
+ $value = '"'.$value.'"';
+ }
+ $str = implode(" ", $event) . "\n";
return $str;
}
}
-class Piwik_Log_Formatter_ScreenFormatter implements Zend_Log_Formatter_Interface
+class Piwik_Log_Formatter_Message_ScreenFormatter implements Zend_Log_Formatter_Interface
{
/**
@@ -120,21 +132,91 @@
public function format($event)
{
- $str = '';
- foreach($event as $name => $value)
+ return $event['message'];
+ }
+}
+class Piwik_Log_Formatter_APICall_ScreenFormatter implements Zend_Log_Formatter_Interface
+{
+ /**
+ * Formats data into a single line to be written by the writer.
+ *
+ * @param array $event event data
+ * @return string formatted line to write to the log
+ */
+ public function format($event)
+ {
+ $str = "\n
";
+ $str .= "Called: {$event['class_name']}.{$event['method_name']} (took {$event['execution_time']}ms) \n
";
+ $str .= "Parameters: ";
+ $parameterNamesAndDefault = unserialize($event['parameter_names_default_values']);
+ $parameterValues = unserialize($event['parameter_values']);
+
+ $i = 0;
+ foreach($parameterNamesAndDefault as $pName => $pDefault)
{
- $str .= "$name : $value \n
";
+ if(isset($parameterValues[$i]))
+ {
+ $currentValue = $parameterValues[$i];
+ }
+ else
+ {
+ $currentValue = $pDefault;
+ }
+
+ $currentValue = $this->formatValue($currentValue);
+ $str .= "$pName = $currentValue, ";
+
+ $i++;
}
+ $str .= "\n
";
+
+ $str .= "Returned: ".$this->formatValue($event['returned_value']);
+ $str .= "\n
";
return $str;
}
-}
-
-class Piwik_Log_APICalls extends Piwik_Log
-{
+
+ private function formatValue( $value )
+ {
+ if(is_string($value))
+ {
+ $value = "'$value'";
+ }
+ if(is_null($value))
+ {
+ $value= 'null';
+ }
+ if(is_array($value))
+ {
+ $value = "array( ".implode(", ", $value). ")";
+ }
+ return $value;
+
+ }
+}
+
+
+class Piwik_Log_Null extends Zend_Log
+{
+ public function __construct()
+ {
+ }
+
+ public function log($message, $priority = Zend_Log::INFO )
+ {
+ parent::log($message, $priority);
+ }
+}
+
+Zend_Loader::loadClass('Piwik_Common');
+
+class Piwik_Log_APICall extends Piwik_Log
+{
+ const ID = 'logger_api_call';
+
function __construct()
{
- $logToFileFilename = 'api_call';
- $logToDatabaseTableName = 'log_api_calls';//TODO generalize
+ $logToFileFilename = self::ID;
+ $logToDatabaseTableName = self::ID;
$logToDatabaseColumnMapping = null;
- $screenFormatter = new Piwik_Log_Formatter_ScreenFormatter;
+ $screenFormatter = new Piwik_Log_Formatter_APICall_ScreenFormatter;
$fileFormatter = new Piwik_Log_Formatter_FileFormatter;
@@ -145,13 +227,16 @@
$logToDatabaseColumnMapping );
- $this->setEventItem('ip', ip2long( Piwik::getIp() ) );
- }
-
- function log( $methodName, $parameters, $executionTime)
+ $this->setEventItem('caller_ip', ip2long( Piwik_Common::getIp() ) );
+ }
+
+ function log( $className, $methodName, $parameterNames, $parameterValues, $executionTime, $returnedValue)
{
$event = array();
- $event['methodName'] = $methodName;
- $event['parameters'] = serialize($parameters);
- $event['executionTime'] = $executionTime;
+ $event['class_name'] = $className;
+ $event['method_name'] = $methodName;
+ $event['parameter_names_default_values'] = serialize($parameterNames);
+ $event['parameter_values'] = serialize($parameterValues);
+ $event['execution_time'] = $executionTime;
+ $event['returned_value'] = is_array($returnedValue) ? serialize($returnedValue) : $returnedValue;
parent::log($event);
@@ -159,12 +244,13 @@
}
-class Piwik_Log_Messages extends Piwik_Log
-{
+class Piwik_Log_Message extends Piwik_Log
+{
+ const ID = 'logger_message';
function __construct()
{
- $logToFileFilename = 'message';
- $logToDatabaseTableName = 'log_message';//TODO generalize
+ $logToFileFilename = self::ID;
+ $logToDatabaseTableName = self::ID;
$logToDatabaseColumnMapping = null;
- $screenFormatter = new Piwik_Log_Formatter_ScreenFormatter;
+ $screenFormatter = new Piwik_Log_Formatter_Message_ScreenFormatter;
$fileFormatter = new Piwik_Log_Formatter_FileFormatter;
@@ -174,6 +260,4 @@
$logToDatabaseTableName,
$logToDatabaseColumnMapping );
-
- $this->setEventItem('ip', ip2long( Piwik::getIp() ) );
}
@@ -187,3 +271,146 @@
}
+class Piwik_Log_Formatter_Error_ScreenFormatter implements Zend_Log_Formatter_Interface
+{
+ /**
+ * Formats data into a single line to be written by the writer.
+ *
+ * @param array $event event data
+ * @return string formatted line to write to the log
+ */
+ public function format($event)
+ {
+ $errno = $event['errno'] ;
+ $errstr = $event['message'] ;
+ $errfile = $event['errfile'] ;
+ $errline = $event['errline'] ;
+ $backtrace = $event['backtrace'] ;
+
+ $strReturned = '';
+ $errno = $errno & error_reporting();
+ if($errno == 0) return '';
+ 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);
+ $strReturned .= "\n";
+ switch($errno)
+ {
+ case E_ERROR: $strReturned .= "Error"; break;
+ case E_WARNING: $strReturned .= "Warning"; break;
+ case E_PARSE: $strReturned .= "Parse Error"; break;
+ case E_NOTICE: $strReturned .= "Notice"; break;
+ case E_CORE_ERROR: $strReturned .= "Core Error"; break;
+ case E_CORE_WARNING: $strReturned .= "Core Warning"; break;
+ case E_COMPILE_ERROR: $strReturned .= "Compile Error"; break;
+ case E_COMPILE_WARNING: $strReturned .= "Compile Warning"; break;
+ case E_USER_ERROR: $strReturned .= "User Error"; break;
+ case E_USER_WARNING: $strReturned .= "User Warning"; break;
+ case E_USER_NOTICE: $strReturned .= "User Notice"; break;
+ case E_STRICT: $strReturned .= "Strict Notice"; break;
+ case E_RECOVERABLE_ERROR: $strReturned .= "Recoverable Error"; break;
+ case E_EXCEPTION: $strReturned .= "Exception"; break;
+ default: $strReturned .= "Unknown error ($errno)"; break;
+ }
+ $strReturned .= ": $errstr in
$errfile on line
$errline\n";
+ $strReturned .= "
Backtrace -->
";
+ $strReturned .= str_replace("\n", "
", $backtrace);
+ $strReturned .= "
";
+ $strReturned .= "\n
";
+
+ return $strReturned;
+ }
+}
+
+class Piwik_Log_Formatter_Exception_ScreenFormatter implements Zend_Log_Formatter_Interface
+{
+ /**
+ * Formats data into a single line to be written by the writer.
+ *
+ * @param array $event event data
+ * @return string formatted line to write to the log
+ */
+ public function format($event)
+ {
+ $errno = $event['errno'] ;
+ $errstr = $event['message'] ;
+ $errfile = $event['errfile'] ;
+ $errline = $event['errline'] ;
+ $backtrace = $event['backtrace'] ;
+
+ $strReturned = '';
+ $strReturned .= "\n";
+ $strReturned .= "Exception uncaught $errstr in
$errfile on line
$errline\n";
+ $strReturned .= "
Backtrace -->
";
+ $strReturned .= str_replace("\n", "
", $backtrace);
+ $strReturned .= "
";
+ $strReturned .= "\n
";
+
+ return $strReturned;
+ }
+}
+
+
+class Piwik_Log_Error extends Piwik_Log
+{
+ const ID = 'logger_error';
+ function __construct()
+ {
+ $logToFileFilename = self::ID;
+ $logToDatabaseTableName = self::ID;
+ $logToDatabaseColumnMapping = null;
+ $screenFormatter = new Piwik_Log_Formatter_Error_ScreenFormatter;
+ $fileFormatter = new Piwik_Log_Formatter_FileFormatter;
+
+ parent::__construct($logToFileFilename,
+ $fileFormatter,
+ $screenFormatter,
+ $logToDatabaseTableName,
+ $logToDatabaseColumnMapping );
+ }
+
+ public function log($errno, $errstr, $errfile, $errline, $backtrace)
+ {
+ $event = array();
+ $event['errno'] = $errno;
+ $event['message'] = $errstr;
+ $event['errfile'] = $errfile;
+ $event['errline'] = $errline;
+ $event['backtrace'] = $backtrace;
+
+ parent::log($event);
+ }
+}
+
+class Piwik_Log_Exception extends Piwik_Log
+{
+ const ID = 'logger_exception';
+ function __construct()
+ {
+ $logToFileFilename = self::ID;
+ $logToDatabaseTableName = self::ID;
+ $logToDatabaseColumnMapping = null;
+ $screenFormatter = new Piwik_Log_Formatter_Exception_ScreenFormatter;
+ $fileFormatter = new Piwik_Log_Formatter_FileFormatter;
+
+ parent::__construct($logToFileFilename,
+ $fileFormatter,
+ $screenFormatter,
+ $logToDatabaseTableName,
+ $logToDatabaseColumnMapping );
+ }
+
+ public function log($exception)
+ {
+
+ $event = array();
+ $event['errno'] = $exception->getCode();
+ $event['message'] = $exception->getMessage();
+ $event['errfile'] = $exception->getFile();
+ $event['errline'] = $exception->getLine();
+ $event['backtrace'] = $exception->getTraceAsString();
+
+ parent::log($event);
+ }
+}
+
?>
Index: /trunk/modules/Piwik.php
===================================================================
--- /trunk/modules/Piwik.php (revision 20)
+++ /trunk/modules/Piwik.php (revision 30)
@@ -7,5 +7,17 @@
static public function log($message, $priority = Zend_Log::NOTICE)
{
- Zend_Registry::get('logger')->log($message . PHP_EOL);
+ Zend_Registry::get('logger_message')->log($message . "
" . PHP_EOL);
+ }
+
+ static public function getTableCreateSql( $tableName )
+ {
+ $tables = Piwik::getTablesCreateSql();
+
+ if(!isset($tables[$tableName]))
+ {
+ throw new Exception("The table '$tableName' SQL creation code couldn't be found.");
+ }
+
+ return $tables[$tableName];
}
@@ -50,12 +62,112 @@
",
- );
+
+ 'logger_message' => "CREATE TABLE {$prefixTables}logger_message (
+ idlogger_message INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
+ timestamp TIMESTAMP NULL,
+ message TINYTEXT NULL,
+ PRIMARY KEY(idlogger_message)
+ )
+ ",
+
+ 'logger_api_call' => "CREATE TABLE {$prefixTables}logger_api_call (
+ idlogger_api_call INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
+ class_name VARCHAR(255) NULL,
+ method_name VARCHAR(255) NULL,
+ parameter_names_default_values TINYTEXT NULL,
+ parameter_values TINYTEXT NULL,
+ execution_time FLOAT NULL,
+ caller_ip BIGINT NULL,
+ timestamp TIMESTAMP NULL,
+ returned_value TINYTEXT NULL,
+ PRIMARY KEY(idlogger_api_call)
+ )
+ ",
+
+ 'logger_error' => "CREATE TABLE {$prefixTables}logger_error (
+ idlogger_error INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
+ timestamp TIMESTAMP NULL,
+ message TINYTEXT NULL,
+ errno INTEGER UNSIGNED NULL,
+ errline INTEGER UNSIGNED NULL,
+ errfile VARCHAR(255) NULL,
+ backtrace TEXT NULL,
+ PRIMARY KEY(idlogger_error)
+ )
+ ",
+
+ 'logger_exception' => "CREATE TABLE {$prefixTables}logger_exception (
+ idlogger_exception INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
+ timestamp TIMESTAMP NULL,
+ message TINYTEXT NULL,
+ errno INTEGER UNSIGNED NULL,
+ errline INTEGER UNSIGNED NULL,
+ errfile VARCHAR(255) NULL,
+ backtrace TEXT NULL,
+ PRIMARY KEY(idlogger_exception)
+ )
+ ",
+
+
+ 'log_action' => "CREATE TABLE {$prefixTables}log_action (
+ idaction INTEGER(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+ name VARCHAR(255) NOT NULL,
+ type TINYINT UNSIGNED NULL,
+ PRIMARY KEY(idaction)
+ )
+ ",
+
+ 'log_visit' => "CREATE TABLE {$prefixTables}log_visit (
+ idvisit INTEGER(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+ idsite INTEGER(10) UNSIGNED NOT NULL,
+ visitor_localtime TIME NOT NULL,
+ visitor_idcookie CHAR(32) NOT NULL,
+ visitor_returning TINYINT(1) NOT NULL,
+ visit_first_action_time DATETIME NOT NULL,
+ visit_last_action_time DATETIME NOT NULL,
+ visit_server_date DATE NOT NULL,
+ visit_exit_idaction INTEGER(11) NOT NULL,
+ visit_entry_idaction INTEGER(11) NOT NULL,
+ visit_total_actions SMALLINT(5) UNSIGNED NOT NULL,
+ visit_total_time SMALLINT(5) UNSIGNED NOT NULL,
+ referer_type INTEGER UNSIGNED NULL,
+ referer_name VARCHAR(70) NULL,
+ referer_url TEXT NOT NULL,
+ referer_keyword VARCHAR(255) NULL,
+ config_md5config CHAR(32) NOT NULL,
+ config_os CHAR(3) NOT NULL,
+ config_browser_name VARCHAR(10) NOT NULL,
+ config_browser_version VARCHAR(20) NOT NULL,
+ config_resolution VARCHAR(9) NOT NULL,
+ config_color_depth TINYINT(2) UNSIGNED NOT NULL,
+ config_pdf TINYINT(1) NOT NULL,
+ config_flash TINYINT(1) NOT NULL,
+ config_java TINYINT(1) NOT NULL,
+ config_javascript TINYINT(1) NOT NULL,
+ config_director TINYINT(1) NOT NULL,
+ config_quicktime TINYINT(1) NOT NULL,
+ config_realplayer TINYINT(1) NOT NULL,
+ config_windowsmedia TINYINT(1) NOT NULL,
+ config_cookie TINYINT(1) NOT NULL,
+ location_ip BIGINT(11) NOT NULL,
+ location_browser_lang VARCHAR(20) NOT NULL,
+ location_country CHAR(3) NOT NULL,
+ location_continent CHAR(3) NOT NULL,
+ PRIMARY KEY(idvisit)
+)
+ ",
+
+ 'log_link_visit_action' => "CREATE TABLE {$prefixTables}log_link_visit_action (
+ idlink_va INTEGER(11) NOT NULL AUTO_INCREMENT,
+ idvisit INTEGER(10) UNSIGNED NOT NULL,
+ idaction INTEGER(10) UNSIGNED NOT NULL,
+ idaction_ref INTEGER(11) UNSIGNED NOT NULL,
+ time_spent_ref_action INTEGER(10) UNSIGNED NOT NULL,
+ PRIMARY KEY(idlink_va)
+ )
+ ",
+
+ );
return $tables;
- }
-
- static public function getIp()
- {
- //TODO test and move from piwik
- return '127.0.0.1';
}
@@ -107,4 +219,23 @@
}
+ static public function createHtAccess( $path )
+ {
+ file_put_contents($path . ".htaccess", "Deny from all");
+ }
+
+ static public function mkdir( $path, $mode = 0755, $denyAccess = true )
+ {
+ $path = PIWIK_INCLUDE_PATH . '/' . $path;
+ if(!is_dir($path))
+ {
+ mkdir($path, $mode, true);
+ }
+
+ if($denyAccess)
+ {
+ Piwik::createHtAccess($path);
+ }
+ }
+
static public function prefixTable( $table )
{
@@ -132,9 +263,10 @@
$db = Zend_Registry::get('db');
- $allTables = $db->fetchCol('SHOW TABLES');
-
- $intersect = array_intersect($allTables, $allMyTables);
-
- return $intersect;
+ $config = Zend_Registry::get('config');
+ $prefixTables = $config->database->tables_prefix;
+
+ $allTables = $db->fetchCol("SHOW TABLES LIKE '$prefixTables%'");
+
+ return $allTables;
}
@@ -165,14 +297,72 @@
static public function createLogObject()
{
- //TODO
- //$log = new Piwik_Log;
- }
- static public function createConfigObject()
- {
- $config = new Piwik_Config;
+ $configAPI = Zend_Registry::get('config')->log;
+
+ $aLoggers = array(
+// 'logger_query_profile' => new Piwik_Log_QueryProfile, // TODO Piwik_Log_QueryProfile
+ 'logger_api_call' => new Piwik_Log_APICall,
+ 'logger_exception' => new Piwik_Log_Exception,
+ 'logger_error' => new Piwik_Log_Error,
+ 'logger_message' => new Piwik_Log_Message,
+ );
+
+ foreach($configAPI as $loggerType => $aRecordTo)
+ {
+ if(isset($aLoggers[$loggerType]))
+ {
+ $logger = $aLoggers[$loggerType];
+
+ foreach($aRecordTo as $recordTo)
+ {
+ switch($recordTo)
+ {
+ case 'screen':
+ $logger->addWriteToScreen();
+ break;
+
+ case 'database':
+ $logger->addWriteToDatabase();
+ break;
+
+ case 'file':
+ $logger->addWriteToFile();
+ break;
+
+ default:
+ throw new Exception("TODO");
+ break;
+ }
+ }
+ }
+ }
+
+ foreach($aLoggers as $loggerType =>$logger)
+ {
+ if($logger->getWritersCount() == 0)
+ {
+ $logger->addWriteToNull();
+ }
+ Zend_Registry::set($loggerType, $logger);
+ }
+ }
+
+ static public function createConfigObject( $pathConfigFile = null )
+ {
+ $config = new Piwik_Config($pathConfigFile);
assert(count($config) != 0);
}
+ static public function dropTables()
+ {
+ $tablesAlreadyInstalled = self::getTablesInstalled();
+ $db = Zend_Registry::get('db');
+
+ foreach($tablesAlreadyInstalled as $tableName)
+ {
+ $db->query("DROP TABLE $tableName");
+ }
+ }
+
static public function createTables()
{
Index: /trunk/modules/ErrorHandler.php
===================================================================
--- /trunk/modules/ErrorHandler.php (revision 14)
+++ /trunk/modules/ErrorHandler.php (revision 22)
@@ -2,35 +2,9 @@
function Piwik_ErrorHandler($errno, $errstr, $errfile, $errline)
{
- $errno = $errno & error_reporting();
- if($errno == 0) return;
- if(!defined('E_STRICT')) define('E_STRICT', 2048);
- if(!defined('E_RECOVERABLE_ERROR')) define('E_RECOVERABLE_ERROR', 4096);
- print "\n";
- switch($errno)
- {
- case E_ERROR: print "Error"; break;
- case E_WARNING: print "Warning"; break;
- case E_PARSE: print "Parse Error"; break;
- case E_NOTICE: print "Notice"; break;
- case E_CORE_ERROR: print "Core Error"; break;
- case E_CORE_WARNING: print "Core Warning"; break;
- case E_COMPILE_ERROR: print "Compile Error"; break;
- case E_COMPILE_WARNING: print "Compile Warning"; break;
- case E_USER_ERROR: print "User Error"; break;
- case E_USER_WARNING: print "User Warning"; break;
- case E_USER_NOTICE: print "User Notice"; break;
- case E_STRICT: print "Strict Notice"; break;
- case E_RECOVERABLE_ERROR: print "Recoverable Error"; break;
- default: print "Unknown error ($errno)"; break;
- }
- print ": $errstr in
$errfile on line
$errline\n";
- print("
Backtrace -->
");
-
- ob_start();
+ ob_start();
debug_print_backtrace();
- $out1 = ob_get_clean();
- print(str_replace("\n", "
", $out1));
- print("
");
- print "\n
";
+ $backtrace = ob_get_contents();
+ ob_end_clean();
+ Zend_Registry::get('logger_error')->log($errno, $errstr, $errfile, $errline, $backtrace);
}
?>
Index: /trunk/modules/Common.php
===================================================================
--- /trunk/modules/Common.php (revision 29)
+++ /trunk/modules/Common.php (revision 29)
@@ -0,0 +1,552 @@
+' (greater than) becomes '>'
+ * - It handles the magic_quotes setting.
+ * - A non string value is returned without modification
+ *
+ * @param mixed The variable to be cleaned
+ * @return mixed The variable after cleaning
+ */
+ static public function sanitizeInputValues($value)
+ {
+ if (is_array($value))
+ {
+ foreach (array_keys($value) as $key)
+ {
+ $newKey = $key;
+ $newKey = Piwik_Common::sanitizeInputValues($newKey);
+ if ($key != $newKey)
+ {
+ $value[$newKey] = $value[$key];
+ unset($value[$key]);
+ }
+
+ $value[$newKey] = Piwik_Common::sanitizeInputValues($value[$newKey]);
+ }
+ }
+ elseif(is_string($value))
+ {
+ $value = htmlspecialchars($value, Piwik_Common::HTML_ENCODING_QUOTE_STYLE, 'UTF-8');
+
+ /* Undo the damage caused by magic_quotes */
+ if (get_magic_quotes_gpc())
+ {
+ $value = stripslashes($value);
+ }
+ }
+ elseif(!is_numeric($value)
+ && !is_null($value)
+ && !is_bool($value)
+ )
+ {
+ throw new Exception("The value to escape has not a supported type. Value = ".var_export($value, true));
+ }
+ return $value;
+ }
+
+ /**
+ * Returns a variable from the $_REQUEST superglobal.
+ * If the variable doesn't have a value or an empty value, returns the defaultValue if specified.
+ * If the variable doesn't have neither a value nor a default value provided, an exception is raised.
+ *
+ * @param string $varName name of the variable
+ * @param string $varDefault default value. If '', and if the type doesn't match, exit() !
+ * @param string $varType Expected type, the value must be one of the following: array, numeric, int, integer, string
+ *
+ * @exception if the variable type is not known
+ * @exception if the variable we want to read doesn't have neither a value nor a default value specified
+ *
+ * @return mixed The variable after cleaning
+ */
+ static public function getRequestVar($varName, $varDefault = null, $varType = null)
+ {
+ $varDefault = self::sanitizeInputValues( $varDefault );
+
+ if($varType == 'int')
+ {
+ // settype accepts only integer
+ // 'int' is simply a shortcut for 'integer'
+ $varType = 'integer';
+ }
+
+ // there is no value $varName in the REQUEST so we try to use the default value
+ if(empty($varName)
+ || !isset($_REQUEST[$varName])
+ || empty($_REQUEST[$varName]))
+ {
+ if( is_null($varDefault))
+ {
+ throw new Exception("\$varName '$varName' doesn't have value in \$_REQUEST and doesn't have a" .
+ " \$varDefault value");
+ }
+ else
+ {
+ if( !is_null($varType)
+ && in_array($varType, array('string', 'integer', 'array'))
+ )
+ {
+ settype($varDefault, $varType);
+ }
+ return $varDefault;
+ }
+ }
+
+ // Normal case, there is a value available in REQUEST for the requested varName
+ $value = self::sanitizeInputValues( $_REQUEST[$varName] );
+
+ if( !is_null($varType))
+ {
+ $ok = false;
+
+ if($varType == 'string')
+ {
+ if(is_string($value)) $ok = true;
+ }
+ elseif($varType == 'numeric')
+ {
+ if(is_numeric($value) || $value==(int)$value || $value==(float)$value) $ok = true;
+ }
+ elseif($varType == 'integer')
+ {
+ if(is_int($value) || $value==(int)$value) $ok = true;
+ }
+ elseif($varType == 'array')
+ {
+ if(is_array($value)) $ok = true;
+ }
+ else
+ {
+ throw new Exception("\$varType specified is not known. It should be one of the following: array, numeric, int, integer, float, string");
+ }
+
+ // The type is not correct
+ if($ok === false)
+ {
+ if($varDefault === null)
+ {
+ throw new Exception("\$varName '$varName' doesn't have a correct type in \$_REQUEST and doesn't " .
+ "have a \$varDefault value");
+ }
+ // we return the default value with the good type set
+ else
+ {
+ settype($varDefault, $varType);
+ return $varDefault;
+ }
+ }
+ }
+
+ return $value;
+ }
+
+
+ static public function generateUniqId()
+ {
+ return md5(uniqid(rand(), true));
+ }
+
+ /**
+ * get the visitor os
+ *
+ * @param string $userAgent
+ * @param array $osList
+ *
+ * @return string
+ */
+ static public function getOs($userAgent)
+ {
+ $osNameToId = Array(
+ 'Nintendo Wii' => 'WII',
+ 'PlayStation Portable' => 'PSP',
+ 'PLAYSTATION 3' => 'PS3',
+ 'Windows NT 6.0' => 'WVI',
+ 'Windows Vista' => 'WVI',
+ 'Windows NT 5.2' => 'WS3',
+ 'Windows Server 2003' => 'WS3',
+ 'Windows NT 5.1' => 'WXP',
+ 'Windows XP' => 'WXP',
+ 'Win98' => 'W98',
+ 'Windows 98' => 'W98',
+ 'Windows NT 5.0' => 'W2K',
+ 'Windows 2000' => 'W2K',
+ 'Windows NT 4.0' => 'WNT',
+ 'WinNT' => 'WNT',
+ 'Windows NT' => 'WNT',
+ 'Win 9x 4.90' => 'WME',
+ 'Win 9x 4.90' => 'WME',
+ 'Windows Me' => 'WME',
+ 'Win32' => 'W95',
+ 'Win95' => 'W95',
+ 'Windows 95' => 'W95',
+ 'Mac_PowerPC' => 'MAC',
+ 'Mac PPC' => 'MAC',
+ 'PPC' => 'MAC',
+ 'Mac PowerPC' => 'MAC',
+ 'Mac OS' => 'MAC',
+ 'Linux' => 'LIN',
+ 'SunOS' => 'SOS',
+ 'FreeBSD' => 'BSD',
+ 'AIX' => 'AIX',
+ 'IRIX' => 'IRI',
+ 'HP-UX' => 'HPX',
+ 'OS/2' => 'OS2',
+ 'NetBSD' => 'NBS',
+ 'Unknown' => 'UNK'
+ );
+
+ foreach($osNameToId as $key => $value)
+ {
+ if ($ok = ereg($key, $userAgent))
+ {
+ return $value;
+ }
+ }
+ return 'UNK';
+ }
+
+ /**
+ * get visitor browser
+ *
+ * @param string $userAgent
+ * @return array array( 'name' => '',
+ 'major_number' => '',
+ 'minor_number' => '',
+ 'version' => '' // major_number.minor_number
+ );
+ */
+ static public function getBrowserInfo($userAgent)
+ {
+ $browsers = array(
+ 'msie' => 'IE',
+ 'microsoft internet explorer' => 'IE',
+ 'internet explorer' => 'IE',
+ 'netscape6' => 'NS',
+ 'netscape' => 'NS',
+ 'galeon' => 'GA',
+ 'phoenix' => 'PX',
+ 'firefox' => 'FF',
+ 'mozilla firebird' => 'FB',
+ 'firebird' => 'FB',
+ 'seamonkey' => 'SM',
+ 'chimera' => 'CH',
+ 'camino' => 'CA',
+ 'safari' => 'SF',
+ 'k-meleon' => 'KM',
+ 'mozilla' => 'MO',
+ 'opera' => 'OP',
+ 'konqueror' => 'KO',
+ 'icab' => 'IC',
+ 'lynx' => 'LX',
+ 'links' => 'LI',
+ 'ncsa mosaic' => 'MC',
+ 'amaya' => 'AM',
+ 'omniweb' => 'OW',
+ 'hotjava' => 'HJ',
+ 'browsex' => 'BX',
+ 'amigavoyager' => 'AV',
+ 'amiga-aweb' => 'AW',
+ 'ibrowse' => 'IB',
+ 'unknown' => 'unk'
+ );
+
+ $info = array(
+ 'name' => 'UNK',
+ 'major_number' => '',
+ 'minor_number' => '',
+ 'version' => ''
+ );
+
+ $browser = '';
+ foreach($browsers as $key => $value)
+ {
+ if(!empty($browser)) $browser .= "|";
+ $browser .= $key;
+ }
+
+ $results = array();
+
+ // added fix for Mozilla Suite detection
+ if ((preg_match_all("/(mozilla)[\/\sa-z;.0-9-(]+rv:([0-9]+)([.0-9a-z]+)\) gecko\/[0-9]{8}$/i", $userAgent, $results))
+ || (preg_match_all("/($browser)[\/\sa-z(]*([0-9]+)([\.0-9a-z]+)?/i", $userAgent, $results))
+ )
+ {
+ $count = count($results[0])-1;
+
+ // browser code
+ $info['name'] = $browsers[strtolower($results[1][$count])];
+
+ // majeur version number (7 in mozilla 1.7
+ $info['major_number'] = $results[2][$count];
+
+ // is an minor version number ? If not, 0
+ $match = array();
+
+ preg_match('/([.\0-9]+)?([\.a-z0-9]+)?/i', $results[3][$count], $match);
+
+ if(isset($match[1]))
+ {
+ // find minor version number (7 in mozilla 1.7, 9 in firefox 0.9.3)
+ $info['minor_number'] = substr($match[1], 0, 2);
+ }
+ else
+ {
+ $info['minor_number'] = '.0';
+ }
+
+ $info['version'] = $info['major_number'] . $info['minor_number'];
+ }
+ return $info;
+ }
+
+
+ /**
+ * Returns the best possible IP
+ *
+ * @return string ip
+ */
+ static public function getIp()
+ {
+ if(isset($_SERVER['HTTP_CLIENT_IP'])
+ && ($ip = Piwik_Common::getFirstIpFromList($_SERVER['HTTP_CLIENT_IP']))
+ && strpos($ip, "unknown") === false)
+ {
+ return $ip;
+ }
+ elseif(isset($_SERVER['HTTP_X_FORWARDED_FOR'])
+ && $ip = Piwik_Common::getFirstIpFromList($_SERVER['HTTP_X_FORWARDED_FOR'])
+ && isset($ip)
+ && !empty($ip)
+ && strpos($ip, "unknown")===false )
+ {
+ return $ip;
+ }
+ elseif( isset($_SERVER['HTTP_CLIENT_IP'])
+ && strlen( Piwik_Common::getFirstIpFromList($_SERVER['HTTP_CLIENT_IP']) ) != 0 )
+ {
+ return Piwik_Common::getFirstIpFromList($_SERVER['HTTP_CLIENT_IP']);
+ }
+ else if( isset($_SERVER['HTTP_X_FORWARDED_FOR'])
+ && strlen ($ip = Piwik_Common::getFirstIpFromList($_SERVER['HTTP_X_FORWARDED_FOR'])) != 0)
+ {
+ return $ip;
+ }
+ else
+ {
+ return Piwik_Common::getFirstIpFromList($_SERVER['REMOTE_ADDR']);
+ }
+ }
+
+
+ /**
+ * Returns the first element of a comma separated list of IPs
+ *
+ * @param string $ip
+ *
+ * @return string first element before ','
+ */
+ static private function getFirstIpFromList($ip)
+ {
+ $p = strpos($ip, ',');
+ if($p!==false)
+ {
+ return Piwik_Common::sanitizeInputValues(substr($ip, 0, $p));
+ }
+ return Piwik_Common::sanitizeInputValues($ip);
+ }
+
+
+ /**
+ * Returns the continent of a given country
+ *
+ * @param string Country 2 letters isocode
+ *
+ * @return string Continent (3 letters code : afr, asi, eur, amn, ams, oce)
+ */
+ function getContinent($country)
+ {
+ require_once PIWIK_DATAFILES_INCLUDE_PATH . "/Countries.php";
+
+ $countryList = $GLOBALS['Piwik_CountryList'];
+
+ if(isset($countryList[$country][0]))
+ {
+ return $countryList[$country][0];
+ }
+ else
+ {
+ return 'unk';
+ }
+ }
+
+ /**
+ * Returns the visitor country based only on the Browser Lang information
+ *
+ * @param string $lang browser lang
+ *
+ * @return string
+ */
+ function getCountry( $lang )
+ {
+ require_once PIWIK_DATAFILES_INCLUDE_PATH . "/Countries.php";
+
+ $countryList = $GLOBALS['Piwik_CountryList'];
+
+ $replaceLangCodeByCountryCode = array(
+ // replace cs language (Serbia Montenegro country code) with czech country code
+ 'cs' => 'cz',
+ // replace sv language (El Salvador country code) with sweden country code
+ 'sv' => 'se',
+ // replace fa language (Unknown country code) with Iran country code
+ 'fa' => 'ir',
+ // replace ja language (Unknown country code) with japan country code
+ 'ja' => 'jp',
+ // replace ko language (Unknown country code) with corée country code
+ 'ko' => 'kr',
+ // replace he language (Unknown country code) with Israel country code
+ 'he' => 'il',
+ // replace da language (Unknown country code) with Danemark country code
+ 'da' => 'dk',
+ // replace gb code with UK country code
+ 'gb' => 'uk',
+ );
+
+
+ if(empty($lang) || strlen($lang) < 2)
+ {
+ return 'xx';
+ }
+
+ $lang = str_replace( array_keys($replaceLangCodeByCountryCode),
+ array_values($replaceLangCodeByCountryCode),
+ $lang
+ );
+
+ // Ex: "fr"
+ if(strlen($lang) == 2)
+ {
+ if(isset($countryList[$lang]))
+ {
+ return $lang;
+ }
+ }
+
+ // when comma
+ $offcomma = strpos($lang, ',');
+
+ if($offcomma == 2)
+ {
+ // in 'fr,en-us', keep first two chars
+ $domain = substr($lang, 0, 2);
+ if(isset($countryList[$domain]))
+ {
+ return $domain;
+ }
+
+ // catch the second language Ex: "fr" in "en,fr"
+ $domain = substr($lang, 3, 2);
+ if(isset($countryList[$domain]))
+ {
+ return $domain;
+ }
+ }
+
+ // detect second code Ex: "be" in "fr-be"
+ $off = strpos($lang, '-');
+ if($off!==false)
+ {
+ $domain = substr($lang, $off+1, 2);
+
+ if(isset($countryList[$domain]))
+ {
+ return $domain;
+ }
+ }
+
+ // catch the second language Ex: "fr" in "en;q=1.0,fr;q=0.9"
+ if(preg_match("/^[a-z]{2};q=[01]\.[0-9],(?P[a-z]{2});/", $lang, $parts))
+ {
+ $domain = $parts['domain'];
+
+ if(isset($GLOBALS['countryList'][$domain][0]))
+ {
+ return $domain;
+ }
+ }
+
+ // finally try with the first ever langage code
+ $domain = substr($lang, 0, 2);
+ if(isset($countryList[$domain]))
+ {
+ return $domain;
+ }
+
+ // at this point we really can't guess the country
+ return 'xx';
+ }
+
+ /**
+ * Returns the value of a GET parameter $parameter in an URL query $urlQuery
+ *
+ * @param string $urlQuery result of parse_url()['query'] and htmlentitied (& is &)
+ * @param string $param
+ *
+ * @return string|bool Parameter value if found (can be the empty string!), false if not found
+ */
+ static public function getParameterFromQueryString( $urlQuery, $parameter)
+ {
+ $refererQuery = '&'.trim(str_replace(array('%20'), ' ', '&'.$urlQuery));
+ $word = '&'.$parameter.'=';
+
+ if( $off = strrpos($refererQuery, $word))
+ {
+ $off += strlen($word); // &q=
+ $str = substr($refererQuery, $off);
+ $len = strpos($str, '&');
+ if($len === false)
+ {
+ $len = strlen($str);
+ }
+ $toReturn = substr($refererQuery, $off, $len);
+ return $toReturn;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+}
+?>
Index: /trunk/libs/Zend/Log/Writer/Stream.php
===================================================================
--- /trunk/libs/Zend/Log/Writer/Stream.php (revision 10)
+++ /trunk/libs/Zend/Log/Writer/Stream.php (revision 23)
@@ -93,5 +93,5 @@
$line = $this->_formatter->format($event);
- if (! @fwrite($this->_stream, $line)) {
+ if ( fwrite($this->_stream, $line) === false) {
throw new Zend_Log_Exception("Unable to write to stream");
}
Index: /trunk/libs/Zend/Db/Adapter/Mysqli.php
===================================================================
--- /trunk/libs/Zend/Db/Adapter/Mysqli.php (revision 10)
+++ /trunk/libs/Zend/Db/Adapter/Mysqli.php (revision 24)
@@ -244,7 +244,16 @@
}
+ if(!class_exists("mysqli"))
+ {
+ /**
+ * @see Zend_Db_Adapter_Mysqli_Exception
+ */
+ require_once 'Zend/Db/Adapter/Mysqli/Exception.php';
+ throw new Zend_Db_Adapter_Mysqli_Exception("The extension mysqli is not installed.");
+ }
+
// Suppress connection warnings here.
// Throw an exception instead.
- @$this->_connection = new mysqli(
+ $this->_connection = new mysqli(
$this->_config['host'],
$this->_config['username'],
Index: /trunk/libs/Event/Dispatcher.php
===================================================================
--- /trunk/libs/Event/Dispatcher.php (revision 24)
+++ /trunk/libs/Event/Dispatcher.php (revision 24)
@@ -0,0 +1,478 @@
+ |
+// | Stephan Schmidt |
+// +-----------------------------------------------------------------------+
+//
+// $Id: Dispatcher.php,v 1.4 2005/09/22 15:37:10 schst Exp $
+
+require_once 'Event/Notification.php';
+
+/**
+ * Pseudo 'static property' for Notification object
+ * @global array $GLOBALS["_Event_Dispatcher"]
+ */
+$GLOBALS['_Event_Dispatcher'] = array(
+ 'NotificationClass' => 'Event_Notification'
+ );
+
+/**
+ * Registers a global observer
+ */
+define('EVENT_DISPATCHER_GLOBAL', '');
+
+/**
+ * Dispatch notifications using PHP callbacks
+ *
+ * The Event_Dispatcher acts acts as a notification dispatch table.
+ * It is used to notify other objects of interesting things, if
+ * they meet certain criteria. This information is encapsulated
+ * in {@link Event_Notification} objects. Client objects register
+ * themselves with the Event_Dispatcher as observers of specific
+ * notifications posted by other objects. When an event occurs,
+ * an object posts an appropriate notification to the Event_Dispatcher.
+ * The Event_Dispatcher dispatches a message to each
+ * registered observer, passing the notification as the sole argument.
+ *
+ * The Event_Dispatcher is actually a combination of three design
+ * patterns: the Singleton, {@link http://c2.com/cgi/wiki?MediatorPattern Mediator},
+ * and Observer patterns. The idea behind Event_Dispatcher is borrowed from
+ * {@link http://developer.apple.com/documentation/Cocoa/Conceptual/Notifications/index.html Apple's Cocoa framework}.
+ *
+ * @category Event
+ * @package Event_Dispatcher
+ * @author Bertrand Mansion
+ * @author Stephan Schmidt
+ * @copyright 1997-2005 The PHP Group
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ * @version Release: @package_version@
+ * @link http://pear.php.net/package/Event_Dispatcher
+ */
+class Event_Dispatcher
+{
+ /**
+ * Registered observer callbacks
+ * @var array
+ * @access private
+ */
+ var $_ro = array();
+
+ /**
+ * Pending notifications
+ * @var array
+ * @access private
+ */
+ var $_pending = array();
+
+ /**
+ * Nested observers
+ * @var array
+ * @access private
+ */
+ var $_nestedDispatchers = array();
+
+ /**
+ * Name of the dispatcher
+ * @var string
+ * @access private
+ */
+ var $_name = null;
+
+ /**
+ * Class used for notifications
+ * @var string
+ * @access private
+ */
+ var $_notificationClass = null;
+
+ /**
+ * PHP4 constructor
+ *
+ * Please use {@link getInstance()} instead.
+ *
+ * @access private
+ * @param string Name of the notification dispatcher.
+ */
+ function Event_Dispatcher($name)
+ {
+ Event_Dispatcher::__construct($name);
+ }
+
+ /**
+ * PHP5 constructor
+ *
+ * Please use {@link getInstance()} instead.
+ *
+ * @access private
+ * @param string Name of the notification dispatcher.
+ */
+ function __construct($name)
+ {
+ $this->_name = $name;
+ $this->_notificationClass = $GLOBALS['_Event_Dispatcher']['NotificationClass'];
+ }
+
+ /**
+ * Returns a notification dispatcher singleton
+ *
+ * There is usually no need to have more than one notification
+ * center for an application so this is the recommended way
+ * to get a Event_Dispatcher object.
+ *
+ * @param string Name of the notification dispatcher.
+ * The default notification dispatcher is named __default.
+ *
+ * @return object Event_Dispatcher
+ */
+ function &getInstance($name = '__default')
+ {
+ static $dispatchers = array();
+
+ if (!isset($dispatchers[$name])) {
+ $dispatchers[$name] = new Event_Dispatcher($name);
+ }
+
+ return $dispatchers[$name];
+ }
+
+ /**
+ * Registers an observer callback
+ *
+ * This method registers a {@link http://www.php.net/manual/en/language.pseudo-types.php#language.types.callback callback}
+ * which is called when the notification corresponding to the
+ * criteria given at registration time is posted.
+ * The criteria are the notification name and eventually the
+ * class of the object posted with the notification.
+ *
+ * If there are any pending notifications corresponding to the criteria
+ * given here, the callback will be called straight away.
+ *
+ * If the notification name is empty, the observer will receive all the
+ * posted notifications. Same goes for the class name.
+ *
+ * @access public
+ * @param mixed A PHP callback
+ * @param string Expected notification name, serves as a filter
+ * @param string Expected contained object class, serves as a filter
+ * @return void
+ */
+ function addObserver($callback, $nName = EVENT_DISPATCHER_GLOBAL, $class = null)
+ {
+ if (is_array($callback)) {
+ if (is_object($callback[0])) {
+ // Note : PHP4 does not allow correct object comparison so
+ // only the class name is used for registration checks.
+ $reg = get_class($callback[0]).'::'.$callback[1];
+ } else {
+ $reg = $callback[0].'::'.$callback[1];
+ }
+ } else {
+ $reg = $callback;
+ }
+
+ $this->_ro[$nName][$reg] = array(
+ 'callback' => $callback,
+ 'class' => $class
+ );
+
+ // Post eventual pending notifications for this observer
+ if (isset($this->_pending[$nName])) {
+ foreach (array_keys($this->_pending[$nName]) as $k) {
+ $notification =& $this->_pending[$nName][$k];
+ if (!$notification->isNotificationCancelled()) {
+ $objClass = get_class($notification->getNotificationObject());
+ if (empty($class) || strcasecmp($class, $objClass) == 0) {
+ call_user_func_array($callback, array(&$notification));
+ $notification->increaseNotificationCount();
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Creates and posts a notification object
+ *
+ * The purpose of the optional associated object is generally to pass
+ * the object posting the notification to the observers, so that the
+ * observers can query the posting object for more information about
+ * the event.
+ *
+ * Notifications are by default added to a pending notification list.
+ * This way, if an observer is not registered by the time they are
+ * posted, it will still be notified when it is added as an observer.
+ * This behaviour can be turned off in order to make sure that only
+ * the registered observers will be notified.
+ *
+ * The info array serves as a container for any kind of useful
+ * information. It is added to the notification object and posted along.
+ *
+ * @access public
+ * @param object Notification associated object
+ * @param string Notification name
+ * @param array Optional user information
+ * @param bool Whether the notification is pending
+ * @param bool Whether you want the notification to bubble up
+ * @return object The notification object
+ */
+ function &post(&$object, $nName, $info = array(), $pending = true, $bubble = true)
+ {
+ $notification =& new $this->_notificationClass($object, $nName, $info);
+ return $this->postNotification($notification, $pending, $bubble);
+ }
+
+ /**
+ * Posts the {@link Event_Notification} object
+ *
+ * @access public
+ * @param object The Notification object
+ * @param bool Whether to post the notification immediately
+ * @param bool Whether you want the notification to bubble up
+ * @see Event_Dispatcher::post()
+ * @return object The notification object
+ */
+ function &postNotification(&$notification, $pending = true, $bubble = true)
+ {
+ $nName = $notification->getNotificationName();
+ if ($pending === true) {
+ $this->_pending[$nName][] =& $notification;
+ }
+ $objClass = get_class($notification->getNotificationObject());
+
+ // Find the registered observers
+ if (isset($this->_ro[$nName])) {
+ foreach (array_keys($this->_ro[$nName]) as $k) {
+ $rObserver =& $this->_ro[$nName][$k];
+ if ($notification->isNotificationCancelled()) {
+ return $notification;
+ }
+ if (empty($rObserver['class']) ||
+ strcasecmp($rObserver['class'], $objClass) == 0) {
+ call_user_func_array($rObserver['callback'], array(&$notification));
+ $notification->increaseNotificationCount();
+ }
+ }
+ }
+
+ // Notify globally registered observers
+ if (isset($this->_ro[EVENT_DISPATCHER_GLOBAL])) {
+ foreach (array_keys($this->_ro[EVENT_DISPATCHER_GLOBAL]) as $k) {
+ $rObserver =& $this->_ro[EVENT_DISPATCHER_GLOBAL][$k];
+ if ($notification->isNotificationCancelled()) {
+ return $notification;
+ }
+ if (empty($rObserver['class']) ||
+ strcasecmp($rObserver['class'], $objClass) == 0) {
+ call_user_func_array($rObserver['callback'], array(&$notification));
+ $notification->increaseNotificationCount();
+ }
+ }
+ }
+
+ if ($bubble === false) {
+ return $notification;
+ }
+
+ // Notify in nested dispatchers
+ foreach (array_keys($this->_nestedDispatchers) as $nested) {
+ $notification =& $this->_nestedDispatchers[$nested]->postNotification($notification, $pending);
+ }
+
+ return $notification;
+ }
+
+ /**
+ * Removes a registered observer that correspond to the given criteria
+ *
+ * @access public
+ * @param mixed A PHP callback
+ * @param string Notification name
+ * @param string Contained object class
+ * @return bool True if an observer was removed, false otherwise
+ */
+ function removeObserver($callback, $nName = EVENT_DISPATCHER_GLOBAL, $class = null)
+ {
+ if (is_array($callback)) {
+ if (is_object($callback[0])) {
+ $reg = get_class($callback[0]).'::'.$callback[1];
+ } else {
+ $reg = $callback[0].'::'.$callback[1];
+ }
+ } else {
+ $reg = $callback;
+ }
+
+ $removed = false;
+ if (isset($this->_ro[$nName][$reg])) {
+ if (!empty($class)) {
+ if (strcasecmp($this->_ro[$nName][$reg]['class'], $class) == 0) {
+ unset($this->_ro[$nName][$reg]);
+ $removed = true;
+ }
+ } else {
+ unset($this->_ro[$nName][$reg]);
+ $removed = true;
+ }
+ }
+
+ if (isset($this->_ro[$nName]) && count($this->_ro[$nName]) == 0) {
+ unset($this->_ro[$nName]);
+ }
+ return $removed;
+ }
+
+ /**
+ * Check, whether the specified observer has been registered with the
+ * dispatcher
+ *
+ * @access public
+ * @param mixed A PHP callback
+ * @param string Notification name
+ * @param string Contained object class
+ * @return bool True if the observer has been registered, false otherwise
+ */
+ function observerRegistered($callback, $nName = EVENT_DISPATCHER_GLOBAL, $class = null)
+ {
+ if (is_array($callback)) {
+ if (is_object($callback[0])) {
+ $reg = get_class($callback[0]).'::'.$callback[1];
+ } else {
+ $reg = $callback[0].'::'.$callback[1];
+ }
+ } else {
+ $reg = $callback;
+ }
+
+ if (!isset($this->_ro[$nName][$reg])) {
+ return false;
+ }
+ if (empty($class)) {
+ return true;
+ }
+ if (strcasecmp($this->_ro[$nName][$reg]['class'], $class) == 0) {
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Get all observers, that have been registered for a notification
+ *
+ * @access public
+ * @param string Notification name
+ * @param string Contained object class
+ * @return array List of all observers
+ */
+ function getObservers($nName = EVENT_DISPATCHER_GLOBAL, $class = null)
+ {
+ $observers = array();
+ if (!isset($this->_ro[$nName])) {
+ return $observers;
+ }
+ foreach ($this->_ro[$nName] as $reg => $observer) {
+ if ($class == null || $observer['class'] == null || strcasecmp($observer['class'], $class) == 0) {
+ $observers[] = $reg;
+ }
+ }
+ return $observers;
+ }
+
+ /**
+ * Get the name of the dispatcher.
+ *
+ * The name is the unique identifier of a dispatcher.
+ *
+ * @access public
+ * @return string name of the dispatcher
+ */
+ function getName()
+ {
+ return $this->_name;
+ }
+
+ /**
+ * add a new nested dispatcher
+ *
+ * Notifications will be broadcasted to this dispatcher as well, which
+ * allows you to create event bubbling.
+ *
+ * @access public
+ * @param Event_Dispatcher The nested dispatcher
+ */
+ function addNestedDispatcher(&$dispatcher)
+ {
+ $name = $dispatcher->getName();
+ $this->_nestedDispatchers[$name] =& $dispatcher;
+ }
+
+ /**
+ * remove a nested dispatcher
+ *
+ * @access public
+ * @param Event_Dispatcher Dispatcher to remove
+ * @return boolean
+ */
+ function removeNestedDispatcher($dispatcher)
+ {
+ if (is_object($dispatcher)) {
+ $dispatcher = $dispatcher->getName();
+ }
+ if (!isset($this->_nestedDispatchers[$dispatcher])) {
+ return false;
+ }
+ unset($this->_nestedDispatchers[$dispatcher]);
+ return true;
+ }
+
+ /**
+ * Changes the class used for notifications
+ *
+ * You may call this method on an object to change it for a single
+ * dispatcher or statically, to set the default for all dispatchers
+ * that will be created.
+ *
+ * @access public
+ * @param string name of the notification class
+ * @return boolean
+ */
+ function setNotificationClass($class)
+ {
+ if (isset($this) && is_a($this, 'Event_Dispatcher')) {
+ $this->_notificationClass = $class;
+ return true;
+ }
+ $GLOBALS['_Event_Dispatcher']['NotificationClass'] = $class;
+ return true;
+ }
+
+}
+?>
Index: /trunk/libs/Event/Notification.php
===================================================================
--- /trunk/libs/Event/Notification.php (revision 24)
+++ /trunk/libs/Event/Notification.php (revision 24)
@@ -0,0 +1,194 @@
+ |
+// | Stephan Schmidt |
+// +-----------------------------------------------------------------------+
+//
+// $Id: Notification.php,v 1.2 2005/02/14 10:35:18 mansion Exp $
+
+/**
+ * Default state of the notification
+ */
+define('EVENT_NOTIFICATION_STATE_DEFAULT', 0);
+
+/**
+ * Notification has been cancelled
+ */
+define('EVENT_NOTIFICATION_STATE_CANCELLED', 1);
+
+/**
+ * A Notification object
+ *
+ * The Notification object can be easily subclassed and serves as a container
+ * for the information about the notification. It holds an object which is
+ * usually a reference to the object that posted the notification,
+ * a notification name used to identify the notification and some user
+ * information which can be anything you need.
+ *
+ * @category Event
+ * @package Event_Dispatcher
+ * @author Bertrand Mansion
+ * @author Stephan Schmidt
+ * @copyright 1997-2005 The PHP Group
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ * @version Release: @package_version@
+ * @link http://pear.php.net/package/Event_Dispatcher
+ */
+class Event_Notification
+{
+ /**
+ * name of the notofication
+ * @var string
+ * @access private
+ */
+ var $_notificationName;
+
+ /**
+ * object of interesed (the sender of the notification, in most cases)
+ * @var object
+ * @access private
+ */
+ var $_notificationObject;
+
+ /**
+ * additional information about the notification
+ * @var mixed
+ * @access private
+ */
+ var $_notificationInfo = array();
+
+ /**
+ * state of the notification
+ *
+ * This may be:
+ * - EVENT_NOTIFICATION_STATE_DEFAULT
+ * - EVENT_NOTIFICATION_STATE_CANCELLED
+ *
+ * @var integer
+ * @access private
+ */
+ var $_notificationState = EVENT_NOTIFICATION_STATE_DEFAULT;
+
+ /**
+ * amount of observers that received this notification
+ * @var mixed
+ * @access private
+ */
+ var $_notificationCount = 0;
+
+ /**
+ * Constructor
+ *
+ * @access public
+ * @param object The object of interest for the notification,
+ * usually is the posting object
+ * @param string Notification name
+ * @param array Free information array
+ */
+ function Event_Notification(&$object, $name, $info = array())
+ {
+ $this->_notificationObject =& $object;
+ $this->_notificationName = $name;
+ $this->_notificationInfo = $info;
+ }
+
+ /**
+ * Returns the notification name
+ * @return string Notification name
+ */
+ function getNotificationName()
+ {
+ return $this->_notificationName;
+ }
+
+ /**
+ * Returns the contained object
+ * @return object Contained object
+ */
+ function &getNotificationObject()
+ {
+ return $this->_notificationObject;
+ }
+
+ /**
+ * Returns the user info array
+ * @return array user info
+ */
+ function getNotificationInfo()
+ {
+ return $this->_notificationInfo;
+ }
+
+ /**
+ * Increase the internal count
+ *
+ * @access public
+ */
+ function increaseNotificationCount()
+ {
+ ++$this->_notificationCount;
+ }
+
+ /**
+ * Get the number of posted notifications
+ *
+ * @access public
+ * @return int
+ */
+ function getNotificationCount()
+ {
+ return $this->_notificationCount;
+ }
+
+ /**
+ * Cancel the notification
+ *
+ * @access public
+ * @return void
+ */
+ function cancelNotification()
+ {
+ $this->_notificationState = EVENT_NOTIFICATION_STATE_CANCELLED;
+ }
+
+ /**
+ * Checks whether the notification has been cancelled
+ *
+ * @access public
+ * @return boolean
+ */
+ function isNotificationCancelled()
+ {
+ return ($this->_notificationState === EVENT_NOTIFICATION_STATE_CANCELLED);
+ }
+}
+?>
Index: /trunk/piwik.php
===================================================================
--- /trunk/piwik.php (revision 19)
+++ /trunk/piwik.php (revision 30)
@@ -1,16 +1,60 @@
input : variables filtered
-// => action : read cookie, read database, database logging, cookie writing
+require_once "Event/Dispatcher.php";
+require_once "Common.php";
+require_once "PluginManager.php";
-// display the logo or pixel 1*1 GIF
+require_once "LogStats.php";
+require_once "LogStats/Plugins.php";
+require_once "LogStats/Config.php";
+require_once "LogStats/Action.php";
+require_once "LogStats/Cookie.php";
+require_once "LogStats/Db.php";
+require_once "LogStats/Visit.php";
+$GLOBALS['DEBUGPIWIK'] = true;
+
+/*
+ * Some benchmarks
+ *
+ * - with the config parsing + db connection
+ * Requests per second: 471.91 [#/sec] (mean)
+ *
+ * - with the main algorithm working + one visitor requesting 5000 times
+ * Requests per second: 155.00 [#/sec] (mean)
+ *
+ */
+
+ob_start();
+printDebug($_GET);
+$process = new Piwik_LogStats;
+$process->main();
+
+// yet to do
+// known visitor test 1h
+// known visitor update 1h
+// unit testing the module 7h
+ob_end_flush();
+printDebug($_COOKIE);
?>
Index: /trunk/misc/generateVisits.php
===================================================================
--- /trunk/misc/generateVisits.php (revision 30)
+++ /trunk/misc/generateVisits.php (revision 30)
@@ -0,0 +1,391 @@
+ campaigns
+ * - newsletter
+ * - partner
+ * - campaign CPC
+ * - referer
+ * - search engine
+ * - misc site
+ * - same website
+ * - url => multiple directories, page names
+ * - multiple idsite
+ * - multiple settings configurations
+ * - action_name
+ * - HTML title
+ *
+ * Objective:
+ * Generate thousands of visits / actions per visitor with random data to test the performance
+ *
+ */
+
+class Piwik_LogStats_Generator
+{
+ private $currentget=array();
+ private $allget=array();
+
+ public $host = 'http://localhost';
+
+ public function __construct()
+ {
+ // init GET and REQUEST to the empty array
+ $this->setFakeRequest();
+ $_COOKIE = array();
+ }
+ public function addParam( $name, $aValue)
+ {
+ if(is_array($aValue))
+ {
+ $this->allget[$name] = array_merge( $aValue,
+ (array)@$this->allget[$name]);
+ }
+ else
+ {
+ $this->allget[$name][] = $aValue;
+ }
+ }
+
+ public function init()
+ {
+ $common = array(
+ 'res' => array('1289x800','1024x768','800x600','564x644','200x100','50x2000',),
+ 'col' => array(24,32,16),
+ 'idsite'=> 1,
+ 'h' => range(0,23),
+ 'm' => range(0,59),
+ 's' => range(0,59),
+
+ );
+
+ foreach($common as $label => $values)
+ {
+ $this->addParam($label,$values);
+ }
+
+ $downloadOrOutlink = array(
+ Piwik_LogStats_Config::getInstance()->LogStats['download_url_var_name'],
+ Piwik_LogStats_Config::getInstance()->LogStats['outlink_url_var_name'],
+ );
+ $this->addParam('piwik_downloadOrOutlink', $downloadOrOutlink);
+ $this->addParam('piwik_downloadOrOutlink', array_fill(0,8,''));
+
+ $campaigns = array(
+ Piwik_LogStats_Config::getInstance()->LogStats['campaign_var_name'],
+ Piwik_LogStats_Config::getInstance()->LogStats['newsletter_var_name'],
+ Piwik_LogStats_Config::getInstance()->LogStats['partner_var_name'],
+ );
+ $this->addParam('piwik_vars_campaign', $campaigns);
+ $this->addParam('piwik_vars_campaign', array_fill(0,5,''));
+
+ $referers = array();
+ require_once "misc/generateVisitsData/Referers.php";
+
+ $this->addParam('urlref',$referers);
+ $this->addParam('urlref',array_fill(0,2000,''));
+
+ $userAgent = $acceptLanguages = array();
+ require_once "misc/generateVisitsData/UserAgent.php";
+ require_once "misc/generateVisitsData/AcceptLanguage.php";
+ $this->userAgents=$userAgent;
+ $this->acceptLanguage=$acceptLanguages;
+ }
+
+ public function generate( $nbVisits, $nbActionsMaxPerVisit )
+ {
+ $nbActionsTotal = 0;
+ for($i = 0; $i < $nbVisits; $i++)
+ {
+// print("$i ");
+ $nbActions = rand(1, $nbActionsMaxPerVisit);
+
+ $this->generateNewVisit();
+ for($j = 1; $j <= $nbActions; $j++)
+ {
+ $this->generateActionVisit();
+ $this->saveVisit();
+ }
+
+ $nbActionsTotal += $nbActions;
+ }
+ print("
Generated $nbVisits visits.");
+ print("
Generated $nbActionsTotal actions.");
+
+ return $nbActionsTotal;
+ }
+
+ private function generateNewVisit()
+ {
+ $this->setCurrentRequest( 'urlref' , $this->getRandom('urlref'));
+ $this->setCurrentRequest( 'idsite', $this->getRandom('idsite'));
+ $this->setCurrentRequest( 'res' ,$this->getRandom('res'));
+ $this->setCurrentRequest( 'col' ,$this->getRandom('col'));
+ $this->setCurrentRequest( 'h' ,$this->getRandom('h'));
+ $this->setCurrentRequest( 'm' ,$this->getRandom('m'));
+ $this->setCurrentRequest( 's' ,$this->getRandom('s'));
+ $this->setCurrentRequest( 'fla' ,$this->getRandom01());
+ $this->setCurrentRequest( 'dir' ,$this->getRandom01());
+ $this->setCurrentRequest( 'qt' ,$this->getRandom01());
+ $this->setCurrentRequest( 'realp' ,$this->getRandom01());
+ $this->setCurrentRequest( 'pdf' ,$this->getRandom01());
+ $this->setCurrentRequest( 'wma' ,$this->getRandom01());
+ $this->setCurrentRequest( 'java' ,$this->getRandom01());
+ $this->setCurrentRequest( 'cookie',$this->getRandom01());
+
+ $_SERVER['HTTP_CLIENT_IP'] = rand(0,255).".".rand(0,255).".".rand(0,255).".".rand(0,255);
+ $_SERVER['HTTP_USER_AGENT'] = $this->userAgents[rand(0,count($this->userAgents)-1)];
+ $_SERVER['HTTP_ACCEPT_LANGUAGE'] = $this->acceptLanguage[rand(0,count($this->acceptLanguage)-1)];
+ }
+
+
+ private function generateActionVisit()
+ {
+ // generate new url referer ; case the visitor makes a new visit the referer will be used
+ $this->setCurrentRequest( 'urlref' , $this->getRandom('urlref'));
+
+ $url = $this->getRandomUrlFromHost($this->host);
+
+ // we generate a campaign (partner or newsletter or campaign)
+ $urlVars = $this->getRandom('piwik_vars_campaign');
+ // campaign name
+ $urlValue = $this->getRandomString(7,6,'lower');
+
+ // if we actually generated a campaign
+ if(!empty($urlVars))
+ {
+ // add the parameter to the url
+ $url .= '?'. $urlVars . '=' . $urlValue;
+
+ // for a campaign of the CPC kind, we sometimes generate a keyword
+ if($urlVars==Piwik_LogStats_Config::getInstance()->LogStats['campaign_var_name']
+ && rand(0,1)==0)
+ {
+ $url .= '&'. Piwik_LogStats_Config::getInstance()->LogStats['campaign_keyword_var_name']
+ . '=' . $this->getRandomString(11,6,'ALL');;
+ }
+ }
+// print($url . "
");
+ $this->setCurrentRequest( 'url' ,$url);
+
+
+
+ // we generate a download Or Outlink parameter in the GET request so that
+ // the current action is counted as a download action OR a outlink click action
+ $GETParamToAdd = $this->getRandom('piwik_downloadOrOutlink');
+ if(!empty($GETParamToAdd))
+ {
+ // download / outlink url
+ $urlValue = $this->getRandomUrlFromHost($this->host);
+ $this->setCurrentRequest($GETParamToAdd, $urlValue);
+ if(rand(0,1)==0)
+ {
+ $this->setCurrentRequest(
+ Piwik_LogStats_Config::getInstance()->LogStats['download_outlink_name_var'],
+ $this->getRandomString(11,6,'ALL')
+ );
+ }
+ }
+
+
+ $this->setCurrentRequest( 'action_name' , $this->getRandomString(15,9));
+ $this->setCurrentRequest( 'title',$this->getRandomString(40,15));
+ }
+
+ private function getRandomUrlFromHost( $host )
+ {
+ $url = $host;
+
+ $deep = rand(0,5);
+ for($i=0;$i<$deep;$i++)
+ {
+ $name = $this->getRandomString(12,3,'ALNUM');
+
+ $url .= '/'.$name;
+ }
+ return $url;
+ }
+
+ // from php.net and edited
+ private function getRandomString($maxLength = 15, $minLength = 5, $type = 'ALL')
+ {
+ $len = rand($minLength, $maxLength);
+
+ // Register the lower case alphabet array
+ $alpha = array('a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
+ 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z');
+
+ // Register the upper case alphabet array
+ $ALPHA = array('A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+ 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z');
+
+ // Register the numeric array
+ $num = array('1', '2', '3', '4', '5', '6', '7', '8', '9', '0');
+
+ // Register the strange array
+ $strange = array('/', '?', '!','"','£','$','%','^','&','*','(',')',' ');
+
+ // Initialize the keyVals array for use in the for loop
+ $keyVals = array();
+
+ // Initialize the key array to register each char
+ $key = array();
+
+ // Loop through the choices and register
+ // The choice to keyVals array
+ switch ($type)
+ {
+ case 'lower' :
+ $keyVals = $alpha;
+ break;
+ case 'upper' :
+ $keyVals = $ALPHA;
+ break;
+ case 'numeric' :
+ $keyVals = $num;
+ break;
+ case 'ALPHA' :
+ $keyVals = array_merge($alpha, $ALPHA);
+ break;
+ case 'ALNUM' :
+ $keyVals = array_merge($alpha, $ALPHA, $num);
+ break;
+ case 'ALL' :
+ $keyVals = array_merge($alpha, $ALPHA, $num, $strange);
+ break;
+ }
+
+ // Loop as many times as specified
+ // Register each value to the key array
+ for($i = 0; $i <= $len-1; $i++)
+ {
+ $r = rand(0,count($keyVals)-1);
+ $key[$i] = $keyVals[$r];
+ }
+
+ // Glue the key array into a string and return it
+ return join("", $key);
+ }
+
+ private function setFakeRequest()
+ {
+ $_REQUEST = $_GET = $this->currentget;
+ }
+
+ private function setCurrentRequest($name,$value)
+ {
+ $this->currentget[$name] = $value;
+ }
+
+ private function getRandom( $name )
+ {
+ if(!isset($this->allget[$name]))
+ {
+ throw new exception("You are asking for $name which doesnt exist");
+ }
+ else
+ {
+ $index = rand(0,count($this->allget[$name])-1);
+ $value =$this->allget[$name][$index];
+ return $value;
+ }
+ }
+
+ private function getRandom01()
+ {
+ return rand(0,1);
+ }
+
+
+ private function saveVisit()
+ {
+ $this->setFakeRequest();
+ $process = new Piwik_LogStats_Generator_Main;
+ $process->main('Piwik_LogStats_Generator_Visit');
+ }
+
+}
+
+class Piwik_LogStats_Generator_Main extends Piwik_LogStats
+{
+ protected function sendHeader($header)
+ {
+ // header($header);
+ }
+}
+
+class Piwik_LogStats_Generator_Visit extends Piwik_LogStats_Visit
+{
+ private $time;
+
+ function __construct( $db )
+ {
+ parent::__construct($db);
+ $this->time = time();
+ }
+
+ protected function getCurrentDate( $format = "Y-m-d")
+ {
+ if($format == "Y-m-d") return date($format);
+ else return date($format, $this->getCurrentTimestamp() );
+ }
+
+ protected function getCurrentTimestamp()
+ {
+ $this->time = max(@$this->visitorInfo['visit_last_action_time'],time(),$this->time);
+ $this->time += rand(4,1840);
+ return $this->time;
+ }
+
+ protected function getDatetimeFromTimestamp($timestamp)
+ {
+ return date("Y-m-d H:i:s",$timestamp);
+ }
+
+}
+require_once PIWIK_INCLUDE_PATH . "/modules/Timer.php";
+
+ob_start();
+$generator = new Piwik_LogStats_Generator;
+$generator->init();
+
+$t = new Piwik_Timer;
+$nbActionsTotal = $generator->generate(10000,5);
+echo "
Request per sec: ". round($nbActionsTotal / $t->getTime(),0);
+echo "
".$t;
+
+ob_end_flush();
+?>
Index: /trunk/misc/generateVisitsData/Referers.php
===================================================================
--- /trunk/misc/generateVisitsData/Referers.php (revision 29)
+++ /trunk/misc/generateVisitsData/Referers.php (revision 29)
@@ -0,0 +1,8043 @@
+