extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-29 01:59:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

"fixed messed up indention"

Browse Source
This commit is contained in:
Ralf Becker 2009-07-08 10:29:06 +00:00
parent 1e58b525d1
commit 8f4960f9b4
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
calendar/inc/class.calendar_bo.inc.php
View File

@ -241,7 +241,7 @@ class calendar_bo
foreach($event['participants'] as $uid => $status) foreach($event['participants'] as $uid => $status)
{ {
if (is_numeric($uid) && $GLOBALS['egw']->accounts->get_type($uid) == 'g' && if (is_numeric($uid) && $GLOBALS['egw']->accounts->get_type($uid) == 'g' &&
($members = $GLOBALS['egw']->accounts->member($uid))) ($members = $GLOBALS['egw']->accounts->member($uid)))
{ {
foreach($members as $member) foreach($members as $member)
{ {
@ -291,7 +291,7 @@ class calendar_bo
$params_in = $params; $params_in = $params;
if (!isset($params['users']) || !$params['users'] || if (!isset($params['users']) || !$params['users'] ||
count($params['users']) == 1 && isset($params['users'][0]) && !$params['users'][0]) // null or '' casted to an array count($params['users']) == 1 && isset($params['users'][0]) && !$params['users'][0]) // null or '' casted to an array
{ {
// for a search use all account you have read grants from // for a search use all account you have read grants from
$params['users'] = $params['query'] ? array_keys($this->grants) : $this->user; $params['users'] = $params['query'] ? array_keys($this->grants) : $this->user;
@ -328,7 +328,7 @@ class calendar_bo
{ {
// use only members which gave the user a read-grant // use only members which gave the user a read-grant
if (!in_array($member['account_id'],$users) && if (!in_array($member['account_id'],$users) &&
($params['ignore_acl'] || $this->check_perms(EGW_ACL_READ|EGW_ACL_FREEBUSY,0,$member['account_id']))) ($params['ignore_acl'] || $this->check_perms(EGW_ACL_READ|EGW_ACL_FREEBUSY,0,$member['account_id'])))
{ {
$users[] = $member['account_id']; $users[] = $member['account_id'];
} }
@ -372,7 +372,7 @@ class calendar_bo
if ($this->debug && ($this->debug > 1 || $this->debug == 'search')) if ($this->debug && ($this->debug > 1 || $this->debug == 'search'))
{ {
$this->debug_message('bocal::search(%1) start=%2, end=%3, daywise=%4, cat_id=%5, filter=%6, query=%7, offset=%8, num_rows=%9, order=%10, show_rejected=%11)', $this->debug_message('bocal::search(%1) start=%2, end=%3, daywise=%4, cat_id=%5, filter=%6, query=%7, offset=%8, num_rows=%9, order=%10, show_rejected=%11)',
True,$params,$start,$end,$daywise,$cat_id,$filter,$params['query'],$offset,(int)$params['num_rows'],$params['order'],$show_rejected); True,$params,$start,$end,$daywise,$cat_id,$filter,$params['query'],$offset,(int)$params['num_rows'],$params['order'],$show_rejected);
} }
// date2ts(,true) converts to server time, db2data converts again to user-time // date2ts(,true) converts to server time, db2data converts again to user-time
$events =& $this->so->search(isset($start) ? $this->date2ts($start,true) : null,isset($end) ? $this->date2ts($end,true) : null, $events =& $this->so->search(isset($start) ? $this->date2ts($start,true) : null,isset($end) ? $this->date2ts($end,true) : null,
@ -765,7 +765,7 @@ class calendar_bo
if ($this->debug && ((int) $this->debug > 3 || $this->debug == 'insert_all_repetions' || $this->debug == 'check_move_horizont' || $this->debug == 'insert_all_repitions')) if ($this->debug && ((int) $this->debug > 3 || $this->debug == 'insert_all_repetions' || $this->debug == 'check_move_horizont' || $this->debug == 'insert_all_repitions'))
{ {
$this->debug_message('bocal::insert_all_repetions(...,%1) checking recur_exceptions[%2] and event[recur_exceptions]=%3 ==> %4',False, $this->debug_message('bocal::insert_all_repetions(...,%1) checking recur_exceptions[%2] and event[recur_exceptions]=%3 ==> %4',False,
$recur_exceptions,$search_date_ymd,$event['recur_exception'],$have_exception); $recur_exceptions,$search_date_ymd,$event['recur_exception'],$have_exception);
} }
if ($have_exception) if ($have_exception)
{ {
@ -849,7 +849,7 @@ class calendar_bo
} }
if (($GLOBALS['egw']->datetime->day_of_week($event_start_arr['year'],$event_start_arr['month'],$event_start_arr['day']) == $GLOBALS['egw']->datetime->day_of_week($search_date_year,$search_date_month,$search_date_day)) && if (($GLOBALS['egw']->datetime->day_of_week($event_start_arr['year'],$event_start_arr['month'],$event_start_arr['day']) == $GLOBALS['egw']->datetime->day_of_week($search_date_year,$search_date_month,$search_date_day)) &&
(ceil($event_start_arr['day']/7) == ceil($search_date_day/7))) (ceil($event_start_arr['day']/7) == ceil($search_date_day/7)))
{ {
$this->add_adjusted_event($events,$event,$search_date_ymd); $this->add_adjusted_event($events,$event,$search_date_ymd);
} }
@ -928,12 +928,12 @@ class calendar_bo
{ {
if (is_numeric($uid)) if (is_numeric($uid))
{ {
$info = array( $info = array(
'res_id' => $uid, 'res_id' => $uid,
'email' => $GLOBALS['egw']->accounts->id2name($uid,'account_email'), 'email' => $GLOBALS['egw']->accounts->id2name($uid,'account_email'),
'name' => trim($GLOBALS['egw']->accounts->id2name($uid,'account_firstname'). ' ' . 'name' => trim($GLOBALS['egw']->accounts->id2name($uid,'account_firstname'). ' ' .
$GLOBALS['egw']->accounts->id2name($uid,'account_lastname')), $GLOBALS['egw']->accounts->id2name($uid,'account_lastname')),
'type' => $GLOBALS['egw']->accounts->get_type($uid), 'type' => $GLOBALS['egw']->accounts->get_type($uid),
); );
} }
else else
@ -1088,12 +1088,12 @@ class calendar_bo
// removing all non-nummerical chars, gives YYYYMMDDhhmmss, independent of the iso8601 format // removing all non-nummerical chars, gives YYYYMMDDhhmmss, independent of the iso8601 format
$date = str_replace(array('-',':','T','Z',' ','+'),'',$date); $date = str_replace(array('-',':','T','Z',' ','+'),'',$date);
$date = array( $date = array(
'year' => (int) substr($date,0,4), 'year' => (int) substr($date,0,4),
'month' => (int) substr($date,4,2), 'month' => (int) substr($date,4,2),
'day' => (int) substr($date,6,2), 'day' => (int) substr($date,6,2),
'hour' => (int) substr($date,8,2), 'hour' => (int) substr($date,8,2),
'minute' => (int) substr($date,10,2), 'minute' => (int) substr($date,10,2),
'second' => (int) substr($date,12,2), 'second' => (int) substr($date,12,2),
); );
// fall-through // fall-through
case 'array': // day, month and year keys case 'array': // day, month and year keys
@ -1330,7 +1330,7 @@ class calendar_bo
$timefmt = $this->common_prefs['timeformat'] == 12 ? 'h:i a' : 'H:i'; $timefmt = $this->common_prefs['timeformat'] == 12 ? 'h:i a' : 'H:i';
$month_before_day = strtolower($datefmt[0]) == 'm' || $month_before_day = strtolower($datefmt[0]) == 'm' ||
strtolower($datefmt[2]) == 'm' && $datefmt[4] == 'd'; strtolower($datefmt[2]) == 'm' && $datefmt[4] == 'd';
if ($display_day) if ($display_day)
{ {