From dee8b8170fba3e495444719c839f98ab4f4a2f6c Mon Sep 17 00:00:00 2001
From: mattpiwik <matthieu.aubry@gmail.com>
Date: Wed, 11 Jun 2008 00:31:03 +0000
Subject: [PATCH] - fixes #205 you can now install with a mysql port non 3306
by specifying your.host:4455
git-svn-id: http://dev.piwik.org/svn/trunk@522 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
config/global.ini.php | 2 ++
modules/LogStats.php | 9 +++++++--
modules/LogStats/Db.php | 4 ++--
plugins/Installation/Controller.php | 8 ++++++--
4 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/config/global.ini.php b/config/global.ini.php
index 14e63b4446..616b3d64c0 100755
--- a/config/global.ini.php
+++ b/config/global.ini.php
@@ -9,6 +9,7 @@ username =
password =
dbname =
tables_prefix =
+port = 3306
adapter = PDO_MYSQL ; PDO_MYSQL or MYSQLI
[database_tests]
@@ -17,6 +18,7 @@ username = root
password =
dbname = piwik_tests
tables_prefix = piwiktests_
+port = 3306
adapter = PDO_MYSQL
[Language]
diff --git a/modules/LogStats.php b/modules/LogStats.php
index c121fea3ef..2d084c985b 100644
--- a/modules/LogStats.php
+++ b/modules/LogStats.php
@@ -87,11 +87,16 @@ class Piwik_LogStats
// we decode the password. Password is html encoded because it's enclosed between " double quotes
$configDb['password'] = htmlspecialchars_decode($configDb['password']);
+ if(!isset($configDb['port']))
+ {
+ // before 0.2.4 there is no port specified in config file
+ $configDb['port'] = '3306';
+ }
self::$db = new Piwik_LogStats_Db( $configDb['host'],
$configDb['username'],
$configDb['password'],
- $configDb['dbname']
- );
+ $configDb['dbname'],
+ $configDb['port'] );
self::$db->connect();
}
diff --git a/modules/LogStats/Db.php b/modules/LogStats/Db.php
index 7637b72fdf..a84e3d5875 100644
--- a/modules/LogStats/Db.php
+++ b/modules/LogStats/Db.php
@@ -30,9 +30,9 @@ class Piwik_LogStats_Db
/**
* Builds the DB object
*/
- public function __construct( $host, $username, $password, $dbname, $driverName = 'mysql')
+ public function __construct( $host, $username, $password, $dbname, $port, $driverName = 'mysql')
{
- $this->dsn = $driverName.":dbname=$dbname;host=$host";
+ $this->dsn = $driverName.":dbname=$dbname;host=$host;port=$port";
$this->username = $username;
$this->password = $password;
}
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index 5f07d3a170..14956844d4 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -121,13 +121,17 @@ class Piwik_Installation_Controller extends Piwik_Controller
'dbname' => $form->getSubmitValue('dbname'),
'tables_prefix' => $form->getSubmitValue('tables_prefix'),
'adapter' => Zend_Registry::get('config')->database->adapter,
+ 'port' => Zend_Registry::get('config')->database->port,
);
- // we test the DB connection with these settings
try{
-// var_dump($dbInfos);exit;
$dbInfos['password'] = '"'.htmlspecialchars($form->getSubmitValue('password')).'"';
+ if(($portIndex = strpos($dbInfos['host'],':')) !== false)
+ {
+ $dbInfos['port'] = substr($dbInfos['host'], $portIndex + 1 );
+ $dbInfos['host'] = substr($dbInfos['host'], 0, $portIndex);
+ }
Piwik::createDatabaseObject($dbInfos);
$_SESSION['db_infos'] = $dbInfos;
--
GitLab