Index: branches/5.2.x/core/install.php =================================================================== diff -u -N -r14574 -r14585 --- branches/5.2.x/core/install.php (.../install.php) (revision 14574) +++ branches/5.2.x/core/install.php (.../install.php) (revision 14585) @@ -1,6 +1,6 @@ writeableFolders[] = $this->toolkit->defaultWritablePath . '/config.php'; } - if (!$this->toolkit->getSystemConfig('Misc', 'WriteablePath')) { + if ( !$this->toolkit->getSystemConfig('Misc', 'WriteablePath') ) { // set global writable folder when such setting is missing $this->toolkit->setSystemConfig('Misc', 'WriteablePath', $this->toolkit->defaultWritablePath); $this->toolkit->SaveConfig(true); // immediately save, because this path will be used in Application later } + if ( !$this->toolkit->getSystemConfig('Misc', 'RestrictedPath') ) { + $this->toolkit->setSystemConfig('Misc', 'RestrictedPath', $this->toolkit->getSystemConfig('Misc', 'WriteablePath') . DIRECTORY_SEPARATOR . '.restricted'); + $this->toolkit->SaveConfig(true); + } + $this->currentStep = $this->GetVar('step'); // can't check login on steps where no application present anyways :) @@ -369,7 +375,10 @@ $curl_helper->SetRequestData($url_params); $file_data = $curl_helper->Send(GET_LICENSE_URL); - if (substr($file_data, 0, 5) == 'Error') { + if ( !$curl_helper->isGoodResponceCode() ) { + $this->errorMessage = 'In-Portal servers temporarily unavailable. Please contact In-Portal support personnel directly.'; + } + elseif (substr($file_data, 0, 5) == 'Error') { $this->errorMessage = substr($file_data, 6) . ' If you don\'t know your username or password, contact Intechnic Support'; } @@ -1074,7 +1083,7 @@ // don't upgrade same version twice $start_pos = $match[0][1] + strlen($match[0][0]); - $end_pos = array_key_exists($index + 1, $matches) ? $matches[$index + 1][0][1] : mb_strlen($sqls); + $end_pos = array_key_exists($index + 1, $matches) ? $matches[$index + 1][0][1] : strlen($sqls); $version_sqls = substr($sqls, $start_pos, $end_pos - $start_pos); if ($start_from_query == 0) {