Fixed bug #8573: TypoScript-Help is not displayed for non-Admins, credits Steffen...

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@3752 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index 0160f81..81dc020 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
        * Follow Up for #8270: fixed some naming and CGL issues
        * Fixed bug #8033: Drag'n'drop in pagetree problem: Dragged menu items disappear under other menuitems, credits Susanne Moog
+       * Fixed bug #8573: TypoScript-Help is not displayed for non-Admins, credits Steffen Kamper
 
 2008-06-02  Ernesto Baschny  <ernst@cron-it.de>
 

diff --git a/typo3/sysext/tsconfig_help/mod1/index.php b/typo3/sysext/tsconfig_help/mod1/index.php
index 4f28a4c..749e73a 100644 (file)
--- a/typo3/sysext/tsconfig_help/mod1/index.php
+++ b/typo3/sysext/tsconfig_help/mod1/index.php
@@ -86,9 +86,7 @@ class tx_tsconfighelp_module1 extends t3lib_SCbase {
                global $BE_USER,$LANG,$BACK_PATH,$TCA_DESCR,$TCA,$CLIENT,$TYPO3_CONF_VARS;
 
                // Access check!
-               // The page will show only if there is a valid page and if this page may be viewed by the user
-               $this->pageinfo = t3lib_BEfunc::readPageAccess($this->id,$this->perms_clause);
-               $access = is_array($this->pageinfo) ? 1 : 0;
+               $access = $BE_USER->check('modules', 'help_txtsconfighelpM1');
 
                        // Draw the header.
                $this->doc = t3lib_div::makeInstance('template');
@@ -96,7 +94,7 @@ class tx_tsconfighelp_module1 extends t3lib_SCbase {
                $this->doc->setModuleTemplate('templates/tsconfig_help.html');
                $this->doc->docType = 'xhtml_trans';
 
-               if (($this->id && $access) || ($BE_USER->user['admin'] && !$this->id))  {
+               if ($access || $BE_USER->user['admin']) {
 
                        $this->doc->form = '<form action="" method="POST">';
 
@@ -129,6 +127,7 @@ class tx_tsconfighelp_module1 extends t3lib_SCbase {
                        $markers['FUNC_MENU'] = t3lib_BEfunc::getFuncMenu($this->id,'SET[function]',$this->MOD_SETTINGS['function'],$this->MOD_MENU['function']);
                } else {
                        $this->content .= $this->doc->header($LANG->getLL('title'));
+                       $markers['FUNC_MENU'] = '';
                }
                        // Setting up the buttons and markers for docheader
                $docHeaderButtons = $this->getButtons();