This commit is contained in:
Andreas Österreicher
2008-04-07 15:29:55 +00:00
parent c04e60cbe2
commit 0e080b46c8
14 changed files with 737 additions and 553 deletions
+1 -1
View File
@@ -31,7 +31,7 @@
function print_news($sql_conn)
{
$news_obj = new news($sql_conn);
$news_obj->getnews(MAXNEWSALTER,'0','0');
$news_obj->getnews(MAXNEWSALTER,'0','0', false, null, MAXNEWS);
$open=true;
$zaehler=0;
echo "<div id='news'>";
+14 -8
View File
@@ -56,6 +56,7 @@
$news_obj->betreff = $title;
$news_obj->text = $news_message;
$news_obj->datum = $datum;
$news_obj->datum_bis = $datum_bis;
$news_obj->updatevon = $user;
if(isset($news_id) && $news_id != "")
@@ -182,6 +183,7 @@
$betreff = $news_obj->betreff;
$text = $news_obj->text;
$datum = $news_obj->datum;
$datum_bis = $news_obj->datum_bis;
echo 'Eintrag &auml;ndern';
}
@@ -203,23 +205,27 @@
<td width="65">Verfasser:</td>
<td width="218"><input type="text" class="TextBox" name="txtAuthor" size="30"<?php if(isset($news_id) && $news_id != "") echo ' value="'.$verfasser.'"'; ?>>
</td>
<td width="60">&nbsp;</td>
<td>&nbsp;Sichtbar ab <input type="text" class="TextBox" name="datum" size="10" value="<?php if(isset($news_id) && $news_id != "") echo date('d.m.Y',strtotime(strftime($datum))); else echo date('d.m.Y'); ?>"></td>
<td width="80">Sichtbar ab</td>
<td><input type="text" class="TextBox" name="datum" size="10" value="<?php if(isset($news_id) && $news_id != "") echo date('d.m.Y',strtotime(strftime($datum))); else echo date('d.m.Y'); ?>"></td>
</tr>
<tr>
<td>Titel:</td>
<td><input type="text" class="TextBox" name="txtTitle" size="30"<?php if(isset($news_id) && $news_id != "") echo ' value="'.$betreff.'"'; ?>></td>
<td><strong><font class="error">Hinweis:</font></strong></td>
<td>Bitte beachten Sie, dass im Titel auch das jeweilige Freifach genannt wird. </td>
<td width="80">Sichtbar bis</td>
<td><input type="text" class="TextBox" name="datum_bis" size="10" value="<?php if(isset($news_id) && $news_id != "" && $datum_bis!='') echo date('d.m.Y',strtotime(strftime($datum_bis))); else echo ''; ?>"></td>
</tr>
<tr>
<td colspan='2'>Bitte geben Sie hier Ihre Nachricht ein:</td>
<td colspan='2'><strong><font class="error">Hinweis:</font></strong>
Bitte beachten Sie, dass im Titel auch das jeweilige Freifach genannt wird.
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td>Bitte geben Sie hier Ihre Nachricht ein:<br>
<td>
<textarea class="TextBox" style="width: 99%; heigth: 166px" name="txtNewsMessage" rows="10" cols="70" maxlength="2000"><?php if(isset($news_id) && $news_id != "") echo str_replace("<br>", "\r\n", $text); ?></textarea></td>
</tr>
<tr>
+1 -1
View File
@@ -86,7 +86,7 @@
<table class="tabcontent">
<?php
$news_obj = new news($sql_conn);
$news_obj->getnews(MAXNEWSALTER,'0','0',true);
$news_obj->getnews(MAXNEWSALTER,'0','0',true, null, MAXNEWS);
$zaehler =0;
$i=0;
File diff suppressed because it is too large Load Diff
+2 -1
View File
@@ -93,9 +93,10 @@
function print_STGnews($stg_id, $semester, $sql_conn, $showall=false, $fachbereich_kurzbz)
{
$alter = ($showall?0:MAXNEWSALTER);
$maxnews = ($showall?0:MAXNEWS);
$news_obj = new news($sql_conn);
if($news_obj->getnews($alter, $stg_id, $semester, $showall, $fachbereich_kurzbz))
if($news_obj->getnews($alter, $stg_id, $semester, $showall, $fachbereich_kurzbz, $maxnews))
{
$zaehler = print_news($news_obj);
}
+20 -4
View File
@@ -26,7 +26,7 @@
//Connection Herstellen
if(!$conn = pg_pconnect(CONN_STRING))
die('Fehler beim oeffnen der Datenbankverbindung');
die('Fehler beim Oeffnen der Datenbankverbindung');
$user = get_uid();
@@ -43,6 +43,11 @@
$term_id = $_GET['term_id'];
}
if(isset($_GET['datum']))
$datum = $_GET['datum'];
if(isset($_GET['datum_bis']))
$datum_bis = $_GET['datum_bis'];
$stg_obj = new studiengang($conn, $course_id);
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
@@ -67,6 +72,7 @@
$news_obj->semester = $term_id;
$news_obj->betreff = $title;
$news_obj->datum = $datum;
$news_obj->datum_bis = $datum_bis;
$news_obj->text = $news_message;
$news_obj->updatevon = $user;
$news_obj->updateamum = date('Y-m-d H:i:s');
@@ -96,6 +102,7 @@
$news_obj->semester = $term_id;
$news_obj->betreff = $title;
$news_obj->datum = $datum;
$news_obj->datum_bis = $datum_bis;
$news_obj->text = $news_message;
$news_obj->updatevon = $user;
$news_obj->updateamum = date('Y-m-d H:i:s');
@@ -270,6 +277,7 @@
$betreff = '';
$text = '';
$datum = '';
$datum_bis = '';
if(isset($news_id) && $news_id != "")
{
@@ -278,6 +286,7 @@
$betreff = $news_obj->betreff;
$text = $news_obj->text;
$datum = $news_obj->datum;
$datum_bis = $news_obj->datum_bis;
echo 'Eintrag &auml;ndern';
}
else
@@ -311,7 +320,7 @@
<td width="218"><input type="text" class="TextBox" name="txtAuthor" size="30" <?php echo $value; ?>>
</td>
<td width="81">Studiengang: </td>
<td>
<td width="130">
<select name="course" onChange="MM_jumpMenu('self',this,0)" class="TextBox">
<?php
$studiengaenge = new studiengang($conn);
@@ -351,7 +360,10 @@
}
?>
</select>
Sichtbar ab <input type="text" class="TextBox" name="datum" size="10" value="<?php if(isset($news_id) && $news_id != "") echo date('d.m.Y',strtotime(strftime($datum))); else echo date('d.m.Y'); ?>"></td>
</td>
<td width="81">Sichtbar ab:</td>
<td>
<input type="text" class="TextBox" name="datum" size="10" value="<?php if(isset($news_id) && $news_id != "") echo date('d.m.Y',strtotime(strftime($datum))); else echo date('d.m.Y'); ?>">
</td>
</tr>
<tr>
@@ -369,7 +381,7 @@
?>
<td><input type="text" class="TextBox" name="txtTitle" size="30" <?php echo $value; ?>></td>
<td>Semester: </td>
<td>
<td width="130">
<select name="term" onChange="MM_jumpMenu('self',this,0)" class="TextBox">
<?php
echo '<option value="pinboard_entry.php?course_id='.$course_id.'&term_id=1" '.($term_id==1?'selected':'').'>1. Semester</option>';
@@ -384,6 +396,10 @@
?>
</select>
</td>
<td width="81">Sichtbar bis:</td>
<td>
<input type="text" class="TextBox" name="datum_bis" size="10" value="<?php if(isset($news_id) && $news_id != "" && $datum_bis!='') echo date('d.m.Y',strtotime(strftime($datum_bis))); else echo ''; ?>">
</td>
</tr>
</table>
</td>
+1 -1
View File
@@ -91,7 +91,7 @@
<?php
$news_obj = new news($conn);
$news_obj->getnews(MAXNEWSALTER,$course_id, $term_id, true);
$news_obj->getnews(MAXNEWSALTER,$course_id, $term_id, true, null, MAXNEWS);
$i=0;
foreach($news_obj->result as $row)
+13 -3
View File
@@ -57,6 +57,8 @@
$txtAuthor=$_POST['txtAuthor'];
if(isset($_POST['datum']))
$datum=$_POST['datum'];
if(isset($_POST['datum_bis']))
$datum_bis=$_POST['datum_bis'];
if(isset($_POST['txtTitle']))
$txtTitle=$_POST['txtTitle'];
if(isset($_POST['btnSend']))
@@ -92,6 +94,7 @@
else
$news->fachbereich_kurzbz = '';
$news->datum = $datum;
$news->datum_bis = $datum_bis;
$news->uid=$user;
$news->updatevon=$user;
$news->updateamum=date('Y-m-d H:i:s');
@@ -128,6 +131,7 @@
$news->uid = $user;
$news->updateamum=date('Y-m-d H:i:s');
$news->datum=$datum;
$news->datum_bis=$datum_bis;
$news->new=true;
if($news->save())
@@ -266,6 +270,12 @@
<tr>
<td>Titel:</td>
<td><input type="text" class="TextBox" name="txtTitle" size="30"<?php if(isset($news_id) && $news_id != "") echo ' value="'.$news->betreff.'"'; ?>></td>
<td>Sichtbar bis (optional):</td>
<td><input type="text" class="TextBox" name="datum_bis" size="10" value="<?php if(isset($news_id) && $news_id != "" && $news->datum_bis!='') echo date('d.m.Y',strtotime(strftime($news->datum_bis))); else echo ''; ?>"></td>
</tr>
<tr>
<td colspan='2'>Bitte geben Sie hier Ihre Nachricht ein:</td>
<?php
if($rechte->isBerechtigt('admin',0) || $rechte->isBerechtigt('assistenz',0))
{
@@ -279,11 +289,11 @@
</table>
</td>
</tr>
<tr>
<!-- <tr>
<td>&nbsp;</td>
</tr>
</tr>-->
<tr>
<td>Bitte geben Sie hier Ihre Nachricht ein:<br>
<td><!--Bitte geben Sie hier Ihre Nachricht ein:<br>-->
<textarea class="TextBox" style="width: 99%; heigth: 166px" name="txtNewsMessage" rows="10" cols="70" maxlength="2000"><?php if(isset($news_id) && $news_id != "") echo str_replace("<br>", "\r\n", $news->text); ?></textarea></td>
</tr>
<tr>
+1 -1
View File
@@ -98,7 +98,7 @@
<?php
$news = new news($sql_conn);
$news->getnews(MAXNEWSALTER,0,null, true, '*');
$news->getnews(0,0,null, true, '*', 0);
$zaehler=0;
$i=0;
+1 -1
View File
@@ -51,7 +51,7 @@
$news = new news($conn);
$news->getnews(MAXNEWSALTER,0,null);
$news->getnews(MAXNEWSALTER,0,null, false, null, MAXNEWS);
$zaehler=0;
$open=true;
foreach ($news->result as $row)
+57
View File
@@ -319,4 +319,61 @@ function checkalias($alias)
return false;
}
// ****************************************************************
// * Prueft ob im LDAP ein User mit diesem Passwort existiert
// ****************************************************************
function checkldapuser($username,$password)
{
if($connect=@ldap_connect(LDAP_SERVER))
{
// bind to ldap connection
if(($bind=@ldap_bind($connect)) == false)
{
print "bind:__FAILED__<br>\n";
return false;
}
// search for user
if (($res_id = ldap_search( $connect, LDAP_BASE_DN, "uid=$username")) == false)
{
print "failure: search in LDAP-tree failed<br>";
return false;
}
if (ldap_count_entries($connect, $res_id) != 1)
{
print "failure: username $username found more than once<br>\n";
return false;
}
if (( $entry_id = ldap_first_entry($connect, $res_id))== false)
{
print "failur: entry of searchresult couln't be fetched<br>\n";
return false;
}
if (( $user_dn = ldap_get_dn($connect, $entry_id)) == false)
{
print "failure: user-dn coulnd't be fetched<br>\n";
return false;
}
/* Authentifizierung des User */
if (($link_id = @ldap_bind($connect, $user_dn, $password)) == false)
{
return false;
}
return true;
@ldap_close($connect);
}
else
{
// no conection to ldap server
echo "no connection to '$ldap_server'<br>\n";
}
@ldap_close($connect);
return(false);
}
?>
+14 -4
View File
@@ -41,6 +41,7 @@ class news
var $updatevon=0; // @var string
var $insertamum; // @var timestamp
var $insertvon=0; // @var string
var $datum_bis; // @date
/**
@@ -81,6 +82,7 @@ class news
$news_obj->studiengang_kz=$row->studiengang_kz;
$news_obj->verfasser = $row->verfasser;
$news_obj->datum = $row->datum;
$news_obj->datum_bis = $row->datum_bis;
$news_obj->insertamum=$row->insertamum;
$news_obj->insertvon=$row->insertvon;
$news_obj->updateamum=$row->updateamum;
@@ -96,7 +98,7 @@ class news
// * als $maxalter Tage sind
// * @param $maxalter
// **********************************
function getnews($maxalter, $studiengang_kz, $semester, $all=false, $fachbereich_kurzbz=null)
function getnews($maxalter, $studiengang_kz, $semester, $all=false, $fachbereich_kurzbz=null, $maxnews)
{
//if(!is_numeric($maxalter) || !is_numeric($studiengang_kz) || ($semester!='' && !is_numeric($semester)))
//{
@@ -111,7 +113,7 @@ class news
}
if(!$all)
$qry.=' AND datum<=now()';
$qry.=' AND datum<=now() AND (datum_bis>= now()::date OR datum_bis is null)';
if($fachbereich_kurzbz!='*')
{
@@ -122,13 +124,16 @@ class news
}
if($studiengang_kz=='0')
$qry.=" AND studiengang_kz='".$studiengang_kz."' ".($semester!=''?"":'AND semester is null');
$qry.=" AND studiengang_kz='".$studiengang_kz."' ".($semester!=''?($semester=='0'?' AND semester=0':''):'AND semester is null');
else if($studiengang_kz=='')
$qry.='';
else
$qry.=" AND ((studiengang_kz='$studiengang_kz' AND semester='$semester') OR (studiengang_kz='$studiengang_kz' AND semester=0) OR (studiengang_kz=0 AND semester='$semester') OR (studiengang_kz=0 and semester is null))";
$qry.=' ORDER BY datum DESC, updateamum DESC';
if($maxnews!=0)
$qry.= " LIMIT $maxnews";
//echo $qry;
if($result = pg_query($this->conn, $qry))
{
@@ -144,6 +149,7 @@ class news
$newsobj->text = $row->text;
$newsobj->verfasser = $row->verfasser;
$newsobj->datum = $row->datum;
$newsobj->datum_bis = $row->datum_bis;
$newsobj->updateamum = $row->updateamum;
$newsobj->updatevon = $row->updateamum;
$newsobj->insertamum = $row->insertamum;
@@ -181,6 +187,7 @@ class news
$newsobj->text = $row->text;
$newsobj->verfasser = $row->verfasser;
$newsobj->datum = $row->datum;
$newsobj->datum_bis = $row->datum_bis;
$newsobj->updateamum = $row->updateamum;
$newsobj->updatevon = $row->updateamum;
$newsobj->insertamum = $row->insertamum;
@@ -230,6 +237,7 @@ class news
$this->studiengang_kz = $row->studiengang_kz;
$this->verfasser = $row->verfasser;
$this->datum = $row->datum;
$this->datum_bis = $row->datum_bis;
$this->insertamum = $row->insertamum;
$this->insertvon = $row->insertvon;
$this->updateamum = $row->updateamum;
@@ -313,7 +321,7 @@ class news
{
//Neuen Datensatz anlegen
$qry = 'INSERT INTO campus.tbl_news (betreff, text, semester, fachbereich_kurzbz, uid, studiengang_kz, verfasser,datum, insertamum, insertvon,
$qry = 'INSERT INTO campus.tbl_news (betreff, text, semester, fachbereich_kurzbz, uid, studiengang_kz, verfasser, datum, datum_bis, insertamum, insertvon,
updateamum, updatevon) VALUES ('.
$this->addslashes($this->betreff).', '.
$this->addslashes($this->text).', '.
@@ -323,6 +331,7 @@ class news
$this->addslashes($this->studiengang_kz).', '.
$this->addslashes($this->verfasser).', '.
$this->addslashes($this->datum).', '.
$this->addslashes($this->datum_bis).', '.
$this->addslashes($this->insertamum).', '.
$this->addslashes($this->insertvon).', '.
$this->addslashes($this->updateamum).', '.
@@ -349,6 +358,7 @@ class news
'studiengang_kz='.$this->addslashes($this->studiengang_kz).', '.
'verfasser='.$this->addslashes($this->verfasser).', '.
'datum='.$this->addslashes($this->datum).', '.
'datum_bis='.$this->addslashes($this->datum_bis).', '.
'insertamum='.$this->addslashes($this->insertamum).', '.
'insertvon='.$this->addslashes($this->insertvon).', '.
'updateamum='.$this->addslashes($this->updateamum).', '.
+18 -8
View File
@@ -28,7 +28,7 @@ class ort
{
var $conn; // @var resource DB-Handle
var $new; // @var boolean
var $errormsg; // @var string
var $errormsg; // @var string
var $result = array(); // @var fachbereich Objekt
//Tabellenspalten
@@ -36,14 +36,16 @@ class ort
var $bezeichnung; // @var string
var $planbezeichnung; // @var string
var $max_person; // @var integer
var $lehre; // @var boolean
var $lehre; // @var boolean
var $reservieren; // @var boolean
var $aktiv; // @var boolean
var $lageplan; // @var oid
var $aktiv; // @var boolean
var $lageplan; // @var oid
var $dislozierung; // @var smallint
var $kosten; // @var numeric(8,2)
var $ausstattung;
var $stockwerk; // @var integer
var $stockwerk; // @var integer
var $standort_kurzbz; // @var varchar(16)
var $telefonklappe; // @var varchar(8)
/**
* Konstruktor
@@ -102,6 +104,8 @@ class ort
$ort_obj->reservieren = ($row->reservieren=='t'?true:false);
$ort_obj->ausstattung = $row->ausstattung;
$ort_obj->stockwerk = $row->stockwerk;
$ort_obj->standort_kurzbz = $row->standort_kurzbz;
$ort_obj->telefonklappe = $row->telefonklappe;
$this->result[] = $ort_obj;
}
@@ -143,6 +147,8 @@ class ort
$this->reservieren = ($row->reservieren=='t'?true:false);
$this->ausstattung = $row->ausstattung;
$this->stockwerk = $row->stockwerk;
$this->standort_kurzbz = $row->standort_kurzbz;
$this->telefonklappe = $row->telefonklappe;
}
else
{
@@ -217,7 +223,7 @@ class ort
}
//Neuen Datensatz anlegen
$qry = 'INSERT INTO public.tbl_ort (ort_kurzbz, bezeichnung, planbezeichnung, max_person, aktiv, lehre, reservieren, lageplan,
dislozierung, kosten, stockwerk) VALUES ('.
dislozierung, kosten, stockwerk, standort_kurzbz, telefonklappe) VALUES ('.
$this->addslashes($this->ort_kurzbz).', '.
$this->addslashes($this->bezeichnung).', '.
$this->addslashes($this->planbezeichnung).', '.
@@ -227,8 +233,10 @@ class ort
($this->reservieren?'true':'false').', '.
$this->addslashes($this->lageplan).', '.
$this->addslashes($this->dislozierung).', '.
$this->addslashes(str_replace(",",".",$this->kosten)).', ';
$this->addslashes($this->stockwerk).');';
$this->addslashes(str_replace(",",".",$this->kosten)).', '.
$this->addslashes($this->stockwerk).','.
$this->addslashes($this->standort_kurzbz).','.
$this->addslashes($this->telefonklappe).');';
}
else
{
@@ -251,6 +259,8 @@ class ort
'lageplan='.$this->addslashes($this->lageplan).', '.
'dislozierung='.$this->addslashes($this->dislozierung).', '.
'kosten='.$this->addslashes(str_replace(",",".",$this->kosten)).', '.
'standort_kurzbz='.$this->addslashes($this->standort_kurzbz).', '.
'telefonklappe='.$this->addslashes($this->telefonklappe).', '.
'stockwerk='.$this->addslashes($this->stockwerk).' '.
'WHERE ort_kurzbz = '.$this->addslashes($this->ort_kurzbz).';';
}
+49
View File
@@ -1,4 +1,24 @@
<?php
/* Copyright (C) 2006 Technikum-Wien
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
* Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
* Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
* Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
*/
require_once('../config.inc.php');
require_once('../../include/globals.inc.php');
require_once('../../include/functions.inc.php');
@@ -27,6 +47,8 @@
$kosten = '';
$ausstattung = '';
$stockwerk = '';
$standort_kurzbz = '';
$telefonklappe = '';
$neu = "true";
@@ -41,6 +63,8 @@
$kosten = $_POST["kosten"];
$ausstattung = $_POST["ausstattung"];
$stockwerk = $_POST["stockwerk"];
$standort_kurzbz = $_POST["standort_kurzbz"];
$telefonklappe = $_POST["telefonklappe"];
$sg_update = new ort($conn);
@@ -56,6 +80,8 @@
$sg_update->kosten = $kosten;
$sg_update->ausstattung = $ausstattung;
$sg_update->stockwerk = $stockwerk;
$sg_update->telefonklappe = $telefonklappe;
$sg_update->standort_kurzbz = $standort_kurzbz;
if ($_POST["neu"] == "true")
@@ -90,6 +116,8 @@
$kosten = $sg->kosten;
$ausstattung = $sg->ausstattung;
$stockwerk = $sg->stockwerk;
$standort_kurzbz = $sg->standort_kurzbz;
$telefonklappe = $sg->telefonklappe;
$neu = "false";
}
@@ -124,6 +152,27 @@
$htmlstr .= " <tr>\n";
$htmlstr .= " <td>Stockwerk</td>\n";
$htmlstr .= " <td><input class='detail' type='text' name='stockwerk' size='8' maxlength='5' value='".$stockwerk."' onchange='submitable()'></td>\n";
$htmlstr .= " <td>Standort</td>\n";
$htmlstr .= " <td>";
$htmlstr .= " <SELECT name='standort_kurzbz'>";
$htmlstr.=" <OPTION value=''>-- keine Auswahl --</OPTION>\n";
$qry = 'SELECT * FROM public.tbl_standort ORDER BY standort_kurzbz';
if($result = pg_query($conn, $qry))
{
while($row = pg_fetch_object($result))
{
if($row->standort_kurzbz==$standort_kurzbz)
$selected='selected';
else
$selected='';
$htmlstr.=" <OPTION value='$row->standort_kurzbz' $selected>$row->standort_kurzbz</OPTION>\n";
}
}
$htmlstr .= " </SELECT>";
$htmlstr .= " </td>\n";
$htmlstr .= " <td>Telefonklappe</td>\n";
$htmlstr .= " <td><input class='detail' type='text' name='telefonklappe' size='3' maxlength='8' value='".$telefonklappe."' onchange='submitable()'></td>\n";
$htmlstr .= " </tr>\n";
$htmlstr .= " <tr>\n";
$htmlstr .= " <td valign='top'>Lehre</td>\n";