gunnar: server/kolab-resource-handlers/kolab-resource-handlers/freebusy pfb.php.in, 1.9, 1.10 freebusy.php.in, 1.6, 1.7

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy
In directory doto:/tmp/cvs-serv6461/freebusy

Modified Files:
	pfb.php.in freebusy.php.in 
Log Message:
	* freebusy/freebusy.php.in: 

	Avoid notices because of undefined
	$params['ldap_classname_suffix'].  

	Avoid notices because of undefined $_REQUEST['cache'] and
	$_REQUEST['extended']
	
	* freebusy/pfb.php.in: 

	Avoid notices because of undefined
	$params['ldap_classname_suffix'].


Index: pfb.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/pfb.php.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- pfb.php.in	22 Nov 2006 13:09:45 -0000	1.9
+++ pfb.php.in	22 Nov 2006 17:05:18 -0000	1.10
@@ -36,6 +36,8 @@
 
 require_once('@kolab_php_module_prefix at freebusy/misc.php');
 require_once('@resmgr_confdir@/freebusy.conf');
+
+if ( empty($params['ldap_classname_suffix'])) $params['ldap_classname_suffix'] = '';
 require_once('@kolab_php_module_prefix at freebusy/freebusyldap'.$params['ldap_classname_suffix'].'.class.php');
 
 require_once('@kolab_php_module_prefix at freebusy/freebusycache.class.php');

Index: freebusy.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.php.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- freebusy.php.in	22 Nov 2006 12:15:33 -0000	1.6
+++ freebusy.php.in	22 Nov 2006 17:05:18 -0000	1.7
@@ -25,6 +25,8 @@
 require_once('@resmgr_confdir@/freebusy.conf');
 require_once('@kolab_php_module_prefix at freebusy/freebusycache.class.php');
 require_once('@kolab_php_module_prefix at freebusy/freebusycollector.class.php');
+
+if ( empty($params['ldap_classname_suffix'])) $params['ldap_classname_suffix'] = '';
 require_once('@kolab_php_module_prefix at freebusy/freebusyldap'.$params['ldap_classname_suffix'].'.class.php');
 
 require_once('@kolab_php_module_prefix at freebusy/misc.php');
@@ -34,8 +36,11 @@
 $user = trim($_REQUEST['uid']);
 $imapuser     = $_SERVER['PHP_AUTH_USER'];
 $imappw       = $_SERVER['PHP_AUTH_PW'];
-$req_cache    = (bool)$_REQUEST['cache'];
-$req_extended = (bool)$_REQUEST['extended'];
+
+$req_cache    = false;
+$req_extended = false;
+if ( !empty($_REQUEST['cache']))    $req_cache    = (bool)$_REQUEST['cache'];
+if ( !empty($_REQUEST['extended'])) $req_extended = (bool)$_REQUEST['extended'];
 
 myLog("---FreeBusy Script starting (".$_SERVER['REQUEST_URI'].")---", RM_LOG_DEBUG );
 myLog("user=$user, imapuser=$imapuser, req_cache=$req_cache, req_extended=$req_extended", RM_LOG_DEBUG );