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>Kolab User Entry</title>
<!--<regexp>^ou=People,o=.*,</regexp>-->
<icon>images/user.png</icon>
<description>New Address Book Entry</description>
<askcontainer>1</askcontainer>
<description>New Address Book Entry</description>
<icon>images/user.png</icon>
<invalid>0</invalid>
<rdn>cn</rdn>
<!--<regexp>^ou=People,o=.*,</regexp>-->
<title>Kolab: User Entry</title>
<visible>1</visible>
<invalid>1</invalid>
<objectClasses>
<objectClass id="inetOrgPerson"></objectClass>
@@ -18,12 +19,12 @@
<attribute id="givenName">
<display>First name</display>
<icon>images/uid.png</icon>
<onchange>autoFill:cn,%givenName% %sn%</onchange>
<onchange>=autoFill(cn;%givenName% %sn%)</onchange>
<order>1</order>
</attribute>
<attribute id="sn">
<display>Last name</display>
<onchange>autoFill:cn,%givenName% %sn%</onchange>
<onchange>=autoFill(cn;%givenName% %sn%)</onchange>
<order>2</order>
</attribute>
<attribute id="cn">
@@ -37,27 +38,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>5</order>
<post>=php.PasswordEncrypt(%enc%;%userPassword%)</post>
<spacer>1</spacer>
<verify>1</verify>
</attribute>
<attribute id="title">
<display>Title</display>
<icon>images/ou.png</icon>
@@ -80,7 +65,6 @@
<order>10</order>
<spacer>1</spacer>
</attribute>
<attribute id="street">
<display>Address</display>
<icon>images/mail.png</icon>
@@ -102,11 +86,11 @@
<display>Postal code</display>
<order>15</order>
</attribute>
<attribute id="c">
<!-- <attribute id="c">
<display>Country</display>
<order>16</order>
<spacer>1</spacer>
</attribute>
</attribute> -->
<attribute id="telephoneNumber">
<display>Work phone</display>
<icon>images/phone.png</icon>
@@ -121,4 +105,5 @@
<order>19</order>
</attribute>
</attributes>
</template>