summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBogomil Shopov <shopov@kolabsys.com>2011-04-21 12:58:55 (GMT)
committerBogomil Shopov <shopov@kolabsys.com>2011-04-21 12:58:55 (GMT)
commit8ef24972bba0bd936fb1279206685527c471ff04 (patch)
tree395b96b6029aeeb825137f6b186ce9f390c42e25
parent610f439dc1e1fdd3fc84fd5da856ac22adf54b67 (diff)
parent2c2d8f8fae92fe2e921900694f3f6a940b545f8b (diff)
downloadkolab-webadmin-8ef24972bba0bd936fb1279206685527c471ff04.tar.gz
Merge branch 'master' of ssh://git.kolabsys.com/git/kolab-webadmin
-rw-r--r--package.xml2
-rw-r--r--www/admin/user/user.php3
2 files changed, 4 insertions, 1 deletions
diff --git a/package.xml b/package.xml
index e1b1859..c92b4a8 100644
--- a/package.xml
+++ b/package.xml
@@ -242,6 +242,7 @@
<file name="sf.php" role="www" />
</dir> <!-- /www/admin/sharedfolder -->
<dir name="user">
+ <file name="activesync.php" role="www" />
<file name="deliver.php" role="www" />
<file name="forward.php" role="www" />
<file name="index.php" role="www" />
@@ -427,6 +428,7 @@
<install as="admin/settings/index.php" name="www/admin/settings/index.php" />
<install as="admin/sharedfolder/index.php" name="www/admin/sharedfolder/index.php" />
<install as="admin/sharedfolder/sf.php" name="www/admin/sharedfolder/sf.php" />
+ <install as="admin/user/activesync.php" name="www/admin/user/activesync.php" />
<install as="admin/user/deliver.php" name="www/admin/user/deliver.php" />
<install as="admin/user/forward.php" name="www/admin/user/forward.php" />
<install as="admin/user/index.php" name="www/admin/user/index.php" />
diff --git a/www/admin/user/user.php b/www/admin/user/user.php
index 215e792..9ee1a6a 100644
--- a/www/admin/user/user.php
+++ b/www/admin/user/user.php
@@ -510,7 +510,8 @@ $entries['street_0'] = array( 'name' => _('Street Address') );
$entries['postOfficeBox_0'] = array( 'name' => _('Postbox') );
$entries['postalCode_0'] = array( 'name' => _('Postal Code') );
$entries['l_0'] = array( 'name' => _('City') );
-$entries['c_0'] = array( 'name' => _('Country') );
+$entries['c_0'] = array( 'name' => _('Country'),
+ 'comment' => _('2 letter code from <a href="http://www.iso.org/iso/english_country_names_and_code_elements" target="_blank">ISO 3166</a>') );
$entries['telephoneNumber_0'] = array( 'name' => _('Telephone Number'),
'validation' => 'checkphone' );
$entries['facsimileTelephoneNumber_0'] = array( 'name' => _('Fax Number'),