IQM: comparison fhiiqm/info

equal deleted inserted replaced

-:679bc22e37e2
+:4411d3239444
 	$inf    = $_POST["inf"];
 $ok		= $_POST["ok"];
 if (!$inf["okn"]) $ok = false;
 $duptext="";
-//    print_r($inf); echo "<br /><br />";
+//    print_r($inf); echo "ok = $ok<br /><br />";
 	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
 include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
 	$dbc = new dbconnection();
 $retv = $dbc -> execute($sql);
 if ($dbc->error) echo "<p  class='red'>error copy Info_Verantwortlich: " . $dbc->error . "</p>";
 if ($ret && $retf && $retp && $reta && $retv)
 {
-$addr = $_SERVER["PHP_SELF"] . "?i=$infid_new&c=1";
+$addr = $_SERVER["PHP_SELF"] . "?i=$infid_new&c=1&$getp";
 header("Location: $addr");
 exit;
 }
 else $duptext = " - Fehler beim Duplizieren von ". $inf["iname"];
 }
 $("input[id='persknr']").addClass("long20");
 $("input[id='cdat']").addClass("long10");
 $("input[id='vdat']").addClass("long10");
 $("input[id='bdat']").addClass("long10");
 });
+function addInputf(divId,anz){
+var cdiv = document.createElement('div');
+var idl = "cbl_" + anz;
+cdiv.innerHTML = "<span></span>Dok-Name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input name='inf[ifname][]' type='text' size='50' maxlength='50' value='' />";
+cdiv.innerHTML += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Schlagwort&nbsp;&nbsp;&nbsp;<input type='text' name='inf[swort][]'  size='30' maxlength='50' value='' />";
+cdiv.innerHTML += "<img src='/fhiiqm/img/nixt.gif' border='0' height='100%' />";
+//cdiv.innerHTML += "<span id='cbl'>&nbsp;&nbsp;&nbsp;<input type='checkbox' id='del' name='vertrag[del][]' value='1'/></span>";
+cdiv.innerHTML += "<span id='cbl'>&nbsp;&nbsp;&nbsp;<input type='checkbox' id='del' name='inf[del][]' value='1'/>";
+cdiv.innerHTML += "<label id='lb' for='del'>&nbsp;l&ouml;schen</label></span>";
+cdiv.innerHTML += "<br />Upload-Dokument&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type='file' name='ifile[]' size='50' maxlength='50' value='' />";
+document.getElementById(divId).appendChild(cdiv);
+var delcb = document.getElementById('del');
+delcb.id = "del_" + anz;
+delcb.style.display = 'none';
+var lcb = document.getElementById('lb');
+lcb.id = "lb_" + anz;
+lcb.setAttribute("for", delcb.id);
+lcb.style.display = 'none';
+counter++;
+}
+function markdelInput(divId,anz){
+for (i=1; i<anz; i++)
+{
+var id = "del_" + i;
+var delcb = document.getElementById(id);
+delcb.style.display = 'inline';
+var idl = "lb_" + i;
+var lcb = document.getElementById(idl);
+lcb.style.display = 'inline';
+}
+}
 </script>
 <?php
 echo "&nbsp;";
 echo "<div class=\"float-br smaller\" valign='top'>";
 echo "<div align='center'>";
 if ($infid) $text = "editieren"; else $text = "erfassen";
 if ($copy) $duptext = " (Kopie)";
 echo "<h3>Information $text$duptext<h3>";
-if ($_FILES["ifile"]["error"] == 1 || $_FILES["ifile"]["error"] == 2)
-{
-if ($_FILES["ifile"]["error"] == 2)
-echo "<p class='red'><b>Uploadfile zu ID '$infid' > 10 MByte!</b></p>\n";
-$ok = 0;
-}
 echo "</div>\n";
+//Filename wenn Upload?
+foreach ($_FILES["ifile"]["error"] as $key => $err)
+if ($err == 0 && !$inf["ifname"][$key]) $ok = $ok && false;
 if (!$ok || (!$sub && !$del && !$dup))
 {
 if ($infid && (!$sub || !$del) && !isset($inf))
 { // update
 $sql = "SELECT info_ID,info_name_s,info_name_l,info_date,info_valid_from,info_valid_to,infotyp_ID,
 $inf["bdat"]    = $row->info_valid_to;
 $inf["ityp"]    = $row->infotyp_ID;
 $inf["persknr"] = $row->aname;
 $inf["pers"]    = $row->persknr;
 $inf["infrel"]  = $row->info_rel_ID;
-$inf["ifname"]  = $row->info_file;
+//                    $inf["ifname"]  = $row->info_file;
 $inf["lang"]    = $row->lang;
 $inf["fg"]      = $row->info_freigabe_ID;
 $inf["sort"]    = $row->info_sort;
 $inf["betr"]    = str_replace('.',',',$row->betrag);
 }
 $inf["vpers"][] = $row->persknr;
 //                    $inf["prio"][]  = $row->prioritaet;
 $inf["prio"][$row->persknr]  = $row->prioritaet;
 }
 }
+// Dokumente
+$sql = "SELECT if_filename, if_schlagwort FROM Info_File WHERE info_ID = $infid ORDER BY if_ID";
+if ($result = $dbc -> queryObjectArray($sql))
+{
+foreach ($result as $row)
+{
+$inf["ifname"][] = $row->if_filename;
+$inf["swort"][] = $row->if_schlagwort;
+}
+}
 //    print_r($inf); echo "<br /><br />";
 }
 include($_SERVER["DOCUMENT_ROOT"]."/fhiiqm/form/info_form2.inc.php");
-if ($sub)
+/*        if ($sub)
 		{
 echo
 "<tr>
 		<td>Upload Infodokument </td>
 		<td><input type=\"file\" name=\"ifile\" size=\"50\" maxlength=\"50\" value=\"" .
 $_FILES["ifile"]["name"] . "\"/></td>
 </tr>";
 		}
+*/
 if ($sub || $del)
 		{
 		  	if ($sub)
 $frage = "Alle Angaben ok?";
 elseif ($del)
 {   // loescht auch m:n - Tabellen wegen Loeschweitergabe
 $sql = "DELETE FROM Info WHERE info_ID = '$infid'";
 $retdi = $dbc -> execute($sql);
 if ($retdi)
 {
-include ("inc/file_upload.inc.php");
+// alte Namen Infodocumente
-$retdf  = mod_file("/var/www/fhiiqm/infos",$infid,"","del");  // Loeschen Dokument
+$sql = "SELECT if_filename FROM Info_File WHERE info_ID = $infid ORDER BY if_ID";
-if ($retdf) echo "<p class='green'><b>Infodokument zu ID '$infid' wurde gel&ouml;scht.</b></p>\n";
+if ($res = $dbc -> queryObjectArray($sql))
+foreach ($res as $row)
+$ifile_old[] = $row->if_filename;
+include_once ("inc/file_upload.inc.php");
+foreach ($inf['ifname'] as $key => $filename)
+$retdf  = $retdf && mod_file("/var/www/fhiiqm/infos",$infid,"","del",$ifile_old[$key]);  // Loeschen alte Datei
+if ($retdf) echo "<p class='green'><b>Infodokumente zu ID '$infid' wurde gel&ouml;scht.</b></p>\n";
 echo "<p class='green'><b>Infodaten zu ID '$infid' wurden gel&ouml;scht.</b></p>\n";
 echo "<br /><br />\n";
 // Anzeigen geloeschter Infodaten
-if ($fname)
-$ifile = $infid . "_" . $fname;
-else
-$ifile = $inf['ifname'];
 echo "<p class='green'><b>DELETE: Daten  zu '".$inf["iname"]."' wurden erfolgreich gel&ouml;scht.</b></p>\n";
 include ("inc/info_dat_show.inc.php");
 }
 else
 {
 $stmt = $dbc -> stmtinit();
 if (is_object($stmt))
 {
 if ($infid)
 {   //UPDATE
-// alter Name Infofile
-$sql = "SELECT info_file FROM Info WHERE info_ID = $infid";
-$ifile_old = $dbc -> querySingleItem($sql);
 $stmt -> prepare("UPDATE fhiiqm.Info SET
 info_name_s = ?,
 info_name_l = ?,
 info_date = ?,
 }
 }
 }   // stmt-Objekt
 if ($result)
 {
-// n:m Tabellen INSERT
+// upload Files
-include ("inc/info_tab_ins.inc.php");
+if ($infid) include ("inc/info_file.inc.php");
+// n:m Tabellen INSERT
-// upload File
+if ($ret &&  $retf) include ("inc/info_tab_ins.inc.php");
-if (is_uploaded_file($_FILES["ifile"]["tmp_name"]) && isset($_FILES["ifile"]["name"]) && $_FILES["ifile"]["name"] )
+}
-{
+if ($result && $retf && $ret && $reta && $retp && $retv) // INSERT/UPDATE Info
-include ("inc/file_upload.inc.php");
-$fname  = gen_filename($inf['ifname'],"ifile",$infid);
-$retdf  = mod_file("/var/www/fhiiqm/infos",$infid,"","del");     // Loeschen alte Datei
-$retf   = upload("ifile", $fname, $infid, "infos");              // Datei prüfen und in Dokumentenverzeichnis verschieben
-if ($retf)
-{   // upload o.k.
-//UPDATE des Filenamens
-$sql = "UPDATE Info SET info_file = '" . $infid . "_" . $fname ."' WHERE info_ID=$infid";
-$reti=$dbc->execute($sql);
-if (!$reti)
-echo $dbc -> error . "<br>\n";
-}
-}
-else
-{// nur Aenderung Dateiname
-if ($inf["ifname"]) // Dateiname vergeben
-{
-include_once ("inc/file_upload.inc.php");
-$fname = gen_filename($inf["ifname"],$ifile_old,$infid,0);
-$len = strlen($infid)+1;
-if (substr($fname,0,$len) != "$infid" . "_") $fname = $infid . "_" . $fname;
-if ($inf["ifname"] != $ifile_old)
-{
-$retf  = mod_file("/var/www/fhiiqm/infos",$infid,$fname,"upd");  // Umbenennen alte Datei
-if ($retf)
-{
-$sql = "UPDATE Info SET info_file = '" . $fname . "' WHERE info_ID=$infid";
-$reti=$dbc->execute($sql);
-if (!$reti)
-echo $dbc -> error . "<br>\n";
-if (substr($fname,0,$len) == "$infid" . "_") $fname = substr($fname,$len,50);
-}
-}
-else
-{
-//kein Upload, keine Dateinamenaenderung
-if (substr($fname,0,$len) == "$infid" . "_") $fname = substr($fname,$len,50);
-$retf=1; $reti=1;
-}
-}
-else // kein Dateiname angegeben
-{
-$retf=1; $reti=1;
-if ($ifile_old)
-{    // Loeschen alte Datei
-include_once ("inc/file_upload.inc.php");
-$retf  = mod_file("/var/www/fhiiqm/infos",$infid,"","del");
-if ($retf)
-{
-$sql = "UPDATE Info SET info_file = null WHERE info_ID=$infid";
-$reti=$dbc->execute($sql);
-if (!$reti)
-echo $dbc -> error . "<br>\n";
-}
-}
-}
-}
-}
-if ($result && $retf && $reti && $reta && $retp && $retv) // INSERT/UPDATE Info
 {
 //Eingabe Daten, Upload File erfolgreich
 echo "<p class='green'><b>Infodaten zu ID '$infid' wurden erfolgreich gespeichert.</b></p>\n";
 echo "<br /><br />\n";
 // Anzeigen gespeicherte Infodaten
-if ($fname)
-$ifile = $infid . "_" . $fname;
-else
-$ifile = $inf['ifname'];
 include ("inc/info_dat_show.inc.php");
 }
 }   // INSERT / UPDATE
 echo "</div>";
 echo "<p class='sc'>&nbsp;&nbsp;&nbsp;<a href=\"info_flist.php?$getp\" target=\"_self\" title=\"Infoliste\">Infoliste</a></p>\n";

changeset 36	4411d3239444
parent 31	0a1eb975fbd9
child 38	45c139f74ea4