Index: branches/unlabeled/unlabeled-1.5.22/core/units/email_events/email_events_config.php =================================================================== diff -u -r3349 -r6557 --- branches/unlabeled/unlabeled-1.5.22/core/units/email_events/email_events_config.php (.../email_events_config.php) (revision 3349) +++ branches/unlabeled/unlabeled-1.5.22/core/units/email_events/email_events_config.php (.../email_events_config.php) (revision 6557) @@ -7,23 +7,23 @@ 'EventHandlerClass' => Array('class'=>'EmailEventsEventsHandler','file'=>'email_events_event_handler.php','build_event'=>'OnBuild'), 'TagProcessorClass' => Array('class'=>'kDBTagProcessor','file'=>'','build_event'=>'OnBuild'), 'AutoLoad' => true, - + 'QueryString' => Array( 1 => 'id', 2 => 'page', 3 => 'event', ), - + 'IDField' => 'EventId', - + 'StatusField' => Array('Enabled'), - + 'TitleField' => 'Event', - + 'TitlePresets' => Array( 'email_settings_list' => Array('prefixes' => Array('emailevents.module_List'), 'format' => '!la_title_EmailSettings! (#emailevents.module_recordcount#)'), ), - + 'FilterMenu' => Array( 'Groups' => Array( Array('mode' => 'AND', 'filters' => Array('show_enabled','show_disabled','show_frontonly'), 'type' => WHERE_FILTER), @@ -34,28 +34,28 @@ 'show_frontonly' => Array('label' => 'la_Text_FrontOnly', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 2' ), ) ), - + 'TableName' => TABLE_PREFIX.'Events', 'CalculatedFields' => Array( '' => Array ( 'FromUser' => 'u.Login', ) ), - + '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), - + 'ItemSQLs' => Array( ''=>'SELECT * FROM %s'), - + 'ListSortings' => Array( '' => Array('Sorting' => Array('Module' => 'asc', 'Description' => 'asc') ), - + 'module' => Array('Sorting' => Array('Description' => 'asc') ), ), - + 'Fields' => Array( 'EventId' => Array(), 'Event' => Array('type' => 'string','not_null' => '1','default' => ''), @@ -68,7 +68,7 @@ 'VirtualFields' => Array( 'FromUser' => Array(), ), - + 'Grids' => Array( 'Default' => Array( 'Icons' => Array('default'=>'icon16_custom.gif'), @@ -79,9 +79,9 @@ 'Type' => Array( 'title'=>'la_col_Type'), 'Enabled' => Array( 'title'=>'la_col_Status'), ), - + ), - + 'EmailSettings' => Array( 'Icons' => Array('default'=>'icon16_custom.gif'), 'Fields' => Array( @@ -90,7 +90,7 @@ 'Enabled' => Array('title'=>'la_col_Status'), 'FromUser' => Array('title'=>'la_col_FromToUser'), ), - + ), ), ); Index: branches/unlabeled/unlabeled-1.59.2/core/kernel/utility/unit_config_reader.php =================================================================== diff -u -r6490 -r6557 --- branches/unlabeled/unlabeled-1.59.2/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 6490) +++ branches/unlabeled/unlabeled-1.59.2/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 6557) @@ -105,7 +105,7 @@ $this->Application->Caches['ConfigVariables'] = $cache['Application.ConfigCacheIds']; $this->Application->ConfigCacheIds = $cache['Application.ConfigCacheIds']; - + $this->Application->ReplacementTemplates = $cache['Application.ReplacementTemplates']; $this->Application->ModuleInfo = $cache['Application.ModuleInfo']; @@ -340,7 +340,7 @@ $this->Application->registerAggregateTag($aggregate_tag); } } - + if (isset($config['ReplacementTemplates']) && $config['ReplacementTemplates']) { // replacement templates defined in this config $this->Application->ReplacementTemplates = array_merge_recursive2($this->Application->ReplacementTemplates, $config['ReplacementTemplates']); @@ -631,6 +631,8 @@ $module_found = false; if (!$this->Application->ModuleInfo) return false; + if (preg_match('/\/plugins\//', $config_path)) return true; + foreach($this->Application->ModuleInfo as $module_name => $module_info) { $module_path = '/'.$module_info['Path']; Index: branches/unlabeled/unlabeled-1.5.22/kernel/units/email_events/email_events_config.php =================================================================== diff -u -r3349 -r6557 --- branches/unlabeled/unlabeled-1.5.22/kernel/units/email_events/email_events_config.php (.../email_events_config.php) (revision 3349) +++ branches/unlabeled/unlabeled-1.5.22/kernel/units/email_events/email_events_config.php (.../email_events_config.php) (revision 6557) @@ -7,23 +7,23 @@ 'EventHandlerClass' => Array('class'=>'EmailEventsEventsHandler','file'=>'email_events_event_handler.php','build_event'=>'OnBuild'), 'TagProcessorClass' => Array('class'=>'kDBTagProcessor','file'=>'','build_event'=>'OnBuild'), 'AutoLoad' => true, - + 'QueryString' => Array( 1 => 'id', 2 => 'page', 3 => 'event', ), - + 'IDField' => 'EventId', - + 'StatusField' => Array('Enabled'), - + 'TitleField' => 'Event', - + 'TitlePresets' => Array( 'email_settings_list' => Array('prefixes' => Array('emailevents.module_List'), 'format' => '!la_title_EmailSettings! (#emailevents.module_recordcount#)'), ), - + 'FilterMenu' => Array( 'Groups' => Array( Array('mode' => 'AND', 'filters' => Array('show_enabled','show_disabled','show_frontonly'), 'type' => WHERE_FILTER), @@ -34,28 +34,28 @@ 'show_frontonly' => Array('label' => 'la_Text_FrontOnly', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 2' ), ) ), - + 'TableName' => TABLE_PREFIX.'Events', 'CalculatedFields' => Array( '' => Array ( 'FromUser' => 'u.Login', ) ), - + '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), - + 'ItemSQLs' => Array( ''=>'SELECT * FROM %s'), - + 'ListSortings' => Array( '' => Array('Sorting' => Array('Module' => 'asc', 'Description' => 'asc') ), - + 'module' => Array('Sorting' => Array('Description' => 'asc') ), ), - + 'Fields' => Array( 'EventId' => Array(), 'Event' => Array('type' => 'string','not_null' => '1','default' => ''), @@ -68,7 +68,7 @@ 'VirtualFields' => Array( 'FromUser' => Array(), ), - + 'Grids' => Array( 'Default' => Array( 'Icons' => Array('default'=>'icon16_custom.gif'), @@ -79,9 +79,9 @@ 'Type' => Array( 'title'=>'la_col_Type'), 'Enabled' => Array( 'title'=>'la_col_Status'), ), - + ), - + 'EmailSettings' => Array( 'Icons' => Array('default'=>'icon16_custom.gif'), 'Fields' => Array( @@ -90,7 +90,7 @@ 'Enabled' => Array('title'=>'la_col_Status'), 'FromUser' => Array('title'=>'la_col_FromToUser'), ), - + ), ), ); Index: branches/unlabeled/unlabeled-1.3.52/kernel/units/email_messages/email_messages_event_handler.php =================================================================== diff -u -r1719 -r6557 --- branches/unlabeled/unlabeled-1.3.52/kernel/units/email_messages/email_messages_event_handler.php (.../email_messages_event_handler.php) (revision 1719) +++ branches/unlabeled/unlabeled-1.3.52/kernel/units/email_messages/email_messages_event_handler.php (.../email_messages_event_handler.php) (revision 6557) @@ -1,8 +1,8 @@ getEmailEventId(); $object =& $event->getObject(); - + $parent_info = $object->getLinkedInfo(); - + $sql = 'SELECT '.$object->IDField.' FROM '.$object->TableName.' WHERE ('.$parent_info['ForeignKey'].' = '.$parent_info['ParentId'].') AND (EventId = '.$email_event_id.')'; - + $id = (int)$this->Conn->GetOne($sql); if(!$id) { @@ -25,12 +25,12 @@ } return $id; } - + function getEmailEventId() { return parent::getPassedID( new kEvent('emailevents:OnDummy') ); } - + /** * If loading empty item, then set parent id * @@ -44,8 +44,7 @@ $event->status = erFATAL; } } - - + /** * Parse message template (split into header, subject & body) * @@ -54,15 +53,15 @@ function OnAfterItemLoad(&$event) { $object =& $event->getObject(); - + $lines = explode("\n", $object->GetDBField('Template') ); - + $headers = Array(); - + foreach($lines as $line) { if( strlen(trim($line)) == 0 || ($line == '.') ) break; - + $parts = explode(':', $line, 2); if(strtolower($parts[0]) == 'subject') { @@ -74,15 +73,15 @@ } } $object->SetDBField('Headers', implode("\n", $headers) ); - + $message_body = ''; while( (list($line_id,$line) = each($lines)) ) { $message_body .= $line; } $object->SetDBField('Body', $message_body); } - + /** * Merge body+subject+headers into message template * @@ -92,7 +91,7 @@ { $this->parseVirtualFields($event); } - + /** * Merge body+subject+headers into message template * @@ -102,7 +101,7 @@ { $this->parseVirtualFields($event); } - + /** * Merge body+subject+headers into message template * @@ -122,7 +121,7 @@ $object->SetDBField('Template', $ret); } } - + /** * Remove trailing CR/LF chars from string * Index: branches/unlabeled/unlabeled-1.32.2/core/units/general/my_application.php =================================================================== diff -u -r5559 -r6557 --- branches/unlabeled/unlabeled-1.32.2/core/units/general/my_application.php (.../my_application.php) (revision 5559) +++ branches/unlabeled/unlabeled-1.32.2/core/units/general/my_application.php (.../my_application.php) (revision 6557) @@ -26,20 +26,6 @@ $this->registerClass('kXMLHelper',MODULES_PATH.'/kernel/units/general/xml_helper.php','kXMLHelper'); $this->registerClass('kModulesHelper', MODULES_PATH.'/kernel/units/general/helpers/modules.php', 'ModulesHelper'); - - /*$this->registerClass('kMultiLanguageHelper',MODULES_PATH.'/kernel/units/general/helpers/multilanguage.php','kMultiLanguageHelper'); - $this->registerClass('kSearchHelper', MODULES_PATH.'/kernel/units/general/helpers/search_helper.php', 'SearchHelper'); - $this->registerClass('kSectionsHelper', MODULES_PATH.'/kernel/units/general/helpers/sections_helper.php', 'SectionsHelper'); - $this->registerClass('kPermissionsHelper', MODULES_PATH.'/kernel/units/general/helpers/permissions_helper.php', 'PermissionsHelper'); - - - $this->registerClass('kModRewriteHelper', MODULES_PATH.'/kernel/units/general/helpers/mod_rewrite_helper.php', 'ModRewriteHelper'); - $this->registerClass('kRecursiveHelper', MODULES_PATH.'/kernel/units/general/helpers/recursive_helper.php', 'RecursiveHelper'); - $this->registerClass('kFilenamesHelper', MODULES_PATH.'/kernel/units/general/helpers/filenames_helper.php', 'kFilenamesHelper'); - - $this->registerClass('kPDFHelper', MODULES_PATH.'/kernel/units/general/helpers/pdf_helper.php', 'kPDFHelper'); - */ - } function getUserGroups($user_id) Index: branches/unlabeled/unlabeled-1.3.52/core/units/email_messages/email_messages_event_handler.php =================================================================== diff -u -r1719 -r6557 --- branches/unlabeled/unlabeled-1.3.52/core/units/email_messages/email_messages_event_handler.php (.../email_messages_event_handler.php) (revision 1719) +++ branches/unlabeled/unlabeled-1.3.52/core/units/email_messages/email_messages_event_handler.php (.../email_messages_event_handler.php) (revision 6557) @@ -1,8 +1,8 @@ getEmailEventId(); $object =& $event->getObject(); - + $parent_info = $object->getLinkedInfo(); - + $sql = 'SELECT '.$object->IDField.' FROM '.$object->TableName.' WHERE ('.$parent_info['ForeignKey'].' = '.$parent_info['ParentId'].') AND (EventId = '.$email_event_id.')'; - + $id = (int)$this->Conn->GetOne($sql); if(!$id) { @@ -25,12 +25,12 @@ } return $id; } - + function getEmailEventId() { return parent::getPassedID( new kEvent('emailevents:OnDummy') ); } - + /** * If loading empty item, then set parent id * @@ -44,8 +44,7 @@ $event->status = erFATAL; } } - - + /** * Parse message template (split into header, subject & body) * @@ -54,15 +53,15 @@ function OnAfterItemLoad(&$event) { $object =& $event->getObject(); - + $lines = explode("\n", $object->GetDBField('Template') ); - + $headers = Array(); - + foreach($lines as $line) { if( strlen(trim($line)) == 0 || ($line == '.') ) break; - + $parts = explode(':', $line, 2); if(strtolower($parts[0]) == 'subject') { @@ -74,15 +73,15 @@ } } $object->SetDBField('Headers', implode("\n", $headers) ); - + $message_body = ''; while( (list($line_id,$line) = each($lines)) ) { $message_body .= $line; } $object->SetDBField('Body', $message_body); } - + /** * Merge body+subject+headers into message template * @@ -92,7 +91,7 @@ { $this->parseVirtualFields($event); } - + /** * Merge body+subject+headers into message template * @@ -102,7 +101,7 @@ { $this->parseVirtualFields($event); } - + /** * Merge body+subject+headers into message template * @@ -122,7 +121,7 @@ $object->SetDBField('Template', $ret); } } - + /** * Remove trailing CR/LF chars from string * Index: branches/unlabeled/unlabeled-1.32.2/kernel/units/general/my_application.php =================================================================== diff -u -r5559 -r6557 --- branches/unlabeled/unlabeled-1.32.2/kernel/units/general/my_application.php (.../my_application.php) (revision 5559) +++ branches/unlabeled/unlabeled-1.32.2/kernel/units/general/my_application.php (.../my_application.php) (revision 6557) @@ -26,20 +26,6 @@ $this->registerClass('kXMLHelper',MODULES_PATH.'/kernel/units/general/xml_helper.php','kXMLHelper'); $this->registerClass('kModulesHelper', MODULES_PATH.'/kernel/units/general/helpers/modules.php', 'ModulesHelper'); - - /*$this->registerClass('kMultiLanguageHelper',MODULES_PATH.'/kernel/units/general/helpers/multilanguage.php','kMultiLanguageHelper'); - $this->registerClass('kSearchHelper', MODULES_PATH.'/kernel/units/general/helpers/search_helper.php', 'SearchHelper'); - $this->registerClass('kSectionsHelper', MODULES_PATH.'/kernel/units/general/helpers/sections_helper.php', 'SectionsHelper'); - $this->registerClass('kPermissionsHelper', MODULES_PATH.'/kernel/units/general/helpers/permissions_helper.php', 'PermissionsHelper'); - - - $this->registerClass('kModRewriteHelper', MODULES_PATH.'/kernel/units/general/helpers/mod_rewrite_helper.php', 'ModRewriteHelper'); - $this->registerClass('kRecursiveHelper', MODULES_PATH.'/kernel/units/general/helpers/recursive_helper.php', 'RecursiveHelper'); - $this->registerClass('kFilenamesHelper', MODULES_PATH.'/kernel/units/general/helpers/filenames_helper.php', 'kFilenamesHelper'); - - $this->registerClass('kPDFHelper', MODULES_PATH.'/kernel/units/general/helpers/pdf_helper.php', 'kPDFHelper'); - */ - } function getUserGroups($user_id)