diff options
| author | vipsoft <vipsoft@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2010-06-12 08:46:13 +0400 |
|---|---|---|
| committer | vipsoft <vipsoft@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2010-06-12 08:46:13 +0400 |
| commit | df3469e8bd9ec5dad5625acdb712479a6302ca8d (patch) | |
| tree | 9091718a8aada6fcaa5407a8bce13d2e61e965c4 /plugins/Installation | |
| parent | 61bbce4d1a82580ccb18dbf0b91e60c05d34301b (diff) | |
fixes #1416, refs #642 - replace static web.config with runtime generated files (at Installation)
Diffstat (limited to 'plugins/Installation')
| -rw-r--r-- | plugins/Installation/Controller.php | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php index f83233f7eb..c3b7dd446d 100644 --- a/plugins/Installation/Controller.php +++ b/plugins/Installation/Controller.php @@ -316,7 +316,6 @@ class Piwik_Installation_Controller extends Piwik_Controller $view->someTablesInstalled = true; $minimumCountPiwikTables = 12; - $baseTablesInstalled = preg_grep('/archive_numeric|archive_blob/', $tablesInstalled, PREG_GREP_INVERT); Piwik::createAccessObject(); Piwik::setUserIsSuperUser(); @@ -656,7 +655,16 @@ class Piwik_Installation_Controller extends Piwik_Controller $infos = array(); $infos['directories'] = Piwik::checkDirectoriesWritable(); - Piwik::createHtAccessFiles(); + + $serverSoftware = $_SERVER['SERVER_SOFTWARE']; + if(preg_match('/^Microsoft-IIS\/(.+)/', $serverSoftware, $matches) && version_compare($matches[1], '7') >= 0) + { + Piwik::createWebConfigFiles(); + } + else + { + Piwik::createHtAccessFiles(); + } $infos['phpVersion_minimum'] = $minimumPhpVersion; $infos['phpVersion'] = phpversion(); @@ -764,7 +772,7 @@ class Piwik_Installation_Controller extends Piwik_Controller $infos['isIpv4'] = false; } - $infos['serverVersion'] = addslashes($_SERVER['SERVER_SOFTWARE']); + $infos['serverVersion'] = addslashes($serverSoftware); $infos['serverOs'] = @php_uname(); $infos['serverTime'] = date('H:i:s'); |