fix insert. Forgot to add a ", ?" when adding gruppenfotoerlaubnis.

[fsinf/pub/w2c.git] / funcs.php

diff --git a/funcs.php b/funcs.php
index f7bf2c49f466f7e6ace944c52b6765ccbf73a488..6e4047fd47daa88f1074ee9880acff072729ee74 100644 (file)
--- a/funcs.php
+++ b/funcs.php
@@ -1,19 +1,19 @@
-<?php
-
+<?php define('FUNCS_PATH', __DIR__);
 /**
 * welcome.TU.code Anmeldesystem.
 * by Jan Vales <jan@jvales.net> (aka. Someone <someone@somenet.org>)
 */
 
-require_once('./settings.php');
-require_once('./db_funcs.php');
+require_once(FUNCS_PATH.'/settings.php');
+require_once(FUNCS_PATH.'/db_funcs.php');
+require_once(FUNCS_PATH.'/html_funcs.php');
 
 function login(){
-//  if(!isset($_SERVER['HTTPS'])){
-//    $url = 'https://'.$_SERVER["HTTP_HOST"].$_SERVER['REQUEST_URI'];
-//    header('Location: '.$url, true, 301);
-//    exit('<h1>Redirecting to: <a href="'.$url.'">'.$url.'</a></h1>');
-//  }
+  if(!isset($_SERVER['HTTPS'])){
+    $url = 'https://'.$_SERVER["HTTP_HOST"].$_SERVER['REQUEST_URI'];
+    header('Location: '.$url, true, 301);
+    exit('<h1>Redirecting to: <a href="'.$url.'">'.$url.'</a></h1>');
+  }
   $uinfo = db_get_uinfo($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']);
   if($uinfo['lvl'] >= 1){
     $GLOBALS['uname'] = $uinfo['uname'];
@@ -21,68 +21,74 @@ function login(){
   }else{
     header('WWW-Authenticate: Basic realm="WelcomeTUcode login"');
     header('HTTP/1.0 401 Unauthorized');
-    exit('Nicht eingeloggt. Falsche Anmeldedaten?');
+    exit(html_top("Anmeldesystem").html_linkbox().'<span class="statusERR">Nicht eingeloggt. Falsche Anmeldedaten?</span>'.html_bottom());
   }
 }
 
 function list_anmeldungen(){
   $liste = db_list_anmeldungen();
-  $ret = '<table border=1><tr><th>Aktion</th><th>id</th><th>Anmeldung bei</th><th>Nachname(n)</th><th>Vorname(n)</th><th>Geboren</th><th>Nationalität</th><th>Sprachkenntnis</th>'.
-    '<th>Vorwissen</th><th>Analphabet</th><th>fotoerlaubnis</th><th>Videoerlaubnis</th><th>Bemerkung</th></tr>';
+  $ret = '<table id="sortable"><thead><tr><th>Aktion</th><th>id</th><th>Anmeldung bei</th><th>Nachname(n)</th><th>Vorname(n)</th><th>Geboren</th>'.
+    '<th>Nationalität</th><th>Sprachkenntnis</th><th>Vorwissen</th><th>Analphabet</th><th>Gruppen-</th><th>Foto-</th><th>Videoerlaubnis</th>'.
+       '<th>Status</th><th>Bemerkung</th><th>Termin</th></tr></thead><tbody>'."\n";
   foreach ($liste as &$person) {
-    $ret .='<tr id="pers_'.$person['id'].'"><td><a href="./person.php?id='.$person['id'].'">Bearbeiten</a></td><td>'.$person['id'].'</td><td>'.$person['uname'].'</td>'.
-       '<td>'.$person['nname'].'</td><td>'.$person['vname'].'</td><td>'.$person['gebdatum'].'</td><td>'.$person['nationaliaet'].'</td>'.
-       '<td>'.$person['sprachen'].'</td><td>'.$person['vorwissen'].'</td><td>'.$person['analphabet'].'</td><td>'.$person['fotoerlaubnis'].'</td>'.
-       '<td>'.$person['videoerlaubnis'].'</td><td>'.$person['bemerkungen'].'</td></tr>';
-/*    echo '<div class="person" id="pers_'.$person['id'].'" style="border:1px solid black;"><div id="pers_'.$person['id'].'_vname">'.$person['vname'].'</div>
-       <div id="pers_'.$person['id'].'_nname">'.$person['nname'].'</div> <div id="pers_'.$person['id'].'_gebdatum">'.$person['gebdatum'].'</div>
-       <div id="pers_'.$person['id'].'_nationaliaet">'.$person['nationaliaet'].'</div> <div id="pers_'.$person['id'].'_sprachen">'.$person['sprachen'].'</div>
-       <div id="pers_'.$person['id'].'_vorwissen">'.$person['vorwissen'].'</div> <div id="pers_'.$person['id'].'_analphabet">'.$person['analphabet'].'</div>
-       <div id="pers_'.$person['id'].'_fotoerlaubnis">'.$person['fotoerlaubnis'].'</div> <div id="pers_'.$person['id'].'_videoerlaubnis">'.$person['videoerlaubnis'].'</div>
-       <div class="bemerkung" id="pers_'.$person['id'].'_bemerkungen">'.$person['bemerkungen'].'</div>
-       </div>';*/
+    $ret .='<tr id="pers_'.$person['id'].'"><td><a href="./person.php?id='.$person['id'].'">Bearbeiten</a></td><td>'.$person['id'].'</td>';
+       $ret .='<td>'.$person['uname'].'</td><td>'.$person['nname'].'</td><td>'.$person['vname'].'</td><td><nobr>'.$person['gebdatum'].'</nobr></td>';
+       $ret .='<td>'.$person['nationaliaet'].'</td><td>'.$person['sprachen'].'</td><td>'.$person['vorwissen'].'</td><td>'.$person['analphabet'].'</td>';
+       $ret .='<td>'.$person['gruppenfotoerlaubnis'].'</td><td>'.$person['fotoerlaubnis'].'</td><td>'.$person['videoerlaubnis'].'</td>';
+    $ret .='<td>'.$person['status'].'</td><td>'.$person['bemerkungen'].'</td><td>'.$person['termin'].'</td></tr>'."\n";
   }
-  return $ret.'</table>';
+  return $ret.'</tbody></table>'."\n";
 }
 
 function store_person(){
-  if(!isset($_REQUEST['delete']) && !isset($_REQUEST['save'])) return 0;
+  if(!isset($_REQUEST['delete']) && !isset($_REQUEST['save']))return;
 
 //var_export($_REQUEST);
 
   if(isset($_REQUEST['delete']))return db_delete_person($_REQUEST['id']);
   if(isset($_REQUEST['save'])){
 
-    if(!isset($_REQUEST['vname']))return '-vname- not set!';
+    if(!isset($_REQUEST['vname']))throw new Exception('NOT_SET vname');
     $pdata['vname']=$_REQUEST['vname'];
 
-    if(!isset($_REQUEST['nname']))return '-nname- not set!';
+    if(!isset($_REQUEST['nname']))throw new Exception('NOT_SET nname');
     $pdata['nname']=$_REQUEST['nname'];
 
-    if(!isset($_REQUEST['gebdatum']))return '-gebdatum- not set!';
+    if($pdata['vname'] == '' && $pdata['nname'] == '')throw new Exception('NO_NAME');
+
+    if(!isset($_REQUEST['gebdatum']))throw new Exception('NOT_SET gebdatum');
     $pdata['gebdatum']=$_REQUEST['gebdatum'];
        
-    if(!isset($_REQUEST['nationaliaet']))return '-nationaliaet- not set!';
+    if(!isset($_REQUEST['nationaliaet']))throw new Exception('NOT_SET nationalitaet');
     $pdata['nationaliaet']=$_REQUEST['nationaliaet'];
 
-    if(!isset($_REQUEST['sprachen']))return '-sprachen- not set!';
+    if(!isset($_REQUEST['sprachen']))throw new Exception('NOT_SET sprachen');
     $pdata['sprachen']=$_REQUEST['sprachen'];
 
-    if(!isset($_REQUEST['vorwissen']))return '-vorwissen- not set!';
+    if(!isset($_REQUEST['vorwissen']))throw new Exception('NOT_SET vorwissen');
     $pdata['vorwissen']=$_REQUEST['vorwissen'];
        
-    if(!isset($_REQUEST['analphabet']))return '-analphabet- not set!';
+    if(!isset($_REQUEST['analphabet']))$_REQUEST['analphabet'] = '0';
     $pdata['analphabet']=$_REQUEST['analphabet'];
 
-    if(!isset($_REQUEST['fotoerlaubnis']))return '-fotoerlaubnis- not set!';
+    if(!isset($_REQUEST['fotoerlaubnis']))$_REQUEST['fotoerlaubnis'] = '0';
     $pdata['fotoerlaubnis']=$_REQUEST['fotoerlaubnis'];
 
-    if(!isset($_REQUEST['videoerlaubnis']))return '-videoerlaubnis- not set!';
+    if(!isset($_REQUEST['gruppenfotoerlaubnis']))$_REQUEST['gruppenfotoerlaubnis'] = '0';
+    $pdata['gruppenfotoerlaubnis']=$_REQUEST['gruppenfotoerlaubnis'];
+
+    if(!isset($_REQUEST['videoerlaubnis']))$_REQUEST['videoerlaubnis'] = '0';
     $pdata['videoerlaubnis']=$_REQUEST['videoerlaubnis'];
 
-    if(!isset($_REQUEST['bemerkungen']))return '-bemerkungen- not set!';
+    if(!isset($_REQUEST['bemerkungen']))throw new Exception('NOT_SET bemerkungen');
     $pdata['bemerkungen']=$_REQUEST['bemerkungen'];
 
+    if(!isset($_REQUEST['termin']))throw new Exception('NOT_SET termin');
+    $pdata['termin']=$_REQUEST['termin'];
+
+    if(!isset($_REQUEST['status']))throw new Exception('NOT_SET status');
+    $pdata['status']=$_REQUEST['status'];
+
     return db_store_person($_REQUEST['id'], $pdata);
   }
 }