Index: branches/5.2.x/core/kernel/processors/main_processor.php =================================================================== diff -u -N -r16434 -r16513 --- branches/5.2.x/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 16434) +++ branches/5.2.x/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 16513) @@ -1,6 +1,6 @@ Application->recallObject('kActions'); - /* @var $actions Params */ $actions->Set('t', $this->Application->GetVar('t')); $actions->Set('sid', $this->Application->GetSID()); @@ -478,8 +478,8 @@ $value_list = $this->Conn->GetOne($sql); if ( $value_list ) { + /** @var InpCustomFieldsHelper $helper */ $helper = $this->Application->recallObject('InpCustomFieldsHelper'); - /* @var $helper InpCustomFieldsHelper */ $options = $helper->GetValuesHash($value_list); $ret = isset($options[$ret]) ? $options[$ret] : $ret; @@ -518,8 +518,8 @@ */ protected function DumpSystemInfo($params) { + /** @var Params $actions */ $actions = $this->Application->recallObject('kActions'); - /* @var $actions Params */ $actions->Set('t', $this->Application->GetVar('t')); @@ -547,8 +547,8 @@ $form_fields = Array (); if ( $this->Application->RewriteURLs() ) { + /** @var Session $session */ $session = $this->Application->recallObject('Session'); - /* @var $session Session */ if ( $session->NeedQueryString() ) { $form_fields['sid'] = $this->Application->GetSID(); @@ -614,14 +614,14 @@ $phrase_key = mb_strtoupper($phrase_name); if ( $default_translation && strpos($translation, '!' . $phrase_key . '!') !== false ) { + /** @var kDBItem $phrase */ $phrase = $this->Application->recallObject('phrases.autocreate', null, Array ('skip_autoload' => true)); - /* @var $phrase kDBItem */ if ( !$phrase->Load($phrase_key, 'PhraseKey') ) { $phrase->SetDBField('Phrase', $phrase_name); + /** @var kMultiLanguageHelper $ml_helper */ $ml_helper = $this->Application->recallObject('kMultiLanguageHelper'); - /* @var $ml_helper kMultiLanguageHelper */ $languages = $ml_helper->getLanguages(); @@ -848,8 +848,8 @@ */ function CheckPermission($params) { + /** @var kPermissionsHelper $perm_helper */ $perm_helper = $this->Application->recallObject('PermissionsHelper'); - /* @var $perm_helper kPermissionsHelper */ return $perm_helper->TagPermissionCheck($params); } @@ -873,8 +873,8 @@ (isset($params['perm_prefix']) && $params['perm_prefix']) || (isset($params['permissions']) && $params['permissions'])) { + /** @var kPermissionsHelper $perm_helper */ $perm_helper = $this->Application->recallObject('PermissionsHelper'); - /* @var $perm_helper kPermissionsHelper */ $perm_status = $perm_helper->TagPermissionCheck($params); if (!$perm_status) { @@ -1015,8 +1015,8 @@ $require = $this->Application->ConfigValue('Require_AdminSSL'); } + /** @var kHTTPQuery $http_query */ $http_query = $this->Application->recallObject('HTTPQuery'); - /* @var $http_query kHTTPQuery */ $pass = $http_query->getRedirectParams(); $pass['pass_events'] = 1; // to make sure all events are passed when redirect happens @@ -1131,8 +1131,8 @@ $path = FULL_PATH . '/' . $params['path']; $pseudo = isset($params['special']) ? 'EmailSender.' . $params['special'] : 'EmailSender'; + /** @var kEmailSendingHelper $esender */ $esender = $this->Application->recallObject($pseudo); - /* @var $esender kEmailSendingHelper */ if ( file_exists($path) && is_file($path) ) { $esender->AddAttachment($path); @@ -1144,8 +1144,8 @@ $this->NoDebug($params); $this->Application->SetVar('skip_last_template', 1); + /** @var kCaptchaHelper $captcha_helper */ $captcha_helper = $this->Application->recallObject('CaptchaHelper'); - /* @var $captcha_helper kCaptchaHelper */ // generate captcha code $code = $captcha_helper->prepareCode( $this->Application->GetVar('var') );