X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=etc%2Fphpldapadmin%2Ftemplates%2Fcreation%2FposixAccount.xml;h=2931c1ee757b95acd9387850796a7f3013d922c4;hb=f7dca5e366df2ec527499431028a20cab323d8fd;hp=6ebee33f698eebdb93cdc0aa442e9168991abb1a;hpb=1f8a56cb171205520714bc9d3282d25717fe74df;p=matthijs%2Fservers%2Fdrsnuggles.git

diff --git a/etc/phpldapadmin/templates/creation/posixAccount.xml b/etc/phpldapadmin/templates/creation/posixAccount.xml
index 6ebee33..2931c1e 100644
--- a/etc/phpldapadmin/templates/creation/posixAccount.xml
+++ b/etc/phpldapadmin/templates/creation/posixAccount.xml
@@ -1,34 +1,35 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE template SYSTEM "template.dtd">
+
 <template>
-<title>User Account</title>
-<!--<regexp>^ou=People,o=.*,</regexp>-->
-<icon>images/user.png</icon>
-<description>New User Account</description>
 <askcontainer>1</askcontainer>
+<description>New User Account</description>
+<icon>ldap-user.png</icon>
+<invalid>0</invalid>
 <rdn>cn</rdn>
+<!--<regexp>^ou=People,o=.*,</regexp>-->
+<title>Generic: User Account</title>
 <visible>1</visible>
 
 <objectClasses>
 <objectClass id="inetOrgPerson"></objectClass>
 <objectClass id="posixAccount"></objectClass>
-<objectClass id="hostObject"></objectClass>
 </objectClasses>
 
 <attributes>
 <attribute id="givenName">
 	<display>First name</display>
-	<icon>images/uid.png</icon>
-	<onchange>autoFill:cn,%givenName% %sn%</onchange>
-	<onchange>autoFill:uid,%givenName|0-1/l%%sn/l%</onchange>
+	<icon>ldap-uid.png</icon>
+	<onchange>=autoFill(cn;%givenName% %sn%)</onchange>
+	<onchange>=autoFill(uid;%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,%givenName|0-1/l%%sn/l%</onchange>
-	<!-- <onchange>autoFill:homeDirectory,/home/users/%uid|0-1/l%/%uid%</onchange> -->
+	<onchange>=autoFill(cn;%givenName% %sn%)</onchange>
+	<onchange>=autoFill(uid;%givenName|0-1/l%%sn/l%)</onchange>
+	<!-- <onchange>=autoFill(homeDirectory;/home/users/%uid|0-1/l%/%uid%)</onchange> -->
 	<order>2</order>
 	<page>1</page>
 </attribute>
@@ -39,70 +40,56 @@
 </attribute>
 <attribute id="uid">
 	<display>User ID</display>
-	<onchange>autoFill:homeDirectory,/home/%uid%</onchange>
+	<onchange>=autoFill(homeDirectory;/home/users/%uid%)</onchange>
 	<order>4</order>
 	<page>1</page>
 	<spacer>1</spacer>
 </attribute>
 <attribute id="homeDirectory">
 	<display>Home directory</display>
-	<!-- <onchange>autoFill:homeDirectory,/home/users/%gidNumber|0-0/T%/%uid|3-%</onchange> -->
+	<!-- <onchange>=autoFill(homeDirectory;/home/users/%gidNumber|0-0/T%/%uid|3-%)</onchange> -->
 	<order>8</order>
 	<page>1</page>
 </attribute>
 <attribute id="uidNumber">
 	<display>UID Number</display>
-	<hint>Automatically determined</hint>
-	<icon>images/terminal.png</icon>
+	<icon>terminal.png</icon>
 	<order>6</order>
 	<page>1</page>
-	<value>=php.GetNextNumber(/,uid)</value>
 	<readonly>1</readonly>
+	<value>=php.GetNextNumber(/;uidNumber)</value>
 </attribute>
 <attribute id="gidNumber">
 	<display>GID Number</display>
-	<!-- <onchange>autoFill:homeDirectory,/home/users/%gidNumber|0-0/T%/%uid|3-%</onchange> -->
+	<!-- <onchange>=autoFill(homeDirectory;/home/users/%gidNumber|0-0/T%/%uid|3-%)</onchange> -->
 	<order>7</order>
 	<page>1</page>
-	<option>=php.PickList(/,(objectClass=posixGroup),gidNumber,%cn%)</option>
+	<value><![CDATA[=php.PickList(/;(&(objectClass=posixGroup));gidNumber;%cn%;;;;cn)]]></value>
 </attribute>
 <attribute id="loginShell">
 	<display>Login shell</display>
 	<order>9</order>
 	<page>1</page>
-	<!-- <option>=php.PickList(/,(objectClass=posixAccount),loginShell,%loginShell%)</option> -->
-	<option>/bin/sh</option>
-	<option>/bin/bash</option>
+	<!-- <value><![CDATA[=php.PickList(/;(&(objectClass=posixAccount));loginShell;%loginShell%;;;;loginShell)]]></value> -->
+	<type>select</type>
+	<value id="/bin/sh">/bin/sh</value>
+	<value id="/bin/csh">/bin/csh</value>
+	<value id="/bin/tsh">/bin/tsh</value>
 </attribute>
 <attribute id="userPassword">
 	<display>Password</display>
-	<icon>images/lock.png</icon>
-	<type>password</type>
-	<verify>1</verify>
-	<helper>
+	<!-- <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>ssha</value>
-	</helper>
-	<post>=php.Password(%enc%,%userPassword%)</post>
+		<value>=php.PasswordEncryptionTypes()</value>
+	</helper> -->
+	<icon>lock.png</icon>
 	<order>5</order>
 	<page>1</page>
+	<post>=php.PasswordEncrypt(%enc%;%userPassword%)</post>
 	<spacer>1</spacer>
-</attribute>
-<attribute id="host">
-	<display>Accessable hosts</display>
-	<hidden>0</hidden>
-	<order>3</order>
-	<page>1</page>
+	<verify>1</verify>
 </attribute>
 </attributes>
+
 </template>