summaryrefslogtreecommitdiff
path: root/php
diff options
context:
space:
mode:
authorSteffen Hansen <steffen@kdab.com>2006-02-22 00:36:27 (GMT)
committerSteffen Hansen <steffen@kdab.com>2006-02-22 00:36:27 (GMT)
commit96564d685d60c3127249bf277df72c408c7ffa22 (patch)
treeb8a9e3a83b3cd9444a7acfc4a94b243f2b867563 /php
parent85cc67a11f4b64f1166680b130eb78cc189576f2 (diff)
downloadkolab-webadmin-96564d685d60c3127249bf277df72c408c7ffa22.tar.gz
Fix for issue1100 (multidomain admin aliases)
Diffstat (limited to 'php')
-rw-r--r--php/admin/include/form.class.php5
-rw-r--r--php/admin/templates/distlistdeleted.tpl12
-rwxr-xr-xphp/admin/templates/service.tpl12
-rw-r--r--php/admin/templates/sfdeleted.tpl12
4 files changed, 34 insertions, 7 deletions
diff --git a/php/admin/include/form.class.php b/php/admin/include/form.class.php
index 61b6cca..969716f 100644
--- a/php/admin/include/form.class.php
+++ b/php/admin/include/form.class.php
@@ -151,8 +151,9 @@ class KolabForm {
} else {
$str .= '<td><table class="contentform">';
foreach( $value['options'] as $opt ) {
- $checked = ( in_array($opt ,$value['value'] ))?"checked":"";
- debug("Checking if $opt is in ".join(",",$value['value'])." :$checked");
+ if( is_array( $value['value'] ) ) $checked = ( in_array($opt ,$value['value'] ))?"checked":"";
+ else $checked = "";
+ //debug("Checking if $opt is in ".join(",",$value['value'])." :$checked");
$str .= '<tr><td><input name="'.$key.'[]" type="checkbox" value="'.MySmarty::htmlentities($opt).'" '.$value['attrs']." $checked /></td><td>"
.MySmarty::htmlentities($opt).'</td></tr>';
}
diff --git a/php/admin/templates/distlistdeleted.tpl b/php/admin/templates/distlistdeleted.tpl
new file mode 100644
index 0000000..2f78033
--- /dev/null
+++ b/php/admin/templates/distlistdeleted.tpl
@@ -0,0 +1,12 @@
+{* Smarty Template *}
+{*
+ Local variables:
+ buffer-file-coding-system: utf-8
+ End:
+*}
+<h1>{$heading}</h1>
+
+<div content="contentsimple">
+<p>{tr msg="The distribution list with DN"} {$dn|escape} {tr msg="has been deleted"}</p>
+<p><a href="index.php">{tr msg="Back to list of distribution lists"}</a></p>
+</div>
diff --git a/php/admin/templates/service.tpl b/php/admin/templates/service.tpl
index 7e548d8..8ea6965 100755
--- a/php/admin/templates/service.tpl
+++ b/php/admin/templates/service.tpl
@@ -6,18 +6,20 @@
*}
<h1>{tr msg="Kolab Server Settings"}</h1>
-{if $systemaliasconf }
+{if count($systemaliasconf)>0 }
<a name="systemaliasconf"></a>
<h2>{tr msg="Administrative email addresses"}</h2>
<div class="contentsimple">
<p>{tr msg="You have not yet set up a receiving account for the administrative email addresses hostmaster@yourdomain.tld, postmaster@yourdomain.tld, MAILER-DAEMON@yourdomain.tld, abuse@yourdomain.tld and virusalert@yourdomain.tld. Enter the email address of a kolab account below and press the button to create a distribution list for each of those addresses. Later you can add or remove people from the lists like any other distribution list"}</p>
+{section name=id loop=$systemaliasconf}
<div class="contentform">
-<form name="systemalias" method="post">
-{tr msg="Email address of account that should receive administrative mail:"}
-<input type="text" name="systemaliasmail" size="80" value="{$systemaliasmail|escape:"html"}" /><br/>
-<div align="right"><input type="submit" name="submitsystemalias" value="{tr msg="Create Distribution Lists"}" /></div>
+<form name="systemalias_{$systemaliasconf[id].n}" method="post">
+{tr msg="Email address of account that should receive administrative mail for domain "} {$systemaliasconf[id].domain|escape:html}:
+<input type="text" name="systemaliasmail_{$systemaliasconf[id].n}" size="80" value="{$systemaliasmail[id]|escape:"html"}" /><br/>
+<div align="right"><input type="submit" name="submitsystemalias_{$systemaliasconf[id].n}" value="{tr msg="Create Distribution Lists"}" /></div>
</form>
</div>
+{/section}
<br />
</div>
{/if}
diff --git a/php/admin/templates/sfdeleted.tpl b/php/admin/templates/sfdeleted.tpl
new file mode 100644
index 0000000..03fa3ea
--- /dev/null
+++ b/php/admin/templates/sfdeleted.tpl
@@ -0,0 +1,12 @@
+{* Smarty Template *}
+{*
+ Local variables:
+ buffer-file-coding-system: utf-8
+ End:
+*}
+<h1>{$heading}</h1>
+
+<div content="contentsimple">
+<p>{tr msg="The shared folder with DN"} {$dn|escape} {tr msg="has been deleted"}</p>
+<p><a href="index.php">{tr msg="Back to list of shared folders"}</a></p>
+</div>