From f5b51eababe28a3d7f716d9369a468e7b00b969a Mon Sep 17 00:00:00 2001
From: skeeter <skeeter@alumni.egroupware.org>
Date: Sun, 10 Dec 2000 16:03:08 +0000
Subject: [PATCH] fixes for matrixviews

---
 calendar/edit_entry.php     |  2 +-
 calendar/inc/header.inc.php | 27 +++++++++++++++++++--------
 calendar/viewmatrix.php     |  9 ++++++++-
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/calendar/edit_entry.php b/calendar/edit_entry.php
index 60615a2b68..18cc362b34 100755
--- a/calendar/edit_entry.php
+++ b/calendar/edit_entry.php
@@ -229,7 +229,7 @@
 
 // Groups
     $phpgw->template->set_var("field",lang("Groups"));
-    $str = "<select name=\"cal[groups[]]\" multiple size=\"5\">";
+    $str = "<select name=\"cal[groups][]\" multiple size=\"5\">";
     $db2 = $phpgw->db;
     $db2->query("SELECT account_lid FROM accounts WHERE account_id=".$cal_info->owner,__LINE__,__FILE__);
     $db2->next_record();
diff --git a/calendar/inc/header.inc.php b/calendar/inc/header.inc.php
index f877f6a00c..c5ffde87f1 100644
--- a/calendar/inc/header.inc.php
+++ b/calendar/inc/header.inc.php
@@ -1,7 +1,8 @@
 <?php
 
   global $date, $year, $month, $day, $thisyear, $thismonth, $thisday, $filter, $keywords;
-//  global $filter_method;
+  global $matrixtype, $participants;
+
   if(!isset($phpgw_info["user"]["preferences"]["calendar"]["weekdaystarts"]))
      $phpgw_info["user"]["preferences"]["calendar"]["weekdaystarts"] = "Sunday";
 
@@ -67,28 +68,38 @@
     <img src="<?php echo $phpgw_info["server"]["app_images"]; ?>/view.gif" alt="<?php echo lang("Daily Matrix View"); ?>" border="0">
    </a>
   </td>
-  <form action="<?php echo $phpgw->link(""); ?>" name="filtermethod" method="POST">
+  <form action="<?php echo $phpgw->link(""); ?>" method="POST" name="filtermethod">
    <td width="55%" align="center" valign="center">
     <b><?php echo lang("Filter"); ?>:</b>
     <input type="hidden" name="from" value="<?php echo $PHP_SELF; ?>">
-    <?php if(isset($date) && $date) { ?>
+<?php if(isset($date) && $date) { ?>
     <input type="hidden" name="date" value="<?php echo $date; ?>">
-    <?php } ?>
+<?php } ?>
     <input type="hidden" name="month" value="<?php echo $thismonth; ?>">
     <input type="hidden" name="day" value="<?php echo $thisday; ?>">
     <input type="hidden" name="year" value="<?php echo $thisyear; ?>">
-    <?php if(isset($keywords) && $keywords) { ?>
+<?php if(isset($keywords) && $keywords) { ?>
     <input type="hidden" name="keywords" value="<?php echo $keywords; ?>">
-    <?php } ?>
+<?php } ?>
+<?php if(isset($matrixtype) && $matrixtype) { ?>
+    <input type="hidden" name="matrixtype" value="<?php echo $matrixtype; ?>">
+<?php } ?>
+<?php
+    if(isset($participants) && $participants) {
+      for ($i=0;$i<count($participants);$i++) {
+	echo "<input type=\"hidden\" name=\"participants[]\" value=\"".$participants[$i]."\">";
+      }
+    } ?>
     <select name="filter" onchange="document.filtermethod.submit()">
-     <option value="all"<?php if((!isset($filter) || !$filter) || $filter=="all") echo " selected"; ?>>All</option>
-     <option value="private"<?php if($filter=="private") echo " selected"; ?>>Private Only</option>
+     <option value="all"<?php if($filter=="all") echo " selected"; ?>>All</option>
+     <option value="private"<?php if((!isset($filter) || !$filter) || $filter=="private") echo " selected"; ?>>Private Only</option>
      <option value="public"<?php if($filter=="public") echo " selected"; ?>>Global Public Only</option>
      <option value="group"<?php if($filter=="group") echo " selected"; ?>>Group Public Only</option>
      <option value="private+public"<?php if($filter=="private+public") echo " selected"; ?>>Private and Global Public</option>
      <option value="private+group"<?php if($filter=="private+group") echo " selected"; ?>>Private and Group Public</option>
      <option value="public+group"<?php if($filter=="public+group") echo " selected"; ?>>Global Public and Group Public</option>
     </select>
+    <NOSCRIPT><INPUT TYPE="submit" VALUE="<?php echo lang("Go!"); ?>"></NOSCRIPT></FONT>
    </td>
   </form>
   <form action="<?php echo $phpgw->link("search.php"); ?>" method="POST">
diff --git a/calendar/viewmatrix.php b/calendar/viewmatrix.php
index b851f4e975..6c3cebb044 100755
--- a/calendar/viewmatrix.php
+++ b/calendar/viewmatrix.php
@@ -13,6 +13,8 @@
 
   /* $Id$ */
 
+  $matrix = $matrixtype;
+
   $phpgw_info["flags"] = array("currentapp" => "calendar", "enable_calendar_class" => True, "enable_nextmatchs_class" => True, "parent_page" => "matrixselect.php");
 
   include("../header.inc.php");
@@ -53,6 +55,8 @@
     }
   }
 
+  reset($participants);
+
   switch($matrixtype) {
     case "free/busy" :
       echo $phpgw->calendar->timematrix($phpgw->calendar->date_to_epoch($date),$phpgw->calendar->splittime("000000"),0,$participants);
@@ -64,9 +68,12 @@
   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=\"matrixtype\" value=\"".$matrixtype."\">";
+  echo "<input type=\"hidden\" name=\"matrixtype\" value=\"".$matrix."\">";
   for ($i=0;$i<count($participants);$i++)
     echo "<input type=\"hidden\" name=\"participants[]\" value=\"".$participants[$i]."\">";
+  if(isset($filter) && $filter) {
+    echo "<input type=\"hidden\" name=\"filter\" value=\"".$filter."\">";
+  }
   echo "<input type=\"submit\" value=\"Refresh\">";
   echo "</form>";
   echo "</center>";