Index: branches/unlabeled/unlabeled-1.11.2/kernel/units/help/help_tag_processor.php =================================================================== diff -u -r5303 -r5708 --- branches/unlabeled/unlabeled-1.11.2/kernel/units/help/help_tag_processor.php (.../help_tag_processor.php) (revision 5303) +++ branches/unlabeled/unlabeled-1.11.2/kernel/units/help/help_tag_processor.php (.../help_tag_processor.php) (revision 5708) @@ -23,28 +23,32 @@ return parent::SectionTitle($params); } - function ShowHelp($params) + function getModule() { $module = $this->Application->GetVar('h_module'); - if (!$module) $module = $this->Application->RecallVar('module'); + if (!$module) { + $module = $this->Application->RecallVar('module'); + } + return $module; + } + + function ShowHelp($params) + { + $module = $this->getModule(); $module = explode(':', $module); $module = $module[0]; $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); - + $module_path = $this->Application->findModule('Name', $module, 'Path'); $help_file = FULL_PATH.'/'.$module_path.'module_help/'.$title_preset.'.txt'; - if( $this->Application->isDebugMode() && constOn('DBG_EDIT_HELP') ) - { + if ($this->Application->isDebugMode() && constOn('DBG_EDIT_HELP')) { global $debugger; $ret = 'Help file: '.$debugger->getLocalFile($help_file).'
'; } - else - { + else { $ret = ''; } @@ -85,6 +89,19 @@ if(!$icon) $icon = getArrayValue($params,'default_icon'); return $icon; } + + /** + * Returns templates path for module, which is gathered from prefix module + * + * @param Array $params + * @return string + * @author Alex + */ + function ModulePath($params) + { + $module_folder = trim( $this->Application->findModule('Name', $this->getModule(), 'Path'), '/'); + return '../../'.$module_folder.'/admin_templates/'; + } } ?> \ No newline at end of file Index: branches/unlabeled/unlabeled-1.4.2/kernel/admin_templates/custom_fields/custom_fields_list.tpl =================================================================== diff -u -r4935 -r5708 --- branches/unlabeled/unlabeled-1.4.2/kernel/admin_templates/custom_fields/custom_fields_list.tpl (.../custom_fields_list.tpl) (revision 4935) +++ branches/unlabeled/unlabeled-1.4.2/kernel/admin_templates/custom_fields/custom_fields_list.tpl (.../custom_fields_list.tpl) (revision 5708) @@ -4,7 +4,7 @@ - + Index: branches/unlabeled/unlabeled-1.11.2/core/units/help/help_tag_processor.php =================================================================== diff -u -r5303 -r5708 --- branches/unlabeled/unlabeled-1.11.2/core/units/help/help_tag_processor.php (.../help_tag_processor.php) (revision 5303) +++ branches/unlabeled/unlabeled-1.11.2/core/units/help/help_tag_processor.php (.../help_tag_processor.php) (revision 5708) @@ -23,28 +23,32 @@ return parent::SectionTitle($params); } - function ShowHelp($params) + function getModule() { $module = $this->Application->GetVar('h_module'); - if (!$module) $module = $this->Application->RecallVar('module'); + if (!$module) { + $module = $this->Application->RecallVar('module'); + } + return $module; + } + + function ShowHelp($params) + { + $module = $this->getModule(); $module = explode(':', $module); $module = $module[0]; $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); - + $module_path = $this->Application->findModule('Name', $module, 'Path'); $help_file = FULL_PATH.'/'.$module_path.'module_help/'.$title_preset.'.txt'; - if( $this->Application->isDebugMode() && constOn('DBG_EDIT_HELP') ) - { + if ($this->Application->isDebugMode() && constOn('DBG_EDIT_HELP')) { global $debugger; $ret = 'Help file: '.$debugger->getLocalFile($help_file).'
'; } - else - { + else { $ret = ''; } @@ -85,6 +89,19 @@ if(!$icon) $icon = getArrayValue($params,'default_icon'); return $icon; } + + /** + * Returns templates path for module, which is gathered from prefix module + * + * @param Array $params + * @return string + * @author Alex + */ + function ModulePath($params) + { + $module_folder = trim( $this->Application->findModule('Name', $this->getModule(), 'Path'), '/'); + return '../../'.$module_folder.'/admin_templates/'; + } } ?> \ No newline at end of file Index: branches/unlabeled/unlabeled-1.14.10/admin/help/help.php =================================================================== diff -u -r3758 -r5708 --- branches/unlabeled/unlabeled-1.14.10/admin/help/help.php (.../help.php) (revision 3758) +++ branches/unlabeled/unlabeled-1.14.10/admin/help/help.php (.../help.php) (revision 5708) @@ -47,6 +47,10 @@
'.$section[1].'.txt
'; + } + if( file_exists($topic_path) ) echo $help_data; else Index: branches/unlabeled/unlabeled-1.6.2/kernel/admin_templates/help.tpl =================================================================== diff -u -r5561 -r5708 --- branches/unlabeled/unlabeled-1.6.2/kernel/admin_templates/help.tpl (.../help.tpl) (revision 5561) +++ branches/unlabeled/unlabeled-1.6.2/kernel/admin_templates/help.tpl (.../help.tpl) (revision 5708) @@ -6,7 +6,7 @@
- .gif" align="absmiddle" title=""> 
+ .gif" align="absmiddle" title="">