diff --git a/cis/private/lehre/abgabe_student_frameset.html b/cis/private/lehre/abgabe_student_frameset.html index 5305ca628..84e22d7bd 100644 --- a/cis/private/lehre/abgabe_student_frameset.html +++ b/cis/private/lehre/abgabe_student_frameset.html @@ -4,7 +4,6 @@ Bachelor-/Diplomarbeitsabgabe - Student - diff --git a/content/bildupload.php b/content/bildupload.php index 30ed51314..e01974b11 100644 --- a/content/bildupload.php +++ b/content/bildupload.php @@ -60,7 +60,7 @@ function resize($filename, $width, $height) imagejpeg($image_p, $filename, 80); imagedestroy($image_p); - imagedestroy($image); + @imagedestroy($image); } $user = get_uid(); diff --git a/content/lvplanung/timetable-week.xul.php b/content/lvplanung/timetable-week.xul.php index 0ed4155a1..6f200a98a 100644 --- a/content/lvplanung/timetable-week.xul.php +++ b/content/lvplanung/timetable-week.xul.php @@ -245,10 +245,14 @@ if ($aktion=='stpl_move' || $aktion=='stpl_set') elseif ($aktion=='stpl_delete_single' || $aktion=='stpl_delete_block') { $lehrstunde=new lehrstunde(); - foreach ($stpl_id as $stundenplan_id) + + if(isset($stpl_id)) { - $lehrstunde->delete($stundenplan_id,$db_stpl_table); - $error_msg.=$lehrstunde->errormsg; + foreach ($stpl_id as $stundenplan_id) + { + $lehrstunde->delete($stundenplan_id,$db_stpl_table); + $error_msg.=$lehrstunde->errormsg; + } } if(isset($res_id)) diff --git a/include/ferien.class.php b/include/ferien.class.php index 9986ba0d1..dc6767d4b 100644 --- a/include/ferien.class.php +++ b/include/ferien.class.php @@ -80,8 +80,8 @@ class ferien extends basis_db $f->studiengang_kz = $row->studiengang_kz; $f->vondatum=$row->vondatum; $f->bisdatum=$row->bisdatum; - $f->vontimestamp=mktime(0,0,0,mb_substr($row->vondatum,5,2),mb_substr($row->vondatum,8),mb_substr($row->vondatum,0,4));; - $f->bistimestamp=mktime(23,59,59,mb_substr($row->bisdatum,5,2),mb_substr($row->bisdatum,8),mb_substr($row->bisdatum,0,4));; + $f->vontimestamp=mktime(0,0,0,mb_substr($row->vondatum,5,2),mb_substr($row->vondatum,8),mb_substr($row->vondatum,0,4)); + $f->bistimestamp=mktime(23,59,59,mb_substr($row->bisdatum,5,2),mb_substr($row->bisdatum,8),mb_substr($row->bisdatum,0,4)); // in array speichern $this->ferien[]=$f; } diff --git a/rdf/bisio.rdf.php b/rdf/bisio.rdf.php index 9157ba107..01d158d7a 100644 --- a/rdf/bisio.rdf.php +++ b/rdf/bisio.rdf.php @@ -87,14 +87,14 @@ else function draw_content($row) { - global $rdf_url, $datum, $conn; + global $rdf_url, $datum, $db; $lehrveranstaltung_id=''; $studiensemester_kurzbz = ''; if($row->lehreinheit_id!='') { $qry = "SELECT lehrveranstaltung_id, studiensemester_kurzbz FROM lehre.tbl_lehreinheit WHERE lehreinheit_id='$row->lehreinheit_id'"; - if($result = $db->db_query($conn, $qry)) + if($result = $db->db_query($qry)) { if($row_lv = $db->db_fetch_object($result)) {