Index: branches/5.3.x/core/install.php =================================================================== diff -u -N -r16156 -r16519 --- branches/5.3.x/core/install.php (.../install.php) (revision 16156) +++ branches/5.3.x/core/install.php (.../install.php) (revision 16519) @@ -1,6 +1,6 @@ Application->GetVar('next_preset'); if ($next_preset !== false) { + /** @var UserHelper $user_helper */ $user_helper = $this->Application->recallObject('UserHelper'); - /* @var $user_helper UserHelper */ $username = $this->Application->GetVar('login'); $password = $this->Application->GetVar('password'); @@ -411,8 +411,8 @@ 'domain' => base64_encode($_SERVER['HTTP_HOST']), ); + /** @var kCurlHelper $curl_helper */ $curl_helper = $this->Application->recallObject('CurlHelper'); - /* @var $curl_helper kCurlHelper */ $curl_helper->SetRequestData($url_params); $file_data = $curl_helper->Send(GET_LICENSE_URL); @@ -473,8 +473,8 @@ fwrite($fp, "Application->recallObject('CurlHelper'); - /* @var $curl_helper kCurlHelper */ $output = $curl_helper->Send($this->Application->BaseURL() . ltrim(WRITEBALE_BASE, '/') . '/install_check.php'); unlink(WRITEABLE . '/install_check.php'); @@ -674,8 +674,8 @@ case 2: // Upload License File $file_data = array_map('trim', file($_FILES['license_file']['tmp_name'])); if ((count($file_data) == 3) && $file_data[1]) { + /** @var kModulesHelper $modules_helper */ $modules_helper = $this->Application->recallObject('kModulesHelper'); - /* @var $modules_helper kModulesHelper */ if ($modules_helper->verifyLicense($file_data[1])) { $this->toolkit->systemConfig->set('License', 'Intechnic', $file_data[1]); @@ -694,8 +694,8 @@ case 3: // Use Existing License $license_hash = $this->toolkit->systemConfig->get('License', 'Intechnic'); if ($license_hash) { + /** @var kModulesHelper $modules_helper */ $modules_helper = $this->Application->recallObject('kModulesHelper'); - /* @var $modules_helper kModulesHelper */ if (!$modules_helper->verifyLicense($license_hash)) { $this->errorMessage = 'Invalid or corrupt license detected'; @@ -723,8 +723,8 @@ $license_password = $this->GetVar('password'); $license_id = $this->GetVar('licenses'); + /** @var kCurlHelper $curl_helper */ $curl_helper = $this->Application->recallObject('CurlHelper'); - /* @var $curl_helper kCurlHelper */ if (strlen($license_login) && strlen($license_password) && !$license_id) { // Here we determine weather login is ok & check available licenses @@ -795,8 +795,8 @@ break; case 'select_domain': + /** @var kModulesHelper $modules_helper */ $modules_helper = $this->Application->recallObject('kModulesHelper'); - /* @var $modules_helper kModulesHelper */ // get domain name as entered by user on the form $domain = $this->GetVar('domain') == 1 ? $_SERVER['HTTP_HOST'] : str_replace(' ', '', $this->GetVar('other')); @@ -841,8 +841,8 @@ case 'root_password': // update root password in database + /** @var kPasswordFormatter $password_formatter */ $password_formatter = $this->Application->recallObject('kPasswordFormatter'); - /* @var $password_formatter kPasswordFormatter */ $config_values = Array ( 'RootPass' => $password_formatter->hashPassword($this->Application->GetVar('root_password')), @@ -858,8 +858,8 @@ $this->toolkit->saveConfigValues($config_values); + /** @var UserHelper $user_helper */ $user_helper = $this->Application->recallObject('UserHelper'); - /* @var $user_helper UserHelper */ // login as "root", when no errors on password screen $user_helper->loginUser('root', $this->Application->GetVar('root_password')); @@ -871,8 +871,8 @@ $this->Application->Session->SetField('Language', 1); // set imported language as primary + /** @var LanguagesItem $lang */ $lang = $this->Application->recallObject('lang.-item', null, Array('skip_autoload' => true)); - /* @var $lang LanguagesItem */ $lang->Load(1); // fresh install => ID=1 $lang->setPrimary(true); // for Front-End @@ -891,8 +891,8 @@ } // update category cache + /** @var kPermCacheUpdater $updater */ $updater = $this->Application->makeClass('kPermCacheUpdater'); - /* @var $updater kPermCacheUpdater */ $updater->OneStepRun(); break; @@ -923,8 +923,8 @@ $theme_name = $this->Conn->GetOne($sql); $site_path = $this->toolkit->systemConfig->get('WebsitePath','Misc') . '/'; + /** @var FileHelper $file_helper */ $file_helper = $this->Application->recallObject('FileHelper'); - /* @var $file_helper FileHelper */ foreach ($this->Application->ModuleInfo as $module_name => $module_info) { if ($module_name == 'In-Portal') { @@ -999,8 +999,8 @@ } // 3. update all theme language packs + /** @var kThemesHelper $themes_helper */ $themes_helper = $this->Application->recallObject('ThemesHelper'); - /* @var $themes_helper kThemesHelper */ $themes_helper->synchronizeModule(false); @@ -1027,11 +1027,11 @@ $this->toolkit->rebuildThemes(); // compile admin skin, so it will be available in 3 frames at once + /** @var SkinHelper $skin_helper */ $skin_helper = $this->Application->recallObject('SkinHelper'); - /* @var $skin_helper SkinHelper */ + /** @var kDBItem $skin */ $skin = $this->Application->recallObject('skin', null, Array ('skip_autoload' => true)); - /* @var $skin kDBItem */ $skin->Load(1, 'IsPrimary'); $skin_helper->compile($skin); @@ -1070,8 +1070,8 @@ if ($this->currentStep == -1) { // step after last step -> redirect to admin + /** @var UserHelper $user_helper */ $user_helper = $this->Application->recallObject('UserHelper'); - /* @var $user_helper UserHelper */ $user_helper->logoutUser(); @@ -1256,8 +1256,8 @@ $upgrade_classes[$module_path] = $upgrade_class; } + /** @var CoreUpgrades $upgrade_object */ $upgrade_object = new $upgrade_classes[$module_path](); - /* @var $upgrade_object CoreUpgrades */ $upgrade_object->setToolkit($this->toolkit);