Index: trunk/kernel/units/email_events/email_events_event_handler.php =================================================================== diff -u -r4675 -r4845 --- trunk/kernel/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 4675) +++ trunk/kernel/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 4845) @@ -16,7 +16,7 @@ ); $this->permMapping = array_merge($this->permMapping, $permissions); } - + /** * Changes permission section to one from REQUEST, not from config * @@ -26,7 +26,7 @@ { $module = $this->Application->GetVar('module'); $module = explode(':', $module, 2); - + if (count($module) == 1) { $main_prefix = $this->Application->findModule('Name', $module[0], 'Var'); } @@ -35,11 +35,11 @@ $main_prefix = $exceptions[ $module[1] ]; } $section = $this->Application->getUnitOption($main_prefix.'.email', 'PermSection'); - + $event->setEventParam('PermSection', $section); return parent::CheckPermission($event); } - + /** * Apply any custom changes to list's sql query * @@ -91,7 +91,7 @@ WHERE '.$id_field.' IN ('.$ids.')'; $this->Conn->Query($sql); } - + $this->finalizePopup($event); } @@ -104,7 +104,7 @@ { $this->StoreSelectedIDs($event); } - + /** * Raised when email message shoul be sent * @@ -152,7 +152,7 @@ */ //Parse Message Template $message_object->Load(array('EventId' => $event_id, 'LanguageId' => $this->Application->GetVar('m_lang'))); - $message_type = $message_object->GetDBField('MessageType'); + $message_type = $message_object->GetDBField('MessageType'); // add footer: begin $sql = 'SELECT em.Template @@ -163,7 +163,7 @@ $footer = $message_object->GetDBField('MessageType') == 'text' ? strip_tags($footer[1]) : $footer[1]; $message_template = $message_object->GetDBField('Template')."\r\n".$footer; // add footer: end - + $email_object = &$this->Application->recallObject('kEmailMessage'); $email_object->Clear();