Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of ssh://git.kolabsys.com/git/roundcube

Browse source
This commit is contained in:
Thomas 2011-08-21 12:48:44 +02:00
commit 218854bca5
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/calendar/skins/default/templates/calendar.html
View file

@ -86,7 +86,7 @@
</div>
<div id="eventedit" class="uidialog">
<form id="eventtabs" action="#" method="post">
<form id="eventtabs" action="#" method="post" enctype="multipart/form-data">
<ul>
<li><a href="#event-tab-1"><roundcube:label name="calendar.tabsummary" /></a></li>
<li id="edit-tab-recurrence"><a href="#event-tab-2"><roundcube:label name="calendar.tabrecurrence" /></a></li>

20
plugins/kolab_folders/kolab_folders.php
View file

@ -205,6 +205,26 @@ class kolab_folders extends rcube_plugin
$ctype = 'mail';
}
// Don't allow changing type of shared folder, according to ACL
if (strlen($mbox)) {
$options = $this->rc->imap->mailbox_info($mbox);
if ($options['namespace'] != 'personal' && !in_array('a', $options['rights'])) {
if (in_array($ctype, $this->types))
$value = $this->gettext('foldertype'.$ctype);
else
$value = $ctype;
if ($subtype)
$value .= ' ('. ($subtype == 'default' ? $this->gettext('default') : $subtype) .')';
$args['form']['props']['fieldsets']['settings']['content']['foldertype'] = array(
'label' => $this->gettext('folderctype'),
'value' => $value,
);
return $args;
}
}
// Add javascript script to the client
$this->include_script('kolab_folders.js');