From: René Fritz <r.fritz@colorcube.de>
Date: Thu, 1 Jul 2004 16:13:55 +0000 (+0000)
Subject: Small enhancement in table(). Changed tabMenu() to work with other params than "id"
X-Git-Tag: TYPO3_3-7-0RC1~65
X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/commitdiff_plain/5a644ed65c339edde308e2ace9d18a86514315be

Small enhancement in table(). Changed tabMenu() to work with other params than "id"


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

diff --git a/typo3/template.php b/typo3/template.php
index d56fb8f27cfd..19dc3ef854fb 100755
--- a/typo3/template.php
+++ b/typo3/template.php
@@ -1100,7 +1100,7 @@ $str.=$this->docBodyTagBegin().
 				if (is_array($val))	{
 					$cc=0;
 					while(list(,$content)=each($val))	{
-						$wrap= is_array($layoutRow[$cc]) ? $layoutRow[$cc] : (is_array($layout[$cc]) ? $layout[$cc] : $layout['defCol']);
+						$wrap= is_array($layoutRow[$cc]) ? $layoutRow[$cc] : (is_array($layoutRow['defCol']) ? $layoutRow['defCol'] : (is_array($layout[$cc]) ? $layout[$cc] : $layout['defCol']));
 						$code_td.=$wrap[0].$content.$wrap[1];
 						$cc++;
 					}
@@ -1392,7 +1392,7 @@ $str.=$this->docBodyTagBegin().
 	 * Returns a tab menu for a module
 	 * Requires the JS function jumpToUrl() to be available
 	 *
-	 * @param	string		$id is the "&id=" parameter value to be sent to the module
+	 * @param	string		$id is the "&id=" parameter value to be sent to the module, but it can be also a parameter array which will be passed instead of the &id=...
 	 * @param	string		$elementName it the form elements name, probably something like "SET[...]"
 	 * @param	string		$currentValue is the value to be selected currently.
 	 * @param	array		$menuItems is an array with the menu items for the selector box
@@ -1401,17 +1401,22 @@ $str.=$this->docBodyTagBegin().
 	 * @return	string		HTML code for tab menu
 	 * @author	René Fritz <r.fritz@colorcube.de>
 	 */
-	function getTabMenu($id,$elementName,$currentValue,$menuItems,$script='',$addparams='')	{
+	function getTabMenu($mainParams,$elementName,$currentValue,$menuItems,$script='',$addparams='')	{
 		$content='';
 
 		if (is_array($menuItems))	{
+			if (!is_array($mainParams)) {
+				$mainParams = array('id' => $mainParams);
+			}
+			$mainParams = t3lib_div::implodeArrayForUrl('',$mainParams);
+		
 			if (!$script) {$script=basename(PATH_thisScript);}
 
 			$menuDef = array();
 			foreach($menuItems as $value => $label) {
 				$menuDef[$value]['isActive'] = !strcmp($currentValue,$value);
 				$menuDef[$value]['label'] = t3lib_div::deHSCentities(htmlspecialchars($label));
-				$menuDef[$value]['url'] = htmlspecialchars($script.'?id='.rawurlencode($id).$addparams.'&'.$elementName.'='.$value);
+				$menuDef[$value]['url'] = htmlspecialchars($script.'?'.$mainParams.$addparams.'&'.$elementName.'='.$value);
 			}
 			$content = $this->getTabMenuRaw($menuDef);