Index: trunk/kernel/include/config.php =================================================================== diff -u -r5168 -r5248 --- trunk/kernel/include/config.php (.../config.php) (revision 5168) +++ trunk/kernel/include/config.php (.../config.php) (revision 5248) @@ -243,24 +243,24 @@ function replace_sql($string, $start_mark = '') { $mark_length = strlen($start_mark); - $string = str_replace("",GetTablePrefix(),$string); - + $string = str_replace("",GetTablePrefix(),$string); + $start = strpos($string, $start_mark); - while($start) - { - $end = strpos($string,""); - if(!$end) - { - $end = strlen($string); - } - $len = $end - $start; + while($start) + { + $end = strpos($string,""); + if(!$end) + { + $end = strlen($string); + } + $len = $end - $start; $sql = substr($string,$start + $mark_length,$len - $mark_length); - - $sql_val = $this->explode_sql($sql); + + $sql_val = $this->explode_sql($sql); $s = substr($string, 0, $start) . $sql_val . substr($string, $end + $mark_length + 1); - - $string = $s; + + $string = $s; $start = strpos($string, $start_mark); } @@ -269,7 +269,7 @@ $string = $this->replace_sql($string, ''); } - return preg_replace('/(.*)$,/','\\1', $string); + return preg_replace('/(.*)$,/','\\1', $string); } function ItemFormElement($StartFrom=1) Index: trunk/core/kernel/startup.php =================================================================== diff -u -r5219 -r5248 --- trunk/core/kernel/startup.php (.../startup.php) (revision 5219) +++ trunk/core/kernel/startup.php (.../startup.php) (revision 5248) @@ -1,5 +1,6 @@ Application->recallObject('kSmtpClient'); + $smtp_object->debug = $this->Application->isDebugMode() && constOn('DBG_SMTP'); $smtp_server = $this->Application->ConfigValue('Smtp_Server'); $smtp_port = $this->Application->ConfigValue('Smtp_Port'); Index: trunk/core/units/email_events/email_events_event_handler.php =================================================================== diff -u -r4845 -r5248 --- trunk/core/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 4845) +++ trunk/core/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 5248) @@ -227,6 +227,7 @@ } $smtp_object = &$this->Application->recallObject('kSmtpClient'); + $smtp_object->debug = $this->Application->isDebugMode() && constOn('DBG_SMTP'); $smtp_server = $this->Application->ConfigValue('Smtp_Server'); $smtp_port = $this->Application->ConfigValue('Smtp_Port'); Index: trunk/kernel/admin_templates/incs/script.js =================================================================== diff -u -r5219 -r5248 --- trunk/kernel/admin_templates/incs/script.js (.../script.js) (revision 5219) +++ trunk/kernel/admin_templates/incs/script.js (.../script.js) (revision 5248) @@ -312,11 +312,11 @@ var $kf = document.getElementById($form_name); var $regex = new RegExp('(.*)\?env=' + document.getElementById('sid').value + '-(.*?):(m[^:]+)'); $regex = $regex.exec($url); - + var $t = $regex[2]; var $window_name = 'select_'+$t.replace(/(\/|-)/g, '_'); set_hidden_field('return_m', $regex[3]); - + if (!isset($window_size)) $window_size = '750x400'; $window_size = $window_size.split('x'); @@ -335,7 +335,7 @@ openwin('', $window_name, $window_size[0], $window_size[1]); $kf.action = $url; $kf.target = $window_name; - + submit_event($prefix, $event, $t); processHooks('openSelector', hAFTER); Index: trunk/core/units/categories/categories_config.php =================================================================== diff -u -r5219 -r5248 --- trunk/core/units/categories/categories_config.php (.../categories_config.php) (revision 5219) +++ trunk/core/units/categories/categories_config.php (.../categories_config.php) (revision 5248) @@ -67,6 +67,7 @@ 'PermItemPrefix' => 'CATEGORY', 'PermSection' => Array('main' => 'CATEGORY:in-portal:categories', /*'search' => 'in-portal:configuration_search',*/ 'email' => 'in-portal:configuration_email', 'custom' => 'in-portal:configuration_custom'), + 'Sections' => Array( // "Structure & Data" section Index: trunk/kernel/units/categories/categories_config.php =================================================================== diff -u -r5219 -r5248 --- trunk/kernel/units/categories/categories_config.php (.../categories_config.php) (revision 5219) +++ trunk/kernel/units/categories/categories_config.php (.../categories_config.php) (revision 5248) @@ -67,6 +67,7 @@ 'PermItemPrefix' => 'CATEGORY', 'PermSection' => Array('main' => 'CATEGORY:in-portal:categories', /*'search' => 'in-portal:configuration_search',*/ 'email' => 'in-portal:configuration_email', 'custom' => 'in-portal:configuration_custom'), + 'Sections' => Array( // "Structure & Data" section Index: trunk/core/kernel/utility/email.php =================================================================== diff -u -r3540 -r5248 --- trunk/core/kernel/utility/email.php (.../email.php) (revision 3540) +++ trunk/core/kernel/utility/email.php (.../email.php) (revision 5248) @@ -426,6 +426,11 @@ if($smtp_object->connect($params) && $smtp_object->send($send_params)){ + if ( $this->Application->isDebugMode() ) + { + $this->Application->Debugger->appendHTML('
'.$smtp_object->debugtext.'
'); + //define('DBG_REDIRECT', 1); + } return true; } else { Index: trunk/kernel/units/general/helpers/multilanguage.php =================================================================== diff -u -r5096 -r5248 --- trunk/kernel/units/general/helpers/multilanguage.php (.../multilanguage.php) (revision 5096) +++ trunk/kernel/units/general/helpers/multilanguage.php (.../multilanguage.php) (revision 5248) @@ -211,8 +211,8 @@ if ($start_index == $this->Application->GetDefaultLanguageId() || !$single_lang) { // create index for primary language column + for all others (if multiple languages installed) - list($field_name, $field_params) = explode(' ', $field_expression, 2); - $ret .= 'ADD INDEX (`'.$field_name.'` (5) ), '; + list($field_name, $field_params) = explode(' ', $field_expression, 2); + $ret .= 'ADD INDEX (`'.$field_name.'` (5) ), '; } $start_index++; Index: trunk/core/units/general/helpers/multilanguage.php =================================================================== diff -u -r5096 -r5248 --- trunk/core/units/general/helpers/multilanguage.php (.../multilanguage.php) (revision 5096) +++ trunk/core/units/general/helpers/multilanguage.php (.../multilanguage.php) (revision 5248) @@ -211,8 +211,8 @@ if ($start_index == $this->Application->GetDefaultLanguageId() || !$single_lang) { // create index for primary language column + for all others (if multiple languages installed) - list($field_name, $field_params) = explode(' ', $field_expression, 2); - $ret .= 'ADD INDEX (`'.$field_name.'` (5) ), '; + list($field_name, $field_params) = explode(' ', $field_expression, 2); + $ret .= 'ADD INDEX (`'.$field_name.'` (5) ), '; } $start_index++;