Added missing columns, changed visualization of URLs

diff --git a/src/Infodrom/events/edit.wml b/src/Infodrom/events/edit.wml
index aaa8d65..7d1be06 100644 (file)
--- a/src/Infodrom/events/edit.wml
+++ b/src/Infodrom/events/edit.wml
@@ -32,10 +32,18 @@
 <form method=post action="update.php3">
 <input type=hidden name=id value="<? echo $id; ?>">
 <b>Name:</b> <input name=name size=60 maxlength=80 value="<? echo $row['name']; ?>"><br>
+<b>City:</b> <input name=city size=60 maxlength=80 value="<? echo $row['city']; ?>"><br>
+<b>Country:</b> <input name=country size=60 maxlength=30 value="<? echo $row['country']; ?>"><br>
+
 <b>Date:</b> <input name=date size=10 maxlength=10 value="<? echo $date; ?>"><br>
 <b>Days:</b> <input name=days size=5 maxlength=2 value="<? echo $days; ?>"><br>
+
+<b>Conference:</b> <input name=conference type=checkbox value=1        <? if ($row['conference']==1) { echo "checked";} ?>><br>
+<b>Exhibition:</b> <input name=exhibition type=checkbox value=1        <? if ($row['exhibition']==1) { echo "checked";} ?>><br>
+
 <b>URL:</b> <input name=url size=60 maxlength=120 value="<? echo $row['url']; ?>"><br>
 <b>Debian URL:</b> <input name=deburl size=60 maxlength=120 value="<? echo $row['deburl']; ?>"><br>
+<b>Local URL:</b> <input name=localurl size=60 maxlength=120 value="<? echo $row['localurl']; ?>"><br>
 <? if ($id > 0) { ?>
 <b>Delete:</b> <input name=delete type=radio value="1"> yes
 <input name=delete type=radio value="0" checked> no<br>
@@ -45,14 +53,20 @@
 
 <p><?
   if ($id > 0) {
-    if ($row['url']) {
-      printf ("<br>URL: <a href=\"%s\">%s</a>", $row['url'], $row['url']);
-    }
-    if ($row['deburl']) {
-      printf ("<br>Debian URL: <a href=\"%s\">%s</a>", $row['deburl'], $row['deburl']);
-    }
-    if ($row['localburl']) {
-      printf ("<br>Local URL: <a href=\"%s\">%s</a>", $row['localurl'], $row['localurl']);
+    if (strlen($row['url']) || strlen($row['deburl']) || strlen($row['localurl'])) {
+      echo ("<h3>URLs</h3><ul>");
+
+      if ($row['url']) {
+       printf ("<li> <a href=\"%s\">Event</a> (%s)", $row['url'], $row['url']);
+      }
+      if ($row['deburl']) {
+       printf ("<li> <a href=\"%s\">Debian</a> (%s)", $row['deburl'], $row['deburl']);
+      }
+      if ($row['localburl']) {
+       printf ("<li> <a href=\"%s\">Infodrom</a> (%s)", $row['localurl'], $row['localurl']);
+      }
+
+      echo ("</ul>");
     }
   }
 ?>
@@ -60,7 +74,6 @@
 </page>
 
 # Local variables:
-# mode: text
+# mode: indented-text
 # mode: auto-fill
-# mode: iso-accents
 # end:

diff --git a/src/Infodrom/events/update.wml b/src/Infodrom/events/update.wml
index 5a77b40..bdf70f4 100644 (file)
--- a/src/Infodrom/events/update.wml
+++ b/src/Infodrom/events/update.wml
@@ -24,7 +24,7 @@
   $date = sprintf ("%d-%d-%d", $date[2], $date[1], $date[0]);
 
 <:
-    for $i (('name','url','deburl','localurl')) {
+    for $i (('name','city','country','url','deburl','localurl')) {
       printf "    \$%s=sql_prepare (\$%s);\n", $i, $i;
     }
 :>
@@ -33,14 +33,15 @@
     if ($delete) {
       $query = sprintf ("DELETE FROM events WHERE oid = %d", $id);
     } else {
-      $query = sprintf ("UPDATE events SET name='%s',start='%s',delta='%s',url='%s',deburl='%s',localurl='%s' WHERE oid = %d",
-                     $name, $date, $days, $url, $deburl, $localurl, $id);
+      $query = sprintf ("UPDATE events SET name='%s',start='%s',delta='%s',city='%s',country='%s',"
+                      ."conference=%d,exhibition=%d,url='%s',deburl='%s',localurl='%s' WHERE oid = %d",
+                     $name, $date, $days, $city, $country, $conference, $exhibition, $url, $deburl, $localurl, $id);
     }
   } else {
-    $query = sprintf ("INSERT INTO events VALUES ('%s','%s','%s','%s','%s','%s','now')",
-                     $date, $days, $name, $url, $deburl, $localurl);
+    $query = sprintf ("INSERT INTO events VALUES ('%s','%s','%s','%s','%s',%d,%d,'%s','%s','%s','now')",
+                     $date, $days, $name, $city, $country, $conference, $exhibition, $url, $deburl, $localurl);
   }
-  printf ("<pre>\n%s\n</pre>\n", $query);
+  //printf ("<pre>\n%s\n</pre>\n", $query);
   $sth = pg_exec ($dbh, $query) or die("Datenbank-Abfrage!");
 
 ?>