Index: typo3/db_list.php
===================================================================
--- typo3/db_list.php	(revision 2661)
+++ typo3/db_list.php	(working copy)
@@ -388,24 +388,36 @@
 			}
 
 				// Adding checkbox options for extended listing and clipboard display:
-			$this->content.='
+			$extendedListingEnabled = false;
 
-					<!--
-						Listing options for clipboard and thumbnails
-					-->
-					<div id="typo3-listOptions">
-						<form action="" method="post">';
+			if (!$BE_USER->getTSConfigVal('options.disableBigControlPanel')) {
+				$extendedListing .=t3lib_BEfunc::getFuncCheck($this->id,'SET[bigControlPanel]',$this->MOD_SETTINGS['bigControlPanel'],'db_list.php',($this->table?'&table='.$this->table:''),'id="checkLargeControl"').' <label for="checkLargeControl">'.$LANG->getLL('largeControl',1).'</label><br />';
+				$extendedListingEnabled = true;
+      }
 
-			$this->content.=t3lib_BEfunc::getFuncCheck($this->id,'SET[bigControlPanel]',$this->MOD_SETTINGS['bigControlPanel'],'db_list.php',($this->table?'&table='.$this->table:''),'id="checkLargeControl"').' <label for="checkLargeControl">'.$LANG->getLL('largeControl',1).'</label><br />';
-			if ($dblist->showClipboard)	{
-				$this->content.=t3lib_BEfunc::getFuncCheck($this->id,'SET[clipBoard]',$this->MOD_SETTINGS['clipBoard'],'db_list.php',($this->table?'&table='.$this->table:''),'id="checkShowClipBoard"').' <label for="checkShowClipBoard">'.$LANG->getLL('showClipBoard',1).'</label><br />';
+			if ($dblist->showClipboard && !$BE_USER->getTSConfigVal('options.disableClipBoard') )	{
+				$extendedListing .=t3lib_BEfunc::getFuncCheck($this->id,'SET[clipBoard]',$this->MOD_SETTINGS['clipBoard'],'db_list.php',($this->table?'&table='.$this->table:''),'id="checkShowClipBoard"').' <label for="checkShowClipBoard">'.$LANG->getLL('showClipBoard',1).'</label><br />';
+				$extendedListingEnabled = true;
 			}
-			$this->content.=t3lib_BEfunc::getFuncCheck($this->id,'SET[localization]',$this->MOD_SETTINGS['localization'],'db_list.php',($this->table?'&table='.$this->table:''),'id="checkLocalization"').' <label for="checkLocalization">'.$LANG->getLL('localization',1).'</label><br />';
-			$this->content.='
-						</form>
-					</div>';
-			$this->content.= t3lib_BEfunc::cshItem('xMOD_csh_corebe', 'list_options', $GLOBALS['BACK_PATH']);
-
+			
+			if (!$BE_USER->getTSConfigVal('options.disableLocalization')) {
+  			$extendedListing .=t3lib_BEfunc::getFuncCheck($this->id,'SET[localization]',$this->MOD_SETTINGS['localization'],'db_list.php',($this->table?'&table='.$this->table:''),'id="checkLocalization"').' <label for="checkLocalization">'.$LANG->getLL('localization',1).'</label><br />';
+				$extendedListingEnabled = true;
+			}
+			
+			if ($extendedListingEnabled) {
+  			$this->content.='
+  					<!--
+  						Listing options for clipboard and thumbnails
+  					-->
+  					<div id="typo3-listOptions">
+  						<form action="" method="post">'
+                .$extendedListing.
+  						'</form>
+  					</div>';
+  			$this->content.= t3lib_BEfunc::cshItem('xMOD_csh_corebe', 'list_options', $GLOBALS['BACK_PATH']);
+			}
+      
 				// Printing clipboard if enabled:
 			if ($this->MOD_SETTINGS['clipBoard'] && $dblist->showClipboard)	{
 				$this->content.= $dblist->clipObj->printClipboard();