summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/templates/activesync.tpl8
-rwxr-xr-xdata/templates/codefusion.tpl2
-rwxr-xr-xdata/templates/erfrakon.tpl2
-rwxr-xr-xdata/templates/intevation.tpl2
-rwxr-xr-xdata/templates/kdab.tpl2
-rwxr-xr-xdata/templates/kde.tpl2
-rw-r--r--data/templates/kolabsystems.tpl2
-rwxr-xr-xdata/templates/page.tpl2
-rw-r--r--data/templates/technology.tpl2
-rwxr-xr-xdata/templates/welcome-admin.tpl25
-rw-r--r--data/templates/welcome-domain-maintainer.tpl18
-rwxr-xr-xdata/templates/welcome-maintainer.tpl19
-rw-r--r--data/templates/welcome-user.tpl11
-rw-r--r--[-rwxr-xr-x]lib/KolabAdmin/include/menu.php4
-rw-r--r--package.xml110
-rw-r--r--www/admin/addressbook/addr.php2
-rw-r--r--www/admin/images/CONTACT.png (renamed from www/admin/pics/CONTACT.png)bin1597 -> 1597 bytes
-rw-r--r--www/admin/images/EVENT.png (renamed from www/admin/pics/EVENT.png)bin1486 -> 1486 bytes
-rw-r--r--www/admin/images/MAIL.png (renamed from www/admin/pics/MAIL.png)bin1451 -> 1451 bytes
-rw-r--r--www/admin/images/NOTES.png (renamed from www/admin/pics/NOTES.png)bin1735 -> 1735 bytes
-rw-r--r--www/admin/images/TASKS.png (renamed from www/admin/pics/TASKS.png)bin1995 -> 1995 bytes
-rw-r--r--www/admin/images/alarm.png (renamed from www/admin/pics/alarm.png)bin630 -> 630 bytes
-rw-r--r--www/admin/images/book.pngbin0 -> 4576 bytes
-rw-r--r--www/admin/images/book2.pngbin0 -> 4703 bytes
-rw-r--r--www/admin/images/codefusion.png (renamed from www/admin/pics/codefusion.png)bin18319 -> 18319 bytes
-rw-r--r--www/admin/images/dialog-information.png (renamed from www/admin/pics/dialog-information.png)bin4255 -> 4255 bytes
-rw-r--r--www/admin/images/erfrakon.png (renamed from www/admin/pics/erfrakon.png)bin2951 -> 2951 bytes
-rw-r--r--www/admin/images/f.png (renamed from www/admin/pics/f.png)bin394 -> 394 bytes
-rw-r--r--www/admin/images/intevation_logo.png (renamed from www/admin/pics/intevation_logo.png)bin7182 -> 7182 bytes
-rw-r--r--www/admin/images/kdab.png (renamed from www/admin/pics/kdab.png)bin25519 -> 25519 bytes
-rw-r--r--www/admin/images/kde.png (renamed from www/admin/pics/kde.png)bin18660 -> 18660 bytes
-rw-r--r--www/admin/images/kolab_logo.png (renamed from www/admin/pics/kolab_logo.png)bin4902 -> 4902 bytes
-rw-r--r--www/admin/images/kolabsystems_logo.png (renamed from www/admin/pics/kolabsystems_logo.png)bin12281 -> 12281 bytes
-rw-r--r--www/admin/images/list.pngbin0 -> 2419 bytes
-rw-r--r--www/admin/images/office-address-book.png (renamed from www/admin/pics/office-address-book.png)bin6651 -> 6651 bytes
-rw-r--r--www/admin/images/phone.pngbin0 -> 3656 bytes
-rw-r--r--www/admin/images/preferences-system-network-sharing.png (renamed from www/admin/pics/preferences-system-network-sharing.png)bin4995 -> 4995 bytes
-rw-r--r--www/admin/images/preferences-system.png (renamed from www/admin/pics/preferences-system.png)bin6296 -> 6296 bytes
-rw-r--r--www/admin/images/resource-group.png (renamed from www/admin/pics/resource-group.png)bin5049 -> 5049 bytes
-rw-r--r--www/admin/images/sync.png (renamed from www/admin/pics/sync.png)bin837 -> 837 bytes
-rw-r--r--www/admin/images/system-users.png (renamed from www/admin/pics/system-users.png)bin4641 -> 4641 bytes
-rw-r--r--www/admin/index.php4
-rw-r--r--www/admin/style.css2
-rwxr-xr-x[-rw-r--r--]www/admin/user/activesync.php44
-rw-r--r--www/admin/user/index.php10
-rw-r--r--www/admin/user/user.php3
46 files changed, 187 insertions, 89 deletions
diff --git a/data/templates/activesync.tpl b/data/templates/activesync.tpl
index f5d5141..862e700 100644
--- a/data/templates/activesync.tpl
+++ b/data/templates/activesync.tpl
@@ -29,13 +29,13 @@
<table width="100%" cellpadding="8" cellspacing="8"><tr valign="top"><td style="border-top-style:dotted;border-right-style:dotted;border-bottom-style:dotted;border-left-style:dotted;border-width:1px;">
{foreach from=$folders key=myId item=fol}
<table border="0" width="100%">
- <tr bgcolor="#c8d2df"><td colspan="5"> <img src="/admin/pics/{$myId}.png" style="vertical-align:middle;"> <span style="font-weight:bolder;">{tr msg=$pnames[$myId]} </span></td></tr>
+ <tr bgcolor="#c8d2df"><td colspan="5"> <img src="/admin/images/{$myId}.png" style="vertical-align:middle;"> <span style="font-weight:bolder;">{tr msg=$pnames[$myId]} </span></td></tr>
<tr>
<td width="20">&nbsp;</td>
- <td width="5"><img src="/admin/pics/sync.png" align="center" style="margin-left:5px;"></td>
+ <td width="5"><img src="/admin/images/sync.png" align="center" style="margin-left:5px;"></td>
{if $myId eq 'EVENT' or $myId eq 'TASKS'}
- <td width="5"><img src="/admin/pics/alarm.png" align="center" style="margin-left:5px;"></td>
+ <td width="5"><img src="/admin/images/alarm.png" align="center" style="margin-left:5px;"></td>
{else}
<td width="25"></td>
{/if}
@@ -47,7 +47,7 @@
<td width="20">&nbsp;</td>
{kolabsync serial=$devices[device].name folder=$fols.realname}
- <td width="25"><img src="/admin/pics/f.png" style="vertical-align:middle;padding:4px;"></td>
+ <td width="25"><img src="/admin/images/f.png" style="vertical-align:middle;padding:4px;"></td>
<td>{$fols.name}</td>
</tr>
diff --git a/data/templates/codefusion.tpl b/data/templates/codefusion.tpl
index 1513511..a747825 100755
--- a/data/templates/codefusion.tpl
+++ b/data/templates/codefusion.tpl
@@ -7,7 +7,7 @@
<div class="contentsimple">
<a href="http://www.codefusion.co.za/">
- <img src="../pics/codefusion.png" alt="Code Fusion" style="border:0" />
+ <img src="../images/codefusion.png" alt="Code Fusion" style="border:0" />
</a>
<p>
diff --git a/data/templates/erfrakon.tpl b/data/templates/erfrakon.tpl
index 3f3a432..054bb98 100755
--- a/data/templates/erfrakon.tpl
+++ b/data/templates/erfrakon.tpl
@@ -11,7 +11,7 @@
</p>
<div class="align_center">
<a href="http://www.erfrakon.de">
- <img src="../pics/erfrakon.png" alt="erfrakon" longdesc="http://www.erfrakon.de" usemap="#maperfrakon" style="border:0px;" />
+ <img src="../images/erfrakon.png" alt="erfrakon" longdesc="http://www.erfrakon.de" usemap="#maperfrakon" style="border:0px;" />
</a>
</div>
<p>
diff --git a/data/templates/intevation.tpl b/data/templates/intevation.tpl
index 7e0cefc..53797e3 100755
--- a/data/templates/intevation.tpl
+++ b/data/templates/intevation.tpl
@@ -6,7 +6,7 @@
<div class="align_center">
<a href="http://intevation.net/">
- <img src="../pics/intevation_logo.png" alt="Logo Intevation GmbH" height="91" longdesc="www.intevation.net" style="border:0px;" />
+ <img src="../images/intevation_logo.png" alt="Logo Intevation GmbH" height="91" longdesc="www.intevation.net" style="border:0px;" />
</a>
</div>
diff --git a/data/templates/kdab.tpl b/data/templates/kdab.tpl
index 2fd745c..5bfdba0 100755
--- a/data/templates/kdab.tpl
+++ b/data/templates/kdab.tpl
@@ -1,7 +1,7 @@
{* Smarty Template *}
<div class="align_center">
<a href="http://www.klaralvdalens-datakonsult.se/">
- <img src="../pics/kdab.png" alt="KDAB" longdesc="http://www.klaralvdalens-datakonsult.se" style="border:0px;" />
+ <img src="../images/kdab.png" alt="KDAB" longdesc="http://www.klaralvdalens-datakonsult.se" style="border:0px;" />
</a>
</div>
<div class="contentsimple">
diff --git a/data/templates/kde.tpl b/data/templates/kde.tpl
index 94deaff..262d33d 100755
--- a/data/templates/kde.tpl
+++ b/data/templates/kde.tpl
@@ -4,7 +4,7 @@
{tr msg="<a href=\"http://www.kde.org\">KDE</a> is a powerful <a href=\"http://www.gnu.org/philosophy/free-sw.html\">Free Software</a> graphical desktop environment for Linux and Unix workstations. It combines ease of use, contemporary functionality, and outstanding graphical design with the technological superiority of the Unix operating system."}
</p>
<div class="align_center">
-<img src="../pics/kde.png" alt="KDE" longdesc="http://www.kde.org" />
+<img src="../images/kde.png" alt="KDE" longdesc="http://www.kde.org" />
</div>
<p>
{tr msg="<b>KDE</b> is an Internet project that is truly open in every sense. Development takes place on the Internet and is discussed on our <a href=\"http://www.kde.org/mailinglists.html\">mailing lists</a>, USENET news groups, and IRC channels to which we invite and welcome everyone."}
diff --git a/data/templates/kolabsystems.tpl b/data/templates/kolabsystems.tpl
index 027ef52..d142d43 100644
--- a/data/templates/kolabsystems.tpl
+++ b/data/templates/kolabsystems.tpl
@@ -1,7 +1,7 @@
{* Smarty Template *}
<div class="align_center">
<a href="http://kolabsys.com/">
- <img src="/admin/pics/kolabsystems_logo.png" alt="Kolab Systems AG" longdesc="http://kolabsys.com" style="border:0px;" />
+ <img src="/admin/images/kolabsystems_logo.png" alt="Kolab Systems AG" longdesc="http://kolabsys.com" style="border:0px;" />
</a>
</div>
<div class="contentsimple">
diff --git a/data/templates/page.tpl b/data/templates/page.tpl
index e6d178d..d3c3b57 100755
--- a/data/templates/page.tpl
+++ b/data/templates/page.tpl
@@ -106,6 +106,6 @@ function changeLanguage(combobox) {ldelim}
</div><!-- .container -->
</div><!-- #root -->
<div id="footer">
-This is the Community Edition of the <b>Kolab Server</b>. It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>. Professional support is available from <a href="http://kolabsys.com">Kolab Systems</a>.
+This is the Community Edition of the <b>Kolab Server</b>. <br />It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>. <br />Professional support is available from <a href="http://kolabsys.com">Kolab Systems</a>.
</body>
</html> \ No newline at end of file
diff --git a/data/templates/technology.tpl b/data/templates/technology.tpl
index 1dbc611..4c2b600 100644
--- a/data/templates/technology.tpl
+++ b/data/templates/technology.tpl
@@ -90,7 +90,6 @@
<li>Alain Abbas</li>
<li>Till Adam</li>
<li>Dr. Paul Adams</li>
- <li>Thomas Arendsen-Hein</li>
<li>Stuart Bing&euml;</li>
<li>Stephan Buys</li>
<li>Matthias Kalle Dalheimer</li>
@@ -111,7 +110,6 @@
<li>Jan-Oliver Wagner</li>
<li>Gunnar Wrobel</li>
<li>Christoph Wickert</li>
- <li>Sascha Wilde</li>
<li>Karl-Heinz Zimmer</li>
<li>Romain Pokrzywka</li>
<li>{tr msg="...and anyone we forgot. Please let us know at <a href=\"mail:server-team@lists.kolabsys.com\">server-team@lists.kolabsys.com</a> so we can add you to this list."}
diff --git a/data/templates/welcome-admin.tpl b/data/templates/welcome-admin.tpl
index 7a88759..bcb7856 100755
--- a/data/templates/welcome-admin.tpl
+++ b/data/templates/welcome-admin.tpl
@@ -7,25 +7,34 @@
<div class="contenttext">
<h1>{tr msg="Welcome to the Kolab Groupware Server Administration"}</h1>
-<table cellspacing="10" cellpadding="10">
+<table cellspacing="10" cellpadding="10" style="background:#d0e2e6">
<tr>
<td>
-<a href="/admin/user/" class="welcomelinks"><img src="/admin/pics/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a>
+<a href="/admin/user/" class="welcomelinks"><img src="/admin/images/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a>
</td>
<td>
-<a href="/admin/addressbook/" class="welcomelinks"><img src="/admin/pics/office-address-book.png" border="0" alt="Addressbook" /><br /><b>{tr msg="Addressbook"}</b></a>
+<a href="/admin/addressbook/" class="welcomelinks"><img src="/admin/images/office-address-book.png" border="0" alt="Addressbook" /><br /><b>{tr msg="Addressbook"}</b></a>
</td>
<td>
-<a href="/admin/sharedfolder/" class="welcomelinks"><img src="/admin/pics/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a>
+<a href="/admin/sharedfolder/" class="welcomelinks"><img src="/admin/images/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a>
</td>
<td>
-<a href="/admin/administrator/" class="welcomelinks"><img src="/admin/pics/resource-group.png" border="0" alt="Administrator" /><br /><b>{tr msg="Administrator"}</b></a>
+<a href="/admin/distributionlist/" class="welcomelinks"><img src="/admin/images/list.png" border="0" alt="Distribution Lists" /><br /><b>{tr msg="Distribution Lists"}</b></a>
</td>
<td>
-<a href="/admin/settings/" class="welcomelinks"><img src="/admin/pics/preferences-system.png" border="0" alt="Settings" /><br /><b>{tr msg="Settings"}</b></a>
+<a href="/admin/administrator/" class="welcomelinks"><img src="/admin/images/resource-group.png" border="0" alt="Administrator" /><br /><b>{tr msg="Administrator"}</b></a>
</td>
<td>
-<a href="/admin/kolab/" class="welcomelinks"><img src="/admin/pics/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
+<a href="/admin/maintainer/" class="welcomelinks"><img src="/admin/images/book.png" border="0" alt="Manage Maintainers" /><br /><b>{tr msg="Maintainers"}</b></a>
+</td>
+<td>
+<a href="/admin/domainmaintainer/" class="welcomelinks"><img src="/admin/images/book2.png" border="0" alt="Domain Maintainers" /><br /><b>{tr msg="Domain Maintainers"}</b></a>
+</td>
+<td>
+<a href="/admin/settings/" class="welcomelinks"><img src="/admin/images/preferences-system.png" border="0" alt="Settings" /><br /><b>{tr msg="Settings"}</b></a>
+</td>
+<td>
+<a href="/admin/kolab/" class="welcomelinks"><img src="/admin/images/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
</td>
</tr></table>
-</div> \ No newline at end of file
+</div>
diff --git a/data/templates/welcome-domain-maintainer.tpl b/data/templates/welcome-domain-maintainer.tpl
index 9de2f87..1dc4550 100644
--- a/data/templates/welcome-domain-maintainer.tpl
+++ b/data/templates/welcome-domain-maintainer.tpl
@@ -17,6 +17,22 @@
</td>
<td>
<a href="/admin/kolab/" class="welcomelinks"><img src="/admin/pics/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
+<table cellspacing="10" cellpadding="10" style="background:#d0e2e6">
+<tr>
+<td>
+<a href="/admin/user/" class="welcomelinks"><img src="/admin/images/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a>
+</td>
+<td>
+<a href="/admin/sharedfolder/" class="welcomelinks"><img src="/admin/images/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a>
+</td>
+<td>
+<a href="/admin/distributionlist/" class="welcomelinks"><img src="/admin/images/list.png" border="0" alt="Distribution Lists" /><br /><b>{tr msg="Distribution Lists"}</b></a>
+</td>
+<td>
+<a href="{$dmurl}" class="welcomelinks"><img src="/admin/images/book2.png" border="0" alt="Domain Maintainers" /><br /><b>{tr msg="Domain Maintainers"}</b></a>
+</td>
+<td>
+<a href="/admin/kolab/" class="welcomelinks"><img src="/admin/images/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
</td>
</tr></table>
-</div> \ No newline at end of file
+</div>
diff --git a/data/templates/welcome-maintainer.tpl b/data/templates/welcome-maintainer.tpl
index ecffab7..36e27ac 100755
--- a/data/templates/welcome-maintainer.tpl
+++ b/data/templates/welcome-maintainer.tpl
@@ -7,25 +7,28 @@
<div class="contenttext">
<h1>{tr msg="Welcome to the Kolab Groupware Server Maintenance"}</h1>
-<table cellspacing="10" cellpadding="10">
+<table cellspacing="10" cellpadding="10" style="background:#d0e2e6">
<tr>
<td>
-<a href="/admin/user/" class="welcomelinks"><img src="/admin/pics/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a>
+<a href="/admin/user/" class="welcomelinks"><img src="/admin/images/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a>
</td>
<td>
-<a href="/admin/addressbook/" class="welcomelinks"><img src="/admin/pics/office-address-book.png" border="0" alt="Addressbook" /><br /><b>{tr msg="Addressbook"}</b></a>
+<a href="/admin/addressbook/" class="welcomelinks"><img src="/admin/images/office-address-book.png" border="0" alt="Addressbook" /><br /><b>{tr msg="Addressbook"}</b></a>
</td>
<td>
-<a href="/admin/sharedfolder/" class="welcomelinks"><img src="/admin/pics/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a>
+<a href="/admin/sharedfolder/" class="welcomelinks"><img src="/admin/images/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a>
</td>
<td>
-<a href="/admin/administrator/" class="welcomelinks"><img src="/admin/pics/resource-group.png" border="0" alt="Administrator" /><br /><b>{tr msg="Administrator"}</b></a>
+<a href="/admin/distributionlist/" class="welcomelinks"><img src="/admin/images/list.png" border="0" alt="Distribution Lists" /><br /><b>{tr msg="Distribution Lists"}</b></a>
</td>
<td>
-<a href="/admin/settings/" class="welcomelinks"><img src="/admin/pics/preferences-system.png" border="0" alt="Settings" /><br /><b>{tr msg="Settings"}</b></a>
+<a href="{$murl}" class="welcomelinks"><img src="/admin/images/book.png" border="0" alt="Manage Maintainers" /><br /><b>{tr msg="Maintainers"}</b></a>
</td>
<td>
-<a href="/admin/kolab/" class="welcomelinks"><img src="/admin/pics/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
+<a href="/admin/domainmaintainer/" class="welcomelinks"><img src="/admin/images/book2.png" border="0" alt="Domain Maintainers" /><br /><b>{tr msg="Domain Maintainers"}</b></a>
+</td>
+<td>
+<a href="/admin/kolab/" class="welcomelinks"><img src="/admin/images/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
</td>
</tr></table>
-</div> \ No newline at end of file
+</div>
diff --git a/data/templates/welcome-user.tpl b/data/templates/welcome-user.tpl
index 6bd553d..a57f91b 100644
--- a/data/templates/welcome-user.tpl
+++ b/data/templates/welcome-user.tpl
@@ -7,13 +7,16 @@
<div class="contenttext">
<h1>{tr msg="Welcome to the Kolab Groupware Server"}</h1>
-<table cellspacing="10" cellpadding="10">
+<table cellspacing="10" cellpadding="10" style="background:#d0e2e6">
<tr>
<td>
-<a href="/admin/user/user.php?action=modify" class="welcomelinks"><img src="/admin/pics/preferences-system.png" border="0" alt="My settings" /><br /><b>{tr msg="My settings"}</b></a>
+<a href="/admin/user/user.php?action=modify" class="welcomelinks"><img src="/admin/images/preferences-system.png" border="0" alt="My settings" /><br /><b>{tr msg="My settings"}</b></a>
</td>
<td>
-<a href="/admin/kolab/" class="welcomelinks"><img src="/admin/pics/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
+<a href="/admin/user/activesync.php" class="welcomelinks"><img src="/admin/images/phone.png" border="0" alt="ActiveSync" /><br /><b>{tr msg="ActiveSync"}</b></a>
+</td>
+<td>
+<a href="/admin/kolab/" class="welcomelinks"><img src="/admin/images/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
</td>
</tr></table>
-</div> \ No newline at end of file
+</div>
diff --git a/lib/KolabAdmin/include/menu.php b/lib/KolabAdmin/include/menu.php
index ccabb2f..b079453 100755..100644
--- a/lib/KolabAdmin/include/menu.php
+++ b/lib/KolabAdmin/include/menu.php
@@ -43,6 +43,10 @@ if( $auth->group() == "admin" || $auth->group() == "maintainer" || $auth->group(
array( 'name' => _('ActiveSync'),
'url' => 'activesync.php' ),
));
+
+ $menuitems['activesync'] = array( 'name' => _('ActiveSync'),
+ 'url' => $topdir.'/user/activesync.php',
+ 'title' => _('ActiveSync'));
}
if( $auth->group() == "admin" || $auth->group() == "maintainer") {
$menuitems['addressbook'] = array( 'name' => _('Addressbook'),
diff --git a/package.xml b/package.xml
index 13e7375..030dbf4 100644
--- a/package.xml
+++ b/package.xml
@@ -26,8 +26,8 @@
<date>2011-04-20</date>
<time>00:44:50</time>
<version>
- <release>2.3.0.2</release>
- <api>2.3.0</api>
+ <release>2.3.1</release>
+ <api>2.3.1</api>
</version>
<stability>
<release>alpha</release>
@@ -70,6 +70,7 @@
</dir> <!-- /data/locale -->
<dir name="templates">
<file name="addrdeleted.tpl" role="data" />
+ <file name="activesync.tpl" role="data" />
<file name="addresslist.tpl" role="data" />
<file name="addrlistall.tpl" role="data" />
<file name="admindeleted.tpl" role="data" />
@@ -92,6 +93,7 @@
<file name="maintainerdeleted.tpl" role="data" />
<file name="maintainerlistall.tpl" role="data" />
<file name="page.tpl" role="data" />
+ <file name="page-ajax.tpl" role="data" />
<file name="settings.tpl" role="data" />
<file name="sfdeleted.tpl" role="data" />
<file name="sflistall.tpl" role="data" />
@@ -123,6 +125,7 @@
<file name="mysmarty.php" role="php" />
<file name="passwd.php" role="php" />
<file name="Sieve.php" role="php" />
+ <file name="function.kolabsync.php" role="php"/>
</dir> <!-- /lib/KolabAdmin/include -->
<dir name="Sieve">
<dir name="Segment">
@@ -173,23 +176,50 @@
<file name="index.php" role="www" />
</dir> <!-- /www/admin/domainmaintainer -->
<dir name="images">
+ <file name="alarm.png" role="www" />
<file name="body.jpg" role="www" />
<file name="bottom.png" role="www" />
+ <file name="codefusion.png" role="www" />
+ <file name="CONTACT.png" role="www" />
+ <file name="dialog-information.png" role="www" />
+ <file name="erfrakon.png" role="www" />
+ <file name="EVENT.png" role="www" />
<file name="eye_pencil.png" role="www" />
+ <file name="f.png" role="www" />
<file name="footer.png" role="www" />
<file name="icon_grey_logout.png" role="www" />
<file name="identica.png" role="www" />
+ <file name="intevation_logo.png" role="www" />
<file name="irc.png" role="www" />
+ <file name="kdab.png" role="www" />
+ <file name="kde.png" role="www" />
<file name="klogo.png" role="www" />
<file name="kolab.png" role="www" />
+ <file name="kolab_logo.png" role="www" />
+ <file name="kolabsystems_logo.png" role="www" />
<file name="line.png" role="www" />
<file name="listitem.png" role="www" />
<file name="logo.png" role="www" />
+ <file name="MAIL.png" role="www" />
<file name="menu.jpg" role="www" />
+ <file name="mootools.v1.11.js" role="www" />
+ <file name="NOTES.png" role="www" />
+ <file name="office-address-book.png" role="www" />
+ <file name="phone.png" role="www" />
+ <file name="preferences-system-network-sharing.png" role="www" />
+ <file name="preferences-system.png" role="www" />
+ <file name="resource-group.png" role="www" />
<file name="root.jpg" role="www" />
+ <file name="sliding-tabs.js" role="www" />
+ <file name="sync.png" role="www" />
+ <file name="system-users.png" role="www" />
+ <file name="TASKS.png" role="www" />
<file name="twitter.png" role="www" />
<file name="ul-icon.png" role="www" />
<file name="user-icon-1-20x20.gif" role="www" />
+ <file name="book.png" role="www" />
+ <file name="book2.png" role="www" />
+ <file name="list.png" role="www" />
</dir> <!-- /www/admin/images -->
<dir name="kolab">
<file name="codefusion.php" role="www" />
@@ -206,21 +236,6 @@
<file name="index.php" role="www" />
<file name="maintainer.php" role="www" />
</dir> <!-- /www/admin/maintainer -->
- <dir name="pics">
- <file name="codefusion.png" role="www" />
- <file name="dialog-information.png" role="www" />
- <file name="erfrakon.png" role="www" />
- <file name="intevation_logo.png" role="www" />
- <file name="kdab.png" role="www" />
- <file name="kde.png" role="www" />
- <file name="kolab_logo.png" role="www" />
- <file name="kolabsystems_logo.png" role="www" />
- <file name="office-address-book.png" role="www" />
- <file name="preferences-system-network-sharing.png" role="www" />
- <file name="preferences-system.png" role="www" />
- <file name="resource-group.png" role="www" />
- <file name="system-users.png" role="www" />
- </dir> <!-- /www/admin/pics -->
<dir name="settings">
<file name="index.php" role="www" />
</dir> <!-- /www/admin/settings -->
@@ -229,11 +244,13 @@
<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" />
<file name="user.php" role="www" />
<file name="vacation.php" role="www" />
+ <file name="activesync.php" role="www" />
</dir> <!-- /www/admin/user -->
<file name="custom.css" role="www" />
<file name="favicon.ico" role="www" />
@@ -276,6 +293,7 @@
<install as="locale/it/LC_MESSAGES/messages.mo" name="data/locale/it/LC_MESSAGES/messages.mo" />
<install as="locale/nl/LC_MESSAGES/messages.mo" name="data/locale/nl/LC_MESSAGES/messages.mo" />
<install as="templates/addrdeleted.tpl" name="data/templates/addrdeleted.tpl" />
+ <install as="templates/activesync.tpl" name="data/templates/activesync.tpl" />
<install as="templates/addresslist.tpl" name="data/templates/addresslist.tpl" />
<install as="templates/addrlistall.tpl" name="data/templates/addrlistall.tpl" />
<install as="templates/admindeleted.tpl" name="data/templates/admindeleted.tpl" />
@@ -298,6 +316,7 @@
<install as="templates/maintainerdeleted.tpl" name="data/templates/maintainerdeleted.tpl" />
<install as="templates/maintainerlistall.tpl" name="data/templates/maintainerlistall.tpl" />
<install as="templates/page.tpl" name="data/templates/page.tpl" />
+ <install as="templates/page-ajax.tpl" name="data/templates/page-ajax.tpl" />
<install as="templates/settings.tpl" name="data/templates/settings.tpl" />
<install as="templates/sfdeleted.tpl" name="data/templates/sfdeleted.tpl" />
<install as="templates/sflistall.tpl" name="data/templates/sflistall.tpl" />
@@ -324,6 +343,7 @@
<install as="KolabAdmin/include/locale.php" name="lib/KolabAdmin/include/locale.php" />
<install as="KolabAdmin/include/menu.php" name="lib/KolabAdmin/include/menu.php" />
<install as="KolabAdmin/include/mysmarty.php" name="lib/KolabAdmin/include/mysmarty.php" />
+ <install as="KolabAdmin/include/function.kolabsync.php" name="lib/KolabAdmin/include/function.kolabsync.php" />
<install as="KolabAdmin/include/passwd.php" name="lib/KolabAdmin/include/passwd.php" />
<install as="KolabAdmin/include/Sieve.php" name="lib/KolabAdmin/include/Sieve.php" />
<install as="KolabAdmin/Sieve/Script.php" name="lib/KolabAdmin/Sieve/Script.php" />
@@ -356,23 +376,50 @@
<install as="admin/distributionlist/list.php" name="www/admin/distributionlist/list.php" />
<install as="admin/domainmaintainer/domainmaintainer.php" name="www/admin/domainmaintainer/domainmaintainer.php" />
<install as="admin/domainmaintainer/index.php" name="www/admin/domainmaintainer/index.php" />
+ <install as="admin/images/alarm.png" name="www/admin/images/alarm.png" />
<install as="admin/images/body.jpg" name="www/admin/images/body.jpg" />
<install as="admin/images/bottom.png" name="www/admin/images/bottom.png" />
+ <install as="admin/images/codefusion.png" name="www/admin/images/codefusion.png" />
+ <install as="admin/images/CONTACT.png" name="www/admin/images/CONTACT.png" />
+ <install as="admin/images/dialog-information.png" name="www/admin/images/dialog-information.png" />
+ <install as="admin/images/erfrakon.png" name="www/admin/images/erfrakon.png" />
+ <install as="admin/images/EVENT.png" name="www/admin/images/EVENT.png" />
<install as="admin/images/eye_pencil.png" name="www/admin/images/eye_pencil.png" />
+ <install as="admin/images/f.png" name="www/admin/images/f.png" />
<install as="admin/images/footer.png" name="www/admin/images/footer.png" />
<install as="admin/images/icon_grey_logout.png" name="www/admin/images/icon_grey_logout.png" />
<install as="admin/images/identica.png" name="www/admin/images/identica.png" />
+ <install as="admin/images/intevation_logo.png" name="www/admin/images/intevation_logo.png" />
<install as="admin/images/irc.png" name="www/admin/images/irc.png" />
+ <install as="admin/images/kdab.png" name="www/admin/images/kdab.png" />
+ <install as="admin/images/kde.png" name="www/admin/images/kde.png" />
<install as="admin/images/klogo.png" name="www/admin/images/klogo.png" />
<install as="admin/images/kolab.png" name="www/admin/images/kolab.png" />
+ <install as="admin/images/kolab_logo.png" name="www/admin/images/kolab_logo.png" />
+ <install as="admin/images/kolabsystems_logo.png" name="www/admin/images/kolabsystems_logo.png" />
<install as="admin/images/line.png" name="www/admin/images/line.png" />
<install as="admin/images/listitem.png" name="www/admin/images/listitem.png" />
<install as="admin/images/logo.png" name="www/admin/images/logo.png" />
+ <install as="admin/images/MAIL.png" name="www/admin/images/MAIL.png" />
<install as="admin/images/menu.jpg" name="www/admin/images/menu.jpg" />
+ <install as="admin/images/mootools.v1.11.js" name="www/admin/images/mootools.v1.11.js" />
+ <install as="admin/images/NOTES.png" name="www/admin/images/NOTES.png" />
+ <install as="admin/images/office-address-book.png" name="www/admin/images/office-address-book.png" />
+ <install as="admin/images/phone.png" name="www/admin/images/phone.png" />
+ <install as="admin/images/preferences-system-network-sharing.png" name="www/admin/images/preferences-system-network-sharing.png" />
+ <install as="admin/images/preferences-system.png" name="www/admin/images/preferences-system.png" />
+ <install as="admin/images/resource-group.png" name="www/admin/images/resource-group.png" />
<install as="admin/images/root.jpg" name="www/admin/images/root.jpg" />
+ <install as="admin/images/sliding-tabs.js" name="www/admin/images/sliding-tabs.js" />
+ <install as="admin/images/sync.png" name="www/admin/images/sync.png" />
+ <install as="admin/images/system-users.png" name="www/admin/images/system-users.png" />
+ <install as="admin/images/TASKS.png" name="www/admin/images/TASKS.png" />
<install as="admin/images/twitter.png" name="www/admin/images/twitter.png" />
<install as="admin/images/ul-icon.png" name="www/admin/images/ul-icon.png" />
<install as="admin/images/user-icon-1-20x20.gif" name="www/admin/images/user-icon-1-20x20.gif" />
+ <install as="admin/images/book2.png" name="www/admin/images/book2.png" />
+ <install as="admin/images/book.png" name="www/admin/images/book.png" />
+ <install as="admin/images/list.png" name="www/admin/images/list.png" />
<install as="admin/kolab/codefusion.php" name="www/admin/kolab/codefusion.php" />
<install as="admin/kolab/erfrakon.php" name="www/admin/kolab/erfrakon.php" />
<install as="admin/kolab/index.php" name="www/admin/kolab/index.php" />
@@ -384,22 +431,10 @@
<install as="admin/kolab/versions.php" name="www/admin/kolab/versions.php" />
<install as="admin/maintainer/index.php" name="www/admin/maintainer/index.php" />
<install as="admin/maintainer/maintainer.php" name="www/admin/maintainer/maintainer.php" />
- <install as="admin/pics/codefusion.png" name="www/admin/pics/codefusion.png" />
- <install as="admin/pics/dialog-information.png" name="www/admin/pics/dialog-information.png" />
- <install as="admin/pics/erfrakon.png" name="www/admin/pics/erfrakon.png" />
- <install as="admin/pics/intevation_logo.png" name="www/admin/pics/intevation_logo.png" />
- <install as="admin/pics/kdab.png" name="www/admin/pics/kdab.png" />
- <install as="admin/pics/kde.png" name="www/admin/pics/kde.png" />
- <install as="admin/pics/kolab_logo.png" name="www/admin/pics/kolab_logo.png" />
- <install as="admin/pics/kolabsystems_logo.png" name="www/admin/pics/kolabsystems_logo.png" />
- <install as="admin/pics/office-address-book.png" name="www/admin/pics/office-address-book.png" />
- <install as="admin/pics/preferences-system-network-sharing.png" name="www/admin/pics/preferences-system-network-sharing.png" />
- <install as="admin/pics/preferences-system.png" name="www/admin/pics/preferences-system.png" />
- <install as="admin/pics/resource-group.png" name="www/admin/pics/resource-group.png" />
- <install as="admin/pics/system-users.png" name="www/admin/pics/system-users.png" />
<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" />
@@ -468,5 +503,20 @@
* Fix new welcome pages
</notes>
</release>
+ <release>
+ <version>
+ <release>2.3.1</release>
+ <api>2.3.0</api>
+ </version>
+ <stability>
+ <release>beta</release>
+ <api>beta</api>
+ </stability>
+ <date>2011-04-28</date>
+ <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
+ <notes>
+* Move all graphics from www/admin/pics to www/admin/images
+ </notes>
+ </release>
</changelog>
</package>
diff --git a/www/admin/addressbook/addr.php b/www/admin/addressbook/addr.php
index 66adeab..6cc0ae4 100644
--- a/www/admin/addressbook/addr.php
+++ b/www/admin/addressbook/addr.php
@@ -175,7 +175,7 @@ if( !$errors ) {
unset( $distlists['count'] );
foreach( $distlists as $distlist ) {
$dlcn = $distlist['mail'][0];
- $errors[] = sprintf(_("Addressbook entry DN could not be modified, distribution list <a href='" $params['kolab_wui'] . "/distributionlist/list.php?action=modify&dn=%s'>'%s'</a> depends on it. To modify this entry, first remove it from the distribution list."), urlencode($distlist['dn']), $dlcn );
+ $errors[] = sprintf(_("Addressbook entry DN could not be modified, distribution list <a href='".$params['kolab_wui']."/distributionlist/list.php?action=modify&dn=%s'>'%s'</a> depends on it. To modify this entry, first remove it from the distribution list."), urlencode($distlist['dn']), $dlcn );
}
if( !$errors ) {
diff --git a/www/admin/pics/CONTACT.png b/www/admin/images/CONTACT.png
index 916f6ab..916f6ab 100644
--- a/www/admin/pics/CONTACT.png
+++ b/www/admin/images/CONTACT.png
Binary files differ
diff --git a/www/admin/pics/EVENT.png b/www/admin/images/EVENT.png
index 2e02fc9..2e02fc9 100644
--- a/www/admin/pics/EVENT.png
+++ b/www/admin/images/EVENT.png
Binary files differ
diff --git a/www/admin/pics/MAIL.png b/www/admin/images/MAIL.png
index bc77592..bc77592 100644
--- a/www/admin/pics/MAIL.png
+++ b/www/admin/images/MAIL.png
Binary files differ
diff --git a/www/admin/pics/NOTES.png b/www/admin/images/NOTES.png
index 7dca846..7dca846 100644
--- a/www/admin/pics/NOTES.png
+++ b/www/admin/images/NOTES.png
Binary files differ
diff --git a/www/admin/pics/TASKS.png b/www/admin/images/TASKS.png
index d3d600d..d3d600d 100644
--- a/www/admin/pics/TASKS.png
+++ b/www/admin/images/TASKS.png
Binary files differ
diff --git a/www/admin/pics/alarm.png b/www/admin/images/alarm.png
index 0703e7a..0703e7a 100644
--- a/www/admin/pics/alarm.png
+++ b/www/admin/images/alarm.png
Binary files differ
diff --git a/www/admin/images/book.png b/www/admin/images/book.png
new file mode 100644
index 0000000..8a35c34
--- /dev/null
+++ b/www/admin/images/book.png
Binary files differ
diff --git a/www/admin/images/book2.png b/www/admin/images/book2.png
new file mode 100644
index 0000000..ac460f5
--- /dev/null
+++ b/www/admin/images/book2.png
Binary files differ
diff --git a/www/admin/pics/codefusion.png b/www/admin/images/codefusion.png
index be04ff1..be04ff1 100644
--- a/www/admin/pics/codefusion.png
+++ b/www/admin/images/codefusion.png
Binary files differ
diff --git a/www/admin/pics/dialog-information.png b/www/admin/images/dialog-information.png
index c65f616..c65f616 100644
--- a/www/admin/pics/dialog-information.png
+++ b/www/admin/images/dialog-information.png
Binary files differ
diff --git a/www/admin/pics/erfrakon.png b/www/admin/images/erfrakon.png
index 3b2d5d6..3b2d5d6 100644
--- a/www/admin/pics/erfrakon.png
+++ b/www/admin/images/erfrakon.png
Binary files differ
diff --git a/www/admin/pics/f.png b/www/admin/images/f.png
index 7572bac..7572bac 100644
--- a/www/admin/pics/f.png
+++ b/www/admin/images/f.png
Binary files differ
diff --git a/www/admin/pics/intevation_logo.png b/www/admin/images/intevation_logo.png
index deb54e4..deb54e4 100644
--- a/www/admin/pics/intevation_logo.png
+++ b/www/admin/images/intevation_logo.png
Binary files differ
diff --git a/www/admin/pics/kdab.png b/www/admin/images/kdab.png
index 66af0ed..66af0ed 100644
--- a/www/admin/pics/kdab.png
+++ b/www/admin/images/kdab.png
Binary files differ
diff --git a/www/admin/pics/kde.png b/www/admin/images/kde.png
index 3efaaf8..3efaaf8 100644
--- a/www/admin/pics/kde.png
+++ b/www/admin/images/kde.png
Binary files differ
diff --git a/www/admin/pics/kolab_logo.png b/www/admin/images/kolab_logo.png
index 27b7d12..27b7d12 100644
--- a/www/admin/pics/kolab_logo.png
+++ b/www/admin/images/kolab_logo.png
Binary files differ
diff --git a/www/admin/pics/kolabsystems_logo.png b/www/admin/images/kolabsystems_logo.png
index 90620d3..90620d3 100644
--- a/www/admin/pics/kolabsystems_logo.png
+++ b/www/admin/images/kolabsystems_logo.png
Binary files differ
diff --git a/www/admin/images/list.png b/www/admin/images/list.png
new file mode 100644
index 0000000..2936528
--- /dev/null
+++ b/www/admin/images/list.png
Binary files differ
diff --git a/www/admin/pics/office-address-book.png b/www/admin/images/office-address-book.png
index 3b00f62..3b00f62 100644
--- a/www/admin/pics/office-address-book.png
+++ b/www/admin/images/office-address-book.png
Binary files differ
diff --git a/www/admin/images/phone.png b/www/admin/images/phone.png
new file mode 100644
index 0000000..8f81416
--- /dev/null
+++ b/www/admin/images/phone.png
Binary files differ
diff --git a/www/admin/pics/preferences-system-network-sharing.png b/www/admin/images/preferences-system-network-sharing.png
index b6faf42..b6faf42 100644
--- a/www/admin/pics/preferences-system-network-sharing.png
+++ b/www/admin/images/preferences-system-network-sharing.png
Binary files differ
diff --git a/www/admin/pics/preferences-system.png b/www/admin/images/preferences-system.png
index 9ea5cec..9ea5cec 100644
--- a/www/admin/pics/preferences-system.png
+++ b/www/admin/images/preferences-system.png
Binary files differ
diff --git a/www/admin/pics/resource-group.png b/www/admin/images/resource-group.png
index 84cfa89..84cfa89 100644
--- a/www/admin/pics/resource-group.png
+++ b/www/admin/images/resource-group.png
Binary files differ
diff --git a/www/admin/pics/sync.png b/www/admin/images/sync.png
index 389f036..389f036 100644
--- a/www/admin/pics/sync.png
+++ b/www/admin/images/sync.png
Binary files differ
diff --git a/www/admin/pics/system-users.png b/www/admin/images/system-users.png
index e2bd558..e2bd558 100644
--- a/www/admin/pics/system-users.png
+++ b/www/admin/images/system-users.png
Binary files differ
diff --git a/www/admin/index.php b/www/admin/index.php
index d4e5d9a..6611264 100644
--- a/www/admin/index.php
+++ b/www/admin/index.php
@@ -70,6 +70,10 @@ $smarty->assign( 'group', $auth->group() );
$smarty->assign( 'page_title', 'Kolab' );
$smarty->assign( 'menuitems', $menuitems );
$smarty->assign( 'submenuitems', array() );
+
+//assign values fo different welcome pages, based on menu.php settings
+$smarty->assign( 'dmurl',$menuitems['domain-maintainer']['url']);
+$smarty->assign( 'murl',$menuitems['maintainer']['url']);
$smarty->assign( 'maincontent', $maincontent );
$smarty->display('page.tpl');
diff --git a/www/admin/style.css b/www/admin/style.css
index 5e69dd2..1edcb40 100644
--- a/www/admin/style.css
+++ b/www/admin/style.css
@@ -31,7 +31,7 @@ a:hover { color: #113399; }
}
#toplogo {
display:block;
- background-image: url(pics/kolab_logo.png);
+ background-image: url(images/kolab_logo.png);
background-color: #B0BCD0;
width: 245px;
height: 70px;
diff --git a/www/admin/user/activesync.php b/www/admin/user/activesync.php
index 081a15a..24aea3e 100644..100755
--- a/www/admin/user/activesync.php
+++ b/www/admin/user/activesync.php
@@ -27,30 +27,30 @@ require_once('KolabAdmin/include/authenticate.php');
require_once('KolabAdmin/include/form.class.php');
require_once('KolabAdmin/include/passwd.php');
+//try to include ALL possible configuration files
+@include_once '/kolab/var/kolab/www/z-push/config.php';
+@include_once '/etc/z-push/config.php';
+@include_once '/usr/share/z-push/config.php';
+@include_once '/var/www/z-push/config.php';
-///kolab/etc/kolab/templates/zpush-config.php.template which is then copied to /kolab/var/kolab/www/z-push/zpush.config
+//define errors array
+$errors = array();
if((@include_once 'Horde/Kolab/Kolab_Zpush/lib/kolabActivesyncData.php') === false ) {
//z-Push in not installed. Why don't you show some scarry warining?
$errors[] =_('zPush in not enabled in your system.');
}
-@include_once '/kolab/var/kolab/www/z-push/config.php';
-@include_once '/etc/z-push/config.php';
-@include_once '/usr/share/z-push/config.php';
-@include_once '/var/www/z-push/config.php';
-/*read from here value of the KOLAB_LAXPIC
+/*read from her value of the KOLAB_LAXPIC
-1 = allow the user to select (or if the constant doesn't exist)
0 = same as the annotations (no lax mode just jpeg)
1 = force the lax mode for all
*/
-
if(!defined('KOLAB_LAXPIC')){define('KOLAB_LAXPIC',-1);}
-//define errors array
-$errors = array();
+
//delete device
if(isset($_POST['deid']))
@@ -215,16 +215,22 @@ function __construct()
//remove Inbox/ part from the name
$folder_chunk=explode("/",$folder);
- //if if only inbox/ show it
- if($folder_chunk[1]!=""){
+ //if it's only inbox/ show it
+
+
+ if($folder_chunk[1]!="" and count($folder_chunk)==2 and $folder_chunk[0]=="INBOX"){
//else is inbox/somepart - show only somepart
$folder=$folder_chunk[1];
- }if($folder_chunk[2]!="")
+ }if($folder_chunk[2]!="" and count($folder_chunk)==3 and $folder_chunk[0]=="user")
{
//user folder
- $folder="(".$folder_chunk[1].") ".$folder_chunk[2];
- }
+ $folder="(".$folder_chunk[1].") ".$folder_chunk[2];
+ }else
+ {
+ $folder= preg_replace(array('/INBOX\//'),array(''),$folder);
+
+ }
//for saving annot
$part_folder[]=$folders[$i]['realname'];
@@ -437,7 +443,7 @@ function is_default($folder)
/**** Authentication etc. ***/
-$sidx = 'user';
+$sidx = 'activesync';
require_once('KolabAdmin/include/menu.php');
/**** Submenu for current page ***/
@@ -446,16 +452,22 @@ $menuitems[$sidx]['selected'] = 'selected';
//ActiveSync part
+if(count($errors) <1)
+{
$d= new ActiveSyncManager;
$devs= $d->getdevices();
$folds=$d->getfolders();
$ola=true;
+
if(count($devs)<1)
{
$errors[] =_("There are currently no devices known for your user.<br/><br/>In order to register a device, please connect it to the server first, using <a href='http://wiki.kolab.org/Z_push#Clients'>the instructions in the Wiki</a>. Afterwards the device should become available for configuration in this dialogue.");
$ola = false;
}
+}
+
+
/**** Insert into template and output ***/
$smarty = new MySmarty();
@@ -514,4 +526,4 @@ $smarty->display('page-ajax.tpl');
End:
vim:encoding=utf-8:
*/
-?>
+?> \ No newline at end of file
diff --git a/www/admin/user/index.php b/www/admin/user/index.php
index 51675ed..1f0b2aa 100644
--- a/www/admin/user/index.php
+++ b/www/admin/user/index.php
@@ -53,10 +53,8 @@ if( !$errors ) {
if (isset($_SESSION['base_dn'])) $base_dn = $_SESSION['base_dn'];
else $base_dn = 'k=kolab';
- $privmembers = array_merge( (array)$ldap->groupMembers( "cn=internal,$base_dn", 'admin' ),
- (array)$ldap->groupMembers( "cn=internal,$base_dn", 'maintainer' ) );
-
- $userfilter = "cn=*";
+
+ $userfilter = "uid=*";
$filterattr = KolabForm::getRequestVar('filterattr');
$filtertype = KolabForm::getRequestVar('filtertype');
$filtervalue = KolabForm::getRequestVar('filtervalue');
@@ -157,7 +155,7 @@ if( !$errors ) {
}
// skip admins and maintainers
- if( !array_key_exists( $dn, $privmembers ) ) {
+
$entries[] = array( 'dn' => $dn,
'sn' => $sn,
'fn' => $fn,
@@ -165,7 +163,7 @@ if( !$errors ) {
'mail' => $mail,
'uid' => $uid,
'deleted' => $deleted );
- }
+
$entry = ldap_next_entry( $ldap->connection,$entry );
}
}
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'),