rysiek
/
owncalendar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

properly urlencode all caldav links 

Conflicts:
	templates/settings.php
master
Georg Ehrke 2014-02-04 21:55:50 +01:00
parent b9541cc63c
commit e282ec846a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/calendar.js
View File

@ -290,7 +290,7 @@ Calendar={
}
},
showCalDAVUrl:function(username, calname){
$('#caldav_url').val(totalurl + '/' + username + '/' + calname);
$('#caldav_url').val(totalurl + '/' + encodeURIComponent(username) + '/' + encodeURIComponent(calname));
$('#caldav_url').show();
$("#caldav_url_close").show();
},

4
templates/settings.php
View File

@ -113,7 +113,7 @@
<dt><?php p($l->t('Primary address (Kontact et al)')); ?></dt>
<dd><input type="text" style="width: 90%;float: left;" value="<?php print_unescaped(OCP\Util::linkToRemote('caldav')); ?>" readonly></dd>
<dt><?php p($l->t('iOS/OS X')); ?></dt>
<dd><input type="text" style="width: 90%;float: left;" value="<?php print_unescaped(OCP\Util::linkToRemote('caldav')); ?>principals/<?php p(OCP\USER::getUser()); ?>/" readonly></dd>
<dd><input type="text" style="width: 90%;float: left;" value="<?php print_unescaped(OCP\Util::linkToRemote('caldav')); ?>principals/<?php p(urlencode(OCP\USER::getUser())); ?>/" readonly></dd>
<dt><?php p($l->t('Read only iCalendar link(s)')); ?></dt>
<dd>
<?php foreach($_['calendars'] as $calendar) {
@ -123,7 +123,7 @@
$uri = rawurlencode(html_entity_decode($calendar['uri'], ENT_QUOTES, 'UTF-8')) . '_shared_by_' . $calendar['userid'];
}
?>
<a href="<?php p(OCP\Util::linkToRemote('caldav').'calendars/'.OCP\USER::getUser().'/'.$uri) ?>?export" class="link"><?php p($calendar['displayname']) ?></a><br />
<a href="<?php p(OCP\Util::linkToRemote('caldav').'calendars/'.urlencode(OCP\USER::getUser().'/'.$uri)) ?>?export" class="link"><?php p($calendar['displayname']) ?></a><br />
<?php } ?>
</dd>
</dl>