Index: branches/5.0.x/core/admin_templates/config/config_email_edit.tpl =================================================================== diff -u --- branches/5.0.x/core/admin_templates/config/config_email_edit.tpl (revision 0) +++ branches/5.0.x/core/admin_templates/config/config_email_edit.tpl (revision 12244) @@ -0,0 +1,80 @@ + + + + + + + + + + + + + +
+ +
+ + + + +
+ + + + + + + + + + + + +
+
+ + \ No newline at end of file Index: branches/5.0.x/core/units/email_events/email_events_event_handler.php =================================================================== diff -u -r12196 -r12244 --- branches/5.0.x/core/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 12196) +++ branches/5.0.x/core/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 12244) @@ -1,6 +1,6 @@ Application->getUnitOption($event->Prefix, 'TableName'); $sql = 'UPDATE '.$table_name.' - SET Enabled = 2 + SET FrontEndOnly = 1 WHERE EventId IN ('.$ids.')'; $this->Conn->Query($sql); + + $this->clearSelectedIDs($event); } /** @@ -99,6 +101,11 @@ */ function OnSelectUser(&$event) { + if ($event->Special != 'module') { + parent::OnSelectUser($event); + return ; + } + $items_info = $this->Application->GetVar('u'); if ($items_info) { $user_id = array_shift( array_keys($items_info) ); @@ -152,11 +159,11 @@ return false; } - $enabled = $email_event->GetDBField('Enabled'); - if ($enabled == EVENT_STATUS_DISABLED) { + if ($email_event->GetDBField('Enabled') == STATUS_DISABLED) { return false; } - if ($enabled == EVENT_STATUS_FRONTEND && $this->Application->IsAdmin()) { + + if ($email_event->GetDBField('FrontEndOnly') && $this->Application->IsAdmin()) { return false; } @@ -190,7 +197,7 @@ /* @var $user UsersItem */ $email = $name = ''; - $result = $user_id > 0 ? $user->Load($user_id) : $user->Clear(); + $result = $user_id > 0 ? $user->Load( (int)$user_id ) : $user->Clear(); if ($user->IsLoaded()) { $email = $user->GetDBField('Email'); $name = trim($user->GetDBField('FirstName').' '.$user->GetDBField('LastName')); Index: branches/5.0.x/core/admin_templates/languages/email_message_list.tpl =================================================================== diff -u -r12117 -r12244 --- branches/5.0.x/core/admin_templates/languages/email_message_list.tpl (.../email_message_list.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/languages/email_message_list.tpl (.../email_message_list.tpl) (revision 12244) @@ -5,8 +5,8 @@ -
-
- + + + + + row-disabled + + + + \ No newline at end of file Index: branches/5.0.x/core/units/email_messages/email_messages_event_handler.php =================================================================== diff -u -r12117 -r12244 --- branches/5.0.x/core/units/email_messages/email_messages_event_handler.php (.../email_messages_event_handler.php) (revision 12117) +++ branches/5.0.x/core/units/email_messages/email_messages_event_handler.php (.../email_messages_event_handler.php) (revision 12244) @@ -1,6 +1,6 @@ addFilter('module_filter', 'Module = ' . $this->Conn->qstr($module)); } - if ($event->Special == 'st') { + if (($event->Special == 'st') && !$this->Application->isDebugMode()) { $object->addFilter('enabled_filter', TABLE_PREFIX . 'Events.Enabled <> ' . STATUS_DISABLED); } } @@ -156,6 +156,30 @@ } /** + * Enabled/disables actual email event + * + * @param kEvent $event + */ + function OnAfterItemUpdate(&$event) + { + parent::OnAfterItemUpdate($event); + + $object =& $event->getObject(); + /* @var $object kDBItem */ + + if ($object->GetDBField('Enabled') != $object->GetOriginalField('Enabled')) { + $email_event =& $this->Application->recallObject('emailevents.-item', null, Array ('skip_autoload' => true)); + /* @var $email_event kDBItem */ + + $email_event->Load( $object->GetDBField('EventId') ); + if ($email_event->isLoaded()) { + $email_event->SetDBField('Enabled', $object->GetDBField('Enabled')); + $email_event->Update(); + } + } + } + + /** * Merge body+subject+headers into message template * * @param kEvent $event Index: branches/5.0.x/core/kernel/constants.php =================================================================== diff -u -r12231 -r12244 --- branches/5.0.x/core/kernel/constants.php (.../constants.php) (revision 12231) +++ branches/5.0.x/core/kernel/constants.php (.../constants.php) (revision 12244) @@ -1,6 +1,6 @@ Conn->GetCol($sql); } + + /** + * Removes "Enabled" column, when not in debug mode + * + * @param Array $params + */ + function ModifyUnitConfig($params) + { + if (!$this->Application->isDebugMode()) { + $grids = $this->Application->getUnitOption($this->Prefix, 'Grids'); + + foreach ($grids as $grid_name => $grid_data) { + if (array_key_exists('Enabled', $grid_data['Fields'])) { + unset($grids[$grid_name]['Fields']['Enabled']); + } + } + + $this->Application->setUnitOption($this->Prefix, 'Grids', $grids); + } + } } ?> \ No newline at end of file Index: branches/5.0.x/core/install/install_schema.sql =================================================================== diff -u -r12231 -r12244 --- branches/5.0.x/core/install/install_schema.sql (.../install_schema.sql) (revision 12231) +++ branches/5.0.x/core/install/install_schema.sql (.../install_schema.sql) (revision 12244) @@ -107,14 +107,16 @@ Event varchar(40) NOT NULL default '', ReplacementTags text, Enabled int(11) NOT NULL default '1', - FromUserId int(11) NOT NULL default '-1', + FrontEndOnly tinyint(3) unsigned NOT NULL default '0', + FromUserId int(11) default NULL, Module varchar(40) NOT NULL default '', Description varchar(255) NOT NULL default '', - Type int(11) NOT NULL default '0', + `Type` int(11) NOT NULL default '0', PRIMARY KEY (EventId), - KEY Type (Type), + KEY `Type` (`Type`), KEY Enabled (Enabled), - KEY Event (Event) + KEY Event (Event), + KEY FrontEndOnly (FrontEndOnly) ); CREATE TABLE IdGenerator ( Index: branches/5.0.x/core/install/upgrades.sql =================================================================== diff -u -r12238 -r12244 --- branches/5.0.x/core/install/upgrades.sql (.../upgrades.sql) (revision 12238) +++ branches/5.0.x/core/install/upgrades.sql (.../upgrades.sql) (revision 12244) @@ -1417,4 +1417,14 @@ UPDATE ConfigurationValues SET Section = 'in-portal:configure_general' WHERE VariableName = 'SessionTimeout'; UPDATE ConfigurationAdmin SET DisplayOrder = DisplayOrder - 0.01 WHERE VariableName IN ('KeepSessionOnBrowserClose', 'SessionReferrerCheck', 'UseJSRedirect'); +ALTER TABLE Events + ADD FrontEndOnly TINYINT UNSIGNED NOT NULL DEFAULT '0' AFTER Enabled, + ADD INDEX (FrontEndOnly); + +UPDATE Events SET FrontEndOnly = 1 WHERE Enabled = 2; +UPDATE Events SET Enabled = 1 WHERE Enabled = 2; + +ALTER TABLE Events CHANGE FromUserId FromUserId INT(11) NULL DEFAULT NULL; +UPDATE Events SET FromUserId = NULL WHERE FromUserId = 0; + UPDATE Modules SET Version = '5.0.1', Loaded = 1 WHERE Name = 'In-Portal'; \ No newline at end of file Index: branches/5.0.x/core/units/email_messages/email_messages_config.php =================================================================== diff -u -r12117 -r12244 --- branches/5.0.x/core/units/email_messages/email_messages_config.php (.../email_messages_config.php) (revision 12117) +++ branches/5.0.x/core/units/email_messages/email_messages_config.php (.../email_messages_config.php) (revision 12244) @@ -1,6 +1,6 @@ 'EmailMessageId', 'TitleField' => 'Subject', + 'StatusField' => Array ('Enabled'), 'TitlePresets' => Array ( 'email_messages_direct_list' => Array ( 'prefixes' => Array ('emailmessages.st_List'), 'format' => "!la_title_EmailMessages!", - 'toolbar_buttons' => Array ('edit', 'view', 'dbl-click'), + 'toolbar_buttons' => Array ('edit', 'approve', 'decline', 'view', 'dbl-click'), ), 'email_messages_edit_direct' => Array ( 'prefixes' => Array ('emailmessages'), @@ -64,10 +65,11 @@ LEFT JOIN '.TABLE_PREFIX.'Events ON '.TABLE_PREFIX.'Events.EventId = %1$s.EventId' ), - 'ItemSQLs' => Array ( - '' => ' SELECT %1$s.* %2$s - FROM %1$s - LEFT JOIN '.TABLE_PREFIX.'Events ON '.TABLE_PREFIX.'Events.EventId = %1$s.EventId' + 'ListSortings' => Array ( + '' => Array ( + 'ForcedSorting' => Array ('Enabled' => 'desc'), + 'Sorting' => Array ('Description' => 'asc') + ), ), 'ForeignKey' => 'LanguageId', @@ -82,6 +84,7 @@ 'Module' => TABLE_PREFIX.'Events.Module', 'Type' => TABLE_PREFIX.'Events.Type', 'ReplacementTags' => TABLE_PREFIX.'Events.ReplacementTags', + 'Enabled' => TABLE_PREFIX.'Events.Enabled', ), ), @@ -106,6 +109,12 @@ 'Module' => Array('type' => 'string','not_null' => '1','default' => ''), 'Type' => Array('formatter'=>'kOptionsFormatter', 'options' => Array (1 => 'la_Text_Admin', 0 => 'la_Text_User'), 'use_phrases' => 1, 'default' => 0, 'not_null' => 1), + 'Enabled' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 1 + ), + // for mass mail sending 'MassSubject' => Array ('type' => 'string', 'default' => ''), 'MassAttachment' => Array ('type' => 'string', 'formatter' => 'kUploadFormatter', 'upload_dir' => ITEM_FILES_PATH, 'max_size' => 50000000, 'default' => ''), @@ -125,13 +134,14 @@ ), 'Emails' => Array( - 'Icons' => Array ('default' => 'icon16_custom.gif'), + 'Icons' => Array (1 => 'icon16_language.gif', 0 => 'icon16_language_disabled.gif'), 'Fields' => Array( 'EventId' => Array( 'title'=>'la_col_Id', 'filter_block' => 'grid_range_filter'), 'Subject' => Array( 'title'=>'la_col_Subject', 'filter_block' => 'grid_like_filter'), 'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'label_grid_checkbox_td', 'filter_block' => 'grid_like_filter'), 'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter'), 'LanguageId' => Array( 'title'=>'la_col_Language', 'filter_block' => 'grid_options_filter'), + 'Enabled' => Array( 'title'=>'la_col_Enabled', 'filter_block' => 'grid_options_filter'), ), ), Index: branches/5.0.x/core/units/email_events/email_events_config.php =================================================================== diff -u -r12117 -r12244 --- branches/5.0.x/core/units/email_events/email_events_config.php (.../email_events_config.php) (revision 12117) +++ branches/5.0.x/core/units/email_events/email_events_config.php (.../email_events_config.php) (revision 12244) @@ -1,6 +1,6 @@ 'emailevents', - 'ItemClass' => Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'), - 'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'), - 'EventHandlerClass' => Array('class'=>'EmailEventsEventsHandler','file'=>'email_events_event_handler.php','build_event'=>'OnBuild'), - 'TagProcessorClass' => Array('class'=>'kDBTagProcessor','file'=>'','build_event'=>'OnBuild'), - 'AutoLoad' => true, + $config = Array ( + 'Prefix' => 'emailevents', + 'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'), + 'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'), + 'EventHandlerClass' => Array ('class' => 'EmailEventsEventsHandler', 'file' => 'email_events_event_handler.php', 'build_event' => 'OnBuild'), + 'TagProcessorClass' => Array ('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'), - 'QueryString' => Array( - 1 => 'id', - 2 => 'page', - 3 => 'event', - ), + 'AutoLoad' => true, - 'IDField' => 'EventId', + 'QueryString' => Array ( + 1 => 'id', + 2 => 'Page', + 3 => 'event', + 4 => 'mode', + ), - 'StatusField' => Array('Enabled'), + 'IDField' => 'EventId', + 'StatusField' => Array ('Enabled'), + 'TitleField' => 'Event', - 'TitleField' => 'Event', + 'TitlePresets' => Array ( + 'default' => Array ( + 'edit_status_labels' => Array ('emailevents' => '!la_title_EditingEmailEvent!'), + ), - 'TitlePresets' => Array( - 'email_settings_list' => Array('prefixes' => Array('emailevents.module_List'), 'format' => '!la_title_EmailSettings!'), + 'email_settings_list' => Array ('prefixes' => Array ('emailevents.module_List'), 'format' => '!la_title_EmailSettings!'), - 'email_send_form' => Array('prefixes' => Array(), 'format' => '!la_title_SendEmail!'), - 'email_prepare' => Array('prefixes' => Array(), 'format' => '!la_title_PreparingEmailsForSending!. !la_title_PleaseWait!'), - 'email_send' => Array('prefixes' => Array(), 'format' => '!la_title_SendingPreparedEmails!. !la_title_PleaseWait!'), - 'email_send_complete' => Array('prefixes' => Array(), 'format' => '!la_title_SendMailComplete!'), - ), + 'email_settings_edit' => Array ( + 'prefixes' => Array ('emailevents'), 'format' => "#emailevents_status# '#emailevents_titlefield#'", + 'toolbar_button' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'), + ), - 'PermSection' => Array('main' => 'in-portal:configure_lang'), + 'email_send_form' => Array ('prefixes' => Array (), 'format' => '!la_title_SendEmail!'), + 'email_prepare' => Array ('prefixes' => Array (), 'format' => '!la_title_PreparingEmailsForSending!. !la_title_PleaseWait!'), + 'email_send' => Array ('prefixes' => Array (), 'format' => '!la_title_SendingPreparedEmails!. !la_title_PleaseWait!'), + 'email_send_complete' => Array ('prefixes' => Array (), 'format' => '!la_title_SendMailComplete!'), + ), - 'FilterMenu' => Array( - 'Groups' => Array( - Array('mode' => 'AND', 'filters' => Array('show_enabled','show_disabled','show_frontonly'), 'type' => WHERE_FILTER), - ), - 'Filters' => Array( - 'show_enabled' => Array('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 1' ), - 'show_disabled' => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 0' ), - 'show_frontonly' => Array('label' => 'la_Text_FrontOnly', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 2' ), - ) - ), + 'PermSection' => Array ('main' => 'in-portal:configure_lang'), - 'TableName' => TABLE_PREFIX.'Events', + 'FilterMenu' => Array ( + 'Groups' => Array ( + Array ('mode' => 'AND', 'filters' => Array ('show_enabled', 'show_disabled', 'show_frontonly'), 'type' => WHERE_FILTER), + ), - 'CalculatedFields' => Array( - '' => Array ( - 'FromUser' => 'u.Login', - ) - ), + 'Filters' => Array ( + 'show_enabled' => Array ('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 1' ), + 'show_disabled' => Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 0' ), + 'show_frontonly' => Array ('label' => 'la_Text_FrontOnly', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 2' ), + ) + ), - 'ListSQLs' => Array( ''=>' SELECT %1$s.* %2$s - FROM %1$s - LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.FromUserId = u.PortalUserId', - ), // key - special, value - list select sql), + 'TableName' => TABLE_PREFIX . 'Events', - 'ItemSQLs' => Array( ''=>'SELECT * FROM %s'), + 'CalculatedFields' => Array ( + '' => Array ( + 'FromUser' => 'u.Login', + ) + ), - 'ListSortings' => Array( - '' => Array('Sorting' => Array('Module' => 'asc', 'Description' => 'asc') ), + 'ListSQLs' => Array ( + '' => ' SELECT %1$s.* %2$s + FROM %1$s + LEFT JOIN ' . TABLE_PREFIX . 'PortalUser u ON %1$s.FromUserId = u.PortalUserId', + ), - 'module' => Array('Sorting' => Array('Description' => 'asc') ), - ), + 'ListSortings' => Array ( + '' => Array ('Sorting' => Array ('Module' => 'asc', 'Description' => 'asc')), + 'module' => Array ('Sorting' => Array ('Description' => 'asc') ), + ), - 'Fields' => Array( - 'EventId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'Event' => Array('type' => 'string','not_null' => '1','default' => ''), - 'ReplacementTags' => Array ('type' => 'string', 'default' => NULL), - 'Enabled' => Array('type'=>'int', 'formatter'=>'kOptionsFormatter', 'options' => Array(1 => 'la_Enabled', 0 => 'la_Disabled', 2 => 'la_Text_FrontOnly'), 'use_phrases' => 1, 'default' => 1, 'not_null' => 1), - 'FromUserId' => Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(-1=>'root'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'required'=>1, 'not_null' => 1, 'default' => -1), - 'Module' => Array('type' => 'string','not_null' => '1','default' => ''), - 'Description' => Array('type' => 'string','not_null' => '1','default' => ''), - 'Type' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options' => Array (1 => 'la_Text_Admin', 0 => 'la_Text_User'), 'use_phrases' => 1, 'default' => 0, 'not_null' => 1), - ), - 'VirtualFields' => Array( - 'FromUser' => Array(), - ), + 'Fields' => Array ( + 'EventId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'Event' => Array ('type' => 'string', 'not_null' => 1, 'required' => 1, 'default' => ''), + 'ReplacementTags' => Array ('type' => 'string', 'default' => NULL), - 'Grids' => Array( - 'Default' => Array ( - 'Icons' => Array('default'=>'icon16_custom.gif'), - 'Fields' => Array( - 'EventId' => Array('title' => 'la_col_Id', 'filter_block' => 'grid_range_filter'), - 'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'label_grid_checkbox_td', 'filter_block' => 'grid_like_filter'), - 'Event' => Array( 'title'=>'la_col_Event', 'filter_block' => 'grid_like_filter'), - 'Module' => Array( 'title'=>'la_col_Module', 'filter_block' => 'grid_like_filter'), - 'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter'), - 'Enabled' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter'), - ), - ), + 'Enabled' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 1 + ), - 'EmailSettings' => Array ( - 'Icons' => Array('default'=>'icon16_custom.gif'), - 'Fields' => Array( - 'EventId' => Array('title' => 'la_col_Id', 'filter_block' => 'grid_range_filter'), - 'Description' => Array('title'=>'la_col_Description', 'data_block' => 'label_grid_checkbox_td' ), - 'Type' => Array('title'=>'la_col_Type', 'filter_block' => 'grid_options_filter'), - 'Enabled' => Array('title'=>'la_col_Status', 'filter_block' => 'grid_options_filter'), - 'FromUser' => Array('title'=>'la_col_FromToUser', 'filter_block' => 'grid_like_filter'), - ), - ), - ), + 'FrontEndOnly' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0 + ), + + 'FromUserId' => Array ( + 'type' => 'int', + 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (-1 => 'root'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', + 'default' => NULL + ), + + 'Module' => Array ('type' => 'string', 'not_null' => 1, 'required' => 1, 'default' => ''), + 'Description' => Array ('type' => 'string', 'not_null' => 1, 'required' => 1, 'default' => ''), + 'Type' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Text_Admin', 0 => 'la_Text_User'), 'use_phrases' => 1, + 'not_null' => 1, 'required' => 1, 'default' => 0 + ), + ), + + 'VirtualFields' => Array ( + 'FromUser' => Array ('type' => 'string', 'default' => ''), + ), + + 'Grids' => Array ( + 'Default' => Array ( + 'Icons' => Array ('default' => 'icon16_custom.gif'), + 'Fields' => Array ( + 'EventId' => Array ('title' => 'la_col_Id', 'filter_block' => 'grid_range_filter'), + 'Description' => Array ( 'title' => 'la_col_Description', 'data_block' => 'label_grid_checkbox_td', 'filter_block' => 'grid_like_filter'), + 'Event' => Array ( 'title' => 'la_col_Event', 'filter_block' => 'grid_like_filter'), + 'Module' => Array ( 'title' => 'la_col_Module', 'filter_block' => 'grid_like_filter'), + 'Type' => Array ( 'title' => 'la_col_Type', 'filter_block' => 'grid_options_filter'), + 'Enabled' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter'), + ), + ), + + 'EmailSettings' => Array ( + 'Icons' => Array ('default' => 'icon16_custom.gif'), + 'Fields' => Array ( + 'EventId' => Array ('title' => 'la_col_Id', 'filter_block' => 'grid_range_filter'), + 'Description' => Array ('title' => 'la_col_Description', 'data_block' => 'label_grid_checkbox_td' ), + 'Type' => Array ('title' => 'la_col_Type', 'filter_block' => 'grid_options_filter'), + 'Enabled' => Array ('title' => 'la_col_Enabled', 'filter_block' => 'grid_options_filter'), + 'FrontEndOnly' => Array ('title' => 'la_col_FrontEndOnly', 'filter_block' => 'grid_options_filter'), + 'FromUser' => Array ('title' => 'la_col_FromToUser', 'filter_block' => 'grid_like_filter'), + ), + ), + ), ); \ No newline at end of file Index: branches/5.0.x/core/admin_templates/config/config_email.tpl =================================================================== diff -u -r12117 -r12244 --- branches/5.0.x/core/admin_templates/config/config_email.tpl (.../config_email.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/config/config_email.tpl (.../config_email.tpl) (revision 12244) @@ -7,43 +7,77 @@ -
- @@ -55,9 +89,9 @@ - + \ No newline at end of file Index: branches/5.0.x/core/admin_templates/languages/email_message_edit.tpl =================================================================== diff -u -r12117 -r12244 --- branches/5.0.x/core/admin_templates/languages/email_message_edit.tpl (.../email_message_edit.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/languages/email_message_edit.tpl (.../email_message_edit.tpl) (revision 12244) @@ -48,12 +48,12 @@ - + - +
Index: branches/5.0.x/core/install/install_data.sql =================================================================== diff -u -r12238 -r12244 --- branches/5.0.x/core/install/install_data.sql (.../install_data.sql) (revision 12238) +++ branches/5.0.x/core/install/install_data.sql (.../install_data.sql) (revision 12244) @@ -224,44 +224,44 @@ INSERT INTO ItemTypes VALUES (1, 'In-Portal', 'c', 'Category', 'Name', 'CreatedById', NULL, NULL, 'la_ItemTab_Categories', 1, 'admin/category/addcategory.php', 'clsCategory', 'Category'); INSERT INTO ItemTypes VALUES (6, 'In-Portal', 'u', 'PortalUser', 'Login', 'PortalUserId', NULL, NULL, '', 0, '', 'clsPortalUser', 'User'); -INSERT INTO Events VALUES (DEFAULT, 'USER.ADD', NULL, 1, 0, 'Core:Users', 'la_event_user.add', 0); -INSERT INTO Events VALUES (DEFAULT, 'USER.ADD', NULL, 2, 0, 'Core:Users', 'la_event_user.add', 1); -INSERT INTO Events VALUES (DEFAULT, 'USER.APPROVE', NULL, 1, 0, 'Core:Users', 'la_event_user.approve', 0); -INSERT INTO Events VALUES (DEFAULT, 'USER.APPROVE', NULL, 2, 0, 'Core:Users', 'la_event_user.approve', 1); -INSERT INTO Events VALUES (DEFAULT, 'USER.VALIDATE', NULL, 1, 0, 'Core:Users', 'la_event_user.validate', 0); -INSERT INTO Events VALUES (DEFAULT, 'USER.VALIDATE', NULL, 2, 0, 'Core:Users', 'la_event_user.validate', 1); -INSERT INTO Events VALUES (DEFAULT, 'USER.DENY', NULL, 1, 0, 'Core:Users', 'la_event_user.deny', 0); -INSERT INTO Events VALUES (DEFAULT, 'USER.DENY', NULL, 2, 0, 'Core:Users', 'la_event_user.deny', 1); -INSERT INTO Events VALUES (DEFAULT, 'USER.PSWD', NULL, 2, 0, 'Core:Users', 'la_event_user.forgotpw', 1); -INSERT INTO Events VALUES (DEFAULT, 'USER.PSWD', NULL, 1, 0, 'Core:Users', 'la_event_user.forgotpw', 0); -INSERT INTO Events VALUES (DEFAULT, 'USER.ADD.PENDING', NULL, 1, 0, 'Core:Users', 'la_event_user.add.pending', 0); -INSERT INTO Events VALUES (DEFAULT, 'USER.ADD.PENDING', NULL, 2, 0, 'Core:Users', 'la_event_user.add.pending', 1); -INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.ADD', NULL, 1, 0, 'Core:Category', 'la_event_category.add', 0); -INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.ADD.PENDING', NULL, 1, 0, 'Core:Category', 'la_event_category.add.pending', 0); -INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.ADD.PENDING', NULL, 2, 0, 'Core:Category', 'la_event_category.add.pending', 1); -INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.ADD', NULL, 2, 0, 'Core:Category', 'la_event_category.add', 1); -INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.DELETE', NULL, 1, 0, 'Core:Category', 'la_event_category_delete', 0); -INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.DELETE', NULL, 2, 0, 'Core:Category', 'la_event_category_delete', 1); -INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.MODIFY', NULL, 1, 0, 'Core:Category', 'la_event_category.modify', 0); -INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.MODIFY', NULL, 2, 0, 'Core:Category', 'la_event_category.modify', 1); -INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.APPROVE', NULL, 1, 0, 'Core:Category', 'la_event_category.approve', 0); -INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.APPROVE', NULL, 2, 0, 'Core:Category', 'la_event_category.approve', 1); -INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.DENY', NULL, 1, 0, 'Core:Category', 'la_event_category.deny', 0); -INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.DENY', NULL, 2, 0, 'Core:Category', 'la_event_category.deny', 1); -INSERT INTO Events VALUES (DEFAULT, 'USER.SUBSCRIBE', NULL, 1, 0, 'Core:Users', 'la_event_user.subscribe', 0); -INSERT INTO Events VALUES (DEFAULT, 'USER.SUBSCRIBE', NULL, 2, 0, 'Core:Users', 'la_event_user.subscribe', 1); -INSERT INTO Events VALUES (DEFAULT, 'USER.UNSUBSCRIBE', NULL, 1, 0, 'Core:Users', 'la_event_user.unsubscribe', 0); -INSERT INTO Events VALUES (DEFAULT, 'USER.UNSUBSCRIBE', NULL, 2, 0, 'Core:Users', 'la_event_user.unsubscribe', 1); -INSERT INTO Events VALUES (DEFAULT, 'USER.SUGGEST', NULL, 1, 0, 'Core:Users', 'la_event_user.suggest', '0'); -INSERT INTO Events VALUES (DEFAULT, 'USER.SUGGEST', NULL, 2, 0, 'Core:Users', 'la_event_user.suggest', '1'); -INSERT INTO Events VALUES (DEFAULT, 'USER.PSWDC', NULL, 1, 0, 'Core:Users', 'la_event_user.pswd_confirm', '0'); -INSERT INTO Events VALUES (DEFAULT, 'USER.MEMBERSHIP.EXPIRED', NULL, 1, 0, 'Core:Users', 'la_event_user.membership_expired', '0'); -INSERT INTO Events VALUES (DEFAULT, 'USER.MEMBERSHIP.EXPIRED', NULL, 1, 0, 'Core:Users', 'la_event_user.membership_expired', '1'); -INSERT INTO Events VALUES (DEFAULT, 'USER.MEMBERSHIP.EXPIRATION.NOTICE', NULL, 1, 0, 'Core:Users', 'la_event_user.membership_expiration_notice', '0'); -INSERT INTO Events VALUES (DEFAULT, 'USER.MEMBERSHIP.EXPIRATION.NOTICE', NULL, 1, 0, 'Core:Users', 'la_event_user.membership_expiration_notice', '1'); -INSERT INTO Events VALUES (DEFAULT, 'COMMON.FOOTER', NULL, 1, 0, 'Core', 'la_event_common.footer', 1); -INSERT INTO Events VALUES (DEFAULT, 'FORM.SUBMITTED', NULL, 1, 0, 'Core:Category', 'la_event_FormSubmitted', 1); -INSERT INTO Events VALUES (DEFAULT, 'FORM.SUBMITTED', NULL, 1, 0, 'Core:Category', 'la_event_FormSubmitted', 0); +INSERT INTO Events VALUES(DEFAULT, 'USER.ADD', NULL, 1, 0, NULL, 'Core:Users', 'la_event_user.add', 0); +INSERT INTO Events VALUES(DEFAULT, 'USER.ADD', NULL, 1, 1, NULL, 'Core:Users', 'la_event_user.add', 1); +INSERT INTO Events VALUES(DEFAULT, 'USER.APPROVE', NULL, 1, 0, NULL, 'Core:Users', 'la_event_user.approve', 0); +INSERT INTO Events VALUES(DEFAULT, 'USER.APPROVE', NULL, 1, 1, NULL, 'Core:Users', 'la_event_user.approve', 1); +INSERT INTO Events VALUES(DEFAULT, 'USER.VALIDATE', NULL, 1, 0, NULL, 'Core:Users', 'la_event_user.validate', 0); +INSERT INTO Events VALUES(DEFAULT, 'USER.VALIDATE', NULL, 1, 1, NULL, 'Core:Users', 'la_event_user.validate', 1); +INSERT INTO Events VALUES(DEFAULT, 'USER.DENY', NULL, 1, 0, NULL, 'Core:Users', 'la_event_user.deny', 0); +INSERT INTO Events VALUES(DEFAULT, 'USER.DENY', NULL, 1, 1, NULL, 'Core:Users', 'la_event_user.deny', 1); +INSERT INTO Events VALUES(DEFAULT, 'USER.PSWD', NULL, 1, 1, NULL, 'Core:Users', 'la_event_user.forgotpw', 1); +INSERT INTO Events VALUES(DEFAULT, 'USER.PSWD', NULL, 1, 0, NULL, 'Core:Users', 'la_event_user.forgotpw', 0); +INSERT INTO Events VALUES(DEFAULT, 'USER.ADD.PENDING', NULL, 1, 0, NULL, 'Core:Users', 'la_event_user.add.pending', 0); +INSERT INTO Events VALUES(DEFAULT, 'USER.ADD.PENDING', NULL, 1, 1, NULL, 'Core:Users', 'la_event_user.add.pending', 1); +INSERT INTO Events VALUES(DEFAULT, 'CATEGORY.ADD', NULL, 1, 0, NULL, 'Core:Category', 'la_event_category.add', 0); +INSERT INTO Events VALUES(DEFAULT, 'CATEGORY.ADD.PENDING', NULL, 1, 0, NULL, 'Core:Category', 'la_event_category.add.pending', 0); +INSERT INTO Events VALUES(DEFAULT, 'CATEGORY.ADD.PENDING', NULL, 1, 1, NULL, 'Core:Category', 'la_event_category.add.pending', 1); +INSERT INTO Events VALUES(DEFAULT, 'CATEGORY.ADD', NULL, 1, 1, NULL, 'Core:Category', 'la_event_category.add', 1); +INSERT INTO Events VALUES(DEFAULT, 'CATEGORY.DELETE', NULL, 1, 0, NULL, 'Core:Category', 'la_event_category_delete', 0); +INSERT INTO Events VALUES(DEFAULT, 'CATEGORY.DELETE', NULL, 1, 1, NULL, 'Core:Category', 'la_event_category_delete', 1); +INSERT INTO Events VALUES(DEFAULT, 'CATEGORY.MODIFY', NULL, 1, 0, NULL, 'Core:Category', 'la_event_category.modify', 0); +INSERT INTO Events VALUES(DEFAULT, 'CATEGORY.MODIFY', NULL, 1, 1, NULL, 'Core:Category', 'la_event_category.modify', 1); +INSERT INTO Events VALUES(DEFAULT, 'CATEGORY.APPROVE', NULL, 1, 0, NULL, 'Core:Category', 'la_event_category.approve', 0); +INSERT INTO Events VALUES(DEFAULT, 'CATEGORY.APPROVE', NULL, 1, 1, NULL, 'Core:Category', 'la_event_category.approve', 1); +INSERT INTO Events VALUES(DEFAULT, 'CATEGORY.DENY', NULL, 1, 0, NULL, 'Core:Category', 'la_event_category.deny', 0); +INSERT INTO Events VALUES(DEFAULT, 'CATEGORY.DENY', NULL, 1, 1, NULL, 'Core:Category', 'la_event_category.deny', 1); +INSERT INTO Events VALUES(DEFAULT, 'USER.SUBSCRIBE', NULL, 1, 0, NULL, 'Core:Users', 'la_event_user.subscribe', 0); +INSERT INTO Events VALUES(DEFAULT, 'USER.SUBSCRIBE', NULL, 1, 1, NULL, 'Core:Users', 'la_event_user.subscribe', 1); +INSERT INTO Events VALUES(DEFAULT, 'USER.UNSUBSCRIBE', NULL, 1, 0, NULL, 'Core:Users', 'la_event_user.unsubscribe', 0); +INSERT INTO Events VALUES(DEFAULT, 'USER.UNSUBSCRIBE', NULL, 1, 1, NULL, 'Core:Users', 'la_event_user.unsubscribe', 1); +INSERT INTO Events VALUES(DEFAULT, 'USER.SUGGEST', NULL, 1, 0, NULL, 'Core:Users', 'la_event_user.suggest', 0); +INSERT INTO Events VALUES(DEFAULT, 'USER.SUGGEST', NULL, 1, 1, NULL, 'Core:Users', 'la_event_user.suggest', 1); +INSERT INTO Events VALUES(DEFAULT, 'USER.PSWDC', NULL, 1, 0, NULL, 'Core:Users', 'la_event_user.pswd_confirm', 0); +INSERT INTO Events VALUES(DEFAULT, 'USER.MEMBERSHIP.EXPIRED', NULL, 1, 0, NULL, 'Core:Users', 'la_event_user.membership_expired', 0); +INSERT INTO Events VALUES(DEFAULT, 'USER.MEMBERSHIP.EXPIRED', NULL, 1, 0, NULL, 'Core:Users', 'la_event_user.membership_expired', 1); +INSERT INTO Events VALUES(DEFAULT, 'USER.MEMBERSHIP.EXPIRATION.NOTICE', NULL, 1, 0, NULL, 'Core:Users', 'la_event_user.membership_expiration_notice', 0); +INSERT INTO Events VALUES(DEFAULT, 'USER.MEMBERSHIP.EXPIRATION.NOTICE', NULL, 1, 0, NULL, 'Core:Users', 'la_event_user.membership_expiration_notice', 1); +INSERT INTO Events VALUES(DEFAULT, 'COMMON.FOOTER', NULL, 1, 0, NULL, 'Core', 'la_event_common.footer', 1); +INSERT INTO Events VALUES(DEFAULT, 'FORM.SUBMITTED', NULL, 1, 0, NULL, 'Core:Category', 'la_event_FormSubmitted', 1); +INSERT INTO Events VALUES(DEFAULT, 'FORM.SUBMITTED', NULL, 1, 0, NULL, 'Core:Category', 'la_event_FormSubmitted', 0); INSERT INTO IdGenerator VALUES ('100');