mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-01 02:49:37 +00:00
Better code commentation
This commit is contained in:
@@ -20,7 +20,7 @@
|
||||
* Rudolf Hangl < rudolf.hangl@technikum-wien.at >
|
||||
* Gerald Simane-Sequens < gerald.simane-sequens@technikum-wien.at >
|
||||
*/
|
||||
|
||||
|
||||
require_once('../../config/vilesci.config.inc.php');
|
||||
require_once('../../include/functions.inc.php');
|
||||
require_once('../../include/studiengang.class.php');
|
||||
@@ -29,7 +29,7 @@ require_once('../../include/betriebsmittel.class.php');
|
||||
|
||||
if (!$db = new basis_db())
|
||||
die('Es konnte keine Verbindung zum Server aufgebaut werden.');
|
||||
|
||||
|
||||
$user = get_uid();
|
||||
|
||||
$rechte = new benutzerberechtigung();
|
||||
@@ -39,22 +39,22 @@ if(!$rechte->isBerechtigt('basis/betriebsmittel'))
|
||||
die('Sie haben keine Berechtigung fuer diese Seite');
|
||||
|
||||
$htmlstr = "";
|
||||
|
||||
|
||||
if(isset($_GET['searchstr']))
|
||||
$searchstr = $_GET['searchstr'];
|
||||
else
|
||||
else
|
||||
$searchstr = '';
|
||||
if(isset($_GET['typ']))
|
||||
$typ=$_GET['typ'];
|
||||
else
|
||||
$typ='Zutrittskarte';
|
||||
|
||||
|
||||
$htmlstr.='
|
||||
<table width="100%">
|
||||
<tr>
|
||||
<td>
|
||||
<form accept-charset="UTF-8" name="search" method="GET">
|
||||
Bitte Suchbegriff eingeben:
|
||||
Bitte Suchbegriff eingeben:
|
||||
<input type="text" name="searchstr" size="30" value="'.$db->convert_html_chars($searchstr).'">
|
||||
<SELECT name="typ">
|
||||
<option value="Zutrittskarte" '.($typ=='Zutrittskarte'?'selected':'').'>Zutrittskarte</option>
|
||||
@@ -69,8 +69,8 @@ $htmlstr.='
|
||||
<input type="submit" name="submit" value="Suchen">
|
||||
</form>
|
||||
</td>
|
||||
</tr></table>';
|
||||
|
||||
</tr></table>';
|
||||
|
||||
if(isset($_GET['searchstr']) || isset($_POST['bmsuche']))
|
||||
{
|
||||
$bm_obj = new betriebsmittel();
|
||||
@@ -80,61 +80,61 @@ if(isset($_GET['searchstr']) || isset($_POST['bmsuche']))
|
||||
$bmsuche=strtoupper($_POST['bmsuche']);
|
||||
$kartennummer = $bm_obj->transform_kartennummer($bmsuche);
|
||||
|
||||
$sql_query="SELECT
|
||||
$sql_query="SELECT
|
||||
distinct on(tbl_betriebsmittelperson.betriebsmittelperson_id)
|
||||
tbl_betriebsmittel.*,
|
||||
tbl_betriebsmittelperson.*,
|
||||
tbl_person.vorname, tbl_person.nachname,
|
||||
tbl_benutzer.uid, tbl_betriebsmittelperson.uid as bmpuid
|
||||
FROM
|
||||
wawi.tbl_betriebsmittel
|
||||
FROM
|
||||
wawi.tbl_betriebsmittel
|
||||
JOIN wawi.tbl_betriebsmittelperson USING(betriebsmittel_id)
|
||||
JOIN public.tbl_person USING(person_id)
|
||||
LEFT JOIN public.tbl_benutzer USING(person_id)
|
||||
WHERE
|
||||
WHERE
|
||||
(
|
||||
upper(nummer) LIKE '%".$db->db_escape($kartennummer)."%'
|
||||
OR
|
||||
OR
|
||||
upper(nummer2) LIKE '%".$db->db_escape($kartennummer)."%'
|
||||
OR
|
||||
upper(nummer) LIKE '%".$db->db_escape($bmsuche)."%'
|
||||
OR
|
||||
OR
|
||||
upper(nummer2) LIKE '%".$db->db_escape($bmsuche)."%'
|
||||
)
|
||||
)
|
||||
AND betriebsmitteltyp=".$db->db_add_param($typ)." LIMIT 30";
|
||||
//echo $sql_query;
|
||||
}
|
||||
elseif(!empty($searchstr))
|
||||
{
|
||||
|
||||
|
||||
$sql_query = '
|
||||
SELECT
|
||||
SELECT
|
||||
distinct on(tbl_betriebsmittelperson.betriebsmittelperson_id)
|
||||
tbl_betriebsmittel.*,
|
||||
tbl_betriebsmittelperson.*,
|
||||
tbl_person.vorname, tbl_person.nachname,
|
||||
tbl_benutzer.uid, tbl_betriebsmittelperson.uid as bmpuid
|
||||
FROM
|
||||
wawi.tbl_betriebsmittel
|
||||
FROM
|
||||
wawi.tbl_betriebsmittel
|
||||
JOIN wawi.tbl_betriebsmittelperson USING(betriebsmittel_id)
|
||||
JOIN public.tbl_person USING(person_id)
|
||||
LEFT JOIN public.tbl_benutzer USING(person_id)
|
||||
';
|
||||
|
||||
|
||||
//Wenn searchstring nur Hexwerte enthaelt, dann in kartennummer umwandeln
|
||||
if(preg_match("/^[A-F0-9]+$/", $searchstr))
|
||||
$kartennummer = $bm_obj->transform_kartennummer($searchstr);
|
||||
else
|
||||
$kartennummer='';
|
||||
$sql_query.=" WHERE
|
||||
(tbl_benutzer.uid ~* ".$db->db_add_param($searchstr)."
|
||||
OR nummer = ".$db->db_add_param($searchstr)."
|
||||
$sql_query.=" WHERE
|
||||
(tbl_benutzer.uid ~* ".$db->db_add_param($searchstr)."
|
||||
OR nummer = ".$db->db_add_param($searchstr)."
|
||||
OR nummer = ".$db->db_add_param($kartennummer)."
|
||||
OR nummer2 = ".$db->db_add_param($searchstr)."
|
||||
OR nummer2 = ".$db->db_add_param($kartennummer)."
|
||||
OR nachname ~* ".$db->db_add_param($searchstr)."
|
||||
OR nummer2 = ".$db->db_add_param($searchstr)."
|
||||
OR nummer2 = ".$db->db_add_param($kartennummer)."
|
||||
OR nachname ~* ".$db->db_add_param($searchstr)."
|
||||
OR vorname ~* ".$db->db_add_param($searchstr).") ";
|
||||
|
||||
|
||||
$sql_query.=" AND betriebsmitteltyp=".$db->db_add_param($typ);
|
||||
}
|
||||
//echo $sql_query;
|
||||
@@ -155,16 +155,16 @@ if(isset($_GET['searchstr']) || isset($_POST['bmsuche']))
|
||||
<th>Retour</th>";
|
||||
$htmlstr .= " </tr></thead><tbody>\n";
|
||||
$i = 0;
|
||||
|
||||
|
||||
while($row=$db->db_fetch_object($erg))
|
||||
{
|
||||
$htmlstr .= " <tr>\n";
|
||||
$htmlstr .= " <td>".$row->betriebsmitteltyp."</td>\n";
|
||||
$htmlstr .= ' <td>
|
||||
<a href="betriebsmittel_details.php?betriebsmittel_id='.$db->convert_html_chars($row->betriebsmittel_id).'&betriebsmittelperson_id='.$db->convert_html_chars($row->betriebsmittelperson_id).'"
|
||||
<a href="betriebsmittel_details.php?betriebsmittel_id='.$db->convert_html_chars($row->betriebsmittel_id).'&betriebsmittelperson_id='.$db->convert_html_chars($row->betriebsmittelperson_id).'"
|
||||
target="betriebsmittel_details">'.$db->convert_html_chars($row->nummer)."</a></td>\n";
|
||||
$htmlstr .= ' <td>
|
||||
<a href="betriebsmittel_details.php?betriebsmittel_id='.$db->convert_html_chars($row->betriebsmittel_id).'&betriebsmittelperson_id='.$db->convert_html_chars($row->betriebsmittelperson_id).'"
|
||||
<a href="betriebsmittel_details.php?betriebsmittel_id='.$db->convert_html_chars($row->betriebsmittel_id).'&betriebsmittelperson_id='.$db->convert_html_chars($row->betriebsmittelperson_id).'"
|
||||
target="betriebsmittel_details">'.$db->convert_html_chars($row->nummer2)."</a></td>\n";
|
||||
$htmlstr .= " <td>".$db->convert_html_chars($row->nachname.' '.$row->vorname)." ( ".$db->convert_html_chars($row->bmpuid)." )</td>\n";
|
||||
$htmlstr .= " <td>".$db->convert_html_chars($row->ausgegebenam)."</td>\n";
|
||||
@@ -193,16 +193,16 @@ if(isset($_GET['searchstr']) || isset($_POST['bmsuche']))
|
||||
|
||||
<script type="text/javascript">
|
||||
<!--
|
||||
$(document).ready(function()
|
||||
{
|
||||
$("#t1").tablesorter(
|
||||
{
|
||||
sortList: [[3,0]],
|
||||
widgets: ["zebra"]
|
||||
});
|
||||
});
|
||||
|
||||
document.getElementById('bmsuche').focus();
|
||||
// $(document).ready(function()
|
||||
// {
|
||||
// $("#t1").tablesorter(
|
||||
// {
|
||||
// sortList: [[3,0]],
|
||||
// widgets: ["zebra"]
|
||||
// });
|
||||
// });
|
||||
//
|
||||
// document.getElementById('bmsuche').focus();
|
||||
//-->
|
||||
</script>
|
||||
</head>
|
||||
|
||||
Reference in New Issue
Block a user