From a33feebe8e7fead360396a2e95ab1b81ee1eb96b Mon Sep 17 00:00:00 2001
From: skeeter <skeeter@alumni.egroupware.org>
Date: Tue, 28 Nov 2000 04:46:18 +0000
Subject: [PATCH] fix for netscape not working with Netscape 6

---
 calendar/matrixselect.php                   | 15 +++++++++------
 calendar/templates/default/matrix_query.tpl |  5 ++---
 calendar/viewmatrix.php                     |  4 ++--
 doc/CHANGELOG                               |  1 +
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/calendar/matrixselect.php b/calendar/matrixselect.php
index f6ef6e53bb..a9707597a5 100755
--- a/calendar/matrixselect.php
+++ b/calendar/matrixselect.php
@@ -81,8 +81,8 @@
 
 // View type
   $phpgw->template->set_var("field",lang("View"));
-  $str = "<select name=\"view\">";
-  $str .= "<option value=\"free/busy\">".lang("free/busy")."</option>\n";
+  $str = "<select name=\"matrixtype\">";
+  $str .= "<option value=\"free/busy\" selected>".lang("free/busy")."</option>\n";
   $str .= "<option value=\"weekly\">".lang("Weekly")."</option>\n";
   $str .= "</select>\n";
   $phpgw->template->set_var("data",$str);
@@ -126,11 +126,14 @@
   $phpgw->template->set_var("data",$str);
   $phpgw->template->parse("output","list",True);
 
-  $phpgw->template->set_var("action_url_button","");
-  $phpgw->template->set_var("action_text_button",lang("Submit"));
-  $phpgw->template->set_var("action_confirm_button","onClick=\"document.matrixform.submit();\"");
+//  $phpgw->template->set_var("action_url_button","");
+//  $phpgw->template->set_var("action_text_button",lang("Submit"));
+//  $phpgw->template->set_var("action_confirm_button","onClick=\"document.matrixform.submit();\"");
+//  $phpgw->template->parse("submit_button","form_button");
+  $phpgw->template->set_var("submit_button",lang("Submit"));
+
+//<!-- {submit_button} -->
 
-  $phpgw->template->parse("submit_button","form_button");
 
 
   $phpgw->template->set_var("action_url_button","");
diff --git a/calendar/templates/default/matrix_query.tpl b/calendar/templates/default/matrix_query.tpl
index 320b82d6e3..391217d70c 100755
--- a/calendar/templates/default/matrix_query.tpl
+++ b/calendar/templates/default/matrix_query.tpl
@@ -3,7 +3,7 @@
 <center>
 <h2><font color="#000000">{matrix_action}</font></h2>
 
-<form action="{action_url}" method="post" name="matrixform" target="viewmatrix">
+<form target="viewmatrix" action="{action_url}" method="post" name="matrixform">
 <table border="0" width="75%">
 <!-- END matrix_query_begin -->
 
@@ -11,9 +11,8 @@
 
 <!-- BEGIN matrix_query_end -->
 </table>
+<input type="submit" value="{submit_button}">
 </form>
-{submit_button}
-
 {cancel_button}
 </center>
 <!-- END matrix_query_end -->
diff --git a/calendar/viewmatrix.php b/calendar/viewmatrix.php
index 20daca0645..b851f4e975 100755
--- a/calendar/viewmatrix.php
+++ b/calendar/viewmatrix.php
@@ -53,7 +53,7 @@
     }
   }
 
-  switch($view) {
+  switch($matrixtype) {
     case "free/busy" :
       echo $phpgw->calendar->timematrix($phpgw->calendar->date_to_epoch($date),$phpgw->calendar->splittime("000000"),0,$participants);
       break;
@@ -64,7 +64,7 @@
   echo "<center>";
   echo "<form action=\"".$phpgw->link("viewmatrix.php")."\" method=\"post\" name=\"matrixform\" target=\"viewmatrix\">";
   echo "<input type=\"hidden\" name=\"date\" value=\"".$date."\">";
-  echo "<input type=\"hidden\" name=\"view\" value=\"".$view."\">";
+  echo "<input type=\"hidden\" name=\"matrixtype\" value=\"".$matrixtype."\">";
   for ($i=0;$i<count($participants);$i++)
     echo "<input type=\"hidden\" name=\"participants[]\" value=\"".$participants[$i]."\">";
   echo "<input type=\"submit\" value=\"Refresh\">";
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index a62cd42fae..963fc2ceba 100755
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -8,6 +8,7 @@
         - Fix for TTS with Update by non-email user.
         - Fixed admin/accesslog.php wasn't using phpgw_access_log
 	- Fix for Week View warning in calendar.
+	- Fix for Matrix View not working with Netscape 6.
 
 [0.9.6] - Fix user permissions where not being checked properly.