![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 45502fd)
raw | patch | inline | side by side (parent: 45502fd)
| author | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Tue, 18 Dec 2007 08:50:41 +0000 (08:50 +0000) | ||
| committer | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Tue, 18 Dec 2007 08:50:41 +0000 (08:50 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8137 594d385d-05f5-0310-b6e9-bd551577e9d8
| gosa-core/plugins/personal/mail/class_mailAccount.inc | patch | blob | history | |
| gosa-core/plugins/personal/mail/generic.tpl | patch | blob | history |
diff --git a/gosa-core/plugins/personal/mail/class_mailAccount.inc b/gosa-core/plugins/personal/mail/class_mailAccount.inc
index c98525c69d658ec6614cdf1e4714dc7b798cb69e..d9db8f2092dc09a4102dfb5d0ea7705569d31b94 100644 (file)
$smarty->assign("spamlevel", $spamlevel);
$smarty->assign("spambox", $this->mailboxList);
$smarty->assign("spamlevel", $spamlevel);
$smarty->assign("spambox", $this->mailboxList);
+ foreach($this->attributes as $attr){
+ $u_attr = "use_".$attr;
+ $smarty->assign($u_attr,in_array($attr,$this->multi_boxes));
+ }
+
+ foreach(array("only_local","gosaMailForwardingAddress","use_mailsize_limit","drop_own_mails","use_vacation","use_spam_filter") as $attr){
+ $u_attr = "use_".$attr;
+ $smarty->assign($u_attr,in_array($attr,$this->multi_boxes));
+ }
+
$smarty->assign("multiple_support",$this->multiple_support_active);
$display.= $smarty->fetch (get_template_path('generic.tpl', TRUE, dirname(__FILE__)));
return ($display);
$smarty->assign("multiple_support",$this->multiple_support_active);
$display.= $smarty->fetch (get_template_path('generic.tpl', TRUE, dirname(__FILE__)));
return ($display);
function init_multiple_support($attrs,$all)
{
plugin::init_multiple_support($attrs,$all);
function init_multiple_support($attrs,$all)
{
plugin::init_multiple_support($attrs,$all);
-
-
+
+ if(isset($this->multi_attrs['gosaMailQuota'])){
+ $this->gosaMailQuota = $this->multi_attrs['gosaMailQuota'];
+ }
}
function get_multi_init_values()
}
function get_multi_init_values()
{
return($this->execute());
}
{
return($this->execute());
}
+
+ function multiple_save_object()
+ {
+ plugin::multiple_save_object();
+
+ $this->save_object();
+ foreach(array("only_local","gosaMailForwardingAddress","use_mailsize_limit","drop_own_mails","use_vacation","use_spam_filter") as $attr){
+ if(isset($_POST["use_".$attr])){
+ $this->multi_boxes[] = $attr;
+ }
+ }
+ }
+
+ function get_multi_edit_values()
+ {
+ $ret = plugin::get_multi_edit_values();
+
+ if(in_array("gosaMailQuota",$this->multi_boxes)){
+ $ret['gosaMailQuota'] = $this->gosaMailQuota;
+ }
+
+ $flag_add = $flag_remove = array();
+ $tmp= preg_replace("/[^a-z]/i","",$this->gosaMailDeliveryMode);
+ $opts = array(
+ "R" => "use_mailsize_limit",
+ "S" => "use_spam_filter",
+ "L" => "only_local",
+ "V" => "use_vacation",
+ "C" => "own_script",
+ "I" => "drop_own_mails");
+
+ foreach($opts as $flag => $post){
+ if(in_array($post, $this->multi_boxes)){
+ if(preg_match("/".$flag."/",$tmp)){
+ $flag_add[] = $flag;
+ }else{
+ $flag_remove[] = $flag;
+ }
+ }
+ }
+
+ $ret['flag_add'] = $flag_add;
+ $ret['flag_remove'] = $flag_remove;
+ return($ret);
+ }
+
+ function set_multi_edit_values($values)
+ {
+ plugin::set_multi_edit_values($values);
+ $tmp= preg_replace("/[^a-z]/i","",$this->gosaMailDeliveryMode);
+ if(isset($values['flag_add'])){
+ foreach($values['flag_add'] as $flag){
+ if(!preg_match("/".$flag."/",$tmp)){
+ $tmp .= $flag;
+ }
+ }
+ }
+ if(isset($values['flag_remove'])){
+ foreach($values['flag_remove'] as $flag){
+ if(preg_match("/".$flag."/",$tmp)){
+ $tmp = preg_replace("/".$flag."/","",$tmp);
+ }
+ }
+ }
+ $this->gosaMailDeliveryMode = "[".$tmp."]";
+ }
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
diff --git a/gosa-core/plugins/personal/mail/generic.tpl b/gosa-core/plugins/personal/mail/generic.tpl
index 785fd44f6e3daf6975632bb75e4f788d99393dfe..2c2d7305a369cef4fb8bf2f646a46394918af357 100644 (file)
<tr>
<td><label for="mail">{t}Primary address{/t}</label>{$must}</td>
<td>
<tr>
<td><label for="mail">{t}Primary address{/t}</label>{$must}</td>
<td>
+{if $multiple_support}
+ <input id="mail" name="dummy1" size=35 maxlength=65 value="{t}Multiple edit{/t}" disabled>
+{else}
{render acl=$mailACL}
<input id="mail" name="mail" size=35 maxlength=65 value="{$mail}">
{/render}
{render acl=$mailACL}
<input id="mail" name="mail" size=35 maxlength=65 value="{$mail}">
{/render}
+{/if}
</td>
</tr>
<tr>
<td><label for="gosaMailServer">{t}Server{/t}</label></td>
<td>
</td>
</tr>
<tr>
<td><label for="gosaMailServer">{t}Server{/t}</label></td>
<td>
-{render acl=$gosaMailServerACL}
+{render acl=$gosaMailServerACL checkbox=$multiple_support checked=$use_gosaMailServer}
<select size="1" id="gosaMailServer" name="gosaMailServer" title="{t}Specify the mail server where the user will be hosted on{/t}">
{html_options values=$mailServers output=$mailServers selected=$gosaMailServer}
<option disabled> </option>
<select size="1" id="gosaMailServer" name="gosaMailServer" title="{t}Specify the mail server where the user will be hosted on{/t}">
{html_options values=$mailServers output=$mailServers selected=$gosaMailServer}
<option disabled> </option>
{/render}
</td>
</tr>
{/render}
</td>
</tr>
+{if !$multiple_support}
<tr>
<td>
<br>
<tr>
<td>
<br>
{/if}
</td>
</tr>
{/if}
</td>
</tr>
+{/if}
<tr>
<td><label for="gosaMailQuota">{t}Quota size{/t}</label></td>
<td>
<tr>
<td><label for="gosaMailQuota">{t}Quota size{/t}</label></td>
<td>
-{render acl=$gosaMailQuotaACL}
+{render acl=$gosaMailQuotaACL checkbox=$multiple_support checked=$use_gosaMailQuota}
<input id="gosaMailQuota" name="gosaMailQuota" size="6" align="middle" maxlength="60"
value="{$gosaMailQuota}"> MB
{/render}
<input id="gosaMailQuota" name="gosaMailQuota" size="6" align="middle" maxlength="60"
value="{$gosaMailQuota}"> MB
{/render}
</table>
</td>
</table>
</td>
+{if !$multiple_support}
<td style="border-left:1px solid #A0A0A0;vertical-align:top;">
<td style="border-left:1px solid #A0A0A0;vertical-align:top;">
<input type=submit value="{t}Delete{/t}" name="delete_alternate">
{/render}
</td>
<input type=submit value="{t}Delete{/t}" name="delete_alternate">
{/render}
</td>
+
+{/if}
+
</tr>
</table>
</tr>
</table>
-<!-- SIEVE -->
+
+{if $multiple_support}
+
<p class="seperator"> </p>
<h2><img class="center" alt="" align="middle" src="images/envelope.png" /> {t}Mail options{/t}</h2>
<p class="seperator"> </p>
<h2><img class="center" alt="" align="middle" src="images/envelope.png" /> {t}Mail options{/t}</h2>
+
+{else}
+
+<!-- SIEVE -->
+<p class="seperator"> </p>
<table summary="" style="vertical-align:top; text-align:left;" cellpadding=4 border=0>
<tr>
<td>
{render acl=$gosaMailDeliveryModeCACL}
<table summary="" style="vertical-align:top; text-align:left;" cellpadding=4 border=0>
<tr>
<td>
{render acl=$gosaMailDeliveryModeCACL}
- <input type=checkbox name="own_script" value="1" {$own_script}
+ <input class="center" type=checkbox name="own_script" value="1" {$own_script}
onClick="
changeState('sieveManagement');
changeState('drop_own_mails');
onClick="
changeState('sieveManagement');
changeState('drop_own_mails');
</tr>
</table>
</tr>
</table>
-
<p class="seperator"> </p>
<p class="seperator"> </p>
+{/if}
+
<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4 border=0>
<tr style="padding-bottom:0px;">
<td style="width:50%">
<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4 border=0>
<tr style="padding-bottom:0px;">
<td style="width:50%">
-{render acl=$gosaMailDeliveryModeIACL}
- <input {if $own_script != ""} disabled {/if} id='drop_own_mails' type=checkbox name="drop_own_mails" value="1" {$drop_own_mails} title="{t}Select if you want to forward mails without getting own copies of them{/t}"> {t}No delivery to own mailbox{/t}
+{render acl=$gosaMailDeliveryModeIACL checkbox=$multiple_support checked=$use_drop_own_mails}
+ <input {if $own_script != ""} disabled {/if} class="center" id='drop_own_mails' type=checkbox name="drop_own_mails" value="1" {$drop_own_mails} title="{t}Select if you want to forward mails without getting own copies of them{/t}"> {t}No delivery to own mailbox{/t}
{/render}
<br>
{/render}
<br>
-{render acl=$gosaMailDeliveryModeVACL}
+{render acl=$gosaMailDeliveryModeVACL checkbox=$multiple_support checked=$use_use_vacation}
<input type=checkbox name="use_vacation" value="1" {$use_vacation} id="use_vacation" {if $own_script != ""} disabled {/if}
<input type=checkbox name="use_vacation" value="1" {$use_vacation} id="use_vacation" {if $own_script != ""} disabled {/if}
- title="{t}Select to automatically response with the vacation message defined below{/t}"
+ title="{t}Select to automatically response with the vacation message defined below{/t}" class="center"
onclick="changeState('day'); changeState('month'); changeState('year'); changeState('sday'); changeState('smonth'); changeState('syear');
"> {t}Activate vacation message{/t}
{/render}
onclick="changeState('day'); changeState('month'); changeState('year'); changeState('sday'); changeState('smonth'); changeState('syear');
"> {t}Activate vacation message{/t}
{/render}
@@ -190,30 +208,30 @@ onclick="changeState('day'); changeState('month'); changeState('year'); changeSt
</td>
<td style="vertical-align:top;">
</td>
<td style="vertical-align:top;">
-{render acl=$gosaMailDeliveryModeSACL}
- <input {if $own_script != ""} disabled {/if} id='use_spam_filter' type=checkbox name="use_spam_filter" value="1" {$use_spam_filter} title="{t}Select if you want to filter this mails through spamassassin{/t}">
+{render acl=$gosaMailDeliveryModeSACL checkbox=$multiple_support checked=$use_use_spam_filter}
+ <input {if $own_script != ""} disabled {/if} id='use_spam_filter' type=checkbox name="use_spam_filter" value="1" {$use_spam_filter} title="{t}Select if you want to filter this mails through spamassassin{/t}" class="center">
{/render}
<label for="gosaSpamSortLevel">{t}Move mails tagged with spam level greater than{/t}</label>
{/render}
<label for="gosaSpamSortLevel">{t}Move mails tagged with spam level greater than{/t}</label>
-{render acl=$gosaSpamSortLevelACL}
+{render acl=$gosaSpamSortLevelACL checkbox=$multiple_support checked=$use_gosaSpamSortLevel}
<select {if $own_script != ""} disabled {/if} id="gosaSpamSortLevel" size="1" name="gosaSpamSortLevel" title="{t}Choose spam level - smaller values are more sensitive{/t}">
{html_options values=$spamlevel output=$spamlevel selected=$gosaSpamSortLevel}
</select>
{/render}
<label for="gosaSpamMailbox">{t}to folder{/t}</label>
<select {if $own_script != ""} disabled {/if} id="gosaSpamSortLevel" size="1" name="gosaSpamSortLevel" title="{t}Choose spam level - smaller values are more sensitive{/t}">
{html_options values=$spamlevel output=$spamlevel selected=$gosaSpamSortLevel}
</select>
{/render}
<label for="gosaSpamMailbox">{t}to folder{/t}</label>
-{render acl=$gosaSpamMailboxACL}
+{render acl=$gosaSpamMailboxACL checkbox=$multiple_support checked=$use_gosaSpamMailbox}
<select {if $own_script != ""} disabled {/if} size="1" id="gosaSpamMailbox" name="gosaSpamMailbox">
{html_options values=$spambox output=$spambox selected=$gosaSpamMailbox}
<option disabled> </option>
</select>
{/render}
<br>
<select {if $own_script != ""} disabled {/if} size="1" id="gosaSpamMailbox" name="gosaSpamMailbox">
{html_options values=$spambox output=$spambox selected=$gosaSpamMailbox}
<option disabled> </option>
</select>
{/render}
<br>
-{render acl=$gosaMailDeliveryModeRACL}
- <input {if $own_script != ""} disabled {/if} id='use_mailsize_limit' type=checkbox name="use_mailsize_limit" value="1" {$use_mailsize_limit} >
+{render acl=$gosaMailDeliveryModeRACL checkbox=$multiple_support checked=$use_use_mailsize_limit}
+ <input {if $own_script != ""} disabled {/if} id='use_mailsize_limit' type=checkbox name="use_mailsize_limit" value="1" {$use_mailsize_limit} class="center">
{/render}
<label for="gosaMailMaxSize">{t}Reject mails bigger than{/t}</label>
{/render}
<label for="gosaMailMaxSize">{t}Reject mails bigger than{/t}</label>
-{render acl=$gosaMailMaxSizeACL}
- <input {if $own_script != ""} disabled {/if} id="gosaMailMaxSize" name="gosaMailMaxSize" size="6" align="middle" maxlength="30" value="{$gosaMailMaxSize}"> {t}MB{/t}
+{render acl=$gosaMailMaxSizeACL checkbox=$multiple_support checked=$use_gosaMailMaxSize}
+ <input {if $own_script != ""} disabled {/if} id="gosaMailMaxSize" name="gosaMailMaxSize" size="6" align="middle" maxlength="30" value="{$gosaMailMaxSize}" class="center"> {t}MB{/t}
{/render}
</td>
</tr>
{/render}
</td>
</tr>
@@ -222,7 +240,7 @@ onclick="changeState('day'); changeState('month'); changeState('year'); changeSt
<p style="margin-bottom:0px;">
<b><label for="gosaVacationMessage">{t}Vacation message{/t}</label></b>
</p>
<p style="margin-bottom:0px;">
<b><label for="gosaVacationMessage">{t}Vacation message{/t}</label></b>
</p>
-{render acl=$gosaVacationMessageACL}
+{render acl=$gosaVacationMessageACL checkbox=$multiple_support checked=$use_gosaVacationMessage}
<textarea {if $own_script != ""} disabled {/if} id="gosaVacationMessage" style="width:99%; height:100px;" name="gosaVacationMessage" rows="4" cols="512">{$gosaVacationMessage}</textarea>
{/render}
<br>
<textarea {if $own_script != ""} disabled {/if} id="gosaVacationMessage" style="width:99%; height:100px;" name="gosaVacationMessage" rows="4" cols="512">{$gosaVacationMessage}</textarea>
{/render}
<br>
@@ -243,8 +261,15 @@ onclick="changeState('day'); changeState('month'); changeState('year'); changeSt
<p style="margin-bottom:0px;">
<b><label for="forwarder_list">{t}Forward messages to{/t}</label></b>
</p>
<p style="margin-bottom:0px;">
<b><label for="forwarder_list">{t}Forward messages to{/t}</label></b>
</p>
+
+{if $multiple_support}
+<input type="checkbox" name="use_gosaMailForwardingAddress" onclick="changeState('gosaMailForwardingAddress');"
+ class="center" {if $use_gosaMailForwardingAddress} checked {/if}>
+{/if}
+
{render acl=$gosaMailForwardingAddressACL}
{render acl=$gosaMailForwardingAddressACL}
- <select id="gosaMailForwardingAddress" style="width:100%; height:100px;" name="forwarder_list[]" size=15 multiple>
+ <select {if $use_gosaMailForwardingAddress} checked {/if}
+ id="gosaMailForwardingAddress" style="width:100%; height:100px;" name="forwarder_list[]" size=15 multiple>
{html_options values=$gosaMailForwardingAddress output=$gosaMailForwardingAddress selected=$template}
<option disabled> </option>
</select>
{html_options values=$gosaMailForwardingAddress output=$gosaMailForwardingAddress selected=$template}
<option disabled> </option>
</select>
@@ -272,8 +297,8 @@ onclick="changeState('day'); changeState('month'); changeState('year'); changeSt
<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding="4" border="0">
<tr>
<td>
<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding="4" border="0">
<tr>
<td>
-{render acl=$gosaMailDeliveryModeLACL}
- <input {if $own_script != ""} disabled {/if} id='only_local' type=checkbox name="only_local" value="1" {$only_local} title="{t}Select if user can only send and receive inside his own domain{/t}">
+{render acl=$gosaMailDeliveryModeLACL checkbox=$multiple_support checked=$use_only_local}
+ <input {if $own_script != ""} disabled {/if} id='only_local' type=checkbox name="only_local" value="1" {$only_local} title="{t}Select if user can only send and receive inside his own domain{/t}" class="center">
{/render}
{t}User is only allowed to send and receive local mails{/t}
</td>
{/render}
{t}User is only allowed to send and receive local mails{/t}
</td>