X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=etc%2Fphpldapadmin%2Ftemplates%2Fcreation%2FsambaSamAccount.xml;h=d44fad821bf28a65fb0a312f31c6f9c439c407e7;hb=537ab47a8a166b386430b61b0c259560e4008d5d;hp=75d98db2eafd88a09d170cc213fd0c3632c0d28d;hpb=8cbae7c2c9aa2d4ed4371113e5900a9adbfa6d5e;p=matthijs%2Fservers%2Fdrsnuggles.git

diff --git a/etc/phpldapadmin/templates/creation/sambaSamAccount.xml b/etc/phpldapadmin/templates/creation/sambaSamAccount.xml
index 75d98db..d44fad8 100644
--- a/etc/phpldapadmin/templates/creation/sambaSamAccount.xml
+++ b/etc/phpldapadmin/templates/creation/sambaSamAccount.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE template SYSTEM "template.dtd">
+
 <template>
-<title>Samba3 Account</title>
-<!--<regexp>^ou=People,o=.*,</regexp>-->
-<icon>images/user.png</icon>
-<description>New Samba3 Account</description>
 <askcontainer>1</askcontainer>
+<description>New Samba3 Account</description>
+<icon>ldap-user.png</icon>
+<invalid>0</invalid>
 <rdn>cn</rdn>
+<!--<regexp>^ou=People,o=.*,</regexp>-->
+<title>Samba: Account</title>
 <visible>1</visible>
 
 <objectClasses>
@@ -18,15 +20,14 @@
 <attributes>
 <attribute id="givenName">
 	<display>First name</display>
-	<icon>images/uid.png</icon>
-	<onchange>autoFill:cn,%givenName% %sn%</onchange>
+	<icon>ldap-uid.png</icon>
+	<onchange>=autoFill(cn;%givenName% %sn%)</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>
 	<order>2</order>
 	<page>1</page>
 </attribute>
@@ -36,101 +37,87 @@
 	<page>1</page>
 	<spacer>1</spacer>
 </attribute>
+<attribute id="gidNumber">
+	<display>GID Number</display>
+	<onchange>=autoFill(homeDirectory;/home/users/%gidNumber|0-0/T%/%uid|3-%)</onchange>
+	<onchange>=autoFill(uid;%gidNumber|0-0/T%-%givenName|0-1/l%%sn/l%)</onchange>
+	<order>4</order>
+	<page>1</page>
+	<value><![CDATA[=php.PickList(/;(&(objectClass=posixGroup));gidNumber;%cn%;;;;cn)]]></value>
+</attribute>
 <attribute id="uid">
 	<display>User ID</display>
-	<onchange>autoFill:homeDirectory,/home/users/%gidNumber|0-0/T%/%uid|3-%</onchange>
-	<order>4</order>
+	<onchange>=autoFill(homeDirectory;/home/users/%gidNumber|0-0/T%/%uid|3-%)</onchange>
+	<order>5</order>
 	<page>1</page>
 	<spacer>1</spacer>
 </attribute>
 <attribute id="uidNumber">
 	<display>UID Number</display>
-	<hint>Automatically determined</hint>
-	<value>=php.GetNextNumber(/,uid)</value>
-	<order>5</order>
+	<order>6</order>
 	<page>1</page>
 	<readonly>1</readonly>
+	<value>=php.GetNextNumber(/;uidNumber)</value>
 </attribute>
 <attribute id="sambaSID">
 	<display>Samba SID</display>
-	<option>=php.PickList(/,(objectClass=sambaDomain),sambaSID,%sambaSID% (%sambaDomainName%))</option>
 	<helper>
 		<id>sidsuffix</id>
-		<option>=php.GetNextNumber(/,uid,false,,*2;+1000)</option>
+		<value>=php.GetNextNumber(/;uidNumber;false;;*2,+1000)</value>
 	</helper>
-	<post>=php.Join(-,(%sambaSID%,%sidsuffix%))</post>
-	<order>6</order>
+	<order>7</order>
 	<page>1</page>
+	<post>=php.Join(-;%sambaSID%,%sidsuffix%)</post>
 	<spacer>1</spacer>
+	<value><![CDATA[=php.PickList(/;(&(objectClass=sambaDomain));sambaSID;%sambaSID% (%sambaDomainName%);;;;sambaDomainName)]]></value>
 </attribute>
 <attribute id="userPassword">
 	<display>Password</display>
-	<icon>images/lock.png</icon>
-	<onchange>autoFill:sambaLMPassword,%userPassword%</onchange>
-	<onchange>autoFill:sambaNTPassword,%userPassword%</onchange>
-	<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>
-	<order>7</order>
+	<icon>lock.png</icon>
+	<onchange>=autoFill(sambaLMPassword;%userPassword%)</onchange>
+	<onchange>=autoFill(sambaNTPassword;%userPassword%)</onchange>
+	<order>8</order>
+	<post>=php.PasswordEncrypt(%enc%;%userPassword%)</post>
 	<page>1</page>
+	<verify>1</verify>
 </attribute>
 <attribute id="sambaLMPassword">
 	<display>LM Password</display>
-	<type>password</type>
-	<post>=php.SambaPassword(LM,%sambaLMPassword%)</post>
-	<order>8</order>
+	<order>9</order>
 	<page>1</page>
+	<post>=php.PasswordEncrypt(LM;%sambaLMPassword%)</post>
+	<type>password</type>
 </attribute>
 <attribute id="sambaNTPassword">
 	<display>NT Password</display>
-	<type>password</type>
-	<post>=php.SambaPassword(NT,%sambaNTPassword%)</post>
-	<order>9</order>
+	<order>10</order>
 	<page>1</page>
+	<post>=php.PasswordEncrypt(NT;%sambaNTPassword%)</post>
 	<spacer>1</spacer>
+	<type>password</type>
 </attribute>
 <attribute id="loginShell">
 	<display>Login shell</display>
-	<icon>images/terminal.png</icon>
-	<!-- <option>=php.PickList(/,(objectClass=posixAccount),loginShell,%loginShell%)</option> -->
-	<option>/bin/sh</option>
-	<option>/bin/tsh</option>
-	<option>/bin/csh</option>
-	<order>10</order>
-	<page>1</page>
-</attribute>
-<attribute id="gidNumber">
-	<display>GID Number</display>
-	<onchange>autoFill:homeDirectory,/home/users/%gidNumber|0-0/T%/%uid|3-%</onchange>
-	<option>=php.PickList(/,(objectClass=posixGroup),gidNumber,%cn%)</option>
+	<icon>terminal.png</icon>
 	<order>11</order>
 	<page>1</page>
+	<type>select</type>
+	<!-- <value><![CDATA[=php.PickList(/;(&(objectClass=posixAccount));loginShell;%loginShell%)]]></value> -->
+	<value id="/bin/sh">/bin/sh</value>
+	<value id="/bin/csh">/bin/csh</value>
+	<value id="/bin/tsh">/bin/tsh</value>
 </attribute>
 <attribute id="sambaPrimaryGroupSID">
 	<display>Primary Group ID</display>
-	<option>=php.PickList(/,(objectClass=sambaGroupMapping),sambaSID,%sambaSID% (%cn%),sambaPrimaryGroupSID)</option>
 	<helper>
 		<id>sidpgsuffix</id>
 		<value></value>
 	</helper>
-	<post>=php.Join(-,(%sambaPrimaryGroupSID%,%sidpgsuffix%))</post>
 	<order>13</order>
 	<page>1</page>
+	<post>=php.Join(-;%sambaPrimaryGroupSID%,%sidpgsuffix%)</post>
 	<spacer>1</spacer>
+	<value><![CDATA[=php.PickList(/;(&(objectClass=sambaGroupMapping));sambaSID;%sambaSID% (%cn%);sambaPrimaryGroupSID;;;;cn)]]></value>
 </attribute>
 <attribute id="homeDirectory">
 	<display>Home directory</display>
@@ -138,8 +125,9 @@
 	<page>1</page>
 </attribute>
 <attribute id="sambaAcctFlags">
-	<value>[U]</value>
 	<hidden>1</hidden>
+	<value>[U]</value>
 </attribute>
 </attributes>
+
 </template>