summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBogomil Shopov <shopov@kolabsys.com>2011-04-21 12:57:36 (GMT)
committerBogomil Shopov <shopov@kolabsys.com>2011-04-21 12:57:36 (GMT)
commit610f439dc1e1fdd3fc84fd5da856ac22adf54b67 (patch)
tree86f8b4ccb20f7222902e612b4fcc8a653f3f29a2
parent013335540ce193f32277fad775269f167f4b6239 (diff)
downloadkolab-webadmin-610f439dc1e1fdd3fc84fd5da856ac22adf54b67.tar.gz
Fixing error on ActiveSync configuration screen: https://bugzilla.kolabsys.com/show_bug.cgi?id=92
-rw-r--r--www/admin/user/activesync.php26
1 files changed, 16 insertions, 10 deletions
diff --git a/www/admin/user/activesync.php b/www/admin/user/activesync.php
index 081a15a..a0b6c0c 100644
--- 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']))
@@ -446,16 +446,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 +520,4 @@ $smarty->display('page-ajax.tpl');
End:
vim:encoding=utf-8:
*/
-?>
+?> \ No newline at end of file