nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-28 03:04:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git+ssh://repo.or.cz/srv/git/davical

Browse Source 
Conflicts:

	inc/tz/get.php
This commit is contained in:
Andrew McMillan 2011-10-05 20:20:37 +13:00
commit adc9849bac
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/tz/get.php
View File

@ -45,8 +45,8 @@ if ( $qry->QDo('SELECT * FROM tz_localnames WHERE our_tzno = :our_tzno', array('
header( 'ETag: "'.$tz->etag.'"' ); header( 'ETag: "'.$tz->etag.'"' );
header( 'Last-Modified', $tz->last_modified ); header( 'Last-Modified', $tz->last_modified );
header( 'Content-Disposition', 'Attachment; Filename="'.str_replace('/','-',$tzid . '.ics"' ); header( 'Content-Disposition', 'Attachment; Filename="'.str_replace('/','-',$tzid . '.ics"' ));
$request->DoResponse(200, $vtz->Render(), 'text/calendar; charset=UTF-8'); $request->DoResponse(200, $vtz->Render(), 'text/calendar; charset=UTF-8');
exit(0); exit(0);

2
zonedb/update-tzdata.sh
View File

@ -13,5 +13,5 @@ TZDATAFILE="`ls -t tzdata*.tar.gz|tail -n 1`"
mkdir tzdata && cd tzdata && tar -xfz ../$TZDATAFILE mkdir tzdata && cd tzdata && tar -xfz ../$TZDATAFILE
) )
vzic --olson-dir tzdata --output-dir vtimezones vzic --pure --olson-dir tzdata --output-dir vtimezones
echo "Olson `echo $TZDATAFILE | cut -f1 -d.`" >vtimezones/primary-source echo "Olson `echo $TZDATAFILE | cut -f1 -d.`" >vtimezones/primary-source