@@ -652,11 +652,8 @@ discard block |
||
| 652 | 652 | public function getOccDate(bool $getStart = true): mixed { |
| 653 | 653 | return $getStart ? |
| 654 | 654 | (isset($this->recur['startocc']) ? |
| 655 | - $this->recur['start'] + (((int) $this->recur['startocc']) * 60) : |
|
| 656 | - $this->recur['start']) : |
|
| 657 | - (isset($this->recur['endocc']) ? |
|
| 658 | - $this->recur['start'] + (((int) $this->recur['endocc']) * 60) : |
|
| 659 | - $this->recur['end']); |
|
| 655 | + $this->recur['start'] + (((int) $this->recur['startocc']) * 60) : $this->recur['start']) : (isset($this->recur['endocc']) ? |
|
| 656 | + $this->recur['start'] + (((int) $this->recur['endocc']) * 60) : $this->recur['end']); |
|
| 660 | 657 | } |
| 661 | 658 | |
| 662 | 659 | /** |
@@ -689,8 +686,7 @@ discard block |
||
| 689 | 686 | $end, |
| 690 | 687 | $startocc, |
| 691 | 688 | $endocc |
| 692 | - ) : |
|
| 693 | - sprintf( |
|
| 689 | + ) : sprintf( |
|
| 694 | 690 | dgettext('zarafa', 'Occurs every %s %s effective %s until %s from %s to %s.'), |
| 695 | 691 | $interval, |
| 696 | 692 | $type, |
@@ -699,16 +695,14 @@ discard block |
||
| 699 | 695 | $startocc, |
| 700 | 696 | $endocc |
| 701 | 697 | ) |
| 702 | - ) : |
|
| 703 | - ( |
|
| 698 | + ) : ( |
|
| 704 | 699 | $occSingleDayRank ? |
| 705 | 700 | sprintf( |
| 706 | 701 | dgettext('zarafa', 'Occurs every %s effective %s until %s.'), |
| 707 | 702 | $type, |
| 708 | 703 | $start, |
| 709 | 704 | $end |
| 710 | - ) : |
|
| 711 | - sprintf( |
|
| 705 | + ) : sprintf( |
|
| 712 | 706 | dgettext('zarafa', 'Occurs every %s %s effective %s until %s.'), |
| 713 | 707 | $interval, |
| 714 | 708 | $type, |
@@ -747,8 +741,7 @@ discard block |
||
| 747 | 741 | $numocc, |
| 748 | 742 | $startocc, |
| 749 | 743 | $endocc |
| 750 | - ) : |
|
| 751 | - sprintf( |
|
| 744 | + ) : sprintf( |
|
| 752 | 745 | dngettext( |
| 753 | 746 | 'zarafa', |
| 754 | 747 | 'Occurs every %s %s effective %s for %s occurrence from %s to %s.', |
@@ -762,8 +755,7 @@ discard block |
||
| 762 | 755 | $startocc, |
| 763 | 756 | $endocc |
| 764 | 757 | ) |
| 765 | - ) : |
|
| 766 | - ( |
|
| 758 | + ) : ( |
|
| 767 | 759 | $occSingleDayRank ? |
| 768 | 760 | sprintf( |
| 769 | 761 | dngettext( |
@@ -775,8 +767,7 @@ discard block |
||
| 775 | 767 | $type, |
| 776 | 768 | $start, |
| 777 | 769 | $numocc |
| 778 | - ) : |
|
| 779 | - sprintf( |
|
| 770 | + ) : sprintf( |
|
| 780 | 771 | dngettext( |
| 781 | 772 | 'zarafa', |
| 782 | 773 | 'Occurs every %s %s effective %s for %s occurrence.', |
@@ -812,8 +803,7 @@ discard block |
||
| 812 | 803 | $start, |
| 813 | 804 | $startocc, |
| 814 | 805 | $endocc |
| 815 | - ) : |
|
| 816 | - sprintf( |
|
| 806 | + ) : sprintf( |
|
| 817 | 807 | dgettext('zarafa', 'Occurs every %s %s effective %s from %s to %s.'), |
| 818 | 808 | $interval, |
| 819 | 809 | $type, |
@@ -821,15 +811,13 @@ discard block |
||
| 821 | 811 | $startocc, |
| 822 | 812 | $endocc |
| 823 | 813 | ) |
| 824 | - ) : |
|
| 825 | - ( |
|
| 814 | + ) : ( |
|
| 826 | 815 | $occSingleDayRank ? |
| 827 | 816 | sprintf( |
| 828 | 817 | dgettext('zarafa', 'Occurs every %s effective %s.'), |
| 829 | 818 | $type, |
| 830 | 819 | $start |
| 831 | - ) : |
|
| 832 | - sprintf( |
|
| 820 | + ) : sprintf( |
|
| 833 | 821 | dgettext('zarafa', 'Occurs every %s %s effective %s.'), |
| 834 | 822 | $interval, |
| 835 | 823 | $type, |
@@ -1309,7 +1297,7 @@ discard block |
||
| 1309 | 1297 | else { |
| 1310 | 1298 | $recip[PR_RECIPIENT_FLAGS] = recipReserved | recipExceptionalDeleted | recipSendable; |
| 1311 | 1299 | } |
| 1312 | - $recip[PR_RECIPIENT_TRACKSTATUS] = olResponseNone; // No Response required |
|
| 1300 | + $recip[PR_RECIPIENT_TRACKSTATUS] = olResponseNone; // No Response required |
|
| 1313 | 1301 | } |
| 1314 | 1302 | unset($recip); |
| 1315 | 1303 | mapi_message_modifyrecipients($exception, MODRECIP_MODIFY, $exception_recips['remove']); |
@@ -1384,7 +1372,7 @@ discard block |
||
| 1384 | 1372 | else { |
| 1385 | 1373 | $recipient[PR_RECIPIENT_FLAGS] = recipReserved | recipExceptionalDeleted | recipSendable; |
| 1386 | 1374 | } |
| 1387 | - $recipient[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone; // No Response required |
|
| 1375 | + $recipient[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone; // No Response required |
|
| 1388 | 1376 | $deletedRecipients[] = $recipient; |
| 1389 | 1377 | } |
| 1390 | 1378 | } |