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)