Index: branches/5.2.x/core/units/site_domains/site_domain_eh.php =================================================================== diff -u -N -r14560 -r14628 --- branches/5.2.x/core/units/site_domains/site_domain_eh.php (.../site_domain_eh.php) (revision 14560) +++ branches/5.2.x/core/units/site_domains/site_domain_eh.php (.../site_domain_eh.php) (revision 14628) @@ -1,6 +1,6 @@ Name == 'OnItemBuild') { // check permission without using $event->getSection(), @@ -104,21 +106,21 @@ */ function LoadItem(&$event) { - if ($this->Application->isAdmin) { + if ( $this->Application->isAdmin ) { // don't load domain data from cache parent::LoadItem($event); - return ; + return; } $object =& $event->getObject(); /* @var $object kDBItem */ $id = (int)$this->getPassedID($event); - if ($object->isLoaded() && ($object->GetID() == $id)) { + if ( $object->isLoaded() && ($object->GetID() == $id) ) { // object is already loaded by same id - return ; + return; } $site_helper =& $this->Application->recallObject('SiteHelper'); @@ -127,9 +129,11 @@ $site_domains = $site_helper->getSiteDomains(); $domain_data = array_key_exists($id, $site_domains) ? $site_domains[$id] : false; - if ($object->LoadFromHash($domain_data)) { + if ( $object->LoadFromHash($domain_data) ) { $actions =& $this->Application->recallObject('kActions'); - $actions->Set($event->getPrefixSpecial().'_id', $object->GetID() ); + /* @var $actions Params */ + + $actions->Set($event->getPrefixSpecial() . '_id', $object->GetID()); } else { $object->setID($id); @@ -162,8 +166,9 @@ $this->Application->setUnitOption($event->Prefix, 'Fields', $fields); // remove grid columns - $grids = $this->Application->getUnitOption($event->Prefix, 'Grids'); - + $grids = $this->Application->getUnitOption($event->Prefix, 'Grids', Array ()); + /* @var $grids Array */ + foreach ($grids as $grid_name => $grid_info) { foreach ($remove_fields as $remove_field) { if (array_key_exists($remove_field, $grid_info['Fields'])) { @@ -180,12 +185,14 @@ * Delete cached information about site domains * * @param kEvent $event + * @return void + * @access protected */ - function OnSave(&$event) + protected function OnSave(&$event) { parent::OnSave($event); - if ($event->status == kEvent::erSUCCESS) { + if ( $event->status == kEvent::erSUCCESS ) { $this->_deleteCache(); } } @@ -207,11 +214,13 @@ } /** - * Set's required fields based on redirect mode + * Sets required fields based on redirect mode * * @param kEvent $event + * @return void + * @access protected */ - function OnAfterItemLoad(&$event) + protected function OnAfterItemLoad(&$event) { parent::OnAfterItemLoad($event); @@ -222,8 +231,10 @@ * Set's required fields based on redirect mode * * @param kEvent $event + * @return void + * @access protected */ - function OnBeforeItemCreate(&$event) + protected function OnBeforeItemCreate(&$event) { parent::OnBeforeItemCreate($event); @@ -234,8 +245,10 @@ * Set's required fields based on redirect mode * * @param kEvent $event + * @return void + * @access protected */ - function OnBeforeItemUpdate(&$event) + protected function OnBeforeItemUpdate(&$event) { parent::OnBeforeItemUpdate($event);