Latest SANDPIT - MERGE from CVS (MERGE-GIT)

This commit is contained in:
Deon George
2009-07-01 16:09:17 +10:00
parent 388783fc84
commit ea17aadef4
210 changed files with 37284 additions and 52716 deletions

View File

@@ -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>
<rdn>cn</rdn>
<visible>1</visible>
<description>New Courier Mail Account</description>
<icon>images/mail_account.png</icon>
<invalid>0</invalid>
<rdn>cn</rdn>
<!--<regexp>^ou=People,o=.*,</regexp>-->
<title>Courier Mail: Account</title>
<visible>1</visible>
<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>
@@ -39,28 +40,27 @@
<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>
<!--<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>
<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%)]]></value>
</attribute>
<attribute id="homeDirectory">
<display>Home Directory</display>
@@ -68,10 +68,10 @@
<page>1</page>
</attribute>
<attribute id="mail">
<display>Email</display>
<display>Email</display>
<icon>images/mail.png</icon>
<order>9</order>
<page>1</page>
<order>9</order>
<page>1</page>
</attribute>
<attribute id="mailbox">
<display>Mailbox</display>
@@ -81,25 +81,11 @@
<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>
<order>11</order>
<page>1</page>
<post>=php.PasswordEncrypt(%enc%;%userPassword%)</post>
<verify>1</verify>
</attribute>
</attributes>
</template>