Index: trunk/kernel/module_help/dummy =================================================================== diff -u -N --- trunk/kernel/module_help/dummy (revision 0) +++ trunk/kernel/module_help/dummy (revision 1662) @@ -0,0 +1 @@ \ No newline at end of file Index: trunk/core/admin_templates/stylesheets/block_style_edit.tpl =================================================================== diff -u -N -r1580 -r1662 --- trunk/core/admin_templates/stylesheets/block_style_edit.tpl (.../block_style_edit.tpl) (revision 1580) +++ trunk/core/admin_templates/stylesheets/block_style_edit.tpl (.../block_style_edit.tpl) (revision 1662) @@ -5,7 +5,7 @@ - + Index: trunk/kernel/units/help/help_config.php =================================================================== diff -u -N -r1566 -r1662 --- trunk/kernel/units/help/help_config.php (.../help_config.php) (revision 1566) +++ trunk/kernel/units/help/help_config.php (.../help_config.php) (revision 1662) @@ -2,13 +2,14 @@ $config = Array( 'Prefix' => 'h', - 'EventHandlerClass' => Array('class'=>'kEventHandler','file'=>'','build_event'=>'OnBuild'), + 'EventHandlerClass' => Array('class'=>'HelpEventHandler','file'=>'help_event_handler.php','build_event'=>'OnBuild'), 'TagProcessorClass' => Array('class'=>'HelpTagProcessor','file'=>'help_tag_processor.php','build_event'=>'OnBuild'), 'QueryString' => Array( 1 => 'prefix', 2 => 'icon', 3 => 'module', 4 => 'title_preset', + 5 => 'event', ), ); Index: trunk/kernel/admin_templates/stylesheets/base_style_edit.tpl =================================================================== diff -u -N -r1580 -r1662 --- trunk/kernel/admin_templates/stylesheets/base_style_edit.tpl (.../base_style_edit.tpl) (revision 1580) +++ trunk/kernel/admin_templates/stylesheets/base_style_edit.tpl (.../base_style_edit.tpl) (revision 1662) @@ -5,7 +5,7 @@ - +
Index: trunk/kernel/admin_templates/regional/languages_edit.tpl =================================================================== diff -u -N -r1580 -r1662 --- trunk/kernel/admin_templates/regional/languages_edit.tpl (.../languages_edit.tpl) (revision 1580) +++ trunk/kernel/admin_templates/regional/languages_edit.tpl (.../languages_edit.tpl) (revision 1662) @@ -6,7 +6,7 @@ - +
Index: trunk/kernel/admin_templates/regional/languages_import_step2.tpl =================================================================== diff -u -N -r1563 -r1662 --- trunk/kernel/admin_templates/regional/languages_import_step2.tpl (.../languages_import_step2.tpl) (revision 1563) +++ trunk/kernel/admin_templates/regional/languages_import_step2.tpl (.../languages_import_step2.tpl) (revision 1662) @@ -4,7 +4,7 @@ - +
Index: trunk/kernel/admin_templates/stylesheets/stylesheets_edit_block.tpl =================================================================== diff -u -N -r1580 -r1662 --- trunk/kernel/admin_templates/stylesheets/stylesheets_edit_block.tpl (.../stylesheets_edit_block.tpl) (revision 1580) +++ trunk/kernel/admin_templates/stylesheets/stylesheets_edit_block.tpl (.../stylesheets_edit_block.tpl) (revision 1662) @@ -6,7 +6,7 @@ - +
Index: trunk/kernel/admin_templates/stylesheets/stylesheets_edit_base.tpl =================================================================== diff -u -N -r1580 -r1662 --- trunk/kernel/admin_templates/stylesheets/stylesheets_edit_base.tpl (.../stylesheets_edit_base.tpl) (revision 1580) +++ trunk/kernel/admin_templates/stylesheets/stylesheets_edit_base.tpl (.../stylesheets_edit_base.tpl) (revision 1662) @@ -6,7 +6,7 @@ - +
Index: trunk/kernel/admin_templates/regional/languages_edit_email_events.tpl =================================================================== diff -u -N -r1580 -r1662 --- trunk/kernel/admin_templates/regional/languages_edit_email_events.tpl (.../languages_edit_email_events.tpl) (revision 1580) +++ trunk/kernel/admin_templates/regional/languages_edit_email_events.tpl (.../languages_edit_email_events.tpl) (revision 1662) @@ -7,7 +7,7 @@ - +
Index: trunk/kernel/units/help/help_event_handler.php =================================================================== diff -u -N --- trunk/kernel/units/help/help_event_handler.php (revision 0) +++ trunk/kernel/units/help/help_event_handler.php (revision 1662) @@ -0,0 +1,30 @@ +Application->GetVar('HelpContent'); + + $module = $this->Application->GetVar('h_module'); + $title_preset = $this->Application->GetVar('h_title_preset'); + + $sql = 'SELECT Path FROM '.TABLE_PREFIX.'Modules WHERE LOWER(Name)='.$this->Conn->qstr( strtolower($module) ); + $module_path = $this->Conn->GetOne($sql); + + $help_file = FULL_PATH.'/'.$module_path.'module_help/'.$title_preset.'.txt'; + $help_data = $this->Application->GetVar('HelpContent'); + + $fp = fopen($help_file,'w'); + fwrite($fp,$help_data); + fclose($fp); + } + } + +?> \ No newline at end of file Index: trunk/core/kernel/application.php =================================================================== diff -u -N -r1654 -r1662 --- trunk/core/kernel/application.php (.../application.php) (revision 1654) +++ trunk/core/kernel/application.php (.../application.php) (revision 1662) @@ -145,7 +145,7 @@ $this->DB = new kDBConnection(SQL_TYPE, Array(&$this,'handleSQLError') ); $this->DB->Connect(SQL_SERVER, SQL_USER, SQL_PASS, SQL_DB); $this->DB->debugMode = $this->isDebugMode(); - + $this->SetDefaultConstants(); $this->Factory = new kFactory(); @@ -277,6 +277,7 @@ $this->registerClass('kCurrencyRates',MODULES_PATH.'/in-commerce/units/rates/currency_rates.php'); } + $this->registerClass('FCKeditor', DOC_ROOT.BASE_PATH.'/'.ADMIN_DIR.'/editor/cmseditor/fckeditor.php'); /*$this->RegisterClass('LoginController', KERNEL_PATH.'/users/login_controller.php');*/ } @@ -296,6 +297,10 @@ if (!defined('ADMINS_LIST')) define('ADMINS_LIST', '/users/users.php'); if (!defined('USER_MODEL')) define('USER_MODEL', 'Users'); if (!defined('DEFAULT_LANGUAGE_ID')) define('DEFAULT_LANGUAGE_ID', 1); + + $admin_dir = $this->ConfigValue('AdminDirectory'); + if(!$admin_dir) $admin_dir = 'admin'; + safeDefine('ADMIN_DIR', $admin_dir); } function ProcessRequest() @@ -841,11 +846,17 @@ $params['admin'] = 1; } + if( getArrayValue($params,'escape') ) + { + $ret = addslashes($ret); + unset($params['escape']); + } + foreach ($params as $param => $value) { $ret .= '&'.$param.'='.$value; } - if( getArrayValue($params,'escape') ) $ret = addslashes($ret); + return $ret; } Index: trunk/admin/editor/editor_new.php =================================================================== diff -u -N -r1647 -r1662 --- trunk/admin/editor/editor_new.php (.../editor_new.php) (revision 1647) +++ trunk/admin/editor/editor_new.php (.../editor_new.php) (revision 1662) @@ -131,7 +131,7 @@ BasePath = 'cmseditor/' ; + $oFCKeditor->BasePath = 'cmseditor/' ; $oFCKeditor->Width = '100%' ; $oFCKeditor->Height = '500' ; $oFCKeditor->ToolbarSet = 'Advanced' ; Index: trunk/kernel/admin_templates/stylesheets/stylesheets_list.tpl =================================================================== diff -u -N -r1580 -r1662 --- trunk/kernel/admin_templates/stylesheets/stylesheets_list.tpl (.../stylesheets_list.tpl) (revision 1580) +++ trunk/kernel/admin_templates/stylesheets/stylesheets_list.tpl (.../stylesheets_list.tpl) (revision 1662) @@ -4,7 +4,7 @@ - +
Index: trunk/kernel/admin_templates/stylesheets/style_editor.tpl =================================================================== diff -u -N -r1563 -r1662 --- trunk/kernel/admin_templates/stylesheets/style_editor.tpl (.../style_editor.tpl) (revision 1563) +++ trunk/kernel/admin_templates/stylesheets/style_editor.tpl (.../style_editor.tpl) (revision 1662) @@ -3,7 +3,7 @@ - +