--- a/fhiiqm/ma_tel_flist.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/ma_tel_flist.php Wed Feb 27 09:43:08 2013 +0100
@@ -21,7 +21,7 @@
if (! isset($_SESSION["userid"]))
{
include_once ("inc/func_lib.inc.php");
- login($_SERVER["PHP_SELF"]);
+ login($_SERVER["PHP_SELF"]."?e=$edit");
exit;
}
@@ -30,7 +30,8 @@
header("Location: start.php");
exit;
}
- }
+// print_r ($_SESSION); echo "<br />";
+ }
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@@ -56,9 +57,9 @@
}
// Felder, nach denen gefiltert werden kann
- $fields = array(2=>"Name",3=>"Vorname",5=>"Abteilung",6=>"Telefon/Fax",9=>"Haus", 10=>"Raum");
+ $fields = array(2=>"Name",3=>"Vorname",5=>"Abteilung",6=>"Arbeitsgruppe",7=>"Telefon/Fax",9=>"Haus", 10=>"Raum");
// $fieldf = array(2=>"trim(nachname)",3=>"vorname",5=>"abt_name",6=>"mt.telefon_nr",9=>"geb_ID", 10=>"raum_nr");
- $fieldf = array(2=>"name",3=>"vorname",5=>"abt_name",6=>"telefon_nr",9=>"geb_ID", 10=>"raum_nr");
+ $fieldf = array(2=>"name",3=>"vorname",5=>"abt_name",6=>"ag",7=>"telefon_nr",9=>"geb_ID", 10=>"raum_nr");
$sort = $_GET["s"]; // Sortierung nach Spalte
if (!isset($sort) && !$sort) $sort = $_POST["s"];
@@ -103,24 +104,38 @@
*/
// $sql = "SELECT persknr, name, vorname, titel, abt_name, telefon_nr, telefon_typ, public, geb_ID, raum_nr, email FROM v_tel_list";
// Raum zu Mitarbeiter und nicht zu Telefon
- $sql = "SELECT persknr, name, vorname, titel, abt_name, telefon_nr, telefon_typ, public, geb_ID, raum_nr, email FROM v_tel_list_ma_raum";
+ if ($edit) // auch ehemalige MA
+// $sql = "SELECT persknr, name, vorname, titel, abt_name, telefon_nr, telefon_typ, public, sort, geb_ID, raum_nr, email, aktiv FROM v_tel_list";
+ $sql = "SELECT persknr, name, vorname, titel, abt_name, ag, telefon_nr, telefon_typ, public, sort, geb_ID, raum_nr, email, aktiv FROM v_tel_list_ag
+ WHERE 1=1";
+ else
+// $sql = "SELECT persknr, name, vorname, titel, abt_name, telefon_nr, telefon_typ, public, sort, geb_ID, raum_nr, email, aktiv FROM v_tel_list_ma_raum";
+ $sql = "SELECT persknr, name, vorname, titel, abt_name, ag, telefon_nr, telefon_typ, public, sort, geb_ID, raum_nr, email, aktiv
+ FROM v_tel_list_ag WHERE aktiv > 0";
if ($filter)
{
if ($fnum > 3)
- $wher = " WHERE " . $fieldf[$fnum] . " LIKE " . "'%$filter%'";
+ $wher = " AND " . $fieldf[$fnum] . " LIKE " . "'%$filter%'";
else
- $wher = " WHERE " . $fieldf[$fnum] . " LIKE " . "'$filter%'";
+ $wher = " AND " . $fieldf[$fnum] . " LIKE " . "'$filter%'";
}
else $wher = "";
-
- if ($sort == 2) $so = "name COLLATE latin1_general_ci $dir, 3, 5";
+ // intern/extern
+ $ip=getenv("REMOTE_ADDR");
+ $ippart=explode(".",$ip);
+ if (($ippart[0] == 141 && $ippart[1] == 14) || ($ippart[0] == 172 && $ippart[1] == 16))
+ $wip = "";
+ else
+ $wip = " AND public=1 ";
+
+ if ($sort == 2) $so = "name COLLATE latin1_general_ci $dir, 1, 3, 5, 6";
// if ($sort == 2) $sort = "2, 3, 5";
- elseif ($sort == 5) $so = "5 $dir, name COLLATE latin1_general_ci, 3";
+ elseif ($sort == 5) $so = "5 $dir, 6, name COLLATE latin1_general_ci, 1, 3";
// if ($sort == 5) $sort = "5, 2, 3";
else $so = "$sort $dir ";
- if ($so) $ord = " ORDER BY $so, 6 "; // immer nach Telefon-Nr als 2.
+ if ($so) $ord = " ORDER BY $so, IFNULL(sort,99), 7 "; // immer nach Telefon-Nr als 2.
- $sql .= $wher . $ord;
+ $sql .= $wher . $wip . $ord;
// echo "sql = $sql<br /><br />";
$result = $dbc ->queryObjectArray($sql);
@@ -136,15 +151,17 @@
echo "<table border='0' cellspacing='0'>\n";
echo "<tr><td class='bigger'>Mittels '<img src='http://achilleus.rz-berlin.mpg.de/fhiiqm/img/auf.gif' border='0' width='11' hight='11' />' / '<img src='http://achilleus.rz-berlin.mpg.de/fhiiqm/img/ab.gif' border='0' width='11' hight='11' />'
- können Sie nach bestimmten Spalten auf- bzw. absteigend sortieren</td></tr>
- <tr><td class='bigger'>'<img src='http://achilleus.rz-berlin.mpg.de/fhiiqm/img/filter.gif' border='0' width='14' hight='11' />' ermöglicht das Filtern nach ausgewählten Spalten der Liste</td></tr>
- <tr><td class='bigger'>Rote Telefon-/Fax-Nummern sind nur intern erreichbar</td></tr>";
+ können Sie nach allen Spalten auf- bzw. absteigend sortieren</td></tr>
+ <tr><td class='bigger'>'<img src='http://achilleus.rz-berlin.mpg.de/fhiiqm/img/filter.gif' border='0' width='14' hight='11' />' ermöglicht das Filtern nach allen Spalten der Liste</td></tr>";
if ($edit)
- echo "<tr><td class='bigger'>Klick auf '<img src='/fhiiqm/img/edit.gif' border='0' width='11' hight='11'>' - Bearbeiten der Angaben</tr>";
-
+ {
+ echo "<tr><td class='bigger'>Klick auf '<img src='/fhiiqm/img/edit.gif' border='0' width='11' hight='11'>' - Bearbeiten der Angaben</td></tr>";
+ echo "<tr><td class='bigger'><span style='color: orange; font-size: 1em;'>Orange</span> <span style='background-color: #FFCC88; font-size: 1em;'>hinterlegte</span> Zeilen markieren ausgeschiedenen Mitarbeiter</td></tr>";
+ }
+ echo "<tr><td class='bigger'><span style='color: red; font-size: 1em;'>Rote</span> Telefon-/Fax-Nummern sind nur intern sichtbar</td></tr>";
echo "</table>\n";
- echo "</div><p> <a href=/fhiiqm/ma_tel_pdf.php?e=$edit$getp>PDF erstellen</a></p>\n<div align='center'>\n";
+ echo "</div><p> <a href='/fhiiqm/ma_tel_pdf_mc.php?e=$edit$getp'>PDF erstellen</a></p>\n<div align='center'>\n";
if (isset($fnum) && $fnum>1 && !$filter && !$subf)
{
// Formular anzeigen fuer Filterbegriff
@@ -179,7 +196,7 @@
echo "<a href='". $_SERVER["PHP_SELF"] . "?e=$edit&f=2&b=". chr($j)."' target=\"_self\" title=\"Telefonliste\" class=\"sc\">".chr($j)." </a>";
}
echo "</p>\n";
- echo "<table width='55%'>\n";
+ echo "<table width='75%'>\n";
if ($filter>'!') echo "<tr><td class='bigger' colspan=6>Filter: ". $fields["$fnum"] . " wie '$filter'</td></tr>\n";
@@ -188,9 +205,10 @@
tab_column(2,"Name",$sort,$dir,2,$fnum,$filter,$start,$zeil,$edit);
tab_column(3,"Vorname",$sort,$dir,3,$fnum,$filter,$start,$zeil,$edit);
tab_column(5,"Abteilung",$sort,$dir,5,$fnum,$filter,$start,$zeil,$edit);
+ tab_column(6,"Arbeitsgruppe",$sort,$dir,6,$fnum,$filter,$start,$zeil,$edit);
tab_column(9,"Haus",$sort,$dir,9,$fnum,$filter,$start,$zeil,$edit);
tab_column(10,"Raum",$sort,$dir,10,$fnum,$filter,$start,$zeil,$edit);
- tab_column(6,"Telefon/Fax",$sort,$dir,6,$fnum,$filter,$start,$zeil,$edit);
+ tab_column(7,"Telefon/Fax",$sort,$dir,7,$fnum,$filter,$start,$zeil,$edit);
if ($edit && !is_null($_SESSION["recht"]) && in_array("mte", $_SESSION["recht"]))
echo "<th> </th>";
echo "</tr>\n";
@@ -201,15 +219,20 @@
if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
$titel = ($row->titel)? ", $row->titel" : "" ;
$email = ($row->email)? "<a href='mailto:$row->email'>$row->name$titel</a>" : "$row->name$titel";
- echo "<tr bgcolor='" . $bg . "'><td >$email</td>";
+ if ($row->aktiv == 0) $class = " class='bgmark'"; else $class="";
+ echo "<tr$class bgcolor='" . $bg . "'><td>$email</td>";
echo "<td>$row->vorname</td>";
echo "<td>$row->abt_name</td>";
+ echo "<td>$row->ag</td>";
// echo "<td class=\"left\">$row->telnr " . ($row->telefon_typ == 'fax')? ", " . strtoupper($row->telefon_typ) : "" . "</td>";
$ttyp = ($row->telefon_typ == 'fax')? " " . strtoupper($row->telefon_typ) : "";
$rot = ($row->public)? "" : " class=\"red\"";
echo "<td>$row->geb_ID</td>";
echo "<td>$row->raum_nr</td>";
- echo "<td$rot>$row->telefon_nr $ttyp</td>";
+ if ($row->sort == 1)
+ echo "<td$rot><b>$row->telefon_nr</b> $ttyp</td>";
+ else
+ echo "<td$rot>$row->telefon_nr $ttyp</td>";
if ($edit && !is_null($_SESSION["recht"]) && in_array("mte", $_SESSION["recht"]))
echo "<td><a href='/fhiiqm/ma_tel_ed.php?i=$row->persknr$getp'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td>";
echo "</tr>\n";
@@ -218,22 +241,39 @@
{
if ($vabt != $row->abt_name) $abt = $row->abt_name;
else $abt = ' ';
+ if ($vag != $row->ag) $ag = $row->ag;
+ else $ag = ' ';
+ if ($vtel != $row->telefon_nr)
+ {
+ $ttyp = ($row->telefon_typ == 'fax')? " " . strtoupper($row->telefon_typ) : "";
+ $rot = ($row->public)? "" : " class=\"red\"";
+ $tel = $row->telefon_nr;
+ }
+ else
+ {
+ $tel = ' ';
+ $ttyp = '';
+ }
echo "<tr bgcolor='" . $bg . "'><td colspan='2'> </td>";
- $ttyp = ($row->telefon_typ == 'fax')? " " . strtoupper($row->telefon_typ) : "";
- $rot = ($row->public)? "" : " class=\"red\"";
echo "<td>$abt</td>";
+ echo "<td>$ag</td>";
echo "<td> </td>";
echo "<td> </td>";
- echo "<td$rot>$row->telefon_nr $ttyp</td>";
+ if ($row->sort == 1)
+ echo "<td$rot><b>$tel</b> $ttyp</td>";
+ else
+ echo "<td$rot>$tel $ttyp</td>";
if ($edit && !is_null($_SESSION["recht"]) && in_array("mte", $_SESSION["recht"]))
echo "<td> </td>";
echo "</tr>\n";
}
$vpnr = $row->persknr;
$vabt = $row->abt_name;
+ $vag = $row->ag;
+ $vtel = $row->telefon_nr;
}
echo "</table></div>\n";
- echo "<p> <a href=/fhiiqm/ma_tel_pdf.php?e=$edit$getp>PDF erstellen</a></p>\n";
+ echo "<p> <a href='/fhiiqm/ma_tel_pdf_mc.php?e=$edit$getp'>PDF erstellen</a></p>\n";
}
else