Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1811)
+++ branches/2.8.x/CHANGELOG	(revision 1812)
@@ -13,6 +13,8 @@
 
 
 
+10 Nov-2012 Build 1812 Dietmar Woellbrink (Luisehahne)
+# fixed always show "no modul rights" in admintools
 09 Nov-2012 Build 1811 Dietmar Woellbrink (Luisehahne)
 ! forgot to upload class.wb.php
 09 Nov-2012 Build 1810 Dietmar Woellbrink (Luisehahne)
Index: branches/2.8.x/wb/admin/skel/themes/htt/admintools.htt
===================================================================
--- branches/2.8.x/wb/admin/skel/themes/htt/admintools.htt	(revision 1811)
+++ branches/2.8.x/wb/admin/skel/themes/htt/admintools.htt	(revision 1812)
@@ -13,7 +13,7 @@
 				{NO_CONTENT}
 			</li>
 		<!-- END tool_list_block -->
-			{TOOL_LIST}
+			<li>{TOOL_LIST}</li>
 		</ul>
 	</div>
 <!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1811)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1812)
@@ -51,5 +51,5 @@
 
 // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
 if(!defined('VERSION')) define('VERSION', '2.8.3');
-if(!defined('REVISION')) define('REVISION', '1811');
+if(!defined('REVISION')) define('REVISION', '1812');
 if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/admin/admintools/index.php
===================================================================
--- branches/2.8.x/wb/admin/admintools/index.php	(revision 1811)
+++ branches/2.8.x/wb/admin/admintools/index.php	(revision 1812)
@@ -15,8 +15,15 @@
  *
  */
 
-require('../../config.php');
-require_once(WB_PATH.'/framework/class.admin.php');
+if(!defined('WB_URL'))
+{
+    $config_file = realpath('../../config.php');
+    if(file_exists($config_file) && !defined('WB_URL'))
+    {
+    	require($config_file);
+    }
+}
+if(!class_exists('admin', false)){ include(WB_PATH.'/framework/class.admin.php'); }
 $admin = new admin('admintools', 'admintools');
 
 // Include the WB functions file
@@ -37,21 +44,21 @@
 // Insert tools into tool list
 $template->set_block('main_block', 'tool_list_block', 'tool_list');
 $template->set_var('TOOL_NAME', '');
-$template->set_var('tool_list', $TEXT['NONE'].' '.$TEXT['MODULE_PERMISSIONS']);
+$template->set_var('tool_list', '');
 $template->set_var('TOOL_DIR', '');
 $template->set_var('TOOL_DESCRIPTION', '');
 $template->set_var('NO_CONTENT', '');
-
 $results = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'tool' order by name");
+$bHasToolRights = false;
 if($results->numRows() > 0) {
-	while( $tool = $results->fetchRow() ) {
-
+	while( $tool = $results->fetchRow(MYSQL_ASSOC) ) {
+        $bHasToolRights = false;
 		if( $admin->get_permission($tool['directory'],'module' ) )
 		{
-			$template->set_var('TOOL_NAME', $tool['name']);
+            $bHasToolRights = true;
+		$template->set_var('TOOL_NAME', $tool['name']);
 			$template->set_var('TOOL_DIR', $tool['directory']);
-// /icons/admintools.png
-		// check if a module description exists for the displayed backend language
+	// check if a module description exists for the displayed backend language
 			$tool_description = false;
 			if(function_exists('file_get_contents') && file_exists(WB_PATH.'/modules/'.$tool['directory'].'/languages/'.LANGUAGE .'.php')) {
 				// read contents of the module language file into string
@@ -69,11 +76,11 @@
 		}
 	}
 
-} else {
-	$template->set_var('TOOL_LIST', $TEXT['NONE_FOUND']);
 }
 
-$template->set_var('TOOL_LIST', '<li>&nbsp;</li>');
+$template->set_var('TOOL_LIST', ($bHasToolRights==false) ? $TEXT['NONE'].' '.$TEXT['MODULE_PERMISSIONS'] : '&nbsp;');
+
+//template->set_var('TOOL_LIST', '<li>&nbsp;</li>');
 // Parse template objects output
 $template->parse('main', 'main_block', false);
 $template->pparse('output', 'page');