1
0
mirror of https://github.com/e107inc/e107.git synced 2025-06-04 01:45:15 +02:00

Bugtracker #4147 - admin help would sometimes display when it shouldn't - thanks marj

This commit is contained in:
e107steved 2007-10-14 20:12:21 +00:00
parent 7aa64c3f01
commit bda4e234d7

View File

@ -1,30 +1,39 @@
if (ADMIN) {
global $ns, $pref;
if (!($handle=opendir(e_LANGUAGEDIR.e_LANGUAGE."/admin/help/"))) {
$handle=opendir(e_LANGUAGEDIR."English/admin/help/");
}
ob_start();
$text = "";
while(false !== ($file = readdir($handle))) {
if ($file != "." && $file != ".." && $file != "CVS") {
if (strpos(e_SELF, $file) !== FALSE) {
if (is_readable(e_LANGUAGEDIR.e_LANGUAGE."/admin/help/".$file)) {
include_once(e_LANGUAGEDIR.e_LANGUAGE."/admin/help/".$file);
} else if (is_readable(e_LANGUAGEDIR."English/admin/help/".$file)) {
include_once(e_LANGUAGEDIR."English/admin/help/".$file);
}
}
}
}
closedir($handle);
$plugpath = getcwd()."/help.php";
if(file_exists($plugpath))
if (ADMIN)
{
global $ns, $pref;
ob_start();
$help_text = "";
if(strpos(e_SELF, e_ADMIN_ABS) !== FALSE)
{
if (!($handle=opendir(e_LANGUAGEDIR.e_LANGUAGE."/admin/help/")))
{
@require_once($plugpath);
$handle=opendir(e_LANGUAGEDIR."English/admin/help/");
}
while(false !== ($file = readdir($handle)))
{
if ($file != "." && $file != ".." && $file != "CVS")
{
if (strpos(e_SELF, $file) !== FALSE)
{
if (is_readable(e_LANGUAGEDIR.e_LANGUAGE."/admin/help/".$file))
{
include_once(e_LANGUAGEDIR.e_LANGUAGE."/admin/help/".$file);
}
elseif (is_readable(e_LANGUAGEDIR."English/admin/help/".$file))
{
include_once(e_LANGUAGEDIR."English/admin/help/".$file);
}
}
}
}
$help_text = ob_get_contents();
ob_end_clean();
return $help_text;
}
closedir($handle);
}
$plugpath = getcwd()."/help.php";
if(file_exists($plugpath))
{
@require_once($plugpath);
}
$help_text = ob_get_contents();
ob_end_clean();
return $help_text;
}