[Xoops-svn] SF.net SVN: xoops-svn:[13148] XoopsCore/branches/2.5.x/2.5.8

[<be...@us...>]

Revision: 13148
          http://sourceforge.net/p/xoops/svn/13148
Author:   beckmi
Date:     2015-09-21 19:55:41 +0000 (Mon, 21 Sep 2015)
Log Message:
-----------
added .tpl option for module Help files

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt
    XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/help.php

Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt	2015-09-12 08:48:58 UTC (rev 13147)
+++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt	2015-09-21 19:55:41 UTC (rev 13148)
@@ -22,6 +22,7 @@
 - replaced intval() with (int) (mamba)
 - added possibility to include full icon URL in module's menu.php (mamba)
 - added strong { font-weight: bold; } to reset.css (mamba)
+- added .tpl option for module Help files (mamba)
 
 
 Security fixes

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/help.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/help.php	2015-09-12 08:48:58 UTC (rev 13147)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/help.php	2015-09-21 19:55:41 UTC (rev 13148)
@@ -88,24 +88,16 @@
 
     if ($page != '') {
         // Call template
-        if (file_exists(
-            XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.html'
-        )
-        ) {
-            $helpcontent = $xoopsTpl->fetch(
-                XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.html'
-            );
+        if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.html')) {
+            $helpcontent = $xoopsTpl->fetch(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.html');
+        } elseif (file_exists(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.tpl')) {
+            $helpcontent = $xoopsTpl->fetch(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.tpl');
+        } elseif (file_exists(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/english/help/' . $page . '.html')) {
+            $helpcontent = $xoopsTpl->fetch(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/english/help/' . $page . '.html');
+        } elseif (file_exists(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/english/help/' . $page . '.tpl')) {
+            $helpcontent = $xoopsTpl->fetch(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/english/help/' . $page . '.tpl');
         } else {
-            if (file_exists(
-                XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/english/help/' . $page . '.html'
-            )
-            ) {
-                $helpcontent = $xoopsTpl->fetch(
-                    XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/english/help/' . $page . '.html'
-                );
-            } else {
-                $xoopsTpl->assign('load_error', 1);
-            }
+            $xoopsTpl->assign('load_error', 1);
         }
         $xoopsTpl->assign('helpcontent', $helpcontent);
     } else {