Corrected indention. I guess the little html snipped confused me somehow...

diff --git a/src/LinuxTag/2002/supporter/job.wml b/src/LinuxTag/2002/supporter/job.wml
index b020712..a615941 100644 (file)
--- a/src/LinuxTag/2002/supporter/job.wml
+++ b/src/LinuxTag/2002/supporter/job.wml
@@ -139,60 +139,60 @@
     }
   }
 
-  reset ($ltdays);
-  while (list($date,$day) = each ($ltdays)) {
-    if (strlen ($frag[$date]) > 0) {
-      printf ("<h3>%s</h3>", $day);
-      # printf ("<p><b>Fragments:</b> %s (DEBUG)", $frag[$date]);
-
-      if (is_array ($assignment[$date])) {
-        $assign = $assignment[$date];
-      } else {
-        $assign = array ();
-      }
+    reset ($ltdays);
+    while (list($date,$day) = each ($ltdays)) {
+      if (strlen ($frag[$date]) > 0) {
+       printf ("<h3>%s</h3>", $day);
+       # printf ("<p><b>Fragments:</b> %s (DEBUG)", $frag[$date]);
 
-      if (is_array ($fragments[$date])) {
-        $fragment = $fragments[$date];
-      } else {
-        $fragment = array ();
-      }
+       if (is_array ($assignment[$date])) {
+         $assign = $assignment[$date];
+       } else {
+         $assign = array ();
+       }
 
-      $as_pivot = 0;   // assignment
-      for ($nr=0; $nr < count ($fragment); $nr++) {
-        while ($as_pivot < count ($assign) && time_lt ($assign[$as_pivot]['start'], $fragment[$nr]['start'])) { $as_pivot++; }
-       if ($as_pivot < count ($assign)) {
-         if ( ($assign[$as_pivot]['start'] == $fragment[$nr]['start'])
-           && ($assign[$as_pivot]['end'] == $fragment[$nr]['end'])) {
+       if (is_array ($fragments[$date])) {
+         $fragment = $fragments[$date];
+       } else {
+         $fragment = array ();
+       }
 
-           while ( ($assign[$as_pivot]['start'] == $fragment[$nr]['start'])
-                && ($assign[$as_pivot]['end'] == $fragment[$nr]['end'])) {
-             printf ("<br>%s-%s: <a href=\"edit.php3?oid=%d\">%s</a> "
+       $as_pivot = 0;   // assignment
+       for ($nr=0; $nr < count ($fragment); $nr++) {
+         while ($as_pivot < count ($assign) && time_lt ($assign[$as_pivot]['start'], $fragment[$nr]['start'])) { $as_pivot++; }
+         if ($as_pivot < count ($assign)) {
+           if ( ($assign[$as_pivot]['start'] == $fragment[$nr]['start'])
+             && ($assign[$as_pivot]['end'] == $fragment[$nr]['end'])) {
+
+             while ( ($assign[$as_pivot]['start'] == $fragment[$nr]['start'])
+                  && ($assign[$as_pivot]['end'] == $fragment[$nr]['end'])) {
+               printf ("<br>%s-%s: <a href=\"edit.php3?oid=%d\">%s</a> "
+                      ."(<a href=\"update.php3?type=loose&assignment=%d\">loose this</a>)",
+                      $fragment[$nr]['start'], $fragment[$nr]['end'],
+                      $assign[$as_pivot]['peroid'], $assign[$as_pivot]['person'],
+                      $assign[$as_pivot]['oid']);
+               $as_pivot++;
+             }
+
+             if (!fragment_ok ($dbh, $fragment[$nr]['id'])) {
+               display_supporters ($dbh, $date, $fragment[$nr]['start'], $fragment[$nr]['end'], $fragment[$nr]['id']);
+             }
+             # FIXME
+           } else {
+             printf ("<br>%s-%s: %s"
                     ."(<a href=\"update.php3?type=loose&assignment=%d\">loose this</a>)",
-                    $fragment[$nr]['start'], $fragment[$nr]['end'],
-                    $assign[$as_pivot]['peroid'], $assign[$as_pivot]['person'],
+                    $assign[$as_pivot]['start'], $assign[$as_pivot]['end'], $assign[$as_pivot]['person'],
                     $assign[$as_pivot]['oid']);
-              $as_pivot++;
-           }
-
-           if (!fragment_ok ($dbh, $fragment[$nr]['id'])) {
+             printf ("<br>%s-%s: free", $fragment[$nr]['start'], $fragment[$nr]['end']);
              display_supporters ($dbh, $date, $fragment[$nr]['start'], $fragment[$nr]['end'], $fragment[$nr]['id']);
            }
-           # FIXME
          } else {
-           printf ("<br>%s-%s: %s"
-                  ."(<a href=\"update.php3?type=loose&assignment=%d\">loose this</a>)",
-                  $assign[$as_pivot]['start'], $assign[$as_pivot]['end'], $assign[$as_pivot]['person'],
-                  $assign[$as_pivot]['oid']);
            printf ("<br>%s-%s: free", $fragment[$nr]['start'], $fragment[$nr]['end']);
            display_supporters ($dbh, $date, $fragment[$nr]['start'], $fragment[$nr]['end'], $fragment[$nr]['id']);
          }
-       } else {
-         printf ("<br>%s-%s: free", $fragment[$nr]['start'], $fragment[$nr]['end']);
-         display_supporters ($dbh, $date, $fragment[$nr]['start'], $fragment[$nr]['end'], $fragment[$nr]['id']);
        }
       }
     }
-  }
 
   } else {
     echo "<p><b>No such job found.</b></p>";

diff --git a/src/LinuxTag/2002/supporter/supporter.wml b/src/LinuxTag/2002/supporter/supporter.wml
index 7fe3f82..6a91bcc 100644 (file)
--- a/src/LinuxTag/2002/supporter/supporter.wml
+++ b/src/LinuxTag/2002/supporter/supporter.wml
@@ -132,48 +132,48 @@
     }
   }
 
-  reset ($ltdays);
-  while (list($date,$day) = each ($ltdays)) {
-    if (strlen ($avail[$date]) > 0) {
-      printf ("<h3>%s</h3>", $day);
-      # printf ("<p><b>Available:</b> %s (DEBUG)", $avail[$date]);
-
-      if (is_array ($assignment[$date])) {
-        $assign = $assignment[$date];
-      } else {
-        $assign = array ();
-      }
-
-      if (is_array ($available[$date])) {
-        $around = $available[$date];
-      } else {
-        $around = array ();
-      }
+    reset ($ltdays);
+    while (list($date,$day) = each ($ltdays)) {
+      if (strlen ($avail[$date]) > 0) {
+       printf ("<h3>%s</h3>", $day);
+       # printf ("<p><b>Available:</b> %s (DEBUG)", $avail[$date]);
 
-      $av_pivot = 0;   // availability
-      $as_pivot = 0;   // assignment
-      $slot = $around[0]['start'];
+       if (is_array ($assignment[$date])) {
+         $assign = $assignment[$date];
+       } else {
+         $assign = array ();
+       }
 
-      while (!($av_pivot >= count ($around) && $as_pivot >= count ($assign))) {
-       if ($as_pivot >= count ($assign)) {
-         display_jobs ($dbh, $date, $slot, $around[$av_pivot++]['end'], $name);
-        } elseif (time_lt ($slot, $assign[$as_pivot]['start'])) {
-         display_jobs ($dbh, $date, $slot, $assign[$as_pivot]['start'], $name);
-         $slot = $assign[$as_pivot]['start'];
+       if (is_array ($available[$date])) {
+         $around = $available[$date];
        } else {
-         printf ("<br>%s-%s: <a href=\"edit_job.php3?id=%d\">%s</a> "
-                ."(<a href=\"update.php3?type=loose&assignment=%d\">loose this</a>)",
-                 $assign[$as_pivot]['start'], $assign[$as_pivot]['end'],
-                $assign[$as_pivot]['job'], $assign[$as_pivot]['title'],
-                $assign[$as_pivot]['oid']);
-          $slot = $assign[$as_pivot++]['end'];
-         if (!time_lt ($slot, $around[$av_pivot]['end'])) {
-           $slot = $around[++$av_pivot]['start'];
+         $around = array ();
+       }
+
+       $av_pivot = 0;   // availability
+       $as_pivot = 0;   // assignment
+       $slot = $around[0]['start'];
+
+       while (!($av_pivot >= count ($around) && $as_pivot >= count ($assign))) {
+         if ($as_pivot >= count ($assign)) {
+           display_jobs ($dbh, $date, $slot, $around[$av_pivot++]['end'], $name);
+         } elseif (time_lt ($slot, $assign[$as_pivot]['start'])) {
+           display_jobs ($dbh, $date, $slot, $assign[$as_pivot]['start'], $name);
+           $slot = $assign[$as_pivot]['start'];
+         } else {
+           printf ("<br>%s-%s: <a href=\"edit_job.php3?id=%d\">%s</a> "
+                  ."(<a href=\"update.php3?type=loose&assignment=%d\">loose this</a>)",
+                  $assign[$as_pivot]['start'], $assign[$as_pivot]['end'],
+                  $assign[$as_pivot]['job'], $assign[$as_pivot]['title'],
+                  $assign[$as_pivot]['oid']);
+           $slot = $assign[$as_pivot++]['end'];
+           if (!time_lt ($slot, $around[$av_pivot]['end'])) {
+             $slot = $around[++$av_pivot]['start'];
+           }
          }
        }
       }
     }
-  }
 
   } else {
     echo "<p><b>No such user found.</b></p>";