blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-07 23:29:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Anpassungen fuer kompatibilitaet von Coodle und Freebusy

Browse Source
This commit is contained in:
Andreas Österreicher
2015-01-14 15:21:01 +00:00
parent e558de5a10
commit ca8cd523be
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/public/freebusy_lvplan.php
+1 -1
View File
@@ -47,12 +47,12 @@ echo "BEGIN:VCALENDAR\n";
echo "VERSION:2.0\n";
echo "PRODID:-//FHCOMPLETE//EN\n";
echo "METHOD:PUBLISH\n";
echo "BEGIN:VFREEBUSY\n";
echo 'ORGANIZER;CN=',$bn->vorname,' ',$bn->nachname,':mailto:',$uid,'@',DOMAIN,"\n";
echo 'DTSTAMP;TZID=Europe/Vienna:',date('Ymd', mktime(date('H'),date('i'),date('s'),date('m'),date('d')-5,date('Y'))),'T',date('Hms'),"\n";
echo 'DTSTART;TZID=Europe/Vienna:',date('Ymd', mktime(0,0,0,date('m'),date('d')-5,date('Y'))),"T000000\n";
echo 'DTEND;TZID=Europe/Vienna:',date('Ymd', mktime(0,0,0,date('m'),date('d')+30,date('Y'))),"T000000\n";
echo 'URL:',APP_ROOT,'cis/public/freebusy_lvplan.php/',$uid,"\n";
echo "BEGIN:VFREEBUSY";
// Stundenplanobjekt erzeugen
$stdplan = new wochenplan($type);
include/ical.class.php
+15 -3
View File
@@ -104,8 +104,8 @@ class ical extends basis_db
$doppelpunktpos = mb_strpos($row, ':');
$row = mb_substr($row, $doppelpunktpos+1);
$slashpos = mb_strpos($row, '/');
$dtstart = mb_substr($row, 0, $slashpos);
$dtend = mb_substr($row, $slashpos+1);
$dtstart = $this->ConvertTimezoneUTC(mb_substr($row, 0, $slashpos));
$dtend = $this->ConvertTimezoneUTC(mb_substr($row, $slashpos+1));
$this->dtresult[]=array('dtstart'=>trim($dtstart),'dtend'=>trim($dtend));
$dtstart = $this->ConvertTimezoneUTC($dtstart);
@@ -115,6 +115,18 @@ class ical extends basis_db
$dtend='';
}
}
elseif($typ=='LVPLAN')
{
// Freebusy Eintrag mit UTC Timestamps
if(mb_strstr($row,'FREEBUSY:'))
{
$dtstart = $this->ConvertTimezoneUTC(mb_substr($row,9,17));
$dtend = $this->ConvertTimezoneUTC(mb_substr($row,27));
$this->result[$idx].='FREEBUSY:'.$dtstart.'/'.$dtend."\n";
$dtstart='';
$dtend='';
}
}
elseif(mb_strpos($row,'FREEBUSY')===0)
{
if(mb_strstr($row,'FREEBUSY:'))
@@ -166,7 +178,7 @@ class ical extends basis_db
$len = mb_strlen($row);
$slashpos = mb_strpos($row, '/');
$dtstart = mb_substr($row, 0, $len-$slashpos);
$dtstart = mb_substr($row, 0, $len-$slashpos-1);
$dtend = mb_substr($row, $slashpos+1);
$dtstart = $this->ConvertTimezoneLocal(trim($dtstart));
$dtend = $this->ConvertTimezoneLocal(trim($dtend));
system/checksystem.php
+1 -1
View File
@@ -2568,7 +2568,7 @@ $tabellen=array(
"lehre.tbl_stundenplan" => array("stundenplan_id","unr","mitarbeiter_uid","datum","stunde","ort_kurzbz","gruppe_kurzbz","titel","anmerkung","lehreinheit_id","studiengang_kz","semester","verband","gruppe","fix","updateamum","updatevon","insertamum","insertvon"),
"lehre.tbl_stundenplandev" => array("stundenplandev_id","lehreinheit_id","unr","studiengang_kz","semester","verband","gruppe","gruppe_kurzbz","mitarbeiter_uid","ort_kurzbz","datum","stunde","titel","anmerkung","fix","updateamum","updatevon","insertamum","insertvon","ext_id"),
"lehre.tbl_vertrag" => array("vertrag_id","person_id","vertragstyp_kurzbz","bezeichnung","betrag","insertamum","insertvon","updateamum","updatevon","ext_id","anmerkung","vertragsdatum"),
"lehre.tbl_vertrag_vertragsstatus" => array("vertragsstatus_kurzbz","vertrag_id","uid","datum","ext_id","insertamum","insertvon","updateaum","updatevon"),
"lehre.tbl_vertrag_vertragsstatus" => array("vertragsstatus_kurzbz","vertrag_id","uid","datum","ext_id","insertamum","insertvon","updateamum","updatevon"),
"lehre.tbl_vertragstyp" => array("vertragstyp_kurzbz","bezeichnung"),
"lehre.tbl_vertragsstatus" => array("vertragsstatus_kurzbz","bezeichnung"),
"lehre.tbl_zeitfenster" => array("wochentag","stunde","ort_kurzbz","studiengang_kz","gewicht"),