Branch '2.3-stable' - 13 commits - data/templates lib/KolabAdmin package.xml www/admin
Christoph Wickert
wickert at kolabsys.com
Tue Sep 27 16:29:25 CEST 2011
data/templates/welcome-domain-maintainer.tpl | 10 -----
lib/KolabAdmin/include/menu.php | 35 ++++++++++++++++----
package.xml | 47 ++++++++++++++++++++++-----
www/admin/user/activesync.php | 16 +++++----
www/admin/user/deliver.php | 7 ++--
www/admin/user/forward.php | 10 ++++-
www/admin/user/vacation.php | 15 +++++---
7 files changed, 99 insertions(+), 41 deletions(-)
New commits:
commit 5e9b85aa44036e617d9d7336f75d53f86f6468fd
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Tue Sep 27 16:28:52 2011 +0200
Fix location of the ActiveSync configuration (bugzilla.kolabsys.com #442), use newer syntax for pear replace
diff --git a/package.xml b/package.xml
index 04b596b..6574c4e 100644
--- a/package.xml
+++ b/package.xml
@@ -23,10 +23,10 @@
<email>wickert at kolabsys.com</email>
<active>yes</active>
</contributor>
- <date>2011-09-13</date>
- <time>23:59:50</time>
+ <date>2011-09-27</date>
+ <time>16:27:00</time>
<version>
- <release>2.3.3</release>
+ <release>2.3.4</release>
<api>2.3.0</api>
</version>
<stability>
@@ -122,8 +122,8 @@
<file name="ldap.class.php" role="php" />
<file name="locale.php" role="php" />
<file name="menu.php" role="php" >
- <replace from="@www_dir@" to="www_dir" type="pear-config"/>
- </file>
+ <tasks:replace from="@www_dir@" to="www_dir" type="pear-config" />
+ </file>
<file name="mysmarty.php" role="php" />
<file name="passwd.php" role="php" />
<file name="Sieve.php" role="php" />
@@ -246,8 +246,8 @@
<file name="sf.php" role="www" />
</dir> <!-- /www/admin/sharedfolder -->
<dir name="user">
- <file name="activesync.php" role="php">
- <replace from="@www_dir@" to="www_dir" type="pear-config"/>
+ <file name="activesync.php" role="www" >
+ <tasks:replace from="@www_dir@" to="www_dir" type="pear-config" />
</file>
<file name="deliver.php" role="www" />
<file name="forward.php" role="www" />
@@ -551,5 +551,20 @@
* Fix domain maintainer welcome screen (kolab/issue4777, kolab/issue4779)
</notes>
</release>
+ <release>
+ <version>
+ <release>2.3.4</release>
+ <api>2.3.0</api>
+ </version>
+ <stability>
+ <release>beta</release>
+ <api>beta</api>
+ </stability>
+ <date>2011-09-27</date>
+ <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
+ <notes>
+* Fix location of the ActiveSync configuration (bugzilla.kolabsys.com #442)
+ </notes>
+ </release>
</changelog>
</package>
commit 810195f8ae2140b13eb2e808b80f9e4a3f6469ac
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Tue Sep 13 23:59:41 2011 +0200
Fix release date and time
diff --git a/package.xml b/package.xml
index d0d9f7a..04b596b 100644
--- a/package.xml
+++ b/package.xml
@@ -23,8 +23,8 @@
<email>wickert at kolabsys.com</email>
<active>yes</active>
</contributor>
- <date>2011-04-20</date>
- <time>00:44:50</time>
+ <date>2011-09-13</date>
+ <time>23:59:50</time>
<version>
<release>2.3.3</release>
<api>2.3.0</api>
commit ed7ffb86f3bf524dd0196ed39b3d0b5431fd76c7
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Tue Sep 13 23:52:39 2011 +0200
Fix typo in changelog
diff --git a/package.xml b/package.xml
index 7cf8261..d0d9f7a 100644
--- a/package.xml
+++ b/package.xml
@@ -548,7 +548,7 @@
<date>2011-09-13</date>
<license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
<notes>
-* Fix domain maintainer welcome screen (kolab/issue4777, kolab/issue4779
+* Fix domain maintainer welcome screen (kolab/issue4777, kolab/issue4779)
</notes>
</release>
</changelog>
commit 62a3e0a384f623f76dd824414d0bf496c9583444
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Tue Sep 13 23:50:53 2011 +0200
Fix domain maintainer welcome screen (kolab/issue4777, kolab/issue4779)
diff --git a/data/templates/welcome-domain-maintainer.tpl b/data/templates/welcome-domain-maintainer.tpl
index 1dc4550..06bfd8e 100644
--- a/data/templates/welcome-domain-maintainer.tpl
+++ b/data/templates/welcome-domain-maintainer.tpl
@@ -10,16 +10,6 @@
<table cellspacing="10" cellpadding="10">
<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>
-</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>
-</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>
diff --git a/package.xml b/package.xml
index c60bc4b..7cf8261 100644
--- a/package.xml
+++ b/package.xml
@@ -26,7 +26,7 @@
<date>2011-04-20</date>
<time>00:44:50</time>
<version>
- <release>2.3.2</release>
+ <release>2.3.3</release>
<api>2.3.0</api>
</version>
<stability>
@@ -536,5 +536,20 @@
* Fix subfolders issue (bugzilla.kolabsys.com #98)
</notes>
</release>
+ <release>
+ <version>
+ <release>2.3.3</release>
+ <api>2.3.0</api>
+ </version>
+ <stability>
+ <release>beta</release>
+ <api>beta</api>
+ </stability>
+ <date>2011-09-13</date>
+ <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
+ <notes>
+* Fix domain maintainer welcome screen (kolab/issue4777, kolab/issue4779
+ </notes>
+ </release>
</changelog>
</package>
commit 5e6be678bce0c3c5eb470e9d1e3b5101ffc51e96
Merge: 05c0866 aebba59
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Fri Jul 15 15:53:15 2011 +0200
Merge branch '2.3-stable'
commit 05c0866e9b81eac23171a2e753a3f8fe720757f0
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Thu Jul 14 17:56:21 2011 +0200
Only refer to $handler if $handler is indeed set.
diff --git a/www/admin/user/deliver.php b/www/admin/user/deliver.php
index 93f738c..1c955f1 100644
--- a/www/admin/user/deliver.php
+++ b/www/admin/user/deliver.php
@@ -84,8 +84,11 @@ $smarty->assign( 'menuitems', $menuitems );
$smarty->assign( 'submenuitems',
array_key_exists('submenu',
$menuitems[$sidx])?$menuitems[$sidx]['submenu']:array() );
-$smarty->assign( 'active', $handler->fetchDeliverySegment()->isActive() );
-$smarty->assign( 'inbox', $handler->fetchDeliverySegment()->getDeliveryFolder() );
+if (isset($handler)) {
+ $smarty->assign( 'active', $handler->fetchDeliverySegment()->isActive() );
+ $smarty->assign( 'inbox', $handler->fetchDeliverySegment()->getDeliveryFolder() );
+}
+
$smarty->assign( 'maincontent', 'deliver.tpl' );
$smarty->display('page.tpl');
diff --git a/www/admin/user/forward.php b/www/admin/user/forward.php
index 789ba44..e470279 100644
--- a/www/admin/user/forward.php
+++ b/www/admin/user/forward.php
@@ -86,9 +86,13 @@ $smarty->assign( 'menuitems', $menuitems );
$smarty->assign( 'submenuitems',
array_key_exists('submenu',
$menuitems[$sidx])?$menuitems[$sidx]['submenu']:array() );
-$smarty->assign( 'active', $handler->fetchForwardSegment()->isActive() );
-$smarty->assign( 'keep', $handler->fetchForwardSegment()->getKeepOnServer() );
-$smarty->assign( 'address', $handler->fetchForwardSegment()->getForwardAddress() );
+
+if (isset($handler)) {
+ $smarty->assign( 'active', $handler->fetchForwardSegment()->isActive() );
+ $smarty->assign( 'keep', $handler->fetchForwardSegment()->getKeepOnServer() );
+ $smarty->assign( 'address', $handler->fetchForwardSegment()->getForwardAddress() );
+}
+
$smarty->assign( 'maincontent', 'forward.tpl' );
$smarty->display('page.tpl');
diff --git a/www/admin/user/vacation.php b/www/admin/user/vacation.php
index 3076847..f0cbac0 100644
--- a/www/admin/user/vacation.php
+++ b/www/admin/user/vacation.php
@@ -87,12 +87,15 @@ $smarty->assign( 'menuitems', $menuitems );
$smarty->assign( 'submenuitems',
array_key_exists('submenu',
$menuitems[$sidx])?$menuitems[$sidx]['submenu']:array() );
-$smarty->assign( 'active', $handler->fetchVacationSegment()->isActive() );
-$smarty->assign( 'text', $handler->fetchVacationSegment()->getResponse() );
-$smarty->assign( 'addresses', $addresses );
-$smarty->assign( 'maildomain', $handler->fetchVacationSegment()->getDomain() );
-$smarty->assign( 'reacttospam', !$handler->fetchVacationSegment()->getReactToSpam() );
-$smarty->assign( 'days', $handler->fetchVacationSegment()->getResendAfter() );
+if (isset($handler)) {
+ $smarty->assign( 'active', $handler->fetchVacationSegment()->isActive() );
+ $smarty->assign( 'text', $handler->fetchVacationSegment()->getResponse() );
+ $smarty->assign( 'addresses', $addresses );
+ $smarty->assign( 'maildomain', $handler->fetchVacationSegment()->getDomain() );
+ $smarty->assign( 'reacttospam', !$handler->fetchVacationSegment()->getReactToSpam() );
+ $smarty->assign( 'days', $handler->fetchVacationSegment()->getResendAfter() );
+}
+
$smarty->assign( 'maincontent', 'vacation.tpl' );
$smarty->display('page.tpl');
commit 253dd2c9f6054919036ccc56e07b6ccdb8608608
Author: Bogomil Shopov (Kolab Systems) <shopov at kolabsys.com>
Date: Thu Jun 23 12:55:37 2011 +0300
Adding ACL checking for ActiveSync. Removing duplicated menu Items. Hiding menu and functionalities depends on ACL.
Changinf package xml with adding file tasks.
diff --git a/lib/KolabAdmin/include/menu.php b/lib/KolabAdmin/include/menu.php
index b079453..e1bc874 100644
--- a/lib/KolabAdmin/include/menu.php
+++ b/lib/KolabAdmin/include/menu.php
@@ -3,7 +3,8 @@
* Copyright (c) 2004 Klarälvdalens Datakonsult AB
*
* Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
- *
+ * Updated by Bogomil Shopov <shopov at kolabsys.com>
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2, or
@@ -20,8 +21,28 @@
require_once('locale.php');
+/*
+ * z-Push part for activesync
+ *
+ * */
+
+include_once '@www_dir@/z-push/config.php';
+$showasmenu=true;
+if(defined('KOLAB_LDAP_ACL') and KOLAB_LDAP_ACL !=""){
+ $showasmenu=false;
+ $filter = '(member='.$_SESSION['auth_user'].')';
+ $result = $ldap->search( KOLAB_LDAP_ACL, $filter);
+ if (ldap_count_entries($ldap->connection, $result) > 0)
+ $showasmenu=true;
+}
+
+/*
+ * end z-push activesync part
+ * */
+
$menuitems = array();
+
if( $auth->group() == "admin" || $auth->group() == "maintainer" || $auth->group() == 'domain-maintainer' ) {
$menuitems['user'] = array( 'name' => _('Users'),
'url' => $topdir.'/user/',
@@ -39,14 +60,14 @@ if( $auth->group() == "admin" || $auth->group() == "maintainer" || $auth->group(
array( 'name' => _('Forward Email'),
'url' => 'forward.php' ),
array( 'name' => _('Vacation'),
- 'url' => 'vacation.php' ),
- array( 'name' => _('ActiveSync'),
- 'url' => 'activesync.php' ),
- ));
-
+ 'url' => 'vacation.php' )
+ ));
+if($showasmenu){
+
$menuitems['activesync'] = array( 'name' => _('ActiveSync'),
'url' => $topdir.'/user/activesync.php',
- 'title' => _('ActiveSync'));
+ 'title' => _('ActiveSync'));
+ }
}
if( $auth->group() == "admin" || $auth->group() == "maintainer") {
$menuitems['addressbook'] = array( 'name' => _('Addressbook'),
diff --git a/package.xml b/package.xml
index 572b22c..c60bc4b 100644
--- a/package.xml
+++ b/package.xml
@@ -121,7 +121,9 @@
<file name="headers.php" role="php" />
<file name="ldap.class.php" role="php" />
<file name="locale.php" role="php" />
- <file name="menu.php" role="php" />
+ <file name="menu.php" role="php" >
+ <replace from="@www_dir@" to="www_dir" type="pear-config"/>
+ </file>
<file name="mysmarty.php" role="php" />
<file name="passwd.php" role="php" />
<file name="Sieve.php" role="php" />
@@ -244,14 +246,15 @@
<file name="sf.php" role="www" />
</dir> <!-- /www/admin/sharedfolder -->
<dir name="user">
- <file name="activesync.php" role="www" />
+ <file name="activesync.php" role="php">
+ <replace from="@www_dir@" to="www_dir" type="pear-config"/>
+ </file>
<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 -->
+ </dir> <!-- /www/admin/user -->
<file name="custom.css" role="www" />
<file name="favicon.ico" role="www" />
<file name="favicon.png" role="www" />
diff --git a/www/admin/user/activesync.php b/www/admin/user/activesync.php
index 0b211cb..0c51e96 100755
--- a/www/admin/user/activesync.php
+++ b/www/admin/user/activesync.php
@@ -27,12 +27,8 @@ 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
- at include_once '/kolab/var/kolab/www/z-push/config.php';
- at include_once '/etc/z-push/config.php';
- at include_once '/usr/share/z-push/config.php';
- at include_once '/var/www/z-push/config.php';
-
+//include z-Push config file file
+include_once '@www_dir@/z-push/config.php';
//define errors array
@@ -43,6 +39,14 @@ if((@include_once 'Horde/Kolab/Kolab_Zpush/lib/kolabActivesyncData.php') === fal
$errors[] =_('zPush in not enabled in your system.');
}
+//check for permissions ACL from zpush config file
+if(defined('KOLAB_LDAP_ACL') and KOLAB_LDAP_ACL !=""){
+ $filter = '(member='.$_SESSION['auth_user'].')';
+ $result = $ldap->search( KOLAB_LDAP_ACL, $filter);
+ if (ldap_count_entries($ldap->connection, $result) == 0)
+ $errors[] ="You don't have permissions to manage your activeSync devices.";
+}
+
/*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)
commit e2d63cca238a72c4cbf71bf858939832eef6241c
Author: Bogomil Shopov <bogomil at efb.bg>
Date: Thu Jun 16 14:04:46 2011 +0300
Fixing bug https://bugzilla.kolabsys.com/show_bug.cgi?id=98#c15.
diff --git a/www/admin/user/activesync.php b/www/admin/user/activesync.php
index d13aa24..0b211cb 100755
--- a/www/admin/user/activesync.php
+++ b/www/admin/user/activesync.php
@@ -294,7 +294,10 @@ function getFolderType($folder)
{
return "NOTES";
- }
+ }else
+ {
+ return "MAIL";
+ }
}else{
return "MAIL";
commit 90224bed2855513aeb626e2e2d36c9a6cabb5fd0
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Mon Jun 13 19:15:07 2011 +0200
Replace server-team with kolab-devel list in the 'About' section
diff --git a/data/templates/technology.tpl b/data/templates/technology.tpl
index 1f97b4e..656c120 100644
--- a/data/templates/technology.tpl
+++ b/data/templates/technology.tpl
@@ -112,7 +112,7 @@
<li>Christoph Wickert</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 at lists.kolabsys.com\">server-team at lists.kolabsys.com</a> so we can add you to this list."}
+ <li>{tr msg="...and anyone we forgot. Please let us know at <a href=\"mail:kolab-devel at kolab.org\">kolab-devel at kolab.org</a> so we can add you to this list."}
</ul>
</div>
commit de850a9b9ac5ca6abb0ab06c11bfd3bde108ac70
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Mon Jun 13 19:13:08 2011 +0200
Remove link to Code Fusion, their company no longer exists
diff --git a/data/templates/technology.tpl b/data/templates/technology.tpl
index 4c2b600..1f97b4e 100644
--- a/data/templates/technology.tpl
+++ b/data/templates/technology.tpl
@@ -69,7 +69,7 @@
</p>
<p>
-{tr msg="<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> joined the project soon after the original Kolab1 server was released. Its developers are primarily responsible for an updated engine (which forms the base of the Kolab2 server), the web client, as well as contributing to development of the Kolab2 storage format."}
+{tr msg="Code Fusion cc joined the project soon after the original Kolab1 server was released. Its developers are primarily responsible for an updated engine (which forms the base of the Kolab2 server), the web client, as well as contributing to development of the Kolab2 storage format."}
</p>
<div>
commit 461a7a1091da347848426a6ee839b11d561cd315
Author: Bogomil Shopov <bogomil at efb.bg>
Date: Thu Jun 2 14:23:28 2011 +0300
Fixing bug: https://bugzilla.kolabsys.com/show_bug.cgi?id=98
diff --git a/www/admin/user/activesync.php b/www/admin/user/activesync.php
index 24aea3e..d13aa24 100755
--- a/www/admin/user/activesync.php
+++ b/www/admin/user/activesync.php
@@ -225,7 +225,7 @@ function __construct()
}if($folder_chunk[2]!="" and count($folder_chunk)==3 and $folder_chunk[0]=="user")
{
//user folder
- $folder="(".$folder_chunk[1].") ".$folder_chunk[2];
+ $folder= preg_replace(array('/INBOX\//'),array(''),$folder);
}else
{
$folder= preg_replace(array('/INBOX\//'),array(''),$folder);
commit 111da600344be8f14bfbec15806d8d207f1e01e4
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Wed Jun 1 13:30:26 2011 +0200
Fix changelog
diff --git a/package.xml b/package.xml
index a0b8753..572b22c 100644
--- a/package.xml
+++ b/package.xml
@@ -500,7 +500,7 @@
<date>2011-04-20</date>
<license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
<notes>
-* Fix new welcome pages
+* Fix new welcome pages (bugzilla.kolabsys.com #87)
</notes>
</release>
<release>
commit 4c67a96d9f334401e50f310b5d5081316ce49082
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Wed Jun 1 12:42:23 2011 +0200
Update package.xml for 2.3.2 release
diff --git a/package.xml b/package.xml
index 030dbf4..a0b8753 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.1</release>
- <api>2.3.1</api>
+ <release>2.3.2</release>
+ <api>2.3.0</api>
</version>
<stability>
<release>alpha</release>
@@ -518,5 +518,20 @@
* Move all graphics from www/admin/pics to www/admin/images
</notes>
</release>
+ <release>
+ <version>
+ <release>2.3.2</release>
+ <api>2.3.0</api>
+ </version>
+ <stability>
+ <release>beta</release>
+ <api>beta</api>
+ </stability>
+ <date>2011-05-06</date>
+ <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
+ <notes>
+* Fix subfolders issue (bugzilla.kolabsys.com #98)
+ </notes>
+ </release>
</changelog>
</package>
More information about the commits
mailing list