.
+ */
+
+/* Die angekreuzten Termine einer Mehrfachauswahl */
+function angekreuzteTermine($praefix)
{
- if($_GET["id"] == "multi"){
- for( $i=1; $i<=$_POST["pagesize"]; $i++){
- mysqli_query($dbconn,"DELETE FROM termin WHERE id='".$_POST["del".$i]."'") or $err=error("Konnte Haupttermin nicht löschen
".mysqli_error($dbconn));
- mysqli_query($dbconn,"DELETE FROM termin WHERE main_id='".$_POST["del".$i]."'" or $err=error("Konnte Nebentermine nicht löschen
".mysqli_error($dbconn)));
- }
- if(!$err)
- doneNreturn("Erfolgreich gelöscht");
- }
- else{
- $qry = mysqli_query($dbconn,"SELECT * FROM termin WHERE id='".mysqli_escape_string($dbconn,$_GET["id"])."'");
- $res = mysqli_fetch_assoc($qry);
- if(!$res)
- $err = error("Dieser Termin existiert nicht!");
-
- mysqli_query($dbconn,"DELETE FROM termin WHERE id='".$res["id"]."'") or $err=error("Konnte Haupttermin nicht löschen
".mysqli_error($dbconn));
- mysqli_query($dbconn,"DELETE FROM termin WHERE main_id='".$res["id"]."'" or $err=error("Konnte Nebentermine nicht löschen
".mysqli_error($dbconn)));
+ $ids = array();
+ $anzahl = isset($_POST["pagesize"]) ? (int)$_POST["pagesize"] : 0;
+ for($i = 1; $i <= $anzahl; $i++)
+ if(!empty($_POST[$praefix.$i]))
+ $ids[] = (int)$_POST[$praefix.$i];
+ return $ids;
+}
+$mehrfach = isset($_GET["id"]) && $_GET["id"] === "multi";
+$terminid = parameterGanzzahl("id");
+$adressid = parameterGanzzahl("adressid");
+$err = 0;
+
+if(($mehrfach || $terminid) && parameterGanzzahl("del") == 1)
+{
+ foreach($mehrfach ? angekreuzteTermine("del") : array($terminid) as $id)
if(!$err)
- doneNreturn("Erfolgreich gelöscht");
+ $err = loescheTerminreihe($dbconn, $id);
+ if(!$err)
+ {
+ doneNreturn("Erfolgreich gelöscht");
+ return;
}
}
-elseif($_GET["id"] && $_GET["done"])
+elseif(($mehrfach || $terminid) && !empty($_GET["done"]))
{
- if($_GET["id"] == "multi"){
- for( $i=1; $i<=$_POST["pagesize"]; $i++){
- mysqli_query($dbconn,"UPDATE termin SET done = 1 WHERE id='".$_POST["erl".$i]."'") or $err+=error("Konnte Haupttermin nicht als erledigt markieren
".mysqli_error($dbconn));
- mysqli_query($dbconn,"UPDATE termin SET done = 1 WHERE main_id='".$_POST["erl".$i]."'") or $err+=error("Konnte Nebentermine nicht als erledigt markieren
".mysqli_error($dbconn));
- }
+ $erledigt = $_GET["done"] != "no";
+ foreach($mehrfach ? angekreuzteTermine("erl") : array($terminid) as $id)
if(!$err)
- doneNreturn("Erfolgreich geändert!");
- }
- else{
- $qry = mysqli_query($dbconn,"SELECT * FROM termin WHERE id='".mysqli_escape_string($dbconn,$_GET["id"])."'");
- $res = mysqli_fetch_assoc($qry);
- if(!$res)
- $err = error("Dieser Termin existiert nicht!");
-
- if($_GET["done"] == "yes")
- {
- mysqli_query($dbconn,"UPDATE termin SET done = 1 WHERE id='".$res["id"]."'") or $err=error("Konnte Haupttermin nicht als erledigt markieren
".mysqli_error($dbconn));
- mysqli_query($dbconn,"UPDATE termin SET done = 1 WHERE main_id='".$res["id"]."'") or $err=error("Konnte Nebentermine nicht als erledigt markieren
".mysqli_error($dbconn));
- }
- elseif($_GET["done"] == "no")
- {
- mysqli_query($dbconn,"UPDATE termin SET done = 0 WHERE id='".$res["id"]."'") or $err=error("Konnte Haupttermin nicht als nicht erledigt markieren
".mysqli_error($dbconn));
- mysqli_query($dbconn,"UPDATE termin SET done = 0 WHERE main_id='".$res["id"]."'") or $err=error("Konnte Nebentermine nicht als nicht erledigt markieren
".mysqli_error($dbconn));
- }
- if(!$err)
- doneNreturn("Erfolgreich geändert!");
+ $err = setzeTerminErledigt($dbconn, $id, $erledigt);
+ if(!$err)
+ {
+ doneNreturn("Erfolgreich geändert!");
+ return;
}
}
-$qry = mysqli_query($dbconn,"SELECT plz, ortsteil, ort, str, hnr, vname, partner_id, nname, vname2, nname2, firma, adresse.id, land, anrede_id, titel_id, anrede2_id, titel2_id
- FROM adresse
- LEFT JOIN strasse ON str_id = strasse.id
- LEFT JOIN ort ON ort_id = ort.id
- LEFT JOIN land ON land_id = land.id
- WHERE adresse.id='".mysql_escape_string($_GET["adressid"])."'
- ORDER BY typ_id ASC") or $err = error("Fehler beim abrufen der Daten ".mysqli_error($dbconn));
-$kdnres=mysqli_fetch_assoc($qry);
-if($_GET["user"])
- $smarty->assign("user",$_GET["user"]);
-
-if(!$kdnres["partner_id"])
+$kunde = terminAdresse($dbconn, $adressid);
+if(empty($kunde["partner_id"]))
+ $adressid = 0;
+
+if(!$err && parameterGanzzahl("formsent") == 1)
{
- $_GET["adressid"] = 0;
+ $err = speichereTermin($dbconn, $terminid, $adressid);
+ if(!$err)
+ {
+ doneNreturn("Erfolgreich eingetragen");
+ return;
+ }
+ // bei einem Fehler die Eingaben im Formular stehen lassen
+ $smarty->assign("termin", $_POST);
}
-if($_GET["formsent"] == 1)
- {
- $head = mysql_escape_string(trim($_POST["head"]));
- $user = mysql_escape_string(trim($_POST["user"]));
- $user2 = mysql_escape_string(trim($_POST["user2"]));
- $user3 = mysql_escape_string(trim($_POST["user3"]));
- $user4 = mysql_escape_string(trim($_POST["user4"]));
- $text = mysql_escape_string(trim($_POST["text"]));
- $typ = mysql_escape_string(trim($_POST["typ"]));
- $done = mysql_escape_string(trim($_POST["done"]));
- $folge = mysql_escape_string(trim($_POST["folge"]));
- $folgetyp = mysql_escape_string(trim($_POST["folgetyp"]));
- $folgedays = mysql_escape_string(trim($_POST["folgedays"]));
- $datetime_start = dispdate_to_mysql_date(mysql_escape_string(trim($_POST["datetime_start"])),0);
- $datetime_end = dispdate_to_mysql_date(mysql_escape_string(trim($_POST["datetime_end"])),1);
- $_POST["termtime"] = $datetime_start;
- $_POST["termend"] = $datetime_end;
- $dauer = $_POST["termdauer"] = mysql_dauer($datetime_start,$datetime_end);
- $days = 1;
- $split_dauer = explode(":",$dauer);
- if($split_dauer[0]>12 || $typ == 0)
- {
- $days = ceil($dauer/24);
- $dauer = "24:00:00";
- $_POST["termtime"] = $datetime_start = substr($datetime_start,0,11)."00:00:00";
- $_POST["termend"] = $datetime_end = substr($datetime_start,0,11)."23:59:00";
- }
- $datetime_start_tmp =$datetime_start;
-
- if($days > 1 && $_GET["id"])
- {
- mysqli_query($dbconn,"DELETE FROM termin WHERE id='".mysqli_escape_string($dbconn,$_GET["id"])."'");
- mysqli_query($dbconn,"DELETE FROM termin WHERE main_id='".mysqli_escape_string($dbconn,$_GET["id"])."'");
-
- $_GET["id"] = "";
- }
- else
- mysqli_query($dbconn,"DELETE FROM termin WHERE main_id='".mysqli_escape_string($dbconn,$_GET["id"])."' AND id != '".mysqli_escape_string($dbconn,$_GET["id"])."'");
- if($done == 0){
- for($i=0;$i<$days;$i++)
- {
- $datetime_start_tmp = date("Y-m-d H:i:s",strtotime("+".$i." day",strtotime($datetime_start)));
-
- $qry = mysqli_query($dbconn,"SELECT * FROM
- ( SELECT id,user, user2, user3, user4, termtime,
- DATE_ADD(termtime,INTERVAL CONCAT(HOUR(termdauer),' ',MINUTE(termdauer)) HOUR_MINUTE)as termend
- FROM termin WHERE termtime != '0000-00-00 00:00:00' AND done = 0)
- as subselect
- WHERE
- (user='$user' OR user2='$user' OR user3='$user' OR user4='$user') AND
- (
- ('$datetime_start_tmp' >= termtime AND '$datetime_start_tmp' < termend) OR
- ('$datetime_end' > termtime AND '$datetime_end' <= termend) OR
- ('$datetime_start_tmp' <= termtime AND '$datetime_end' >= termend)
- )") or $err=error("Fehler beim überprüfen von Überlappungen
".mysqli_error($dbconn));
- $res=mysqli_fetch_assoc($qry);
- if(!$res && $user2)
- {
- $qry = mysqli_query($dbconn,"SELECT * FROM
- ( SELECT id,user, user2, user3, user4, termtime,
- DATE_ADD(termtime,INTERVAL CONCAT(HOUR(termdauer),' ',MINUTE(termdauer)) HOUR_MINUTE)as termend
- FROM termin WHERE termtime != '0000-00-00 00:00:00' AND done = 0)
- as subselect
- WHERE
- (user='$user2' OR user2='$user2' OR user3='$user2' OR user4='$user2') AND
- (
- ('$datetime_start_tmp' >= termtime AND '$datetime_start_tmp' < termend) OR
- ('$datetime_end' > termtime AND '$datetime_end' <= termend) OR
- ('$datetime_start_tmp' <= termtime AND '$datetime_end' >= termend)
- )") or $err=error("Fehler beim überprüfen von Überlappungen
".mysqli_error($dbconn));
- $res=mysqli_fetch_assoc($qry);
- }
- if(!$res && $user3)
- {
- $qry = mysqli_query($dbconn,"SELECT * FROM
- ( SELECT id,user, user2, user3, user4, termtime,
- DATE_ADD(termtime,INTERVAL CONCAT(HOUR(termdauer),' ',MINUTE(termdauer)) HOUR_MINUTE)as termend
- FROM termin WHERE termtime != '0000-00-00 00:00:00' AND done = 0)
- as subselect
- WHERE
- (user='$user3' OR user2='$user3' OR user3='$user3' OR user4='$user3') AND
- (
- ('$datetime_start_tmp' >= termtime AND '$datetime_start_tmp' < termend) OR
- ('$datetime_end' > termtime AND '$datetime_end' <= termend) OR
- ('$datetime_start_tmp' <= termtime AND '$datetime_end' >= termend)
- )") or $err=error("Fehler beim überprüfen von Überlappungen
".mysqli_error($dbconn));
- $res=mysqli_fetch_assoc($qry);
- }
- if(!$res && $user4)
- {
- $qry = mysqli_query($dbconn,"SELECT * FROM
- ( SELECT id,user, user2, user3, user4, termtime,
- DATE_ADD(termtime,INTERVAL CONCAT(HOUR(termdauer),' ',MINUTE(termdauer)) HOUR_MINUTE)as termend
- FROM termin WHERE termtime != '0000-00-00 00:00:00' AND done = 0)
- as subselect
- WHERE
- (user='$user4' OR user2='$user4' OR user3='$user4' OR user4='$user4') AND
- (
- ('$datetime_start_tmp' >= termtime AND '$datetime_start_tmp' < termend) OR
- ('$datetime_end' > termtime AND '$datetime_end' <= termend) OR
- ('$datetime_start_tmp' <= termtime AND '$datetime_end' >= termend)
- )") or $err=error("Fehler beim überprüfen von Überlappungen
".mysqli_error($dbconn));
- $res=mysqli_fetch_assoc($qry);
- }
- if($res && $res["id"] != $_GET["id"])
- {
- $err=error("Dieser Mitarbeiter hat zu der Zeit bereits einen Termin, er kann nicht an zwei Orten gleichzeitig sein.");
- break;
- }
- }
- }
-
- if(!$err)
- {
-
- for($i=0;$i<$days;$i++)
- {
- $datetime_start_tmp = date("Y-m-d H:i:s",strtotime("+".$i." day",strtotime($datetime_start)));
- if(strstr($datetime_start_tmp,"1970")){
- echo "NICHTTERMINIERT!!";
- $datetime_start_tmp = "0000-00-00 00:00:00";
- }
- if($_GET["id"])
- {
- $qry=mysqli_query($dbconn,"SELECT * FROM termin WHERE id = '".mysqli_escape_string($dbconn,($_GET["id"]))."'");
- if ($res=mysqli_fetch_assoc($qry))
- {
- if($done && $folge && !$res["followed_by"] && !$i)
- {
- mysqli_query($dbconn,"INSERT INTO termin SET head='$head',
- text='',
- adresse_id='".mysqli_escape_string($dbconn,$_GET["adressid"])."',
- typ='$folgetyp',
- changetime=NOW(),
- datetime=NOW(),
- done='0',
- termtime='',
- termdauer='',
- user='$user',
- user2='$user2',
- user3='$user3',
- user4='$user4',
- changeuser='".$_SESSION["user"]."',
- act_date=DATE_ADD(CURDATE(),INTERVAL $folgedays DAY)") or $err=error("Fehler beim anlegen des Folgetermins
".mysqli_error($dbconn));
- $res["followed_by"] = mysqli_insert_id($dbconn);
- mysqli_query($dbconn,"UPDATE termin SET main_id = '".$res["followed_by"]."' WHERE id='".$res["followed_by"]."'");
- }
- if(!$i)
- {
- mysqli_query($dbconn,"UPDATE termin SET head='$head',
- text='$text',
- adresse_id='".mysqli_escape_string($dbconn,$_GET["adressid"])."',
- typ='$typ',
- changetime=NOW(),
- done='$done',
- termtime='$datetime_start_tmp',
- termdauer='$dauer',
- changeuser='".$_SESSION["user"]."',
- user='$user',
- user2='$user2',
- user3='$user3',
- user4='$user4',
- followed_by='".$res["followed_by"]."'
- WHERE id='".mysqli_escape_string($dbconn,$_GET["id"])."'") or $err=error("Fehler beim ändern des Termins
".mysqli_error($dbconn));
-
- }
- }
- else
- $err=error("dieser Termin existiert nicht!");
- }
- else
- {
- if($done && $folge && !$err && !$i)
- {
- mysqli_query($dbconn,"INSERT INTO termin SET head='$head',
- text='',
- adresse_id='".mysqli_escape_string($dbconn,$_GET["adressid"])."',
- typ='$folgetyp',
- changetime=NOW(),
- datetime=NOW(),
- done='0',
- termtime='',
- termdauer='',
- changeuser='".$_SESSION["user"]."',
- user='$user',
- user2='$user2',
- user3='$user3',
- user4='$user4',
- act_date=DATE_ADD(CURDATE(),INTERVAL $folgedays DAY)") or $err=error("Fehler beim anlegen des Folgetermins
".mysqli_error($dbconn));
- $res["followed_by"] = mysqli_insert_id($dbconn);
- mysqli_query($dbconn,"UPDATE termin SET main_id = '".$res["followed_by"]."' WHERE id='".$res["followed_by"]."'");
- }
- if(!$err)
- {
- if(!$i)
- {
- mysqli_query($dbconn,"INSERT INTO termin SET head='$head',
- text='$text',
- adresse_id='".mysqli_escape_string($dbconn,$_GET["adressid"])."',
- typ='$typ',
- changetime=NOW(),
- datetime=NOW(),
- done='$done',
- termtime='$datetime_start_tmp',
- termdauer='$dauer',
- changeuser='".$_SESSION["user"]."',
- user='$user',
- user2='$user2',
- user3='$user3',
- user4='$user4',
- followed_by='".$res["followed_by"]."'") or $err=error("Fehler beim anlegen des Termins
".mysqli_error($dbconn));
- $main_id = mysqli_insert_id($dbconn);
- mysqli_query($dbconn,"UPDATE termin SET main_id = '$main_id' WHERE id='$main_id'");
- }
- else
- {
- mysqli_query($dbconn,"INSERT INTO termin SET head='$head',
- text='$text',
- adresse_id='".mysqli_escape_string($dbconn,$_GET["adressid"])."',
- typ='$typ',
- changetime=NOW(),
- datetime=NOW(),
- done='$done',
- termtime='$datetime_start_tmp',
- termdauer='$dauer',
- changeuser='".$_SESSION["user"]."',
- user='$user',
- user2='$user2',
- user3='$user3',
- user4='$user4',
- main_id='$main_id',
- followed_by='".$res["followed_by"]."'") or $err=error("Fehler beim anlegen des Termins
".mysqli_error($dbconn));
- }
- }
- }
- }
- if(!$err)
- {
- doneNreturn("Erfolgreich eingetragen");
- }
- }
- if($err){
- $smarty->assign("termin",$_POST);
- }
- //elseif(!$head)
- // $err=error("Bitte geben Sie eine Terminbeschreibung an!");
- }
-
-
- $qry = mysqli_query($dbconn,"SELECT id, typ
- FROM termtyp WHERE id > 0") or $err = error("Fehler beim abrufen der Termintypen
".mysqli_error($dbconn));
- while($res = mysqli_fetch_assoc($qry))
- {
- $typids[] =$res["id"];
- $typs[] = $res["typ"];
- }
- $smarty->assign("typs",$typs);
- $smarty->assign("typids",$typids);
-
- $typids=array();
- $typs=array();
- $qry = mysqli_query($dbconn,"SELECT id, vname, nname
- FROM user WHERE blocked = 0 AND id > 0") or $err = error("Fehler beim abrufen der Benutzer
".mysqli_error($dbconn));
- while($res = mysqli_fetch_assoc($qry))
- {
- $typids[] =$res["id"];
- $typs[] = $res["vname"]." ".$res["nname"];
- }
- $smarty->assign("users",$typs);
- $smarty->assign("userids",$typids);
- $typs[]="Keiner";
- $typids[]=0;
- $smarty->assign("optusers",$typs);
- $smarty->assign("optuserids",$typids);
-
- $smarty->assign("days",array(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40));
- $smarty->assign("kunde",$kdnres);
- if($_GET["id"])
- {
- $qry=mysqli_query($dbconn,"SELECT MIN(termtime) AS termtime,
- SEC_TO_TIME(SUM(TIME_TO_SEC(termdauer))) AS termdauer,
- head,
- followed_by,
- MIN(id) AS id,
- main_id,
- typ,adresse_id,
- done,
- user,
- user2,
- user3,
- user4,
- changeuser,
- act_date,
- text
- FROM termin WHERE main_id = '".mysqli_escape_string($dbconn,$_GET["id"])."' GROUP BY main_id");
- if ($res=mysqli_fetch_assoc($qry))
- {
-
- if($res["followed_by"] > 0)
- {
- $qry2=mysqli_query($dbconn, "SELECT DATE_FORMAT(act_date,'%Y-%m-%d'), typ_id FROM termin WHERE id = '".$res["followed_by"]."'");
- $res2=mysqli_fetch_assoc($qry2);
- $days = (strtotime($res2["act_date"]) - strtotime(date("Y-m-d"))) / (60 * 60 * 24);
- $res["folgetyp"]= $res2["typ_id"];
- if($days > 0)
- $res["folgedays"] = $days;
- }
- $res["termend"] = dauer_to_date($res["termtime"], $res["termdauer"]);
- if(strstr($res["termend"],"00:00:00")){
- $res["termend"] = date("Y-m-d H:i:s",strtotime("-1 minutes",strtotime($res["termend"])));
- }
- $smarty->assign("termin",$res);
- if($_GET["adressid"])
- $smarty->assign("heading","Termin ändern");
- else
- $smarty->assign("heading","Urlaub / Krankheit ändern");
- }
- else
- {
- $err=error("Dieser Termin existiert nicht!");
- }
- }
- else
- {
-
- $smarty->assign("termin",$_POST);
-
- if($_GET["adressid"]){
- $smarty->assign("heading","Neuer Termin");
- }
- else{
- $smarty->assign("heading","Neuer Urlaub / Krankheitstag");
- $typids=array();
- $typs=array();
- $qry = mysqli_query($dbconn,"SELECT id, typ
- FROM termtyp WHERE typ = 'Urlaub' OR typ = 'Krankheit'") or $err = error("Fehler beim abrufen der Termintypen
".mysqli_error($dbconn));
- while($res = mysqli_fetch_assoc($qry))
- {
- $typids[] =$res["id"];
- $typs[] = $res["typ"];
- }
- $smarty->assign("vac_types_id",$typids);
- $smarty->assign("vac_types_name",$typs);
-
- }
- }
- $smarty->display("heading.tpl");
- $smarty->display("addtermin.tpl");
+terminAuswahllisten($dbconn, $smarty);
+$smarty->assign("kunde", $kunde);
+$smarty->assign("user", parameterGanzzahl("user"));
-?>
\ No newline at end of file
+if($terminid && !$err)
+{
+ $termin = terminZumBearbeiten($dbconn, $terminid);
+ if(!$termin)
+ $err = error("Dieser Termin existiert nicht!");
+ else
+ {
+ $smarty->assign("termin", $termin);
+ $smarty->assign("heading", $adressid ? "Termin ändern" : "Urlaub / Krankheit ändern");
+ }
+}
+elseif(!$terminid)
+{
+ if(!$err)
+ $smarty->assign("termin", $_POST);
+ $smarty->assign("heading", $adressid ? "Neuer Termin" : "Neuer Urlaub / Krankheitstag");
+}
+
+$smarty->display("heading.tpl");
+$smarty->display("addtermin.tpl");
+?>
diff --git a/sites/terminshow.php b/sites/terminshow.php
index 9739905..65110ce 100644
--- a/sites/terminshow.php
+++ b/sites/terminshow.php
@@ -1,71 +1,45 @@
-addpage();
- $prevpage=1;
- $termin=maketerminarray($dbconn, $res["id"]);
- $adresse=maketerminadresse($dbconn, $res["id"]);
- $telnrn=maketelnrn($dbconn,$res["id"]);
- makesingleterminpage($pdf,$termin,$adresse,$telnrn,0);
- }
- }
-}
-$tmppdfname = str_replace(array(" ","."),array("_","_"),microtime());
-savePDF($pdf,"./temp/pdftemp/$tmppdfname.pdf");
-$smarty->assign("pdffile","./temp/pdftemp/$tmppdfname.pdf");
+$terminid = parameterGanzzahl("id");
+$datum = isset($_GET["date"]) && is_string($_GET["date"]) ? date("Y-m-d", strtotime($_GET["date"])) : "";
-$pdf = makerawPDFanfahrt(0);
-if($_GET["id"] && !$_GET["date"])
+$ids = array();
+if($terminid && !$datum)
+ $ids[] = $terminid;
+elseif($datum)
{
- $termin=maketerminarray($dbconn, $_GET["id"]);
- $adresse=maketerminadresse($dbconn, $_GET["id"]);
- $googleadresse=makegooglestring($dbconn, $_GET["id"]);
- $telnrn=maketelnrn($dbconn,$_GET["id"]);
- makesingleterminpage($pdf,$termin,$adresse,$telnrn,1,$googleadresse);
+ $zeilen = db_zeilen($dbconn, "SELECT id FROM termin WHERE adresse_id != 0 AND DATE(termtime) = ? ORDER BY termtime ASC", array($datum));
+ foreach((array)$zeilen as $z)
+ $ids[] = $z["id"];
}
-elseif($_GET["date"])
-{
- $qry=mysqli_query($dbconn,"SELECT id FROM termin WHERE adresse_id AND DATE_FORMAT(termtime,'%Y%m%d') = '".date("Ymd",strtotime($_GET["date"]))."' ORDER BY termtime ASC");
- if($_GET["type"]="singlepages")
- {
- $prevpage=0;
- while($res=mysqli_fetch_assoc($qry))
- {
- if($prevpage)
- $pdf->addpage();
- $prevpage=1;
- $termin=maketerminarray($dbconn, $res["id"]);
- $adresse=maketerminadresse($dbconn, $res["id"]);
- $googleadresse=makegooglestring($dbconn,$res["id"]);
- $telnrn=maketelnrn($dbconn,$res["id"]);
- makesingleterminpage($pdf,$termin,$adresse,$telnrn,1,$googleadresse);
-
- }
- }
-}
-$tmppdfname = str_replace(array(" ","."),array("_","_"),microtime());
-savePDF($pdf,"./temp/pdftemp/$tmppdfname.pdf");
-$smarty->assign("pdffile2","./temp/pdftemp/$tmppdfname.pdf");
+/* $anfahrt = 0 für den Terminzettel, 1 für die Seite mit der Karte */
+function terminzettel($dbconn, $ids, $anfahrt)
+{
+ $pdf = $anfahrt ? makerawPDFanfahrt(0) : makerawPDFcopy(0);
+ $erste = true;
+ foreach($ids as $id)
+ {
+ if(!$erste)
+ $pdf->addpage();
+ $erste = false;
+ $googleadresse = $anfahrt ? makegooglestring($dbconn, $id) : "";
+ makesingleterminpage($pdf, maketerminarray($dbconn, $id), maketerminadresse($dbconn, $id),
+ maketelnrn($dbconn, $id), $anfahrt, $googleadresse);
+ }
+ $name = str_replace(array(" ", "."), array("_", "_"), microtime());
+ savePDF($pdf, "./temp/pdftemp/$name.pdf");
+ return "./temp/pdftemp/$name.pdf";
+}
+
+$smarty->assign("pdffile", terminzettel($dbconn, $ids, 0));
+$smarty->assign("pdffile2", terminzettel($dbconn, $ids, 1));
$smarty->display("terminshow.tpl");
-
-
-?>
\ No newline at end of file
+?>
diff --git a/templates/addtermin.tpl b/templates/addtermin.tpl
index 133873c..1fef8e4 100644
--- a/templates/addtermin.tpl
+++ b/templates/addtermin.tpl
@@ -5,7 +5,7 @@
{/if}
Termin für Kunde Nummer:
{$kunde.partner_id}
- {$kunde.vname} {$kunde.nname} {$kunde.firma}
{$kunde.str} {$kunde.hnr}
{$kunde.plz} {$kunde.ort}
+ {$kunde.vname|escape} {$kunde.nname|escape} {$kunde.firma|escape}
{$kunde.str|escape} {$kunde.hnr|escape}
{$kunde.plz|escape} {$kunde.ort|escape}
{/if}
{if $user}
{$termin.user = $user}
@@ -45,10 +45,10 @@
{/if}
-
+
-
+
diff --git a/templates/calendar.tpl b/templates/calendar.tpl
index b22e52d..a97c65f 100644
--- a/templates/calendar.tpl
+++ b/templates/calendar.tpl
@@ -50,9 +50,9 @@
{foreach $weekday.fulldaytermine as $key=>$termin}
- {$termin.typ|substr:0:3}.
+ style='width: 1em;height: {$height}em;top: {$start}em;left: {$shift + $dayXpos}em;background-color: {$users.{$termin.user}.color|escape};'
+ title='{$termin.typ|escape}
{$termin.head|escape} - {$termin.uservname|escape} {$termin.usernname|escape}
Ganztags
{if {$termin.ort}}In {$termin.ort|escape}{if $termin.ortsteil}-{$termin.ortsteil|escape}{/if}
{/if}{if {$termin.vname} || {$termin.nname} || {$termin.firma}}Bei {$termin.vname|escape} {$termin.nname|escape} {$termin.firma|escape}{/if}'>
+ {$termin.typ|substr:0:3|escape}.
{$shift = $shift+1.1}
@@ -107,19 +107,19 @@
{if {$termin.typ} != 'Arbeitsleistung'}
Dauer {if {$termin.termdauer|date_format:'%k'} > 0} {$termin.termdauer|date_format:'%k'}h{/if}
{if {$termin.termdauer|date_format:'%M'} > 0}{$termin.termdauer|date_format:'%M'}min{/if}
- In {$termin.ort}{if $termin.ortsteil}-{$termin.ortsteil}{/if}
- Bei {$termin.vname} {$termin.nname} {$termin.firma}'>
+ In {$termin.ort|escape}{if $termin.ortsteil}-{$termin.ortsteil|escape}{/if}
+ Bei {$termin.vname|escape} {$termin.nname|escape} {$termin.firma|escape}'>
{else}
+ style='width: {$width-0.3}em;height: {$height}em;top: {$start}em;left: {$dayXpos+ 0.1 + $shift}em;background-color: {if $termin.done}#CFC{else}{$users.{$termin.user}.color|escape}{/if};'
+ title='{$termin.typ|escape} - {$termin.firma|escape} {$termin.vname|escape} {$termin.nname|escape}
{$termin.projectname|escape}
{$termin.head|escape}
Dauer: {$termin.termdauer|string_format:"%.1f"}h'>
{/if}
- {$termin.typ|substr:0:3}.
+ {$termin.typ|substr:0:3|escape}.
{/foreach}
@@ -133,9 +133,9 @@
{$width = 9}
{$start = $ma_nr + 0.5}
- {if {$mitarb.complete} == 0}{else}{/if}{$mitarb.vname} {$mitarb.nname|substr:0:1}.
+ style='width: {$width}em;height: {$height}em;top: {$start}em;left: {$dayXpos+ 0.5}em;background-color: {$mitarb.color|escape};'
+ title='{$mitarb.vname|escape} {$mitarb.nname|escape} - Anwesend {if {$mitarb.complete} == 0} aber noch nicht ausgestempelt{/if}
'>
+ {if {$mitarb.complete} == 0}{else}{/if}{$mitarb.vname|escape} {$mitarb.nname|substr:0:1|escape}.
{/foreach}
@@ -169,9 +169,9 @@
{foreach $users as $user}
{if $user.openvacation < 0}
- {$user.vname} {$user.nname} ({$user.openvacation})
+ {$user.vname|escape} {$user.nname|escape} ({$user.openvacation|escape})
{else}
- {$user.vname} {$user.nname} ({$user.openvacation})
+ {$user.vname|escape} {$user.nname|escape} ({$user.openvacation|escape})
{/if}
{/foreach}
diff --git a/templates/calendar_month.tpl b/templates/calendar_month.tpl
index 9b21f5f..24833d9 100644
--- a/templates/calendar_month.tpl
+++ b/templates/calendar_month.tpl
@@ -104,9 +104,9 @@
{$start = 4 + ($terminstart - 420)/15}
- {$termin.typ|substr:0:3}.
+ style='width: 1em;height: {$height}em;top: {$start}em;left: {$shift}em;background-color: {$users.{$termin.user}.color|escape}'
+ title='{$termin.typ|escape}
{$termin.head|escape} - {$termin.uservname|escape} {$termin.usernname|escape}
Ganztags
{if {$termin.ort}}In {$termin.ort|escape}{if $termin.ortsteil}-{$termin.ortsteil|escape}{/if}
{/if}{if {$termin.vname} || {$termin.nname} || {$termin.firma}}Bei {$termin.vname|escape} {$termin.nname|escape} {$termin.firma|escape}{/if}'>
+ {$termin.typ|substr:0:3|escape}.
{else}
{$terminlength = ({$termin.termdauer|date_format:"%H"}*60 + {$termin.termdauer|date_format:"%M"})}
@@ -124,24 +124,24 @@
{$start = 4 + ($terminstart - 420)/15}
{if {$termin.typ} != 'Arbeitsleistung'}
Dauer {if {$termin.termdauer|date_format:'%k'} > 0} {$termin.termdauer|date_format:'%k'}h{/if}
{if {$termin.termdauer|date_format:'%M'} > 0}{$termin.termdauer|date_format:'%M'}min{/if}
- In {$termin.ort}{if $termin.ortsteil}-{$termin.ortsteil}{/if}
- Bei {$termin.vname} {$termin.nname} {$termin.firma}'>
+ In {$termin.ort|escape}{if $termin.ortsteil}-{$termin.ortsteil|escape}{/if}
+ Bei {$termin.vname|escape} {$termin.nname|escape} {$termin.firma|escape}'>
{else}
{$termin.typ|substr:0:3}.
+ {$termin.typ|substr:0:3|escape}.
{/if}
@@ -154,9 +154,9 @@
{$height = ($terminlength/15)}
{$start = 4 + ($terminstart - 420)/15}
- {$termin.typ|substr:0:3}.
+ style='width: 1em;height: {$height}em;top: {$start}em;left: {$shift}em;background-color: {$users.{$termin.user2}.color|escape}'
+ title='{$termin.typ|escape}
{$termin.head|escape} - {$termin.uservname2|escape} {$termin.usernname2|escape}
Ganztags
{if {$termin.ort}}In {$termin.ort|escape}{if $termin.ortsteil}-{$termin.ortsteil|escape}{/if}
{/if}{if {$termin.vname} || {$termin.nname} || {$termin.firma}}Bei {$termin.vname|escape} {$termin.nname|escape} {$termin.firma|escape}{/if}'>
+ {$termin.typ|substr:0:3|escape}.
{else}
{$terminlength = ({$termin.termdauer|date_format:"%H"}*60 + {$termin.termdauer|date_format:"%M"})}
@@ -164,9 +164,9 @@
{$height = ($terminlength/15)}
{$start = 4 + ($terminstart - 420)/15}
Dauer {if {$termin.termdauer|date_format:'%k'} > 0} {$termin.termdauer|date_format:'%k'}h{/if} {if {$termin.termdauer|date_format:'%M'} > 0}{$termin.termdauer|date_format:'%M'}min{/if}
In {$termin.ort}{if $termin.ortsteil}-{$termin.ortsteil}{/if}
Bei {$termin.vname} {$termin.nname} {$termin.firma}'>
- {$termin.typ|substr:0:3}.
+ style='width: {$width}em;height: {$height}em;top: {$start}em;left: {$shift}em;background-color: {$users.{$termin.user2}.color|escape}'
+ title='{$termin.typ|escape}
{$termin.head|escape} - {$termin.uservname2|escape} {$termin.usernname2|escape}
Um {$termin.termtime|date_format:'%k:%M'}Uhr
Dauer {if {$termin.termdauer|date_format:'%k'} > 0} {$termin.termdauer|date_format:'%k'}h{/if} {if {$termin.termdauer|date_format:'%M'} > 0}{$termin.termdauer|date_format:'%M'}min{/if}
In {$termin.ort|escape}{if $termin.ortsteil}-{$termin.ortsteil|escape}{/if}
Bei {$termin.vname|escape} {$termin.nname|escape} {$termin.firma|escape}'>
+ {$termin.typ|substr:0:3|escape}.
{/if}
@@ -180,9 +180,9 @@
{$height = ($terminlength/15)}
{$start = 4 + ($terminstart - 420)/15}
- {$termin.typ|substr:0:3}.
+ style='width: 1em;height: {$height}em;top: {$start}em;left: {$shift}em;background-color: {$users.{$termin.user3}.color|escape}'
+ title='{$termin.typ|escape}
{$termin.head|escape} - {$termin.uservname3|escape} {$termin.usernname3|escape}
Ganztags
{if {$termin.ort}}In {$termin.ort|escape}{if $termin.ortsteil}-{$termin.ortsteil|escape}{/if}
{/if}{if {$termin.vname} || {$termin.nname} || {$termin.firma}}Bei {$termin.vname|escape} {$termin.nname|escape} {$termin.firma|escape}{/if}'>
+ {$termin.typ|substr:0:3|escape}.
{else}
{$terminlength = ({$termin.termdauer|date_format:"%H"}*60 + {$termin.termdauer|date_format:"%M"})}
@@ -190,9 +190,9 @@
{$height = ($terminlength/15)}
{$start = 4 + ($terminstart - 420)/15}
Dauer {if {$termin.termdauer|date_format:'%k'} > 0} {$termin.termdauer|date_format:'%k'}h{/if} {if {$termin.termdauer|date_format:'%M'} > 0}{$termin.termdauer|date_format:'%M'}min{/if}
In {$termin.ort}{if $termin.ortsteil}-{$termin.ortsteil}{/if}
Bei {$termin.vname} {$termin.nname} {$termin.firma}'>
- {$termin.typ|substr:0:3}.
+ style='width: {$width}em;height: {$height}em;top: {$start}em;left: {$shift}em;background-color: {$users.{$termin.user3}.color|escape}'
+ title='{$termin.typ|escape}
{$termin.head|escape} - {$termin.uservname3|escape} {$termin.usernname3|escape}
Um {$termin.termtime|date_format:'%k:%M'}Uhr
Dauer {if {$termin.termdauer|date_format:'%k'} > 0} {$termin.termdauer|date_format:'%k'}h{/if} {if {$termin.termdauer|date_format:'%M'} > 0}{$termin.termdauer|date_format:'%M'}min{/if}
In {$termin.ort|escape}{if $termin.ortsteil}-{$termin.ortsteil|escape}{/if}
Bei {$termin.vname|escape} {$termin.nname|escape} {$termin.firma|escape}'>
+ {$termin.typ|substr:0:3|escape}.
{/if}
@@ -206,9 +206,9 @@
{$height = ($terminlength/15)}
{$start = 4 + ($terminstart - 420)/15}
- {$termin.typ|substr:0:3}.
+ style='width: 1em;height: {$height}em;top: {$start}em;left: {$shift}em;background-color: {$users.{$termin.user4}.color|escape}'
+ title='{$termin.typ|escape}
{$termin.head|escape} - {$termin.uservname4|escape} {$termin.usernname4|escape}
Ganztags
{if {$termin.ort}}In {$termin.ort|escape}{if $termin.ortsteil}-{$termin.ortsteil|escape}{/if}
{/if}{if {$termin.vname} || {$termin.nname} || {$termin.firma}}Bei {$termin.vname|escape} {$termin.nname|escape} {$termin.firma|escape}{/if}'>
+ {$termin.typ|substr:0:3|escape}.
{else}
{$terminlength = ({$termin.termdauer|date_format:"%H"}*60 + {$termin.termdauer|date_format:"%M"})}
@@ -216,9 +216,9 @@
{$height = ($terminlength/15)}
{$start = 4 + ($terminstart - 420)/15}
Dauer {if {$termin.termdauer|date_format:'%k'} > 0} {$termin.termdauer|date_format:'%k'}h{/if} {if {$termin.termdauer|date_format:'%M'} > 0}{$termin.termdauer|date_format:'%M'}min{/if}
In {$termin.ort}{if $termin.ortsteil}-{$termin.ortsteil}{/if}
Bei {$termin.vname} {$termin.nname} {$termin.firma}'>
- {$termin.typ|substr:0:3}.
+ style='width: {$width}em;height: {$height}em;top: {$start}em;left: {$shift}em;background-color: {$users.{$termin.user4}.color|escape}'
+ title='{$termin.typ|escape}
{$termin.head|escape} - {$termin.uservname4|escape} {$termin.usernname4|escape}
Um {$termin.termtime|date_format:'%k:%M'}Uhr
Dauer {if {$termin.termdauer|date_format:'%k'} > 0} {$termin.termdauer|date_format:'%k'}h{/if} {if {$termin.termdauer|date_format:'%M'} > 0}{$termin.termdauer|date_format:'%M'}min{/if}
In {$termin.ort|escape}{if $termin.ortsteil}-{$termin.ortsteil|escape}{/if}
Bei {$termin.vname|escape} {$termin.nname|escape} {$termin.firma|escape}'>
+ {$termin.typ|substr:0:3|escape}.
{/if}
@@ -251,7 +251,7 @@
{foreach $users as $user}
- {$user.vname} {$user.nname}
+ {$user.vname|escape} {$user.nname|escape}
{/foreach}
diff --git a/templates/terminshow.tpl b/templates/terminshow.tpl
index c45f589..8eaa76c 100644
--- a/templates/terminshow.tpl
+++ b/templates/terminshow.tpl
@@ -1,4 +1,4 @@
{include file="heading.tpl" heading="Terminanzeige"}
Ohne Anfahrt:
Mit Anfahrt:
-
-
+
+