@@ -238,7 +238,7 @@ discard block |
||
| 238 | 238 | // -720 min |
| 239 | 239 | "Dateline Standard Time" => array( |
| 240 | 240 | "Etc/GMT+12", |
| 241 | - ), |
|
| 241 | + ), |
|
| 242 | 242 | |
| 243 | 243 | // -660 min |
| 244 | 244 | "Samoa Standard Time" => array( |
@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | "Pacific/Pago_Pago", |
| 249 | 249 | "Pacific/Samoa", |
| 250 | 250 | "US/Samoa", |
| 251 | - ), |
|
| 251 | + ), |
|
| 252 | 252 | |
| 253 | 253 | // -600 min |
| 254 | 254 | "Hawaiian Standard Time" => array( |
@@ -262,12 +262,12 @@ discard block |
||
| 262 | 262 | "Pacific/Tahiti", |
| 263 | 263 | "US/Aleutian", |
| 264 | 264 | "US/Hawaii", |
| 265 | - ), |
|
| 265 | + ), |
|
| 266 | 266 | |
| 267 | 267 | // -570 min |
| 268 | 268 | "-570" => array( |
| 269 | 269 | "Pacific/Marquesas", |
| 270 | - ), |
|
| 270 | + ), |
|
| 271 | 271 | |
| 272 | 272 | // -540 min |
| 273 | 273 | "Alaskan Standard Time" => array( |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | "Etc/GMT+9", |
| 280 | 280 | "Pacific/Gambier", |
| 281 | 281 | "US/Alaska", |
| 282 | - ), |
|
| 282 | + ), |
|
| 283 | 283 | |
| 284 | 284 | // -480 min |
| 285 | 285 | "Pacific Standard Time" => array( |
@@ -299,7 +299,7 @@ discard block |
||
| 299 | 299 | "PST8PDT", |
| 300 | 300 | "US/Pacific", |
| 301 | 301 | "US/Pacific-New", |
| 302 | - ), |
|
| 302 | + ), |
|
| 303 | 303 | |
| 304 | 304 | // -420 min |
| 305 | 305 | "US Mountain Standard Time" => array( |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | "Navajo", |
| 326 | 326 | "US/Arizona", |
| 327 | 327 | "US/Mountain", |
| 328 | - ), |
|
| 328 | + ), |
|
| 329 | 329 | |
| 330 | 330 | // -360 min |
| 331 | 331 | "Central Standard Time" => array( |
@@ -347,17 +347,17 @@ discard block |
||
| 347 | 347 | "US/Indiana-Starke", |
| 348 | 348 | "CST6CDT", |
| 349 | 349 | "Etc/GMT+6", |
| 350 | - ), |
|
| 350 | + ), |
|
| 351 | 351 | "Canada Central Standard Time" => array( |
| 352 | 352 | "Canada/Central", |
| 353 | 353 | "Canada/East-Saskatchewan", |
| 354 | 354 | "Canada/Saskatchewan", |
| 355 | - ), |
|
| 355 | + ), |
|
| 356 | 356 | "Mexico Standard Time" => array( |
| 357 | 357 | "America/Mexico_City", |
| 358 | 358 | "America/Monterrey", |
| 359 | 359 | "Mexico/General", |
| 360 | - ), |
|
| 360 | + ), |
|
| 361 | 361 | "Central America Standard Time" => array( |
| 362 | 362 | "America/Bahia_Banderas", |
| 363 | 363 | "America/Belize", |
@@ -372,7 +372,7 @@ discard block |
||
| 372 | 372 | "Chile/EasterIsland", |
| 373 | 373 | "Pacific/Easter", |
| 374 | 374 | "Pacific/Galapagos", |
| 375 | - ), |
|
| 375 | + ), |
|
| 376 | 376 | |
| 377 | 377 | // -300 min |
| 378 | 378 | "US Eastern Standard Time" => array( |
@@ -403,7 +403,7 @@ discard block |
||
| 403 | 403 | "US/East-Indiana", |
| 404 | 404 | "US/Eastern", |
| 405 | 405 | "US/Michigan", |
| 406 | - ), |
|
| 406 | + ), |
|
| 407 | 407 | "SA Pacific Standard Time" => array( |
| 408 | 408 | "America/Atikokan", |
| 409 | 409 | "America/Bogota", |
@@ -418,12 +418,12 @@ discard block |
||
| 418 | 418 | "America/Panama", |
| 419 | 419 | "America/Pangnirtung", |
| 420 | 420 | "America/Port-au-Prince", |
| 421 | - ), |
|
| 421 | + ), |
|
| 422 | 422 | |
| 423 | 423 | // -270 min |
| 424 | 424 | "Venezuela Standard Time" => array( |
| 425 | 425 | "America/Caracas", |
| 426 | - ), |
|
| 426 | + ), |
|
| 427 | 427 | // -240 min |
| 428 | 428 | "Atlantic Standard Time" => array( |
| 429 | 429 | "America/Barbados", |
@@ -443,7 +443,7 @@ discard block |
||
| 443 | 443 | "Atlantic/Bermuda", |
| 444 | 444 | "Canada/Atlantic", |
| 445 | 445 | "Etc/GMT+4", |
| 446 | - ), |
|
| 446 | + ), |
|
| 447 | 447 | "SA Western Standard Time" => array( |
| 448 | 448 | "America/Anguilla", |
| 449 | 449 | "America/Antigua", |
@@ -472,19 +472,19 @@ discard block |
||
| 472 | 472 | "America/Rio_Branco", |
| 473 | 473 | "Brazil/Acre", |
| 474 | 474 | "Brazil/West", |
| 475 | - ), |
|
| 475 | + ), |
|
| 476 | 476 | "Pacific SA Standard Time" => array( |
| 477 | 477 | "America/Santiago", |
| 478 | 478 | "America/Santo_Domingo", |
| 479 | 479 | "Antarctica/Palmer", |
| 480 | 480 | "Chile/Continental", |
| 481 | - ), |
|
| 481 | + ), |
|
| 482 | 482 | |
| 483 | 483 | // -210 min |
| 484 | 484 | "Newfoundland and Labrador Standard Time" => array( |
| 485 | 485 | "America/St_Johns", |
| 486 | 486 | "Canada/Newfoundland", |
| 487 | - ), |
|
| 487 | + ), |
|
| 488 | 488 | |
| 489 | 489 | // -180 min |
| 490 | 490 | "E South America Standard Time" => array( |
@@ -497,7 +497,7 @@ discard block |
||
| 497 | 497 | "America/Sao_Paulo", |
| 498 | 498 | "Brazil/East", |
| 499 | 499 | "Etc/GMT+3", |
| 500 | - ), |
|
| 500 | + ), |
|
| 501 | 501 | "SA Eastern Standard Time" => array( |
| 502 | 502 | "America/Argentina/Buenos_Aires", |
| 503 | 503 | "America/Argentina/Catamarca", |
@@ -524,11 +524,11 @@ discard block |
||
| 524 | 524 | "America/Paramaribo", |
| 525 | 525 | "America/Rosario", |
| 526 | 526 | "America/Santarem", |
| 527 | - ), |
|
| 527 | + ), |
|
| 528 | 528 | "Greenland Standard Time" => array( |
| 529 | 529 | "Antarctica/Rothera", |
| 530 | 530 | "Atlantic/Stanley", |
| 531 | - ), |
|
| 531 | + ), |
|
| 532 | 532 | |
| 533 | 533 | // -120 min |
| 534 | 534 | "Mid-Atlantic Standard Time" => array( |
@@ -536,17 +536,17 @@ discard block |
||
| 536 | 536 | "Atlantic/South_Georgia", |
| 537 | 537 | "Brazil/DeNoronha", |
| 538 | 538 | "Etc/GMT+2", |
| 539 | - ), |
|
| 539 | + ), |
|
| 540 | 540 | |
| 541 | 541 | // -60 min |
| 542 | 542 | "Azores Standard Time" => array( |
| 543 | 543 | "Atlantic/Azores", |
| 544 | 544 | "Etc/GMT+1", |
| 545 | - ), |
|
| 545 | + ), |
|
| 546 | 546 | "Cape Verde Standard Time" => array( |
| 547 | 547 | "America/Scoresbysund", |
| 548 | 548 | "Atlantic/Cape_Verde", |
| 549 | - ), |
|
| 549 | + ), |
|
| 550 | 550 | |
| 551 | 551 | // 0 min |
| 552 | 552 | "GMT Standard Time" => array( |
@@ -580,7 +580,7 @@ discard block |
||
| 580 | 580 | "UCT", |
| 581 | 581 | "Universal", |
| 582 | 582 | "UTC", |
| 583 | - ), |
|
| 583 | + ), |
|
| 584 | 584 | "Greenwich Standard Time" => array( |
| 585 | 585 | "Africa/Abidjan", |
| 586 | 586 | "Africa/Accra", |
@@ -606,7 +606,7 @@ discard block |
||
| 606 | 606 | "Atlantic/Reykjavik", |
| 607 | 607 | "Atlantic/St_Helena", |
| 608 | 608 | "Zulu", |
| 609 | - ), |
|
| 609 | + ), |
|
| 610 | 610 | |
| 611 | 611 | // +60 min |
| 612 | 612 | "Central Europe Standard Time" => array( |
@@ -616,7 +616,7 @@ discard block |
||
| 616 | 616 | "Europe/Ljubljana", |
| 617 | 617 | "Europe/Prague", |
| 618 | 618 | "Europe/Vaduz", |
| 619 | - ), |
|
| 619 | + ), |
|
| 620 | 620 | "Central European Standard Time" => array( |
| 621 | 621 | "Europe/Sarajevo", |
| 622 | 622 | "Europe/Skopje", |
@@ -624,7 +624,7 @@ discard block |
||
| 624 | 624 | "Europe/Zagreb", |
| 625 | 625 | "MET", |
| 626 | 626 | "Poland", |
| 627 | - ), |
|
| 627 | + ), |
|
| 628 | 628 | "Romance Standard Time" => array( |
| 629 | 629 | "Europe/Andorra", |
| 630 | 630 | "Europe/Brussels", |
@@ -637,7 +637,7 @@ discard block |
||
| 637 | 637 | "Europe/Podgorica", |
| 638 | 638 | "Europe/San_Marino", |
| 639 | 639 | "Europe/Tirane", |
| 640 | - ), |
|
| 640 | + ), |
|
| 641 | 641 | "W Europe Standard Time" => array( |
| 642 | 642 | "Europe/Amsterdam", |
| 643 | 643 | "Europe/Berlin", |
@@ -652,7 +652,7 @@ discard block |
||
| 652 | 652 | "WET", |
| 653 | 653 | "CET", |
| 654 | 654 | "Etc/GMT-1", |
| 655 | - ), |
|
| 655 | + ), |
|
| 656 | 656 | "W Central Africa Standard Time" => array( |
| 657 | 657 | "Africa/Algiers", |
| 658 | 658 | "Africa/Bangui", |
@@ -670,7 +670,7 @@ discard block |
||
| 670 | 670 | "Africa/Tunis", |
| 671 | 671 | "Africa/Windhoek", |
| 672 | 672 | "Atlantic/Jan_Mayen", |
| 673 | - ), |
|
| 673 | + ), |
|
| 674 | 674 | |
| 675 | 675 | // +120 min |
| 676 | 676 | "E Europe Standard Time" => array( |
@@ -684,13 +684,13 @@ discard block |
||
| 684 | 684 | "Europe/Tiraspol", |
| 685 | 685 | "Europe/Uzhgorod", |
| 686 | 686 | "Europe/Zaporozhye", |
| 687 | - ), |
|
| 687 | + ), |
|
| 688 | 688 | "Egypt Standard Time" => array( |
| 689 | 689 | "Africa/Cairo", |
| 690 | 690 | "Africa/Tripoli", |
| 691 | 691 | "Egypt", |
| 692 | 692 | "Libya", |
| 693 | - ), |
|
| 693 | + ), |
|
| 694 | 694 | "FLE Standard Time" => array( |
| 695 | 695 | "Europe/Helsinki", |
| 696 | 696 | "Europe/Kiev", |
@@ -698,13 +698,13 @@ discard block |
||
| 698 | 698 | "Europe/Sofia", |
| 699 | 699 | "Europe/Tallinn", |
| 700 | 700 | "Europe/Vilnius", |
| 701 | - ), |
|
| 701 | + ), |
|
| 702 | 702 | "GTB Standard Time" => array( |
| 703 | 703 | "Asia/Istanbul", |
| 704 | 704 | "Europe/Athens", |
| 705 | 705 | "Europe/Istanbul", |
| 706 | 706 | "Turkey", |
| 707 | - ), |
|
| 707 | + ), |
|
| 708 | 708 | "Israel Standard Time" => array( |
| 709 | 709 | "Asia/Amman", |
| 710 | 710 | "Asia/Beirut", |
@@ -715,7 +715,7 @@ discard block |
||
| 715 | 715 | "Asia/Tel_Aviv", |
| 716 | 716 | "Asia/Jerusalem", |
| 717 | 717 | "Israel", |
| 718 | - ), |
|
| 718 | + ), |
|
| 719 | 719 | "South Africa Standard Time" => array( |
| 720 | 720 | "Africa/Blantyre", |
| 721 | 721 | "Africa/Bujumbura", |
@@ -728,7 +728,7 @@ discard block |
||
| 728 | 728 | "Africa/Maputo", |
| 729 | 729 | "Africa/Maseru", |
| 730 | 730 | "Africa/Mbabane", |
| 731 | - ), |
|
| 731 | + ), |
|
| 732 | 732 | |
| 733 | 733 | // +180 min |
| 734 | 734 | "Russian Standard Time" => array( |
@@ -736,12 +736,12 @@ discard block |
||
| 736 | 736 | "Europe/Kaliningrad", |
| 737 | 737 | "Europe/Minsk", |
| 738 | 738 | "Etc/GMT-3", |
| 739 | - ), |
|
| 739 | + ), |
|
| 740 | 740 | "Arab Standard Time" => array( |
| 741 | 741 | "Asia/Qatar", |
| 742 | 742 | "Asia/Kuwait", |
| 743 | 743 | "Asia/Riyadh", |
| 744 | - ), |
|
| 744 | + ), |
|
| 745 | 745 | "E Africa Standard Time" => array( |
| 746 | 746 | "Africa/Addis_Ababa", |
| 747 | 747 | "Africa/Asmara", |
@@ -753,7 +753,7 @@ discard block |
||
| 753 | 753 | "Africa/Khartoum", |
| 754 | 754 | "Africa/Mogadishu", |
| 755 | 755 | "Africa/Nairobi", |
| 756 | - ), |
|
| 756 | + ), |
|
| 757 | 757 | "Arabic Standard Time" => array( |
| 758 | 758 | "Asia/Aden", |
| 759 | 759 | "Asia/Baghdad", |
@@ -761,13 +761,13 @@ discard block |
||
| 761 | 761 | "Indian/Antananarivo", |
| 762 | 762 | "Indian/Comoro", |
| 763 | 763 | "Indian/Mayotte", |
| 764 | - ), |
|
| 764 | + ), |
|
| 765 | 765 | |
| 766 | 766 | // +210 min |
| 767 | 767 | "Iran Standard Time" => array( |
| 768 | 768 | "Asia/Tehran", |
| 769 | 769 | "Iran", |
| 770 | - ), |
|
| 770 | + ), |
|
| 771 | 771 | |
| 772 | 772 | // +240 min |
| 773 | 773 | "Arabian Standard Time" => array( |
@@ -776,7 +776,7 @@ discard block |
||
| 776 | 776 | "Indian/Mahe", |
| 777 | 777 | "Indian/Mauritius", |
| 778 | 778 | "Indian/Reunion", |
| 779 | - ), |
|
| 779 | + ), |
|
| 780 | 780 | "Caucasus Standard Time" => array( |
| 781 | 781 | "Asia/Baku", |
| 782 | 782 | "Asia/Tbilisi", |
@@ -786,17 +786,17 @@ discard block |
||
| 786 | 786 | "Europe/Samara", |
| 787 | 787 | "Europe/Volgograd", |
| 788 | 788 | "W-SU", |
| 789 | - ), |
|
| 789 | + ), |
|
| 790 | 790 | |
| 791 | 791 | // +270 min |
| 792 | 792 | "Transitional Islamic State of Afghanistan Standard Time" => array( |
| 793 | 793 | "Asia/Kabul", |
| 794 | - ), |
|
| 794 | + ), |
|
| 795 | 795 | |
| 796 | 796 | // +300 min |
| 797 | 797 | "Ekaterinburg Standard Time" => array( |
| 798 | 798 | "Antarctica/Mawson", |
| 799 | - ), |
|
| 799 | + ), |
|
| 800 | 800 | "West Asia Standard Time" => array( |
| 801 | 801 | "Asia/Aqtau", |
| 802 | 802 | "Asia/Aqtobe", |
@@ -810,29 +810,29 @@ discard block |
||
| 810 | 810 | "Etc/GMT-5", |
| 811 | 811 | "Indian/Kerguelen", |
| 812 | 812 | "Indian/Maldives", |
| 813 | - ), |
|
| 813 | + ), |
|
| 814 | 814 | |
| 815 | 815 | // +330 min |
| 816 | 816 | "India Standard Time" => array( |
| 817 | 817 | "Asia/Calcutta", |
| 818 | 818 | "Asia/Colombo", |
| 819 | 819 | "Asia/Kolkata", |
| 820 | - ), |
|
| 820 | + ), |
|
| 821 | 821 | |
| 822 | 822 | // +345 min |
| 823 | 823 | "Nepal Standard Time" => array( |
| 824 | 824 | "Asia/Kathmandu", |
| 825 | 825 | "Asia/Katmandu", |
| 826 | - ), |
|
| 826 | + ), |
|
| 827 | 827 | |
| 828 | 828 | // +360 min |
| 829 | 829 | "Central Asia Standard Time" => array( |
| 830 | 830 | "Asia/Dacca", |
| 831 | 831 | "Asia/Dhaka", |
| 832 | - ), |
|
| 832 | + ), |
|
| 833 | 833 | "Sri Lanka Standard Time" => array( |
| 834 | 834 | "Indian/Chagos", |
| 835 | - ), |
|
| 835 | + ), |
|
| 836 | 836 | "N Central Asia Standard Time" => array( |
| 837 | 837 | "Antarctica/Vostok", |
| 838 | 838 | "Asia/Almaty", |
@@ -842,13 +842,13 @@ discard block |
||
| 842 | 842 | "Asia/Thimphu", |
| 843 | 843 | "Asia/Yekaterinburg", |
| 844 | 844 | "Etc/GMT-6", |
| 845 | - ), |
|
| 845 | + ), |
|
| 846 | 846 | |
| 847 | 847 | // +390 min |
| 848 | 848 | "Myanmar Standard Time" => array( |
| 849 | 849 | "Asia/Rangoon", |
| 850 | 850 | "Indian/Cocos", |
| 851 | - ), |
|
| 851 | + ), |
|
| 852 | 852 | |
| 853 | 853 | // +420 min |
| 854 | 854 | "SE Asia Standard Time" => array( |
@@ -859,7 +859,7 @@ discard block |
||
| 859 | 859 | "Asia/Phnom_Penh", |
| 860 | 860 | "Asia/Saigon", |
| 861 | 861 | "Indian/Christmas", |
| 862 | - ), |
|
| 862 | + ), |
|
| 863 | 863 | "North Asia Standard Time" => array( |
| 864 | 864 | "Antarctica/Davis", |
| 865 | 865 | "Asia/Novokuznetsk", |
@@ -868,7 +868,7 @@ discard block |
||
| 868 | 868 | "Asia/Pontianak", |
| 869 | 869 | "Asia/Vientiane", |
| 870 | 870 | "Etc/GMT-7", |
| 871 | - ), |
|
| 871 | + ), |
|
| 872 | 872 | |
| 873 | 873 | // +480 min |
| 874 | 874 | "China Standard Time" => array( |
@@ -884,19 +884,19 @@ discard block |
||
| 884 | 884 | "Hongkong", |
| 885 | 885 | "PRC", |
| 886 | 886 | "ROC", |
| 887 | - ), |
|
| 887 | + ), |
|
| 888 | 888 | "Singapore Standard Time" => array( |
| 889 | 889 | "Singapore", |
| 890 | 890 | "Asia/Singapore", |
| 891 | 891 | "Asia/Kuala_Lumpur", |
| 892 | - ), |
|
| 892 | + ), |
|
| 893 | 893 | "Taipei Standard Time" => array( |
| 894 | 894 | "Asia/Taipei", |
| 895 | - ), |
|
| 895 | + ), |
|
| 896 | 896 | "W Australia Standard Time" => array( |
| 897 | 897 | "Australia/Perth", |
| 898 | 898 | "Australia/West", |
| 899 | - ), |
|
| 899 | + ), |
|
| 900 | 900 | "North Asia East Standard Time" => array( |
| 901 | 901 | "Antarctica/Casey", |
| 902 | 902 | "Asia/Kashgar", |
@@ -909,43 +909,43 @@ discard block |
||
| 909 | 909 | "Etc/GMT-8", |
| 910 | 910 | "Asia/Ulaanbaatar", |
| 911 | 911 | "Asia/Ulan_Bator", |
| 912 | - ), |
|
| 912 | + ), |
|
| 913 | 913 | |
| 914 | 914 | // +525 min |
| 915 | 915 | "525" => array( |
| 916 | 916 | "Australia/Eucla", |
| 917 | - ), |
|
| 917 | + ), |
|
| 918 | 918 | |
| 919 | 919 | // +540 min |
| 920 | 920 | "Korea Standard Time" => array( |
| 921 | 921 | "Asia/Seoul", |
| 922 | 922 | "Asia/Pyongyang", |
| 923 | 923 | "ROK", |
| 924 | - ), |
|
| 924 | + ), |
|
| 925 | 925 | "Tokyo Standard Time" => array( |
| 926 | 926 | "Asia/Tokyo", |
| 927 | 927 | "Japan", |
| 928 | 928 | "Etc/GMT-9", |
| 929 | - ), |
|
| 929 | + ), |
|
| 930 | 930 | "Yakutsk Standard Time" => array( |
| 931 | 931 | "Asia/Dili", |
| 932 | 932 | "Asia/Irkutsk", |
| 933 | 933 | "Asia/Jayapura", |
| 934 | 934 | "Pacific/Palau", |
| 935 | - ), |
|
| 935 | + ), |
|
| 936 | 936 | |
| 937 | 937 | // +570 min |
| 938 | 938 | "AUS Central Standard Time" => array( |
| 939 | 939 | "Australia/Darwin", |
| 940 | 940 | "Australia/North", |
| 941 | - ), |
|
| 942 | - // DST |
|
| 941 | + ), |
|
| 942 | + // DST |
|
| 943 | 943 | "Cen Australia Standard Time" => array( |
| 944 | 944 | "Australia/Adelaide", |
| 945 | 945 | "Australia/Broken_Hill", |
| 946 | 946 | "Australia/South", |
| 947 | 947 | "Australia/Yancowinna", |
| 948 | - ), |
|
| 948 | + ), |
|
| 949 | 949 | |
| 950 | 950 | // +600 min |
| 951 | 951 | "AUS Eastern Standard Time" => array( |
@@ -956,20 +956,20 @@ discard block |
||
| 956 | 956 | "Australia/ACT", |
| 957 | 957 | "Australia/NSW", |
| 958 | 958 | "Australia/Victoria", |
| 959 | - ), |
|
| 959 | + ), |
|
| 960 | 960 | "E Australia Standard Time" => array( |
| 961 | 961 | "Etc/GMT-10", |
| 962 | 962 | "Australia/Brisbane", |
| 963 | 963 | "Australia/Queensland", |
| 964 | 964 | "Australia/Lindeman", |
| 965 | - ), |
|
| 965 | + ), |
|
| 966 | 966 | "Tasmania Standard Time" => array( |
| 967 | 967 | "Australia/Hobart", |
| 968 | 968 | "Australia/Tasmania", |
| 969 | - ), |
|
| 969 | + ), |
|
| 970 | 970 | "Vladivostok Standard Time" => array( |
| 971 | 971 | "Antarctica/DumontDUrville", |
| 972 | - ), |
|
| 972 | + ), |
|
| 973 | 973 | "West Pacific Standard Time" => array( |
| 974 | 974 | "Asia/Yakutsk", |
| 975 | 975 | "Pacific/Chuuk", |
@@ -978,13 +978,13 @@ discard block |
||
| 978 | 978 | "Pacific/Saipan", |
| 979 | 979 | "Pacific/Truk", |
| 980 | 980 | "Pacific/Yap", |
| 981 | - ), |
|
| 981 | + ), |
|
| 982 | 982 | |
| 983 | 983 | // +630 min |
| 984 | 984 | "630" => array( |
| 985 | 985 | "Australia/LHI", |
| 986 | 986 | "Australia/Lord_Howe", |
| 987 | - ), |
|
| 987 | + ), |
|
| 988 | 988 | |
| 989 | 989 | // +660 min |
| 990 | 990 | "Central Pacific Standard Time" => array( |
@@ -998,12 +998,12 @@ discard block |
||
| 998 | 998 | "Pacific/Noumea", |
| 999 | 999 | "Pacific/Pohnpei", |
| 1000 | 1000 | "Pacific/Ponape", |
| 1001 | - ), |
|
| 1001 | + ), |
|
| 1002 | 1002 | |
| 1003 | 1003 | // 690 min |
| 1004 | 1004 | "690" => array( |
| 1005 | 1005 | "Pacific/Norfolk", |
| 1006 | - ), |
|
| 1006 | + ), |
|
| 1007 | 1007 | |
| 1008 | 1008 | // +720 min |
| 1009 | 1009 | "Fiji Islands Standard Time" => array( |
@@ -1011,7 +1011,7 @@ discard block |
||
| 1011 | 1011 | "Asia/Kamchatka", |
| 1012 | 1012 | "Asia/Magadan", |
| 1013 | 1013 | "Kwajalein", |
| 1014 | - ), |
|
| 1014 | + ), |
|
| 1015 | 1015 | "New Zealand Standard Time" => array( |
| 1016 | 1016 | "Antarctica/McMurdo", |
| 1017 | 1017 | "Antarctica/South_Pole", |
@@ -1026,13 +1026,13 @@ discard block |
||
| 1026 | 1026 | "Pacific/Tarawa", |
| 1027 | 1027 | "Pacific/Wake", |
| 1028 | 1028 | "Pacific/Wallis", |
| 1029 | - ), |
|
| 1029 | + ), |
|
| 1030 | 1030 | |
| 1031 | 1031 | // +765 min |
| 1032 | 1032 | "765" => array( |
| 1033 | 1033 | "NZ-CHAT", |
| 1034 | 1034 | "Pacific/Chatham", |
| 1035 | - ), |
|
| 1035 | + ), |
|
| 1036 | 1036 | |
| 1037 | 1037 | // +780 min |
| 1038 | 1038 | "Tonga Standard Time" => array( |
@@ -1040,14 +1040,14 @@ discard block |
||
| 1040 | 1040 | "Pacific/Apia", |
| 1041 | 1041 | "Pacific/Enderbury", |
| 1042 | 1042 | "Pacific/Tongatapu", |
| 1043 | - ), |
|
| 1043 | + ), |
|
| 1044 | 1044 | |
| 1045 | 1045 | // +840 min |
| 1046 | 1046 | "840" => array( |
| 1047 | 1047 | "Etc/GMT-14", |
| 1048 | 1048 | "Pacific/Fakaofo", |
| 1049 | 1049 | "Pacific/Kiritimati", |
| 1050 | - ), |
|
| 1050 | + ), |
|
| 1051 | 1051 | ); |
| 1052 | 1052 | |
| 1053 | 1053 | /** |
@@ -8,16 +8,16 @@ |
||
| 8 | 8 | */ |
| 9 | 9 | |
| 10 | 10 | class ServiceUnavailableException extends HTTPReturnCodeException { |
| 11 | - protected $defaultLogLevel = LOGLEVEL_INFO; |
|
| 12 | - protected $httpReturnCode = HTTP_CODE_503; |
|
| 13 | - protected $httpReturnMessage = "Service Unavailable"; |
|
| 14 | - protected $httpHeaders = array(); |
|
| 15 | - protected $showLegal = false; |
|
| 11 | + protected $defaultLogLevel = LOGLEVEL_INFO; |
|
| 12 | + protected $httpReturnCode = HTTP_CODE_503; |
|
| 13 | + protected $httpReturnMessage = "Service Unavailable"; |
|
| 14 | + protected $httpHeaders = array(); |
|
| 15 | + protected $showLegal = false; |
|
| 16 | 16 | |
| 17 | - public function __construct($message = "", $code = 0, $previous = NULL, $logLevel = false) { |
|
| 18 | - parent::__construct($message, $code, $previous, $logLevel); |
|
| 19 | - if (RETRY_AFTER_DELAY !== false) { |
|
| 20 | - $this->httpHeaders[] = 'Retry-After: ' . RETRY_AFTER_DELAY; |
|
| 21 | - } |
|
| 22 | - } |
|
| 17 | + public function __construct($message = "", $code = 0, $previous = NULL, $logLevel = false) { |
|
| 18 | + parent::__construct($message, $code, $previous, $logLevel); |
|
| 19 | + if (RETRY_AFTER_DELAY !== false) { |
|
| 20 | + $this->httpHeaders[] = 'Retry-After: ' . RETRY_AFTER_DELAY; |
|
| 21 | + } |
|
| 22 | + } |
|
| 23 | 23 | } |
@@ -439,13 +439,13 @@ discard block |
||
| 439 | 439 | } |
| 440 | 440 | |
| 441 | 441 | /** |
| 442 | - * This function returns the next remindertime starting from $timestamp |
|
| 443 | - * When no next reminder exists, false is returned. |
|
| 444 | - * |
|
| 445 | - * Note: Before saving this new reminder time (when snoozing), you must check for |
|
| 446 | - * yourself if this reminder time is earlier than your snooze time, else |
|
| 447 | - * use your snooze time and not this reminder time. |
|
| 448 | - */ |
|
| 442 | + * This function returns the next remindertime starting from $timestamp |
|
| 443 | + * When no next reminder exists, false is returned. |
|
| 444 | + * |
|
| 445 | + * Note: Before saving this new reminder time (when snoozing), you must check for |
|
| 446 | + * yourself if this reminder time is earlier than your snooze time, else |
|
| 447 | + * use your snooze time and not this reminder time. |
|
| 448 | + */ |
|
| 449 | 449 | function getNextReminderTime($timestamp) |
| 450 | 450 | { |
| 451 | 451 | /** |
@@ -618,10 +618,10 @@ discard block |
||
| 618 | 618 | } else { |
| 619 | 619 | if ($occSingleDayRank) { |
| 620 | 620 | $pattern = sprintf(ngettext('Occurs every %s effective %s for %s occurence.', |
| 621 | - 'Occurs every %s effective %s for %s occurences.', $numocc), $type, $start, $numocc); |
|
| 621 | + 'Occurs every %s effective %s for %s occurences.', $numocc), $type, $start, $numocc); |
|
| 622 | 622 | } else { |
| 623 | 623 | $pattern = sprintf(ngettext('Occurs every %s %s effective %s for %s occurence.', |
| 624 | - 'Occurs every %s %s effective %s for %s occurences.', $numocc), $everyn, $type, $start, $numocc); |
|
| 624 | + 'Occurs every %s %s effective %s for %s occurences.', $numocc), $everyn, $type, $start, $numocc); |
|
| 625 | 625 | } |
| 626 | 626 | } |
| 627 | 627 | } else if ($term == 0x21) { |
@@ -683,18 +683,18 @@ discard block |
||
| 683 | 683 | */ |
| 684 | 684 | function createExceptionAttachment($exception_props, $exception_recips = array(), $copy_attach_from = false) |
| 685 | 685 | { |
| 686 | - // Create new attachment. |
|
| 687 | - $attachment = mapi_message_createattach($this->message); |
|
| 688 | - $props = array(); |
|
| 689 | - $props[PR_ATTACHMENT_FLAGS] = 2; |
|
| 690 | - $props[PR_ATTACHMENT_HIDDEN] = true; |
|
| 691 | - $props[PR_ATTACHMENT_LINKID] = 0; |
|
| 692 | - $props[PR_ATTACH_FLAGS] = 0; |
|
| 693 | - $props[PR_ATTACH_METHOD] = 5; |
|
| 694 | - $props[PR_DISPLAY_NAME] = "Exception"; |
|
| 695 | - $props[PR_EXCEPTION_STARTTIME] = $this->fromGMT($this->tz, $exception_props[$this->proptags["startdate"]]); |
|
| 696 | - $props[PR_EXCEPTION_ENDTIME] = $this->fromGMT($this->tz, $exception_props[$this->proptags["duedate"]]); |
|
| 697 | - mapi_setprops($attachment, $props); |
|
| 686 | + // Create new attachment. |
|
| 687 | + $attachment = mapi_message_createattach($this->message); |
|
| 688 | + $props = array(); |
|
| 689 | + $props[PR_ATTACHMENT_FLAGS] = 2; |
|
| 690 | + $props[PR_ATTACHMENT_HIDDEN] = true; |
|
| 691 | + $props[PR_ATTACHMENT_LINKID] = 0; |
|
| 692 | + $props[PR_ATTACH_FLAGS] = 0; |
|
| 693 | + $props[PR_ATTACH_METHOD] = 5; |
|
| 694 | + $props[PR_DISPLAY_NAME] = "Exception"; |
|
| 695 | + $props[PR_EXCEPTION_STARTTIME] = $this->fromGMT($this->tz, $exception_props[$this->proptags["startdate"]]); |
|
| 696 | + $props[PR_EXCEPTION_ENDTIME] = $this->fromGMT($this->tz, $exception_props[$this->proptags["duedate"]]); |
|
| 697 | + mapi_setprops($attachment, $props); |
|
| 698 | 698 | |
| 699 | 699 | $imessage = mapi_attach_openobj($attachment, MAPI_CREATE | MAPI_MODIFY); |
| 700 | 700 | |
@@ -748,11 +748,11 @@ discard block |
||
| 748 | 748 | $tempattach = mapi_message_openattach($this->message, $attachRow[PR_ATTACH_NUM]); |
| 749 | 749 | $exception = mapi_attach_openobj($tempattach); |
| 750 | 750 | |
| 751 | - $data = mapi_message_getprops($exception, array($this->proptags["basedate"])); |
|
| 751 | + $data = mapi_message_getprops($exception, array($this->proptags["basedate"])); |
|
| 752 | 752 | |
| 753 | - if($this->dayStartOf($this->fromGMT($this->tz, $data[$this->proptags["basedate"]])) == $this->dayStartOf($base_date)) { |
|
| 754 | - mapi_message_deleteattach($this->message, $attachRow[PR_ATTACH_NUM]); |
|
| 755 | - } |
|
| 753 | + if($this->dayStartOf($this->fromGMT($this->tz, $data[$this->proptags["basedate"]])) == $this->dayStartOf($base_date)) { |
|
| 754 | + mapi_message_deleteattach($this->message, $attachRow[PR_ATTACH_NUM]); |
|
| 755 | + } |
|
| 756 | 756 | } |
| 757 | 757 | } |
| 758 | 758 | |
@@ -1125,19 +1125,19 @@ discard block |
||
| 1125 | 1125 | } |
| 1126 | 1126 | |
| 1127 | 1127 | if (!$found) { |
| 1128 | - $foundInDeletedRecipients = false; |
|
| 1129 | - // Look if the $recipient is in the list of deleted recipients |
|
| 1130 | - if (!empty($deletedRecipients)) { |
|
| 1131 | - foreach($deletedRecipients as $recip) { |
|
| 1132 | - if ($recip[PR_SEARCH_KEY] == $recipient[PR_SEARCH_KEY]){ |
|
| 1133 | - $foundInDeletedRecipients = true; |
|
| 1134 | - break; |
|
| 1135 | - } |
|
| 1136 | - } |
|
| 1137 | - } |
|
| 1138 | - |
|
| 1139 | - // If recipient is not in list of deleted recipient, add him |
|
| 1140 | - if (!$foundInDeletedRecipients) { |
|
| 1128 | + $foundInDeletedRecipients = false; |
|
| 1129 | + // Look if the $recipient is in the list of deleted recipients |
|
| 1130 | + if (!empty($deletedRecipients)) { |
|
| 1131 | + foreach($deletedRecipients as $recip) { |
|
| 1132 | + if ($recip[PR_SEARCH_KEY] == $recipient[PR_SEARCH_KEY]){ |
|
| 1133 | + $foundInDeletedRecipients = true; |
|
| 1134 | + break; |
|
| 1135 | + } |
|
| 1136 | + } |
|
| 1137 | + } |
|
| 1138 | + |
|
| 1139 | + // If recipient is not in list of deleted recipient, add him |
|
| 1140 | + if (!$foundInDeletedRecipients) { |
|
| 1141 | 1141 | if (!isset($recipient[PR_RECIPIENT_FLAGS]) || $recipient[PR_RECIPIENT_FLAGS] != (recipReserved | recipExceptionalDeleted | recipSendable)) { |
| 1142 | 1142 | $recipient[PR_RECIPIENT_FLAGS] = recipSendable | recipExceptionalDeleted; |
| 1143 | 1143 | } else { |
@@ -83,116 +83,116 @@ discard block |
||
| 83 | 83 | $calendaritems = Array(); |
| 84 | 84 | |
| 85 | 85 | $restrict = Array(RES_OR, |
| 86 | - Array( |
|
| 87 | - // OR |
|
| 88 | - // (item[start] >= start && item[start] <= end) |
|
| 89 | - Array(RES_AND, |
|
| 90 | - Array( |
|
| 91 | - Array(RES_PROPERTY, |
|
| 92 | - Array(RELOP => RELOP_GE, |
|
| 93 | - ULPROPTAG => $this->proptags["startdate"], |
|
| 94 | - VALUE => $start |
|
| 95 | - ) |
|
| 96 | - ), |
|
| 97 | - Array(RES_PROPERTY, |
|
| 98 | - Array(RELOP => RELOP_LE, |
|
| 99 | - ULPROPTAG => $this->proptags["startdate"], |
|
| 100 | - VALUE => $end |
|
| 101 | - ) |
|
| 102 | - ) |
|
| 103 | - ) |
|
| 104 | - ), |
|
| 105 | - // OR |
|
| 106 | - // (item[end] >= start && item[end] <= end) |
|
| 107 | - Array(RES_AND, |
|
| 108 | - Array( |
|
| 109 | - Array(RES_PROPERTY, |
|
| 110 | - Array(RELOP => RELOP_GE, |
|
| 111 | - ULPROPTAG => $this->proptags["duedate"], |
|
| 112 | - VALUE => $start |
|
| 113 | - ) |
|
| 114 | - ), |
|
| 115 | - Array(RES_PROPERTY, |
|
| 116 | - Array(RELOP => RELOP_LE, |
|
| 117 | - ULPROPTAG => $this->proptags["duedate"], |
|
| 118 | - VALUE => $end |
|
| 119 | - ) |
|
| 120 | - ) |
|
| 121 | - ) |
|
| 122 | - ), |
|
| 123 | - // OR |
|
| 124 | - // (item[start] < start && item[end] > end) |
|
| 125 | - Array(RES_AND, |
|
| 126 | - Array( |
|
| 127 | - Array(RES_PROPERTY, |
|
| 128 | - Array(RELOP => RELOP_LT, |
|
| 129 | - ULPROPTAG => $this->proptags["startdate"], |
|
| 130 | - VALUE => $start |
|
| 131 | - ) |
|
| 132 | - ), |
|
| 133 | - Array(RES_PROPERTY, |
|
| 134 | - Array(RELOP => RELOP_GT, |
|
| 135 | - ULPROPTAG => $this->proptags["duedate"], |
|
| 136 | - VALUE => $end |
|
| 137 | - ) |
|
| 138 | - ) |
|
| 139 | - ) |
|
| 140 | - ), |
|
| 141 | - // OR |
|
| 142 | - Array(RES_OR, |
|
| 143 | - Array( |
|
| 144 | - // OR |
|
| 145 | - // (EXIST(ecurrence_enddate_property) && item[isRecurring] == true && item[end] >= start) |
|
| 146 | - Array(RES_AND, |
|
| 147 | - Array( |
|
| 148 | - Array(RES_EXIST, |
|
| 149 | - Array(ULPROPTAG => $this->proptags["enddate_recurring"], |
|
| 150 | - ) |
|
| 151 | - ), |
|
| 152 | - Array(RES_PROPERTY, |
|
| 153 | - Array(RELOP => RELOP_EQ, |
|
| 154 | - ULPROPTAG => $this->proptags["recurring"], |
|
| 155 | - VALUE => true |
|
| 156 | - ) |
|
| 157 | - ), |
|
| 158 | - Array(RES_PROPERTY, |
|
| 159 | - Array(RELOP => RELOP_GE, |
|
| 160 | - ULPROPTAG => $this->proptags["enddate_recurring"], |
|
| 161 | - VALUE => $start |
|
| 162 | - ) |
|
| 163 | - ) |
|
| 164 | - ) |
|
| 165 | - ), |
|
| 166 | - // OR |
|
| 167 | - // (!EXIST(ecurrence_enddate_property) && item[isRecurring] == true && item[start] <= end) |
|
| 168 | - Array(RES_AND, |
|
| 169 | - Array( |
|
| 170 | - Array(RES_NOT, |
|
| 171 | - Array( |
|
| 172 | - Array(RES_EXIST, |
|
| 173 | - Array(ULPROPTAG => $this->proptags["enddate_recurring"] |
|
| 174 | - ) |
|
| 175 | - ) |
|
| 176 | - ) |
|
| 177 | - ), |
|
| 178 | - Array(RES_PROPERTY, |
|
| 179 | - Array(RELOP => RELOP_LE, |
|
| 180 | - ULPROPTAG => $this->proptags["startdate"], |
|
| 181 | - VALUE => $end |
|
| 182 | - ) |
|
| 183 | - ), |
|
| 184 | - Array(RES_PROPERTY, |
|
| 185 | - Array(RELOP => RELOP_EQ, |
|
| 186 | - ULPROPTAG => $this->proptags["recurring"], |
|
| 187 | - VALUE => true |
|
| 188 | - ) |
|
| 189 | - ) |
|
| 190 | - ) |
|
| 191 | - ) |
|
| 192 | - ) |
|
| 193 | - ) // EXISTS OR |
|
| 194 | - ) |
|
| 195 | - ); // global OR |
|
| 86 | + Array( |
|
| 87 | + // OR |
|
| 88 | + // (item[start] >= start && item[start] <= end) |
|
| 89 | + Array(RES_AND, |
|
| 90 | + Array( |
|
| 91 | + Array(RES_PROPERTY, |
|
| 92 | + Array(RELOP => RELOP_GE, |
|
| 93 | + ULPROPTAG => $this->proptags["startdate"], |
|
| 94 | + VALUE => $start |
|
| 95 | + ) |
|
| 96 | + ), |
|
| 97 | + Array(RES_PROPERTY, |
|
| 98 | + Array(RELOP => RELOP_LE, |
|
| 99 | + ULPROPTAG => $this->proptags["startdate"], |
|
| 100 | + VALUE => $end |
|
| 101 | + ) |
|
| 102 | + ) |
|
| 103 | + ) |
|
| 104 | + ), |
|
| 105 | + // OR |
|
| 106 | + // (item[end] >= start && item[end] <= end) |
|
| 107 | + Array(RES_AND, |
|
| 108 | + Array( |
|
| 109 | + Array(RES_PROPERTY, |
|
| 110 | + Array(RELOP => RELOP_GE, |
|
| 111 | + ULPROPTAG => $this->proptags["duedate"], |
|
| 112 | + VALUE => $start |
|
| 113 | + ) |
|
| 114 | + ), |
|
| 115 | + Array(RES_PROPERTY, |
|
| 116 | + Array(RELOP => RELOP_LE, |
|
| 117 | + ULPROPTAG => $this->proptags["duedate"], |
|
| 118 | + VALUE => $end |
|
| 119 | + ) |
|
| 120 | + ) |
|
| 121 | + ) |
|
| 122 | + ), |
|
| 123 | + // OR |
|
| 124 | + // (item[start] < start && item[end] > end) |
|
| 125 | + Array(RES_AND, |
|
| 126 | + Array( |
|
| 127 | + Array(RES_PROPERTY, |
|
| 128 | + Array(RELOP => RELOP_LT, |
|
| 129 | + ULPROPTAG => $this->proptags["startdate"], |
|
| 130 | + VALUE => $start |
|
| 131 | + ) |
|
| 132 | + ), |
|
| 133 | + Array(RES_PROPERTY, |
|
| 134 | + Array(RELOP => RELOP_GT, |
|
| 135 | + ULPROPTAG => $this->proptags["duedate"], |
|
| 136 | + VALUE => $end |
|
| 137 | + ) |
|
| 138 | + ) |
|
| 139 | + ) |
|
| 140 | + ), |
|
| 141 | + // OR |
|
| 142 | + Array(RES_OR, |
|
| 143 | + Array( |
|
| 144 | + // OR |
|
| 145 | + // (EXIST(ecurrence_enddate_property) && item[isRecurring] == true && item[end] >= start) |
|
| 146 | + Array(RES_AND, |
|
| 147 | + Array( |
|
| 148 | + Array(RES_EXIST, |
|
| 149 | + Array(ULPROPTAG => $this->proptags["enddate_recurring"], |
|
| 150 | + ) |
|
| 151 | + ), |
|
| 152 | + Array(RES_PROPERTY, |
|
| 153 | + Array(RELOP => RELOP_EQ, |
|
| 154 | + ULPROPTAG => $this->proptags["recurring"], |
|
| 155 | + VALUE => true |
|
| 156 | + ) |
|
| 157 | + ), |
|
| 158 | + Array(RES_PROPERTY, |
|
| 159 | + Array(RELOP => RELOP_GE, |
|
| 160 | + ULPROPTAG => $this->proptags["enddate_recurring"], |
|
| 161 | + VALUE => $start |
|
| 162 | + ) |
|
| 163 | + ) |
|
| 164 | + ) |
|
| 165 | + ), |
|
| 166 | + // OR |
|
| 167 | + // (!EXIST(ecurrence_enddate_property) && item[isRecurring] == true && item[start] <= end) |
|
| 168 | + Array(RES_AND, |
|
| 169 | + Array( |
|
| 170 | + Array(RES_NOT, |
|
| 171 | + Array( |
|
| 172 | + Array(RES_EXIST, |
|
| 173 | + Array(ULPROPTAG => $this->proptags["enddate_recurring"] |
|
| 174 | + ) |
|
| 175 | + ) |
|
| 176 | + ) |
|
| 177 | + ), |
|
| 178 | + Array(RES_PROPERTY, |
|
| 179 | + Array(RELOP => RELOP_LE, |
|
| 180 | + ULPROPTAG => $this->proptags["startdate"], |
|
| 181 | + VALUE => $end |
|
| 182 | + ) |
|
| 183 | + ), |
|
| 184 | + Array(RES_PROPERTY, |
|
| 185 | + Array(RELOP => RELOP_EQ, |
|
| 186 | + ULPROPTAG => $this->proptags["recurring"], |
|
| 187 | + VALUE => true |
|
| 188 | + ) |
|
| 189 | + ) |
|
| 190 | + ) |
|
| 191 | + ) |
|
| 192 | + ) |
|
| 193 | + ) // EXISTS OR |
|
| 194 | + ) |
|
| 195 | + ); // global OR |
|
| 196 | 196 | |
| 197 | 197 | $contents = mapi_folder_getcontentstable($this->calendar); |
| 198 | 198 | mapi_table_restrict($contents, $restrict); |
@@ -266,8 +266,8 @@ discard block |
||
| 266 | 266 | } |
| 267 | 267 | |
| 268 | 268 | /** |
| 269 | - * Sorts by timestamp, if equal, then end before start |
|
| 270 | - */ |
|
| 269 | + * Sorts by timestamp, if equal, then end before start |
|
| 270 | + */ |
|
| 271 | 271 | function cmp($a, $b) |
| 272 | 272 | { |
| 273 | 273 | if ($a["time"] == $b["time"]) { |
@@ -281,9 +281,9 @@ discard block |
||
| 281 | 281 | } |
| 282 | 282 | |
| 283 | 283 | /** |
| 284 | - * Function mergeItems |
|
| 285 | - * @author Steve Hardy |
|
| 286 | - */ |
|
| 284 | + * Function mergeItems |
|
| 285 | + * @author Steve Hardy |
|
| 286 | + */ |
|
| 287 | 287 | function mergeItemsFB($items) |
| 288 | 288 | { |
| 289 | 289 | $merged = Array(); |
@@ -643,7 +643,7 @@ |
||
| 643 | 643 | /* PersistElementType Values ElementIDs for persist data of PR_IPM_OL2007_ENTRYIDS / PR_ADDITIONAL_REN_ENTRYIDS_EX */ |
| 644 | 644 | define('ELEMENT_SENTINEL' ,0x0000); // 0 bytes Indicates that the PersistElement structure is the last one contained in the DataElements field of the PersistData structure. |
| 645 | 645 | define('RSF_ELID_ENTRYID' ,0x0001); // variable Indicates that the ElementData field contains the entry ID of the special folder |
| 646 | - // that is of the type indicated by the value of the PersistID field of the PersistData structure. |
|
| 646 | + // that is of the type indicated by the value of the PersistID field of the PersistData structure. |
|
| 647 | 647 | define('RSF_ELID_HEADER' ,0x0002); // 4 bytes Indicates that the ElementData field contains a 4-byte header value equal to 0x00000000. |
| 648 | 648 | |
| 649 | 649 | define('STGM_DIRECT' ,0x00000000); |
@@ -193,12 +193,12 @@ discard block |
||
| 193 | 193 | function getCalendarItems($store, $calendar, $viewstart, $viewend, $propsrequested){ |
| 194 | 194 | $result = array(); |
| 195 | 195 | $properties = getPropIdsFromStrings($store, Array( "duedate" => "PT_SYSTIME:PSETID_Appointment:0x820e", |
| 196 | - "startdate" => "PT_SYSTIME:PSETID_Appointment:0x820d", |
|
| 197 | - "enddate_recurring" => "PT_SYSTIME:PSETID_Appointment:0x8236", |
|
| 198 | - "recurring" => "PT_BOOLEAN:PSETID_Appointment:0x8223", |
|
| 199 | - "recurring_data" => "PT_BINARY:PSETID_Appointment:0x8216", |
|
| 200 | - "timezone_data" => "PT_BINARY:PSETID_Appointment:0x8233", |
|
| 201 | - "label" => "PT_LONG:PSETID_Appointment:0x8214" |
|
| 196 | + "startdate" => "PT_SYSTIME:PSETID_Appointment:0x820d", |
|
| 197 | + "enddate_recurring" => "PT_SYSTIME:PSETID_Appointment:0x8236", |
|
| 198 | + "recurring" => "PT_BOOLEAN:PSETID_Appointment:0x8223", |
|
| 199 | + "recurring_data" => "PT_BINARY:PSETID_Appointment:0x8216", |
|
| 200 | + "timezone_data" => "PT_BINARY:PSETID_Appointment:0x8233", |
|
| 201 | + "label" => "PT_LONG:PSETID_Appointment:0x8214" |
|
| 202 | 202 | )); |
| 203 | 203 | |
| 204 | 204 | // Create a restriction that will discard rows of appointments that are definitely not in our |
@@ -209,32 +209,32 @@ discard block |
||
| 209 | 209 | $restriction = |
| 210 | 210 | // OR |
| 211 | 211 | Array(RES_OR, |
| 212 | - Array( |
|
| 213 | - Array(RES_AND, // Normal items: itemEnd must be after viewStart, itemStart must be before viewEnd |
|
| 214 | - Array( |
|
| 215 | - Array(RES_PROPERTY, |
|
| 216 | - Array(RELOP => RELOP_GT, |
|
| 217 | - ULPROPTAG => $properties["duedate"], |
|
| 218 | - VALUE => $viewstart |
|
| 219 | - ) |
|
| 220 | - ), |
|
| 221 | - Array(RES_PROPERTY, |
|
| 222 | - Array(RELOP => RELOP_LT, |
|
| 223 | - ULPROPTAG => $properties["startdate"], |
|
| 224 | - VALUE => $viewend |
|
| 225 | - ) |
|
| 226 | - ) |
|
| 227 | - ) |
|
| 228 | - ), |
|
| 229 | - // OR |
|
| 230 | - Array(RES_PROPERTY, |
|
| 231 | - Array(RELOP => RELOP_EQ, |
|
| 232 | - ULPROPTAG => $properties["recurring"], |
|
| 233 | - VALUE => true |
|
| 234 | - ) |
|
| 235 | - ) |
|
| 236 | - ) // EXISTS OR |
|
| 237 | - ); // global OR |
|
| 212 | + Array( |
|
| 213 | + Array(RES_AND, // Normal items: itemEnd must be after viewStart, itemStart must be before viewEnd |
|
| 214 | + Array( |
|
| 215 | + Array(RES_PROPERTY, |
|
| 216 | + Array(RELOP => RELOP_GT, |
|
| 217 | + ULPROPTAG => $properties["duedate"], |
|
| 218 | + VALUE => $viewstart |
|
| 219 | + ) |
|
| 220 | + ), |
|
| 221 | + Array(RES_PROPERTY, |
|
| 222 | + Array(RELOP => RELOP_LT, |
|
| 223 | + ULPROPTAG => $properties["startdate"], |
|
| 224 | + VALUE => $viewend |
|
| 225 | + ) |
|
| 226 | + ) |
|
| 227 | + ) |
|
| 228 | + ), |
|
| 229 | + // OR |
|
| 230 | + Array(RES_PROPERTY, |
|
| 231 | + Array(RELOP => RELOP_EQ, |
|
| 232 | + ULPROPTAG => $properties["recurring"], |
|
| 233 | + VALUE => true |
|
| 234 | + ) |
|
| 235 | + ) |
|
| 236 | + ) // EXISTS OR |
|
| 237 | + ); // global OR |
|
| 238 | 238 | |
| 239 | 239 | // Get requested properties, plus whatever we need |
| 240 | 240 | $proplist = array(PR_ENTRYID, $properties["recurring"], $properties["recurring_data"], $properties["timezone_data"]); |
@@ -611,7 +611,7 @@ discard block |
||
| 611 | 611 | * @param string $newProposedStartTime contains starttime if user has proposed other time |
| 612 | 612 | * @param string $newProposedEndTime contains endtime if user has proposed other time |
| 613 | 613 | * @param string $basedate start of day of occurrence for which user has accepted the recurrent meeting |
| 614 | - * @param boolean $isImported true to indicate that MR is imported from .ics or .vcs file else it false. |
|
| 614 | + * @param boolean $isImported true to indicate that MR is imported from .ics or .vcs file else it false. |
|
| 615 | 615 | * @return string $entryid entryid of item which created/updated in calendar |
| 616 | 616 | */ |
| 617 | 617 | function doAccept($tentative, $sendresponse, $move, $newProposedStartTime=false, $newProposedEndTime=false, $body=false, $userAction = false, $store=false, $basedate = false, $isImported = false) |
@@ -1841,7 +1841,7 @@ discard block |
||
| 1841 | 1841 | |
| 1842 | 1842 | /** |
| 1843 | 1843 | * Function will resolve the user and open its store |
| 1844 | - * @param String $ownerentryid the entryid of the user |
|
| 1844 | + * @param String $ownerentryid the entryid of the user |
|
| 1845 | 1845 | * @return MAPIStore store of the user |
| 1846 | 1846 | */ |
| 1847 | 1847 | function openCustomUserStore($ownerentryid) |
@@ -3752,7 +3752,7 @@ discard block |
||
| 3752 | 3752 | } |
| 3753 | 3753 | |
| 3754 | 3754 | return $localCategories; |
| 3755 | - } |
|
| 3755 | + } |
|
| 3756 | 3756 | |
| 3757 | 3757 | /** |
| 3758 | 3758 | * Helper function which is use to apply local categories on respective occurrences. |
@@ -95,55 +95,55 @@ discard block |
||
| 95 | 95 | } |
| 96 | 96 | |
| 97 | 97 | /** |
| 98 | - * Function for parsing the Recurrence value of a Calendar item. |
|
| 99 | - * |
|
| 100 | - * Retrieve it from Named Property 0x8216 as a PT_BINARY and pass the |
|
| 101 | - * data to this function |
|
| 102 | - * |
|
| 103 | - * Returns a structure containing the data: |
|
| 104 | - * |
|
| 105 | - * type - type of recurrence: day=10, week=11, month=12, year=13 |
|
| 106 | - * subtype - type of day recurrence: 2=monthday (ie 21st day of month), 3=nday'th weekdays (ie. 2nd Tuesday and Wednesday) |
|
| 107 | - * start - unix timestamp of first occurrence |
|
| 108 | - * end - unix timestamp of last occurrence (up to and including), so when start == end -> occurrences = 1 |
|
| 109 | - * numoccur - occurrences (may be very large when there is no end data) |
|
| 110 | - * |
|
| 111 | - * then, for each type: |
|
| 112 | - * |
|
| 113 | - * Daily: |
|
| 114 | - * everyn - every [everyn] days in minutes |
|
| 115 | - * regen - regenerating event (like tasks) |
|
| 116 | - * |
|
| 117 | - * Weekly: |
|
| 118 | - * everyn - every [everyn] weeks in weeks |
|
| 119 | - * regen - regenerating event (like tasks) |
|
| 120 | - * weekdays - bitmask of week days, where each bit is one weekday (weekdays & 1 = Sunday, weekdays & 2 = Monday, etc) |
|
| 121 | - * |
|
| 122 | - * Monthly: |
|
| 123 | - * everyn - every [everyn] months |
|
| 124 | - * regen - regenerating event (like tasks) |
|
| 125 | - * |
|
| 126 | - * subtype 2: |
|
| 127 | - * monthday - on day [monthday] of the month |
|
| 128 | - * |
|
| 129 | - * subtype 3: |
|
| 130 | - * weekdays - bitmask of week days, where each bit is one weekday (weekdays & 1 = Sunday, weekdays & 2 = Monday, etc) |
|
| 131 | - * nday - on [nday]'th [weekdays] of the month |
|
| 132 | - * |
|
| 133 | - * Yearly: |
|
| 134 | - * everyn - every [everyn] months (12, 24, 36, ...) |
|
| 135 | - * month - in month [month] (although the month is encoded in minutes since the startning of the year ........) |
|
| 136 | - * regen - regenerating event (like tasks) |
|
| 137 | - * |
|
| 138 | - * subtype 2: |
|
| 139 | - * monthday - on day [monthday] of the month |
|
| 140 | - * |
|
| 141 | - * subtype 3: |
|
| 142 | - * weekdays - bitmask of week days, where each bit is one weekday (weekdays & 1 = Sunday, weekdays & 2 = Monday, etc) |
|
| 143 | - * nday - on [nday]'th [weekdays] of the month [month] |
|
| 144 | - * @param string $rdata Binary string |
|
| 145 | - * @return array recurrence data. |
|
| 146 | - */ |
|
| 98 | + * Function for parsing the Recurrence value of a Calendar item. |
|
| 99 | + * |
|
| 100 | + * Retrieve it from Named Property 0x8216 as a PT_BINARY and pass the |
|
| 101 | + * data to this function |
|
| 102 | + * |
|
| 103 | + * Returns a structure containing the data: |
|
| 104 | + * |
|
| 105 | + * type - type of recurrence: day=10, week=11, month=12, year=13 |
|
| 106 | + * subtype - type of day recurrence: 2=monthday (ie 21st day of month), 3=nday'th weekdays (ie. 2nd Tuesday and Wednesday) |
|
| 107 | + * start - unix timestamp of first occurrence |
|
| 108 | + * end - unix timestamp of last occurrence (up to and including), so when start == end -> occurrences = 1 |
|
| 109 | + * numoccur - occurrences (may be very large when there is no end data) |
|
| 110 | + * |
|
| 111 | + * then, for each type: |
|
| 112 | + * |
|
| 113 | + * Daily: |
|
| 114 | + * everyn - every [everyn] days in minutes |
|
| 115 | + * regen - regenerating event (like tasks) |
|
| 116 | + * |
|
| 117 | + * Weekly: |
|
| 118 | + * everyn - every [everyn] weeks in weeks |
|
| 119 | + * regen - regenerating event (like tasks) |
|
| 120 | + * weekdays - bitmask of week days, where each bit is one weekday (weekdays & 1 = Sunday, weekdays & 2 = Monday, etc) |
|
| 121 | + * |
|
| 122 | + * Monthly: |
|
| 123 | + * everyn - every [everyn] months |
|
| 124 | + * regen - regenerating event (like tasks) |
|
| 125 | + * |
|
| 126 | + * subtype 2: |
|
| 127 | + * monthday - on day [monthday] of the month |
|
| 128 | + * |
|
| 129 | + * subtype 3: |
|
| 130 | + * weekdays - bitmask of week days, where each bit is one weekday (weekdays & 1 = Sunday, weekdays & 2 = Monday, etc) |
|
| 131 | + * nday - on [nday]'th [weekdays] of the month |
|
| 132 | + * |
|
| 133 | + * Yearly: |
|
| 134 | + * everyn - every [everyn] months (12, 24, 36, ...) |
|
| 135 | + * month - in month [month] (although the month is encoded in minutes since the startning of the year ........) |
|
| 136 | + * regen - regenerating event (like tasks) |
|
| 137 | + * |
|
| 138 | + * subtype 2: |
|
| 139 | + * monthday - on day [monthday] of the month |
|
| 140 | + * |
|
| 141 | + * subtype 3: |
|
| 142 | + * weekdays - bitmask of week days, where each bit is one weekday (weekdays & 1 = Sunday, weekdays & 2 = Monday, etc) |
|
| 143 | + * nday - on [nday]'th [weekdays] of the month [month] |
|
| 144 | + * @param string $rdata Binary string |
|
| 145 | + * @return array recurrence data. |
|
| 146 | + */ |
|
| 147 | 147 | function parseRecurrence($rdata) |
| 148 | 148 | { |
| 149 | 149 | if (strlen($rdata) < 10) { |
@@ -1355,31 +1355,31 @@ discard block |
||
| 1355 | 1355 | } |
| 1356 | 1356 | |
| 1357 | 1357 | /** |
| 1358 | - * Function which converts a recurrence date timestamp to an unix date timestamp. |
|
| 1359 | - * @author Steve Hardy |
|
| 1360 | - * @param Int $rdate the date which will be converted |
|
| 1361 | - * @return Int the converted date |
|
| 1362 | - */ |
|
| 1358 | + * Function which converts a recurrence date timestamp to an unix date timestamp. |
|
| 1359 | + * @author Steve Hardy |
|
| 1360 | + * @param Int $rdate the date which will be converted |
|
| 1361 | + * @return Int the converted date |
|
| 1362 | + */ |
|
| 1363 | 1363 | function recurDataToUnixData($rdate) |
| 1364 | 1364 | { |
| 1365 | 1365 | return ($rdate - 194074560) * 60 ; |
| 1366 | 1366 | } |
| 1367 | 1367 | |
| 1368 | 1368 | /** |
| 1369 | - * Function which converts an unix date timestamp to recurrence date timestamp. |
|
| 1370 | - * @author Johnny Biemans |
|
| 1371 | - * @param Date $date the date which will be converted |
|
| 1372 | - * @return Int the converted date in minutes |
|
| 1373 | - */ |
|
| 1369 | + * Function which converts an unix date timestamp to recurrence date timestamp. |
|
| 1370 | + * @author Johnny Biemans |
|
| 1371 | + * @param Date $date the date which will be converted |
|
| 1372 | + * @return Int the converted date in minutes |
|
| 1373 | + */ |
|
| 1374 | 1374 | function unixDataToRecurData($date) |
| 1375 | 1375 | { |
| 1376 | 1376 | return ($date / 60) + 194074560; |
| 1377 | 1377 | } |
| 1378 | 1378 | |
| 1379 | 1379 | /** |
| 1380 | - * gmtime() doesn't exist in standard PHP, so we have to implement it ourselves |
|
| 1381 | - * @author Steve Hardy |
|
| 1382 | - */ |
|
| 1380 | + * gmtime() doesn't exist in standard PHP, so we have to implement it ourselves |
|
| 1381 | + * @author Steve Hardy |
|
| 1382 | + */ |
|
| 1383 | 1383 | function GetTZOffset($ts) |
| 1384 | 1384 | { |
| 1385 | 1385 | $Offset = date("O", $ts); |
@@ -1392,11 +1392,11 @@ discard block |
||
| 1392 | 1392 | } |
| 1393 | 1393 | |
| 1394 | 1394 | /** |
| 1395 | - * gmtime() doesn't exist in standard PHP, so we have to implement it ourselves |
|
| 1396 | - * @author Steve Hardy |
|
| 1397 | - * @param Date $time |
|
| 1398 | - * @return Date GMT Time |
|
| 1399 | - */ |
|
| 1395 | + * gmtime() doesn't exist in standard PHP, so we have to implement it ourselves |
|
| 1396 | + * @author Steve Hardy |
|
| 1397 | + * @param Date $time |
|
| 1398 | + * @return Date GMT Time |
|
| 1399 | + */ |
|
| 1400 | 1400 | function gmtime($time) |
| 1401 | 1401 | { |
| 1402 | 1402 | $TZOffset = $this->GetTZOffset($time); |
@@ -60,5 +60,5 @@ |
||
| 60 | 60 | |
| 61 | 61 | // Tell the PHP extension which exception class to instantiate |
| 62 | 62 | if (function_exists('mapi_enable_exceptions')) { |
| 63 | - //mapi_enable_exceptions("mapiexception"); |
|
| 63 | + //mapi_enable_exceptions("mapiexception"); |
|
| 64 | 64 | } |