X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=etc%2Fphpldapadmin%2Ftemplates%2Fcreation%2FcourierMailAccount.xml;h=b7602abf930255239dd2968d509d5b37c15d5677;hb=f7dca5e366df2ec527499431028a20cab323d8fd;hp=bc1a6c4f5bc2ee9dbd82c524e14968641599e843;hpb=88cba54a92d38fbc47d36326f988fcaa8046830e;p=matthijs%2Fservers%2Fdrsnuggles.git

diff --git a/etc/phpldapadmin/templates/creation/courierMailAccount.xml b/etc/phpldapadmin/templates/creation/courierMailAccount.xml
index bc1a6c4..b7602ab 100644
--- a/etc/phpldapadmin/templates/creation/courierMailAccount.xml
+++ b/etc/phpldapadmin/templates/creation/courierMailAccount.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE template SYSTEM "template.dtd">
+
 <template>
-<title>Courier Mail Account</title>
-<!--<regexp>^ou=People,o=.*,</regexp>-->
-<icon>images/mail_account.png</icon>
-<description>New Courier Mail Account</description>
 <askcontainer>1</askcontainer>
+<description>New Courier Mail Account</description>
+<icon>mail_account.png</icon>
+<invalid>0</invalid>
 <rdn>cn</rdn>
+<!--<regexp>^ou=People,o=.*,</regexp>-->
+<title>Courier Mail: Account</title>
 <visible>1</visible>
-<invalid>0</invalid>
 
 <objectClasses>
 <objectClass id="inetOrgPerson"></objectClass>
@@ -18,15 +19,15 @@
 <attributes>
 <attribute id="givenName">
 	<display>Given Name</display>
-	<onchange>autoFill:cn,%givenName% %sn%</onchange>
-	<onchange>autoFill:uid,%gidNumber|0-0/T%-%givenName|0-1/l%%sn/l%</onchange>
+	<onchange>=autoFill(cn;%givenName% %sn%)</onchange>
+	<onchange>=autoFill(uid;%gidNumber|0-0/T%-%givenName|0-1/l%%sn/l%)</onchange>
 	<order>1</order>
 	<page>1</page>
 </attribute>
 <attribute id="sn">
 	<display>Last name</display>
-	<onchange>autoFill:cn,%givenName% %sn%</onchange>
-	<onchange>autoFill:uid,%gidNumber|0-0/T%-%givenName|0-1/l%%sn/l%</onchange>
+	<onchange>=autoFill(cn;%givenName% %sn%)</onchange>
+	<onchange>=autoFill(uid;%gidNumber|0-0/T%-%givenName|0-1/l%%sn/l%)</onchange>
 	<order>2</order>
 	<page>1</page>
 </attribute>
@@ -38,29 +39,28 @@
 </attribute>
 <attribute id="uid">
 	<display>User ID</display>
-	<icon>images/uid.png</icon>
-	<!--<onchange>autoFill:homeDirectory,/home/users/%uid%</onchange>-->
-	<onchange>autoFill:homeDirectory,/home/users/%gidNumber|0-0/T%/%uid|3-%</onchange>
+	<icon>ldap-uid.png</icon>
+	<!--<onchange>=autoFill(homeDirectory;/home/users/%uid%)</onchange>-->
+	<onchange>=autoFill(homeDirectory;/home/users/%gidNumber|0-0/T%/%uid|3-%)</onchange>
 	<order>4</order>
 	<page>1</page>
 </attribute>
 <attribute id="uidNumber">
 	<display>UID Number</display>
-	<hint>Automatically determined</hint>
-	<icon>images/terminal.png</icon>
-	<value>=php.GetNextNumber(/,uid)</value>
-	<readonly>1</readonly>
+	<icon>terminal.png</icon>
 	<order>6</order>
 	<page>1</page>
+	<readonly>1</readonly>
+	<value>=php.GetNextNumber(/;uidNumber)</value>
 </attribute>
 <attribute id="gidNumber">
 	<display>GID Number</display>
-	<onchange>autoFill:uid,%gidNumber|0-0/T%-%givenName|0-1/l%%sn/l%</onchange>
-	<onchange>autoFill:homeDirectory,/home/users/%gidNumber|0-0/T%/%uid|3-%</onchange>
-	<option>=php.PickList(/,(objectClass=posixGroup),gidNumber,%cn%)</option>
+	<onchange>=autoFill(uid;%gidNumber|0-0/T%-%givenName|0-1/l%%sn/l%)</onchange>
+	<onchange>=autoFill(homeDirectory;/home/users/%gidNumber|0-0/T%/%uid|3-%)</onchange>
 	<order>7</order>
 	<page>1</page>
 	<spacer>1</spacer>
+	<value><![CDATA[=php.PickList(/;(&(objectClass=posixGroup));gidNumber;%cn%;;;;cn)]]></value>
 </attribute>
 <attribute id="homeDirectory">
 	<display>Home Directory</display>
@@ -68,10 +68,10 @@
 	<page>1</page>
 </attribute>
 <attribute id="mail">
-        <display>Email</display>
-	<icon>images/mail.png</icon>
-        <order>9</order>
-        <page>1</page>
+	<display>Email</display>
+	<icon>mail.png</icon>
+	<order>9</order>
+	<page>1</page>
 </attribute>
 <attribute id="mailbox">
 	<display>Mailbox</display>
@@ -80,26 +80,12 @@
 </attribute>
 <attribute id="userPassword">
 	<display>Password</display>
-	<icon>images/lock.png</icon>
-	<type>password</type>
-	<verify>1</verify>
-	<helper>
-		<display>Encryption</display>
-		<id>enc</id>
-		<option>blowfish</option>
-		<option>clear</option>
-		<option>crypt</option>
-		<option>ext_des</option>
-		<option>md5</option>
-		<option>md5crypt</option>
-		<option>sha</option>
-		<option>smd5</option>
-		<option>ssha</option>
-		<value>md5</value>
-	</helper>
-	<post>=php.Password(%enc%,%userPassword%)</post>
+	<icon>lock.png</icon>
 	<order>11</order>
 	<page>1</page>
+	<post>=php.PasswordEncrypt(%enc%;%userPassword%)</post>
+	<verify>1</verify>
 </attribute>
 </attributes>
+
 </template>