@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | ); |
106 | 106 | if ($location == 'admin') |
107 | 107 | { |
108 | - display_section(self::$appname,$file); |
|
108 | + display_section(self::$appname,$file); |
|
109 | 109 | } |
110 | 110 | else |
111 | 111 | { |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | 'yes' => lang('Yes') |
129 | 129 | ); |
130 | 130 | |
131 | - $settings = array( |
|
131 | + $settings = array( |
|
132 | 132 | 'startfolder' => array( |
133 | 133 | 'type' => 'input', |
134 | 134 | 'name' => 'startfolder', |
@@ -123,7 +123,7 @@ |
||
123 | 123 | } |
124 | 124 | // Custom fields |
125 | 125 | if($content && strpos($content, '#') !== 0) |
126 | - { |
|
126 | + { |
|
127 | 127 | // Expand link-to custom fields |
128 | 128 | $this->cf_link_to_expand($file, $content, $info); |
129 | 129 |
@@ -1909,7 +1909,7 @@ |
||
1909 | 1909 | WHERE cal_id='.(int)$row['cal_id'].' AND cal_start='.(int)$row['cal_start'],__LINE__,__FILE__); |
1910 | 1910 | } |
1911 | 1911 | |
1912 | - $GLOBALS['egw_setup']->db->query('UPDATE egw_cal_repeats SET recur_interval=1 |
|
1912 | + $GLOBALS['egw_setup']->db->query('UPDATE egw_cal_repeats SET recur_interval=1 |
|
1913 | 1913 | WHERE recur_interval=0',__LINE__,__FILE__); |
1914 | 1914 | |
1915 | 1915 | return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.007'; |
@@ -32,8 +32,8 @@ |
||
32 | 32 | protected static $conditions = array('exists'); |
33 | 33 | |
34 | 34 | /** |
35 | - * For figuring out if an entry has changed |
|
36 | - */ |
|
35 | + * For figuring out if an entry has changed |
|
36 | + */ |
|
37 | 37 | protected $tracking; |
38 | 38 | |
39 | 39 | /** |
@@ -1490,13 +1490,13 @@ discard block |
||
1490 | 1490 | } |
1491 | 1491 | |
1492 | 1492 | /** |
1493 | - * Converts a participant into a (readable) user- or resource-name |
|
1494 | - * |
|
1495 | - * @param string|int $id id of user or resource |
|
1496 | - * @param string|boolean $use_type =false type-letter or false |
|
1497 | - * @param boolean $append_email =false append email (Name <email>) |
|
1498 | - * @return string with name |
|
1499 | - */ |
|
1493 | + * Converts a participant into a (readable) user- or resource-name |
|
1494 | + * |
|
1495 | + * @param string|int $id id of user or resource |
|
1496 | + * @param string|boolean $use_type =false type-letter or false |
|
1497 | + * @param boolean $append_email =false append email (Name <email>) |
|
1498 | + * @return string with name |
|
1499 | + */ |
|
1500 | 1500 | function participant_name($id,$use_type=false, $append_email=false) |
1501 | 1501 | { |
1502 | 1502 | static $id2lid = array(); |
@@ -1525,13 +1525,13 @@ discard block |
||
1525 | 1525 | } |
1526 | 1526 | |
1527 | 1527 | /** |
1528 | - * Converts participants array of an event into array of (readable) participant-names with status |
|
1529 | - * |
|
1530 | - * @param array $event event-data |
|
1531 | - * @param boolean $long_status =false should the long/verbose status or an icon be use |
|
1532 | - * @param boolean $show_group_invitation =false show group-invitations (status == 'G') or not (default) |
|
1533 | - * @return array with id / names with status pairs |
|
1534 | - */ |
|
1528 | + * Converts participants array of an event into array of (readable) participant-names with status |
|
1529 | + * |
|
1530 | + * @param array $event event-data |
|
1531 | + * @param boolean $long_status =false should the long/verbose status or an icon be use |
|
1532 | + * @param boolean $show_group_invitation =false show group-invitations (status == 'G') or not (default) |
|
1533 | + * @return array with id / names with status pairs |
|
1534 | + */ |
|
1535 | 1535 | function participants($event,$long_status=false,$show_group_invitation=false) |
1536 | 1536 | { |
1537 | 1537 | //error_log(__METHOD__.__LINE__.array2string($event['participants'])); |
@@ -1601,12 +1601,12 @@ discard block |
||
1601 | 1601 | } |
1602 | 1602 | |
1603 | 1603 | /** |
1604 | - * Converts category string of an event into array of (readable) category-names |
|
1605 | - * |
|
1606 | - * @param string $category cat-id (multiple id's commaseparated) |
|
1607 | - * @param int $color color of the category, if multiple cats, the color of the last one with color is returned |
|
1608 | - * @return array with id / names |
|
1609 | - */ |
|
1604 | + * Converts category string of an event into array of (readable) category-names |
|
1605 | + * |
|
1606 | + * @param string $category cat-id (multiple id's commaseparated) |
|
1607 | + * @param int $color color of the category, if multiple cats, the color of the last one with color is returned |
|
1608 | + * @return array with id / names |
|
1609 | + */ |
|
1610 | 1610 | function categories($category,&$color) |
1611 | 1611 | { |
1612 | 1612 | static $id2cat = array(); |
@@ -1504,22 +1504,22 @@ discard block |
||
1504 | 1504 | // check the old list against the new list |
1505 | 1505 | foreach ($old_event['participants'] as $userid => $status) |
1506 | 1506 | { |
1507 | - if (!isset($new_event['participants'][$userid])){ |
|
1508 | - // Attendee will be deleted this way |
|
1509 | - $new_event['participants'][$userid] = 'G'; |
|
1510 | - } |
|
1511 | - elseif ($new_event['participants'][$userid] == $status) |
|
1512 | - { |
|
1513 | - // Same status -- nothing to do. |
|
1514 | - unset($new_event['participants'][$userid]); |
|
1515 | - } |
|
1507 | + if (!isset($new_event['participants'][$userid])){ |
|
1508 | + // Attendee will be deleted this way |
|
1509 | + $new_event['participants'][$userid] = 'G'; |
|
1510 | + } |
|
1511 | + elseif ($new_event['participants'][$userid] == $status) |
|
1512 | + { |
|
1513 | + // Same status -- nothing to do. |
|
1514 | + unset($new_event['participants'][$userid]); |
|
1515 | + } |
|
1516 | 1516 | } |
1517 | 1517 | // write the changes |
1518 | 1518 | foreach ($new_event['participants'] as $userid => $status) |
1519 | 1519 | { |
1520 | 1520 | $this->set_status($old_event, $userid, $status, $recur_date, true, false,$skip_notification); |
1521 | 1521 | } |
1522 | - } |
|
1522 | + } |
|
1523 | 1523 | |
1524 | 1524 | /** |
1525 | 1525 | * deletes an event |
@@ -2493,24 +2493,24 @@ discard block |
||
2493 | 2493 | /** |
2494 | 2494 | * classifies an incoming event from the eGW point-of-view |
2495 | 2495 | * |
2496 | - * exceptions: unlike other calendar apps eGW does not create an event exception |
|
2497 | - * if just the participant state changes - therefore we have to distinguish between |
|
2498 | - * real exceptions and status only exceptions |
|
2499 | - * |
|
2500 | - * @param array $event the event to check |
|
2501 | - * |
|
2502 | - * @return array |
|
2503 | - * type => |
|
2504 | - * SINGLE a single event |
|
2505 | - * SERIES-MASTER the series master |
|
2506 | - * SERIES-EXCEPTION event is a real exception |
|
2507 | - * SERIES-PSEUDO-EXCEPTION event is a status only exception |
|
2508 | - * SERIES-EXCEPTION-PROPAGATE event was a status only exception in the past and is now a real exception |
|
2509 | - * stored_event => if event already exists in the database array with event data or false |
|
2510 | - * master_event => for event type SERIES-EXCEPTION, SERIES-PSEUDO-EXCEPTION or SERIES-EXCEPTION-PROPAGATE |
|
2511 | - * the corresponding series master event array |
|
2512 | - * NOTE: this param is false if event is of type SERIES-MASTER |
|
2513 | - */ |
|
2496 | + * exceptions: unlike other calendar apps eGW does not create an event exception |
|
2497 | + * if just the participant state changes - therefore we have to distinguish between |
|
2498 | + * real exceptions and status only exceptions |
|
2499 | + * |
|
2500 | + * @param array $event the event to check |
|
2501 | + * |
|
2502 | + * @return array |
|
2503 | + * type => |
|
2504 | + * SINGLE a single event |
|
2505 | + * SERIES-MASTER the series master |
|
2506 | + * SERIES-EXCEPTION event is a real exception |
|
2507 | + * SERIES-PSEUDO-EXCEPTION event is a status only exception |
|
2508 | + * SERIES-EXCEPTION-PROPAGATE event was a status only exception in the past and is now a real exception |
|
2509 | + * stored_event => if event already exists in the database array with event data or false |
|
2510 | + * master_event => for event type SERIES-EXCEPTION, SERIES-PSEUDO-EXCEPTION or SERIES-EXCEPTION-PROPAGATE |
|
2511 | + * the corresponding series master event array |
|
2512 | + * NOTE: this param is false if event is of type SERIES-MASTER |
|
2513 | + */ |
|
2514 | 2514 | function get_event_info($event) |
2515 | 2515 | { |
2516 | 2516 | $type = 'SINGLE'; // default |
@@ -2681,16 +2681,16 @@ discard block |
||
2681 | 2681 | 'stored_event' => $stored_event, |
2682 | 2682 | 'master_event' => $master_event, |
2683 | 2683 | ); |
2684 | - } |
|
2685 | - |
|
2686 | - /** |
|
2687 | - * Translates all timestamps for a given event from server-time to user-time. |
|
2688 | - * The update() and save() methods expect timestamps in user-time. |
|
2689 | - * @param &$event the event we are working on |
|
2690 | - * |
|
2691 | - */ |
|
2692 | - function server2usertime (&$event) |
|
2693 | - { |
|
2684 | + } |
|
2685 | + |
|
2686 | + /** |
|
2687 | + * Translates all timestamps for a given event from server-time to user-time. |
|
2688 | + * The update() and save() methods expect timestamps in user-time. |
|
2689 | + * @param &$event the event we are working on |
|
2690 | + * |
|
2691 | + */ |
|
2692 | + function server2usertime (&$event) |
|
2693 | + { |
|
2694 | 2694 | // we run all dates through date2usertime, to adjust to user-time |
2695 | 2695 | foreach(array('start','end','recur_enddate','recurrence') as $ts) |
2696 | 2696 | { |
@@ -2713,7 +2713,7 @@ discard block |
||
2713 | 2713 | $event['alarm'][$id]['time'] = $this->date2usertime($alarm['time']); |
2714 | 2714 | } |
2715 | 2715 | } |
2716 | - } |
|
2716 | + } |
|
2717 | 2717 | /** |
2718 | 2718 | * Delete events that are more than $age years old |
2719 | 2719 | * |
@@ -326,20 +326,20 @@ discard block |
||
326 | 326 | } |
327 | 327 | |
328 | 328 | /** |
329 | - * Table plugin for event |
|
330 | - * Lists events for a certain day of the week. Only works for one week at a time, so for multiple weeks, |
|
331 | - * use multiple date ranges. |
|
332 | - * |
|
333 | - * Use: |
|
334 | - * $$table/Monday$$ $$starttime$$ $$title$$ $$endtable$$ |
|
335 | - * The day of the week may be language specific (date('l')). |
|
336 | - * |
|
337 | - * @param string $plugin (Monday-Sunday) |
|
338 | - * @param int/array date or date range |
|
339 | - * @param int $n Row number |
|
340 | - * @param string $repeat Text being repeated for each entry |
|
341 | - * @return array |
|
342 | - */ |
|
329 | + * Table plugin for event |
|
330 | + * Lists events for a certain day of the week. Only works for one week at a time, so for multiple weeks, |
|
331 | + * use multiple date ranges. |
|
332 | + * |
|
333 | + * Use: |
|
334 | + * $$table/Monday$$ $$starttime$$ $$title$$ $$endtable$$ |
|
335 | + * The day of the week may be language specific (date('l')). |
|
336 | + * |
|
337 | + * @param string $plugin (Monday-Sunday) |
|
338 | + * @param int/array date or date range |
|
339 | + * @param int $n Row number |
|
340 | + * @param string $repeat Text being repeated for each entry |
|
341 | + * @return array |
|
342 | + */ |
|
343 | 343 | public function day_plugin($plugin,$date,$n,$repeat) |
344 | 344 | { |
345 | 345 | static $days = null; |
@@ -414,16 +414,16 @@ discard block |
||
414 | 414 | } |
415 | 415 | |
416 | 416 | /** |
417 | - * Table plugin for a certain date |
|
418 | - * |
|
419 | - * Can be either a particular date (2011-02-15) or a day of the month (15) |
|
420 | - * |
|
421 | - * @param string $plugin |
|
422 | - * @param int $id ID for this record |
|
423 | - * @param int $n Repeated row number |
|
424 | - * @param string $repeat Text being repeated for each entry |
|
425 | - * @return array |
|
426 | - */ |
|
417 | + * Table plugin for a certain date |
|
418 | + * |
|
419 | + * Can be either a particular date (2011-02-15) or a day of the month (15) |
|
420 | + * |
|
421 | + * @param string $plugin |
|
422 | + * @param int $id ID for this record |
|
423 | + * @param int $n Repeated row number |
|
424 | + * @param string $repeat Text being repeated for each entry |
|
425 | + * @return array |
|
426 | + */ |
|
427 | 427 | public function day($plugin,$id,$n,$repeat) |
428 | 428 | { |
429 | 429 | static $days = null; |
@@ -515,15 +515,15 @@ discard block |
||
515 | 515 | } |
516 | 516 | |
517 | 517 | /** |
518 | - * Table plugin for participants |
|
519 | - * |
|
520 | - * Copied from eventmgr resources |
|
521 | - * |
|
522 | - * @param string $plugin |
|
523 | - * @param int $id |
|
524 | - * @param int $n |
|
525 | - * @return array |
|
526 | - */ |
|
518 | + * Table plugin for participants |
|
519 | + * |
|
520 | + * Copied from eventmgr resources |
|
521 | + * |
|
522 | + * @param string $plugin |
|
523 | + * @param int $id |
|
524 | + * @param int $n |
|
525 | + * @return array |
|
526 | + */ |
|
527 | 527 | public function participant($plugin,$id,$n) |
528 | 528 | { |
529 | 529 | unset($plugin); // not used, but required by function signature |
@@ -582,7 +582,7 @@ discard block |
||
582 | 582 | { |
583 | 583 | foreach($resource as $name => $value) |
584 | 584 | { |
585 | - $replacements['$$'.$name.'$$'] = $value; |
|
585 | + $replacements['$$'.$name.'$$'] = $value; |
|
586 | 586 | } |
587 | 587 | } |
588 | 588 | break; |
@@ -323,17 +323,17 @@ |
||
323 | 323 | $days = $states['days']; |
324 | 324 | $ui = new calendar_uiviews($states); |
325 | 325 | if (!$days) |
326 | - { |
|
327 | - $days = isset($_GET['days']) ? $_GET['days'] : $ui->cal_prefs['days_in_weekview']; |
|
328 | - if ($days != 5) $days = 7; |
|
329 | - } |
|
326 | + { |
|
327 | + $days = isset($_GET['days']) ? $_GET['days'] : $ui->cal_prefs['days_in_weekview']; |
|
328 | + if ($days != 5) $days = 7; |
|
329 | + } |
|
330 | 330 | if ($states['view'] == 'week' && $days == 4) // next 4 days view |
331 | - { |
|
332 | - $query['start'] = $this->bo->date2ts($states['date']); |
|
333 | - $query['end'] = strtotime("+$days days",$query['start']) - 1; |
|
334 | - } |
|
335 | - else |
|
336 | - { |
|
331 | + { |
|
332 | + $query['start'] = $this->bo->date2ts($states['date']); |
|
333 | + $query['end'] = strtotime("+$days days",$query['start']) - 1; |
|
334 | + } |
|
335 | + else |
|
336 | + { |
|
337 | 337 | $query['start'] = $ui->datetime->get_weekday_start($states['year'],$states['month'],$states['day']); |
338 | 338 | if ($days == 5) // no weekend-days |
339 | 339 | { |
@@ -132,10 +132,10 @@ discard block |
||
132 | 132 | } |
133 | 133 | |
134 | 134 | /** |
135 | - * Do some magic with the participants and recurrance. |
|
136 | - * If this is one of a recurring event, append the recur_date to the participant field so we can |
|
137 | - * filter by it later. |
|
138 | - */ |
|
135 | + * Do some magic with the participants and recurrance. |
|
136 | + * If this is one of a recurring event, append the recur_date to the participant field so we can |
|
137 | + * filter by it later. |
|
138 | + */ |
|
139 | 139 | if(is_array($data['participants'])) |
140 | 140 | { |
141 | 141 | $participants = $data['participants']; |
@@ -195,10 +195,10 @@ discard block |
||
195 | 195 | } |
196 | 196 | |
197 | 197 | /** |
198 | - * Do some magic with the participants and recurrance. |
|
199 | - * If this is one of a recurring event, append the recur_date to the participant field so we can |
|
200 | - * filter by it later. |
|
201 | - */ |
|
198 | + * Do some magic with the participants and recurrance. |
|
199 | + * If this is one of a recurring event, append the recur_date to the participant field so we can |
|
200 | + * filter by it later. |
|
201 | + */ |
|
202 | 202 | protected function alter_participants($participants) |
203 | 203 | { |
204 | 204 | $data = array(); |