From 3d65ae21586b1318c5d45762a474b61a801f292e Mon Sep 17 00:00:00 2001
From: Wouter van Oijen <wouter@webgui-svn>
Date: Sun, 16 Oct 2005 19:33:27 +0000
Subject: [PATCH] XHTML bugfixes

---
 lib/WebGUI/Auth/LDAP.pm          |  5 +++--
 lib/WebGUI/Operation/Commerce.pm | 18 ++++++------------
 lib/WebGUI/Operation/Settings.pm |  9 +++------
 lib/WebGUI/Operation/User.pm     | 10 +++-------
 4 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/lib/WebGUI/Auth/LDAP.pm b/lib/WebGUI/Auth/LDAP.pm
index 03d54b5e9..0b5af6547 100644
--- a/lib/WebGUI/Auth/LDAP.pm
+++ b/lib/WebGUI/Auth/LDAP.pm
@@ -107,7 +107,7 @@ sub addUserForm {
 	   }
 	   $jsArray .= 'ldapValue["0"]="'.$ldapUrl.'";'."\n";
 	   $jscript = qq|
-	   <script>
+	   <script type="text/javascript">
 	      <!--
 	        var ldapValue = new Array();
 		    $jsArray
@@ -132,7 +132,8 @@ sub addUserForm {
 		-label => WebGUI::International::get(4,'AuthLDAP'),
 		-value => $connectDN,
 	);
-	return $jscript.$f->printRowsOnly;
+	WebGUI::Style::setRawHeadTags($jscript);
+	return $f->printRowsOnly;
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Operation/Commerce.pm b/lib/WebGUI/Operation/Commerce.pm
index 878794795..9f0470869 100644
--- a/lib/WebGUI/Operation/Commerce.pm
+++ b/lib/WebGUI/Operation/Commerce.pm
@@ -433,7 +433,7 @@ sub www_editCommerceSettings {
 		
 	# payment plugin
 	if (%paymentPlugins) {
-		$tabform->getTab('payment')->raw('<script type="text/javascript"> var activePayment="'.$paymentPlugin.'"; </script>');
+		WebGUI::Style::setRawHeadTags('<script type="text/javascript">var activePayment="'.$paymentPlugin.'";</script>');
 		$tabform->getTab("payment")->selectList(
 			-name		=> 'commercePaymentPlugin',
 			-options	=> \%paymentPlugins,
@@ -442,15 +442,12 @@ sub www_editCommerceSettings {
 			-extras		=> 'onchange="activePayment=operateHidden(this.options[this.selectedIndex].value,activePayment)"'
 			);
 			
-		$jscript = '<script type="text/javascript">';
 		foreach $currentPlugin (@paymentPlugins) {
-			$tabform->getTab('payment')->raw('<tr id="'.$currentPlugin->namespace.'"><td colspan="2" width="100%">'.
+			my $style = '" style="display: none;' unless ($currentPlugin->namespace eq $paymentPlugin);
+			$tabform->getTab('payment')->raw('<tr id="'.$currentPlugin->namespace.$style.'"><td colspan="2" width="100%">'.
 				'<table border="0" cellspacing="0" cellpadding="0" width="100%">'.
 				$currentPlugin->configurationForm.'<tr><td width="304">&nbsp;</td><td width="496">&nbsp;</td></tr></table></td></tr>');
-			$jscript .= "document.getElementById(\"".$currentPlugin->namespace."\").style.display='".(($currentPlugin->namespace eq $paymentPlugin)?"":"none")."';";
 		}
-		$jscript .= '</script>';	
-		$tabform->getTab('payment')->raw($jscript);
 	} else {
 		$tabform->getTab('payment')->raw('<tr><td colspan="2" align="left">'.$i18n->get('no payment plugins selected').'</td></tr>');
 	}
@@ -474,7 +471,7 @@ sub www_editCommerceSettings {
 	
 	# shipping plugin
 	if (%shippingPlugins) {
-		$tabform->getTab('shipping')->raw('<script type="text/javascript"> var activeShipping="'.$shippingPlugin.'"; </script>');
+		WebGUI::Style::setRawHeadTags('<script type="text/javascript">var activeShipping="'.$shippingPlugin.'";</script>');
 		$tabform->getTab('shipping')->selectList(
 			-name	=> 'commerceShippingPlugin',
 			-options=> \%shippingPlugins,
@@ -483,15 +480,12 @@ sub www_editCommerceSettings {
 			-extras	=> 'onchange="activeShipping=operateHidden(this.options[this.selectedIndex].value,activeShipping)"'
 			);
 		
-		$jscript = '<script type="text/javascript">';
 		foreach $currentPlugin (@shippingPlugins) {
-			$tabform->getTab('shipping')->raw('<tr id="'.$currentPlugin->namespace.'"><td colspan="2" width="100%">'.
+			my $style = '" style="display: none;' unless ($currentPlugin->namespace eq $shippingPlugin);
+			$tabform->getTab('shipping')->raw('<tr id="'.$currentPlugin->namespace.$style.'"><td colspan="2" width="100%">'.
 				'<table border="0" cellspacing="0" cellpadding="0" width="100%">'.
 				$currentPlugin->configurationForm.'<tr><td width="304">&nbsp;</td><td width="496">&nbsp;</td></tr></table></td></tr>');
-			$jscript .= "document.getElementById(\"".$currentPlugin->namespace."\").style.display='".(($currentPlugin->namespace eq $shippingPlugin)?"":"none")."';";
 		}
-		$jscript .= '</script>';	
-		$tabform->getTab('shipping')->raw($jscript);
 	} else {
 		$tabform->getTab('shipping')->raw('<tr><td colspan="2" align="left">'.$i18n->get('no shipping plugins selected').'</td></tr>');
 	}
diff --git a/lib/WebGUI/Operation/Settings.pm b/lib/WebGUI/Operation/Settings.pm
index b393b6e0b..2fa4fb66b 100644
--- a/lib/WebGUI/Operation/Settings.pm
+++ b/lib/WebGUI/Operation/Settings.pm
@@ -269,7 +269,7 @@ sub www_editSettings {
         );
 # auth settings 
 	WebGUI::Style::setScript($session{config}{extrasURL}."/swapLayers.js",{type=>"text/javascript"});
-   	$tabform->getTab("auth")->raw('<script type="text/javascript" > var active="'.$session{setting}{authMethod}.'"; </script>');
+	WebGUI::Style::setRawHeadTags('<script type="text/javascript" >var active="'.$session{setting}{authMethod}.'";</script>');
    	my $options;
    	foreach (@{$session{config}{authMethods}}) {
       		$options->{$_} = $_;
@@ -282,14 +282,11 @@ sub www_editSettings {
 		-value=>[$session{setting}{authMethod}],
 		-extras=>"onChange=\"active=operateHidden(this.options[this.selectedIndex].value,active)\""
 		);
-	my $jscript = '<script type="text/javascript">';
 	foreach (@{$session{config}{authMethods}}) {
 		my $authInstance = WebGUI::Operation::Auth::getInstance($_,1);
-		$tabform->getTab("auth")->raw('<tr id="'.$_.'"><td colspan="2" width="100%"><table border="0" cellspacing="0" cellpadding="0" width="100%">'.$authInstance->editUserSettingsForm.'<tr><td width="304">&nbsp;</td><td width="496">&nbsp;</td></tr></table></td></tr>');
-		$jscript .= "document.getElementById(\"$_\").style.display='".(($_ eq $session{setting}{authMethod})?"":"none")."';";
+		my $style = '" style="display: none;' unless ($_ eq $session{setting}{authMethod});
+		$tabform->getTab("auth")->raw('<tr id="'.$_.$style.'"><td colspan="2" width="100%"><table border="0" cellspacing="0" cellpadding="0" width="100%">'.$authInstance->editUserSettingsForm.'<tr><td width="304">&nbsp;</td><td width="496">&nbsp;</td></tr></table></td></tr>');
 	}
-	$jscript .= "</script>";	
-	$tabform->getTab("auth")->raw($jscript);
 	$tabform->submit();
 	my $ac = WebGUI::AdminConsole->new("settings");
 	$ac->setHelp("settings");
diff --git a/lib/WebGUI/Operation/User.pm b/lib/WebGUI/Operation/User.pm
index 15189f328..67941179b 100644
--- a/lib/WebGUI/Operation/User.pm
+++ b/lib/WebGUI/Operation/User.pm
@@ -223,10 +223,9 @@ sub www_editUser {
 		"groups"=> { label=>$i18n->get('89')},
 		);
 	my $tabform = WebGUI::TabForm->new(\%tabs);
-	$tabform->formHeader({extras=>'autocomplete="off"'});
 	my $u = WebGUI::User->new(($session{form}{uid} eq 'new') ? '' : $session{form}{uid});
 	WebGUI::Style::setScript($session{config}{extrasURL}."/swapLayers.js", {type=>"text/javascript"});
-	$tabform->getTab("account")->raw('<script type="text/javascript" > var active="'.$u->authMethod.'"; </script>');
+	WebGUI::Style::setRawHeadTags('<script type="text/javascript">var active="'.$u->authMethod.'";</script>');
     	$tabform->hidden({name=>"op",value=>"editUserSave"});
     	$tabform->hidden({name=>"uid",value=>$session{form}{uid}});
     	$tabform->getTab("account")->raw('<tr><td width="170">&nbsp;</td><td>&nbsp;</td></tr>');
@@ -270,14 +269,11 @@ sub www_editUser {
 		-value=>[$u->authMethod],
 		-extras=>"onChange=\"active=operateHidden(this.options[this.selectedIndex].value,active)\""
 		);
-	my $jscript = '<script type="text/javascript">';
 	foreach (@{$session{config}{authMethods}}) {
 		my $authInstance = WebGUI::Operation::Auth::getInstance($_,$u->userId);
-		$tabform->getTab("account")->raw('<tr id="'.$_.'"><td colspan="2" align="center"><table>'.$authInstance->editUserForm.'<tr><td width="170">&nbsp;</td><td>&nbsp;</td></tr></table></td></tr>');
-		$jscript .= "document.getElementById(\"$_\").style.display='".(($_ eq $u->authMethod)?"":"none")."';";
+		my $style = '" style="display: none;' unless ($_ eq $u->authMethod);
+		$tabform->getTab("account")->raw('<tr id="'.$_.$style.'"><td colspan="2" align="center"><table>'.$authInstance->editUserForm.'<tr><td width="170">&nbsp;</td><td>&nbsp;</td></tr></table></td></tr>');
 	}
-	$jscript .= "</script>";	    
-	$tabform->getTab("account")->raw($jscript);
         my $a = WebGUI::SQL->read("select * from userProfileField,userProfileCategory
                 where userProfileField.profileCategoryId=userProfileCategory.profileCategoryId
                 order by userProfileCategory.sequenceNumber,userProfileField.sequenceNumber");