extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 01:22:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

using references to loop of items in profind and some cleanups

Browse Source
This commit is contained in:
Ralf Becker 2009-10-16 08:36:28 +00:00
parent ae3ecf9891
commit 4f69a5d1b0
3 changed files with 19 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addressbook/inc/class.addressbook_groupdav.inc.php
View File

@ -79,8 +79,7 @@ class addressbook_groupdav extends groupdav_handler
*/ */
function propfind($path,$options,&$files,$user,$id='') function propfind($path,$options,&$files,$user,$id='')
{ {
//$starttime = microtime(true); $starttime = microtime(true);
$filter = array(); $filter = array();
// show addressbook of a single user? // show addressbook of a single user?
if ($user && $path != '/addressbook/') $filter['contact_owner'] = $user; if ($user && $path != '/addressbook/') $filter['contact_owner'] = $user;
@ -143,8 +142,7 @@ class addressbook_groupdav extends groupdav_handler
); );
} }
} }
if ($this->debug) error_log(__METHOD__."($path) took ".(microtime(true) - $starttime).' to return '.count($files['files']).' items');
//$endtime = microtime(true) - $starttime; error_log(__METHOD__."($path) elapsed time : $endtime, returning ".count($files['files']).' contacts');
return true; return true;
} }

17
calendar/inc/class.calendar_groupdav.inc.php
View File

@ -7,7 +7,7 @@
* @package calendar * @package calendar
* @subpackage groupdav * @subpackage groupdav
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de> * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @copyright (c) 2007/8 by Ralf Becker <RalfBecker-AT-outdoor-training.de> * @copyright (c) 2007-9 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @version $Id$ * @version $Id$
*/ */
@ -85,10 +85,9 @@ class calendar_groupdav extends groupdav_handler
function propfind($path,$options,&$files,$user,$id='') function propfind($path,$options,&$files,$user,$id='')
{ {
if ($this->debug) error_log(__METHOD__."($path,".array2string($options).",,$user,$id)"); if ($this->debug) error_log(__METHOD__."($path,".array2string($options).",,$user,$id)");
//error_log(__METHOD__."($path,".array2string($options).",,$user,$id)");//njv: $starttime = microtime(true);
// ToDo: add parameter to only return id & etag // ToDo: add parameter to only return id & etag
//error_log( __FILE__ . __METHOD__ ." :$user ". print_r($options,true));
$st = microtime(true);
$cal_filters = array( $cal_filters = array(
'users' => $user, 'users' => $user,
'start' => time()-100*24*3600, // default one month back -30 breaks all sync recurrences 'start' => time()-100*24*3600, // default one month back -30 breaks all sync recurrences
@ -98,7 +97,7 @@ class calendar_groupdav extends groupdav_handler
'date_format' => 'server', 'date_format' => 'server',
); );
if ($this->debug > 1) error_log(__METHOD__."($path,,,$user,$id) cal_filters=".array2string($cal_filters)); if ($this->debug > 1) error_log(__METHOD__."($path,,,$user,$id) cal_filters=".array2string($cal_filters));
//error_log(__METHOD__."($path,,,$user,$id) cal_filters=".array2string($cal_filters));//njv //error_log(__METHOD__."($path,,,$user,$id) cal_filters=".array2string($cal_filters));
// process REPORT filters or multiget href's // process REPORT filters or multiget href's
if (($id || $options['root']['name'] != 'propfind') && !$this->_report_filters($options,$cal_filters,$id)) if (($id || $options['root']['name'] != 'propfind') && !$this->_report_filters($options,$cal_filters,$id))
{ {
@ -116,10 +115,9 @@ class calendar_groupdav extends groupdav_handler
} }
} }
} }
//error_log(__FILE__ . __METHOD__ ."Filters:" .print_r($cal_filters,true)); if (($events =& $this->bo->search($cal_filters)))
if (($events = $this->bo->search($cal_filters)))
{ {
foreach($events as $event) foreach($events as &$event)
{ {
//header('X-EGROUPWARE-EVENT-'.$event['id'].': '.$event['title'].': '.date('Y-m-d H:i:s',$event['start']).' - '.date('Y-m-d H:i:s',$event['end'])); //header('X-EGROUPWARE-EVENT-'.$event['id'].': '.$event['title'].': '.date('Y-m-d H:i:s',$event['start']).' - '.date('Y-m-d H:i:s',$event['end']));
$props = array( $props = array(
@ -148,8 +146,7 @@ class calendar_groupdav extends groupdav_handler
); );
} }
} }
$end = microtime(true) - $st; if ($this->debug) error_log(__METHOD__."($path) took ".(microtime(true) - $starttime).' to return '.count($files['files']).' items');
if ($this->debug) error_log(__FILE__ . __METHOD__ . "Function took : $end");
return true; return true;
} }

30
infolog/inc/class.infolog_groupdav.inc.php
View File

@ -7,7 +7,7 @@
* @package infolog * @package infolog
* @subpackage groupdav * @subpackage groupdav
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de> * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @copyright (c) 2007/8 by Ralf Becker <RalfBecker-AT-outdoor-training.de> * @copyright (c) 2007-9 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @version $Id$ * @version $Id$
*/ */
@ -22,7 +22,7 @@ class infolog_groupdav extends groupdav_handler
* @var infolog_bo * @var infolog_bo
*/ */
var $bo; var $bo;
static $debugInfo = 0; // sometimes debuging is quite handy, to see things. check with the error log to see results
/** /**
* Constructor * Constructor
* *
@ -32,10 +32,8 @@ class infolog_groupdav extends groupdav_handler
*/ */
function __construct($app,$debug=null,$base_uri=null) function __construct($app,$debug=null,$base_uri=null)
{ {
if (self::$debugInfo) $debug = self::$debugInfo;
if (self::$debugInfo) error_log(__METHOD__." called ");
parent::__construct($app,$debug,$base_uri); parent::__construct($app,$debug,$base_uri);
if (self::$debugInfo) error_log(__METHOD__." parent constructed with $app,$debug,$base_uri; initializing infolog_bo ");
$this->bo = new infolog_bo(); $this->bo = new infolog_bo();
} }
@ -49,7 +47,6 @@ class infolog_groupdav extends groupdav_handler
*/ */
static function get_path($info) static function get_path($info)
{ {
if (self::$debugInfo) error_log(__METHOD__." called with".print_r($info,true));
if (is_numeric($info) && self::PATH_ATTRIBUTE == 'info_id') if (is_numeric($info) && self::PATH_ATTRIBUTE == 'info_id')
{ {
$name = $info; $name = $info;
@ -57,7 +54,6 @@ class infolog_groupdav extends groupdav_handler
else else
{ {
if (!is_array($info)) $info = $this->bo->read($info); if (!is_array($info)) $info = $this->bo->read($info);
if (self::$debugInfo) error_log(__METHOD__." returning info on ".print_r( $info,true));
$name = $info[self::PATH_ATTRIBUTE]; $name = $info[self::PATH_ATTRIBUTE];
} }
return '/infolog/'.$name.'.ics'; return '/infolog/'.$name.'.ics';
@ -74,7 +70,8 @@ class infolog_groupdav extends groupdav_handler
*/ */
function propfind($path,$options,&$files,$user,$id='') function propfind($path,$options,&$files,$user,$id='')
{ {
if (self::$debugInfo) error_log(__METHOD__." called "); $starttime = microtime(true);
// todo add a filter to limit how far back entries from the past get synced // todo add a filter to limit how far back entries from the past get synced
$filter = array( $filter = array(
'info_type' => 'task', 'info_type' => 'task',
@ -82,7 +79,7 @@ class infolog_groupdav extends groupdav_handler
if ($id) $filter['info_id'] = $id; // propfind on a single id if ($id) $filter['info_id'] = $id; // propfind on a single id
// ToDo: add parameter to only return id & etag // ToDo: add parameter to only return id & etag
if (($tasks = $this->bo->search($params=array( if (($tasks =& $this->bo->search($params=array(
'order' => 'info_datemodified', 'order' => 'info_datemodified',
'sort' => 'DESC', 'sort' => 'DESC',
'filter' => 'own', // filter my: entries user is responsible for, 'filter' => 'own', // filter my: entries user is responsible for,
@ -90,7 +87,7 @@ class infolog_groupdav extends groupdav_handler
'col_filter' => $filter, 'col_filter' => $filter,
)))) ))))
{ {
foreach($tasks as $task) foreach($tasks as &$task)
{ {
$files['files'][] = array( $files['files'][] = array(
'path' => self::get_path($task), 'path' => self::get_path($task),
@ -105,6 +102,7 @@ class infolog_groupdav extends groupdav_handler
); );
} }
} }
if ($this->debug) error_log(__METHOD__."($path) took ".(microtime(true) - $starttime).' to return '.count($files['files']).' items');
return true; return true;
} }
@ -117,7 +115,6 @@ class infolog_groupdav extends groupdav_handler
*/ */
function get(&$options,$id) function get(&$options,$id)
{ {
if (self::$debugInfo) error_log(__METHOD__." called ");
if (!is_array($task = $this->_common_get_put_delete('GET',$options,$id))) if (!is_array($task = $this->_common_get_put_delete('GET',$options,$id)))
{ {
return $task; return $task;
@ -140,7 +137,6 @@ class infolog_groupdav extends groupdav_handler
*/ */
function put(&$options,$id,$user=null) function put(&$options,$id,$user=null)
{ {
if (self::$debugInfo) error_log(__METHOD__." called ");
$ok = $this->_common_get_put_delete('PUT',$options,$id); $ok = $this->_common_get_put_delete('PUT',$options,$id);
if (!is_null($ok) && !is_array($ok)) if (!is_null($ok) && !is_array($ok))
{ {
@ -149,7 +145,7 @@ class infolog_groupdav extends groupdav_handler
$handler = $this->_get_handler(); $handler = $this->_get_handler();
if (!($info_id = $handler->importVTODO($options['content'],is_numeric($id) ? $id : -1))) if (!($info_id = $handler->importVTODO($options['content'],is_numeric($id) ? $id : -1)))
{ {
if ($this->debug ) error_log(__METHOD__."(,$id) import_vtodo($options[content]) returned false"); if ($this->debug) error_log(__METHOD__."(,$id) import_vtodo($options[content]) returned false");
return '403 Forbidden'; return '403 Forbidden';
} }
header('ETag: '.$this->get_etag($info_id)); header('ETag: '.$this->get_etag($info_id));
@ -170,7 +166,6 @@ class infolog_groupdav extends groupdav_handler
*/ */
function delete(&$options,$id) function delete(&$options,$id)
{ {
if (self::$debugInfo) error_log(__METHOD__." called ");
if (!is_array($task = $this->_common_get_put_delete('DELETE',$options,$id))) if (!is_array($task = $this->_common_get_put_delete('DELETE',$options,$id)))
{ {
return $task; return $task;
@ -186,7 +181,6 @@ class infolog_groupdav extends groupdav_handler
*/ */
function read($id) function read($id)
{ {
if (self::$debugInfo) error_log(__METHOD__." called ");
return $this->bo->read($id,false); return $this->bo->read($id,false);
} }
@ -199,7 +193,6 @@ class infolog_groupdav extends groupdav_handler
*/ */
function check_access($acl,$task) function check_access($acl,$task)
{ {
if (self::$debugInfo) error_log(__METHOD__." called ");
return $this->bo->check_access($task,$acl); return $this->bo->check_access($task,$acl);
} }
@ -211,7 +204,6 @@ class infolog_groupdav extends groupdav_handler
*/ */
function get_etag($info) function get_etag($info)
{ {
if (self::$debugInfo) error_log(__METHOD__." called ");
if (!is_array($info)) if (!is_array($info))
{ {
$info = $this->bo->read($info); $info = $this->bo->read($info);
@ -230,11 +222,9 @@ class infolog_groupdav extends groupdav_handler
*/ */
private function _get_handler() private function _get_handler()
{ {
if (self::$debugInfo) error_log(__METHOD__." called ");
$handler = new infolog_ical(); $handler = new infolog_ical();
$handler->setSupportedFields('GroupDAV',$this->agent); $handler->setSupportedFields('GroupDAV',$this->agent);
return $handler; return $handler;
} }
} }