Fixed ACL problem in oxchange plugin

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@492 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/personal/connectivity/class_oxchangeAccount.inc b/plugins/personal/connectivity/class_oxchangeAccount.inc
index 6da63562b784047a38326c1d46c0ff41602bcaaa..9108b92cb1d0884e299f4d2538315d065b344b85 100644 (file)
--- a/plugins/personal/connectivity/class_oxchangeAccount.inc
+++ b/plugins/personal/connectivity/class_oxchangeAccount.inc
@@ -16,7 +16,7 @@ class oxchangeAccount extends plugin
   var $OXTimeZone="GMT";
   var $writeGlobalAddressBook="FALSE";
   var $mailEnabled="OK";
-  
+
   /* attribute list for save action */
   var $attributes= array("OXAppointmentDays", "OXTaskDays", "OXTimeZone","writeGlobalAddressBook","mailEnabled");
   var $objectclasses= array("OXUserObject");
@@ -25,692 +25,694 @@ class oxchangeAccount extends plugin
   var $oxconf = array();
 
   var $timezones=array(
-    "Africa/Abidjan",
-    "Africa/Accra",
-    "Africa/Addis_Ababa",
-    "Africa/Algiers",
-    "Africa/Asmera",
-    "Africa/Bamako",
-    "Africa/Bangui",
-    "Africa/Banjul",
-    "Africa/Bissau",
-    "Africa/Blantyre",
-    "Africa/Brazzaville",
-    "Africa/Bujumbura",
-    "Africa/Cairo",
-    "Africa/Casablanca",
-    "Africa/Ceuta",
-    "Africa/Conakry",
-    "Africa/Dakar",
-    "Africa/Dar_es_Salaam",
-    "Africa/Djibouti",
-    "Africa/Douala",
-    "Africa/El_Aaiun",
-    "Africa/Freetown",
-    "Africa/Gaborone",
-    "Africa/Harare",
-    "Africa/Johannesburg",
-    "Africa/Kampala",
-    "Africa/Khartoum",
-    "Africa/Kigali",
-    "Africa/Kinshasa",
-    "Africa/Lagos",
-    "Africa/Libreville",
-    "Africa/Lome",
-    "Africa/Luanda",
-    "Africa/Lubumbashi",
-    "Africa/Lusaka",
-    "Africa/Malabo",
-    "Africa/Maputo",
-    "Africa/Maseru",
-    "Africa/Mbabane",
-    "Africa/Mogadishu",
-    "Africa/Monrovia",
-    "Africa/Nairobi",
-    "Africa/Ndjamena",
-    "Africa/Niamey",
-    "Africa/Nouakchott",
-    "Africa/Ouagadougou",
-    "Africa/Porto-Novo",
-    "Africa/Sao_Tome",
-    "Africa/Timbuktu",
-    "Africa/Tripoli",
-    "Africa/Tunis",
-    "Africa/Windhoek",
-    "America/Adak",
-    "America/Anchorage",
-    "America/Anguilla",
-    "America/Antigua",
-    "America/Araguaina",
-    "America/Aruba",
-    "America/Asuncion",
-    "America/Atka",
-    "America/Barbados",
-    "America/Belem",
-    "America/Belize",
-    "America/Boa_Vista",
-    "America/Bogota",
-    "America/Boise",
-    "America/Buenos_Aires",
-    "America/Cambridge_Bay",
-    "America/Cancun",
-    "America/Caracas",
-    "America/Catamarca",
-    "America/Cayenne",
-    "America/Cayman",
-    "America/Chicago",
-    "America/Chihuahua",
-    "America/Cordoba",
-    "America/Costa_Rica",
-    "America/Cuiaba",
-    "America/Curacao",
-    "America/Danmarkshavn",
-    "America/Dawson",
-    "America/Dawson_Creek",
-    "America/Denver",
-    "America/Detroit",
-    "America/Dominica",
-    "America/Edmonton",
-    "America/Eirunepe",
-    "America/El_Salvador",
-    "America/Ensenada",
-    "America/Fortaleza",
-    "America/Fort_Wayne",
-    "America/Glace_Bay",
-    "America/Godthab",
-    "America/Goose_Bay",
-    "America/Grand_Turk",
-    "America/Grenada",
-    "America/Guadeloupe",
-    "America/Guatemala",
-    "America/Guayaquil",
-    "America/Guyana",
-    "America/Halifax",
-    "America/Havana",
-    "America/Hermosillo",
-    "America/Indiana",
-    "America/Indiana/Indianapolis",
-    "America/Indiana/Knox",
-    "America/Indiana/Marengo",
-    "America/Indiana/Vevay",
-    "America/Indianapolis",
-    "America/Inuvik",
-    "America/Iqaluit",
-    "America/Jamaica",
-    "America/Jujuy",
-    "America/Juneau",
-    "America/Kentucky",
-    "America/Kentucky/Louisville",
-    "America/Kentucky/Monticello",
-    "America/Knox_IN",
-    "America/La_Paz",
-    "America/Lima",
-    "America/Los_Angeles",
-    "America/Louisville",
-    "America/Maceio",
-    "America/Managua",
-    "America/Manaus",
-    "America/Martinique",
-    "America/Mazatlan",
-    "America/Mendoza",
-    "America/Menominee",
-    "America/Merida",
-    "America/Mexico_City",
-    "America/Miquelon",
-    "America/Monterrey",
-    "America/Montevideo",
-    "America/Montreal",
-    "America/Montserrat",
-    "America/Nassau",
-    "America/New_York",
-    "America/Nipigon",
-    "America/Nome",
-    "America/Noronha",
-    "America/North_Dakota",
-    "America/North_Dakota/Center",
-    "America/Panama",
-    "America/Pangnirtung",
-    "America/Paramaribo",
-    "America/Phoenix",
-    "America/Port-au-Prince",
-    "America/Porto_Acre",
-    "America/Porto_Velho",
-    "America/Port_of_Spain",
-    "America/Puerto_Rico",
-    "America/Rainy_River",
-    "America/Rankin_Inlet",
-    "America/Recife",
-    "America/Regina",
-    "America/Rio_Branco",
-    "America/Rosario",
-    "America/Santiago",
-    "America/Santo_Domingo",
-    "America/Sao_Paulo",
-    "America/Scoresbysund",
-    "America/Shiprock",
-    "America/St_Johns",
-    "America/St_Kitts",
-    "America/St_Lucia",
-    "America/St_Thomas",
-    "America/St_Vincent",
-    "America/Swift_Current",
-    "America/Tegucigalpa",
-    "America/Thule",
-    "America/Thunder_Bay",
-    "America/Tijuana",
-    "America/Tortola",
-    "America/Vancouver",
-    "America/Virgin",
-    "America/Whitehorse",
-    "America/Winnipeg",
-    "America/Yakutat",
-    "America/Yellowknife",
-    "Antarctica/Casey",
-    "Antarctica/Davis",
-    "Antarctica/DumontDUrville",
-    "Antarctica/Mawson",
-    "Antarctica/McMurdo",
-    "Antarctica/Palmer",
-    "Antarctica/South_Pole",
-    "Antarctica/Syowa",
-    "Antarctica/Vostok",
-    "Arctic/Longyearbyen",
-    "Asia/Aden",
-    "Asia/Almaty",
-    "Asia/Amman",
-    "Asia/Anadyr",
-    "Asia/Aqtau",
-    "Asia/Aqtobe",
-    "Asia/Ashgabat",
-    "Asia/Ashkhabad",
-    "Asia/Baghdad",
-    "Asia/Bahrain",
-    "Asia/Baku",
-    "Asia/Bangkok",
-    "Asia/Beirut",
-    "Asia/Bishkek",
-    "Asia/Brunei",
-    "Asia/Calcutta",
-    "Asia/Choibalsan",
-    "Asia/Chongqing",
-    "Asia/Chungking",
-    "Asia/Colombo",
-    "Asia/Dacca",
-    "Asia/Damascus",
-    "Asia/Dhaka",
-    "Asia/Dili",
-    "Asia/Dubai",
-    "Asia/Dushanbe",
-    "Asia/Gaza",
-    "Asia/Harbin",
-    "Asia/Hong_Kong",
-    "Asia/Hovd",
-    "Asia/Irkutsk",
-    "Asia/Istanbul",
-    "Asia/Jakarta",
-    "Asia/Jayapura",
-    "Asia/Jerusalem",
-    "Asia/Kabul",
-    "Asia/Kamchatka",
-    "Asia/Karachi",
-    "Asia/Kashgar",
-    "Asia/Katmandu",
-    "Asia/Krasnoyarsk",
-    "Asia/Kuala_Lumpur",
-    "Asia/Kuching",
-    "Asia/Kuwait",
-    "Asia/Macao",
-    "Asia/Macau",
-    "Asia/Magadan",
-    "Asia/Manila",
-    "Asia/Muscat",
-    "Asia/Nicosia",
-    "Asia/Novosibirsk",
-    "Asia/Omsk",
-    "Asia/Oral",
-    "Asia/Phnom_Penh",
-    "Asia/Pontianak",
-    "Asia/Pyongyang",
-    "Asia/Qatar",
-    "Asia/Qyzylorda",
-    "Asia/Rangoon",
-    "Asia/Riyadh",
-    "Asia/Riyadh87",
-    "Asia/Riyadh88",
-    "Asia/Riyadh89",
-    "Asia/Saigon",
-    "Asia/Sakhalin",
-    "Asia/Samarkand",
-    "Asia/Seoul",
-    "Asia/Shanghai",
-    "Asia/Singapore",
-    "Asia/Taipei",
-    "Asia/Tashkent",
-    "Asia/Tbilisi",
-    "Asia/Tehran",
-    "Asia/Tel_Aviv",
-    "Asia/Thimbu",
-    "Asia/Thimphu",
-    "Asia/Tokyo",
-    "Asia/Ujung_Pandang",
-    "Asia/Ulaanbaatar",
-    "Asia/Ulan_Bator",
-    "Asia/Urumqi",
-    "Asia/Vientiane",
-    "Asia/Vladivostok",
-    "Asia/Yakutsk",
-    "Asia/Yekaterinburg",
-    "Asia/Yerevan",
-    "Atlantic/Azores",
-    "Atlantic/Bermuda",
-    "Atlantic/Canary",
-    "Atlantic/Cape_Verde",
-    "Atlantic/Faeroe",
-    "Atlantic/Jan_Mayen",
-    "Atlantic/Madeira",
-    "Atlantic/Reykjavik",
-    "Atlantic/South_Georgia",
-    "Atlantic/Stanley",
-    "Atlantic/St_Helena",
-    "Australia/ACT",
-    "Australia/Adelaide",
-    "Australia/Brisbane",
-    "Australia/Broken_Hill",
-    "Australia/Canberra",
-    "Australia/Darwin",
-    "Australia/Hobart",
-    "Australia/LHI",
-    "Australia/Lindeman",
-    "Australia/Lord_Howe",
-    "Australia/Melbourne",
-    "Australia/North",
-    "Australia/NSW",
-    "Australia/Perth",
-    "Australia/Queensland",
-    "Australia/South",
-    "Australia/Sydney",
-    "Australia/Tasmania",
-    "Australia/Victoria",
-    "Australia/West",
-    "Australia/Yancowinna",
-    "Brazil/Acre",
-    "Brazil/DeNoronha",
-    "Brazil/East",
-    "Brazil/West",
-    "Canada/Atlantic",
-    "Canada/Central",
-    "Canada/East-Saskatchewan",
-    "Canada/Eastern",
-    "Canada/Mountain",
-    "Canada/Newfoundland",
-    "Canada/Pacific",
-    "Canada/Saskatchewan",
-    "Canada/Yukon",
-    "CET",
-    "Chile/Continental",
-    "Chile/EasterIsland",
-    "CST6CDT",
-    "Cuba",
-    "EET",
-    "Egypt",
-    "Eire",
-    "EST",
-    "EST5EDT",
-    "Etc/GMT",
-    "Etc/GMT+0",
-    "Etc/GMT+1",
-    "Etc/GMT+10",
-    "Etc/GMT+11",
-    "Etc/GMT+12",
-    "Etc/GMT+2",
-    "Etc/GMT+3",
-    "Etc/GMT+4",
-    "Etc/GMT+5",
-    "Etc/GMT+6",
-    "Etc/GMT+7",
-    "Etc/GMT+8",
-    "Etc/GMT+9",
-    "Etc/GMT-0",
-    "Etc/GMT-1",
-    "Etc/GMT-10",
-    "Etc/GMT-11",
-    "Etc/GMT-12",
-    "Etc/GMT-13",
-    "Etc/GMT-14",
-    "Etc/GMT-2",
-    "Etc/GMT-3",
-    "Etc/GMT-4",
-    "Etc/GMT-5",
-    "Etc/GMT-6",
-    "Etc/GMT-7",
-    "Etc/GMT-8",
-    "Etc/GMT-9",
-    "Etc/GMT0",
-    "Etc/Greenwich",
-    "Etc/UCT",
-    "Etc/Universal",
-    "Etc/UTC",
-    "Etc/Zulu",
-    "Europe/Amsterdam",
-    "Europe/Andorra",
-    "Europe/Athens",
-    "Europe/Belfast",
-    "Europe/Belgrade",
-    "Europe/Berlin",
-    "Europe/Bratislava",
-    "Europe/Brussels",
-    "Europe/Bucharest",
-    "Europe/Budapest",
-    "Europe/Chisinau",
-    "Europe/Copenhagen",
-    "Europe/Dublin",
-    "Europe/Gibraltar",
-    "Europe/Helsinki",
-    "Europe/Istanbul",
-    "Europe/Kaliningrad",
-    "Europe/Kiev",
-    "Europe/Lisbon",
-    "Europe/Ljubljana",
-    "Europe/London",
-    "Europe/Luxembourg",
-    "Europe/Madrid",
-    "Europe/Malta",
-    "Europe/Minsk",
-    "Europe/Monaco",
-    "Europe/Moscow",
-    "Europe/Nicosia",
-    "Europe/Oslo",
-    "Europe/Paris",
-    "Europe/Prague",
-    "Europe/Riga",
-    "Europe/Rome",
-    "Europe/Samara",
-    "Europe/San_Marino",
-    "Europe/Sarajevo",
-    "Europe/Simferopol",
-    "Europe/Skopje",
-    "Europe/Sofia",
-    "Europe/Stockholm",
-    "Europe/Tallinn",
-    "Europe/Tirane",
-    "Europe/Tiraspol",
-    "Europe/Uzhgorod",
-    "Europe/Vaduz",
-    "Europe/Vatican",
-    "Europe/Vienna",
-    "Europe/Vilnius",
-    "Europe/Warsaw",
-    "Europe/Zagreb",
-    "Europe/Zaporozhye",
-    "Europe/Zurich",
-    "Factory",
-    "GB",
-    "GB-Eire",
-    "GMT",
-    "GMT+0",
-    "GMT-0",
-    "GMT0",
-    "Greenwich",
-    "Hongkong",
-    "HST",
-    "Iceland",
-    "Indian/Antananarivo",
-    "Indian/Chagos",
-    "Indian/Christmas",
-    "Indian/Cocos",
-    "Indian/Comoro",
-    "Indian/Kerguelen",
-    "Indian/Mahe",
-    "Indian/Maldives",
-    "Indian/Mauritius",
-    "Indian/Mayotte",
-    "Indian/Reunion",
-    "Iran",
-    "Israel",
-    "Jamaica",
-    "Japan",
-    "Kwajalein",
-    "Libya",
-    "MET",
-    "Mexico/BajaNorte",
-    "Mexico/BajaSur",
-    "Mexico/General",
-    "Mideast/Riyadh87",
-    "Mideast/Riyadh88",
-    "Mideast/Riyadh89",
-    "MST",
-    "MST7MDT",
-    "Navajo",
-    "NZ",
-    "NZ-CHAT",
-    "Pacific/Apia",
-    "Pacific/Auckland",
-    "Pacific/Chatham",
-    "Pacific/Easter",
-    "Pacific/Efate",
-    "Pacific/Enderbury",
-    "Pacific/Fakaofo",
-    "Pacific/Fiji",
-    "Pacific/Funafuti",
-    "Pacific/Galapagos",
-    "Pacific/Gambier",
-    "Pacific/Guadalcanal",
-    "Pacific/Guam",
-    "Pacific/Honolulu",
-    "Pacific/Johnston",
-    "Pacific/Kiritimati",
-    "Pacific/Kosrae",
-    "Pacific/Kwajalein",
-    "Pacific/Majuro",
-    "Pacific/Marquesas",
-    "Pacific/Midway",
-    "Pacific/Nauru",
-    "Pacific/Niue",
-    "Pacific/Norfolk",
-    "Pacific/Noumea",
-    "Pacific/Pago_Pago",
-    "Pacific/Palau",
-    "Pacific/Pitcairn",
-    "Pacific/Ponape",
-    "Pacific/Port_Moresby",
-    "Pacific/Rarotonga",
-    "Pacific/Saipan",
-    "Pacific/Samoa",
-    "Pacific/Tahiti",
-    "Pacific/Tarawa",
-    "Pacific/Tongatapu",
-    "Pacific/Truk",
-    "Pacific/Wake",
-    "Pacific/Wallis",
-    "Pacific/Yap",
-    "Poland",
-    "Portugal",
-    "PRC",
-    "PST8PDT",
-    "ROC",
-    "ROK",
-    "Singapore",
-    "SystemV/AST4",
-    "SystemV/AST4ADT",
-    "SystemV/CST6",
-    "SystemV/CST6CDT",
-    "SystemV/EST5",
-    "SystemV/EST5EDT",
-    "SystemV/HST10",
-    "SystemV/MST7",
-    "SystemV/MST7MDT",
-    "SystemV/PST8",
-    "SystemV/PST8PDT",
-    "SystemV/YST9",
-    "SystemV/YST9YDT",
-    "Turkey",
-    "UCT",
-    "Universal",
-    "US/Alaska",
-    "US/Aleutian",
-    "US/Arizona",
-    "US/Central",
-    "US/East-Indiana",
-    "US/Eastern",
-    "US/Hawaii",
-    "US/Indiana-Starke",
-    "US/Michigan",
-    "US/Mountain",
-    "US/Pacific",
-    "US/Samoa",
-    "UTC",
-    "W-SU",
-    "WET",
-    "Zulu"
-  );
+      "Africa/Abidjan",
+      "Africa/Accra",
+      "Africa/Addis_Ababa",
+      "Africa/Algiers",
+      "Africa/Asmera",
+      "Africa/Bamako",
+      "Africa/Bangui",
+      "Africa/Banjul",
+      "Africa/Bissau",
+      "Africa/Blantyre",
+      "Africa/Brazzaville",
+      "Africa/Bujumbura",
+      "Africa/Cairo",
+      "Africa/Casablanca",
+      "Africa/Ceuta",
+      "Africa/Conakry",
+      "Africa/Dakar",
+      "Africa/Dar_es_Salaam",
+      "Africa/Djibouti",
+      "Africa/Douala",
+      "Africa/El_Aaiun",
+      "Africa/Freetown",
+      "Africa/Gaborone",
+      "Africa/Harare",
+      "Africa/Johannesburg",
+      "Africa/Kampala",
+      "Africa/Khartoum",
+      "Africa/Kigali",
+      "Africa/Kinshasa",
+      "Africa/Lagos",
+      "Africa/Libreville",
+      "Africa/Lome",
+      "Africa/Luanda",
+      "Africa/Lubumbashi",
+      "Africa/Lusaka",
+      "Africa/Malabo",
+      "Africa/Maputo",
+      "Africa/Maseru",
+      "Africa/Mbabane",
+      "Africa/Mogadishu",
+      "Africa/Monrovia",
+      "Africa/Nairobi",
+      "Africa/Ndjamena",
+      "Africa/Niamey",
+      "Africa/Nouakchott",
+      "Africa/Ouagadougou",
+      "Africa/Porto-Novo",
+      "Africa/Sao_Tome",
+      "Africa/Timbuktu",
+      "Africa/Tripoli",
+      "Africa/Tunis",
+      "Africa/Windhoek",
+      "America/Adak",
+      "America/Anchorage",
+      "America/Anguilla",
+      "America/Antigua",
+      "America/Araguaina",
+      "America/Aruba",
+      "America/Asuncion",
+      "America/Atka",
+      "America/Barbados",
+      "America/Belem",
+      "America/Belize",
+      "America/Boa_Vista",
+      "America/Bogota",
+      "America/Boise",
+      "America/Buenos_Aires",
+      "America/Cambridge_Bay",
+      "America/Cancun",
+      "America/Caracas",
+      "America/Catamarca",
+      "America/Cayenne",
+      "America/Cayman",
+      "America/Chicago",
+      "America/Chihuahua",
+      "America/Cordoba",
+      "America/Costa_Rica",
+      "America/Cuiaba",
+      "America/Curacao",
+      "America/Danmarkshavn",
+      "America/Dawson",
+      "America/Dawson_Creek",
+      "America/Denver",
+      "America/Detroit",
+      "America/Dominica",
+      "America/Edmonton",
+      "America/Eirunepe",
+      "America/El_Salvador",
+      "America/Ensenada",
+      "America/Fortaleza",
+      "America/Fort_Wayne",
+      "America/Glace_Bay",
+      "America/Godthab",
+      "America/Goose_Bay",
+      "America/Grand_Turk",
+      "America/Grenada",
+      "America/Guadeloupe",
+      "America/Guatemala",
+      "America/Guayaquil",
+      "America/Guyana",
+      "America/Halifax",
+      "America/Havana",
+      "America/Hermosillo",
+      "America/Indiana",
+      "America/Indiana/Indianapolis",
+      "America/Indiana/Knox",
+      "America/Indiana/Marengo",
+      "America/Indiana/Vevay",
+      "America/Indianapolis",
+      "America/Inuvik",
+      "America/Iqaluit",
+      "America/Jamaica",
+      "America/Jujuy",
+      "America/Juneau",
+      "America/Kentucky",
+      "America/Kentucky/Louisville",
+      "America/Kentucky/Monticello",
+      "America/Knox_IN",
+      "America/La_Paz",
+      "America/Lima",
+      "America/Los_Angeles",
+      "America/Louisville",
+      "America/Maceio",
+      "America/Managua",
+      "America/Manaus",
+      "America/Martinique",
+      "America/Mazatlan",
+      "America/Mendoza",
+      "America/Menominee",
+      "America/Merida",
+      "America/Mexico_City",
+      "America/Miquelon",
+      "America/Monterrey",
+      "America/Montevideo",
+      "America/Montreal",
+      "America/Montserrat",
+      "America/Nassau",
+      "America/New_York",
+      "America/Nipigon",
+      "America/Nome",
+      "America/Noronha",
+      "America/North_Dakota",
+      "America/North_Dakota/Center",
+      "America/Panama",
+      "America/Pangnirtung",
+      "America/Paramaribo",
+      "America/Phoenix",
+      "America/Port-au-Prince",
+      "America/Porto_Acre",
+      "America/Porto_Velho",
+      "America/Port_of_Spain",
+      "America/Puerto_Rico",
+      "America/Rainy_River",
+      "America/Rankin_Inlet",
+      "America/Recife",
+      "America/Regina",
+      "America/Rio_Branco",
+      "America/Rosario",
+      "America/Santiago",
+      "America/Santo_Domingo",
+      "America/Sao_Paulo",
+      "America/Scoresbysund",
+      "America/Shiprock",
+      "America/St_Johns",
+      "America/St_Kitts",
+      "America/St_Lucia",
+      "America/St_Thomas",
+      "America/St_Vincent",
+      "America/Swift_Current",
+      "America/Tegucigalpa",
+      "America/Thule",
+      "America/Thunder_Bay",
+      "America/Tijuana",
+      "America/Tortola",
+      "America/Vancouver",
+      "America/Virgin",
+      "America/Whitehorse",
+      "America/Winnipeg",
+      "America/Yakutat",
+      "America/Yellowknife",
+      "Antarctica/Casey",
+      "Antarctica/Davis",
+      "Antarctica/DumontDUrville",
+      "Antarctica/Mawson",
+      "Antarctica/McMurdo",
+      "Antarctica/Palmer",
+      "Antarctica/South_Pole",
+      "Antarctica/Syowa",
+      "Antarctica/Vostok",
+      "Arctic/Longyearbyen",
+      "Asia/Aden",
+      "Asia/Almaty",
+      "Asia/Amman",
+      "Asia/Anadyr",
+      "Asia/Aqtau",
+      "Asia/Aqtobe",
+      "Asia/Ashgabat",
+      "Asia/Ashkhabad",
+      "Asia/Baghdad",
+      "Asia/Bahrain",
+      "Asia/Baku",
+      "Asia/Bangkok",
+      "Asia/Beirut",
+      "Asia/Bishkek",
+      "Asia/Brunei",
+      "Asia/Calcutta",
+      "Asia/Choibalsan",
+      "Asia/Chongqing",
+      "Asia/Chungking",
+      "Asia/Colombo",
+      "Asia/Dacca",
+      "Asia/Damascus",
+      "Asia/Dhaka",
+      "Asia/Dili",
+      "Asia/Dubai",
+      "Asia/Dushanbe",
+      "Asia/Gaza",
+      "Asia/Harbin",
+      "Asia/Hong_Kong",
+      "Asia/Hovd",
+      "Asia/Irkutsk",
+      "Asia/Istanbul",
+      "Asia/Jakarta",
+      "Asia/Jayapura",
+      "Asia/Jerusalem",
+      "Asia/Kabul",
+      "Asia/Kamchatka",
+      "Asia/Karachi",
+      "Asia/Kashgar",
+      "Asia/Katmandu",
+      "Asia/Krasnoyarsk",
+      "Asia/Kuala_Lumpur",
+      "Asia/Kuching",
+      "Asia/Kuwait",
+      "Asia/Macao",
+      "Asia/Macau",
+      "Asia/Magadan",
+      "Asia/Manila",
+      "Asia/Muscat",
+      "Asia/Nicosia",
+      "Asia/Novosibirsk",
+      "Asia/Omsk",
+      "Asia/Oral",
+      "Asia/Phnom_Penh",
+      "Asia/Pontianak",
+      "Asia/Pyongyang",
+      "Asia/Qatar",
+      "Asia/Qyzylorda",
+      "Asia/Rangoon",
+      "Asia/Riyadh",
+      "Asia/Riyadh87",
+      "Asia/Riyadh88",
+      "Asia/Riyadh89",
+      "Asia/Saigon",
+      "Asia/Sakhalin",
+      "Asia/Samarkand",
+      "Asia/Seoul",
+      "Asia/Shanghai",
+      "Asia/Singapore",
+      "Asia/Taipei",
+      "Asia/Tashkent",
+      "Asia/Tbilisi",
+      "Asia/Tehran",
+      "Asia/Tel_Aviv",
+      "Asia/Thimbu",
+      "Asia/Thimphu",
+      "Asia/Tokyo",
+      "Asia/Ujung_Pandang",
+      "Asia/Ulaanbaatar",
+      "Asia/Ulan_Bator",
+      "Asia/Urumqi",
+      "Asia/Vientiane",
+      "Asia/Vladivostok",
+      "Asia/Yakutsk",
+      "Asia/Yekaterinburg",
+      "Asia/Yerevan",
+      "Atlantic/Azores",
+      "Atlantic/Bermuda",
+      "Atlantic/Canary",
+      "Atlantic/Cape_Verde",
+      "Atlantic/Faeroe",
+      "Atlantic/Jan_Mayen",
+      "Atlantic/Madeira",
+      "Atlantic/Reykjavik",
+      "Atlantic/South_Georgia",
+      "Atlantic/Stanley",
+      "Atlantic/St_Helena",
+      "Australia/ACT",
+      "Australia/Adelaide",
+      "Australia/Brisbane",
+      "Australia/Broken_Hill",
+      "Australia/Canberra",
+      "Australia/Darwin",
+      "Australia/Hobart",
+      "Australia/LHI",
+      "Australia/Lindeman",
+      "Australia/Lord_Howe",
+      "Australia/Melbourne",
+      "Australia/North",
+      "Australia/NSW",
+      "Australia/Perth",
+      "Australia/Queensland",
+      "Australia/South",
+      "Australia/Sydney",
+      "Australia/Tasmania",
+      "Australia/Victoria",
+      "Australia/West",
+      "Australia/Yancowinna",
+      "Brazil/Acre",
+      "Brazil/DeNoronha",
+      "Brazil/East",
+      "Brazil/West",
+      "Canada/Atlantic",
+      "Canada/Central",
+      "Canada/East-Saskatchewan",
+      "Canada/Eastern",
+      "Canada/Mountain",
+      "Canada/Newfoundland",
+      "Canada/Pacific",
+      "Canada/Saskatchewan",
+      "Canada/Yukon",
+      "CET",
+      "Chile/Continental",
+      "Chile/EasterIsland",
+      "CST6CDT",
+      "Cuba",
+      "EET",
+      "Egypt",
+      "Eire",
+      "EST",
+      "EST5EDT",
+      "Etc/GMT",
+      "Etc/GMT+0",
+      "Etc/GMT+1",
+      "Etc/GMT+10",
+      "Etc/GMT+11",
+      "Etc/GMT+12",
+      "Etc/GMT+2",
+      "Etc/GMT+3",
+      "Etc/GMT+4",
+      "Etc/GMT+5",
+      "Etc/GMT+6",
+      "Etc/GMT+7",
+      "Etc/GMT+8",
+      "Etc/GMT+9",
+      "Etc/GMT-0",
+      "Etc/GMT-1",
+      "Etc/GMT-10",
+      "Etc/GMT-11",
+      "Etc/GMT-12",
+      "Etc/GMT-13",
+      "Etc/GMT-14",
+      "Etc/GMT-2",
+      "Etc/GMT-3",
+      "Etc/GMT-4",
+      "Etc/GMT-5",
+      "Etc/GMT-6",
+      "Etc/GMT-7",
+      "Etc/GMT-8",
+      "Etc/GMT-9",
+      "Etc/GMT0",
+      "Etc/Greenwich",
+      "Etc/UCT",
+      "Etc/Universal",
+      "Etc/UTC",
+      "Etc/Zulu",
+      "Europe/Amsterdam",
+      "Europe/Andorra",
+      "Europe/Athens",
+      "Europe/Belfast",
+      "Europe/Belgrade",
+      "Europe/Berlin",
+      "Europe/Bratislava",
+      "Europe/Brussels",
+      "Europe/Bucharest",
+      "Europe/Budapest",
+      "Europe/Chisinau",
+      "Europe/Copenhagen",
+      "Europe/Dublin",
+      "Europe/Gibraltar",
+      "Europe/Helsinki",
+      "Europe/Istanbul",
+      "Europe/Kaliningrad",
+      "Europe/Kiev",
+      "Europe/Lisbon",
+      "Europe/Ljubljana",
+      "Europe/London",
+      "Europe/Luxembourg",
+      "Europe/Madrid",
+      "Europe/Malta",
+      "Europe/Minsk",
+      "Europe/Monaco",
+      "Europe/Moscow",
+      "Europe/Nicosia",
+      "Europe/Oslo",
+      "Europe/Paris",
+      "Europe/Prague",
+      "Europe/Riga",
+      "Europe/Rome",
+      "Europe/Samara",
+      "Europe/San_Marino",
+      "Europe/Sarajevo",
+      "Europe/Simferopol",
+      "Europe/Skopje",
+      "Europe/Sofia",
+      "Europe/Stockholm",
+      "Europe/Tallinn",
+      "Europe/Tirane",
+      "Europe/Tiraspol",
+      "Europe/Uzhgorod",
+      "Europe/Vaduz",
+      "Europe/Vatican",
+      "Europe/Vienna",
+      "Europe/Vilnius",
+      "Europe/Warsaw",
+      "Europe/Zagreb",
+      "Europe/Zaporozhye",
+      "Europe/Zurich",
+      "Factory",
+      "GB",
+      "GB-Eire",
+      "GMT",
+      "GMT+0",
+      "GMT-0",
+      "GMT0",
+      "Greenwich",
+      "Hongkong",
+      "HST",
+      "Iceland",
+      "Indian/Antananarivo",
+      "Indian/Chagos",
+      "Indian/Christmas",
+      "Indian/Cocos",
+      "Indian/Comoro",
+      "Indian/Kerguelen",
+      "Indian/Mahe",
+      "Indian/Maldives",
+      "Indian/Mauritius",
+      "Indian/Mayotte",
+      "Indian/Reunion",
+      "Iran",
+      "Israel",
+      "Jamaica",
+      "Japan",
+      "Kwajalein",
+      "Libya",
+      "MET",
+      "Mexico/BajaNorte",
+      "Mexico/BajaSur",
+      "Mexico/General",
+      "Mideast/Riyadh87",
+      "Mideast/Riyadh88",
+      "Mideast/Riyadh89",
+      "MST",
+      "MST7MDT",
+      "Navajo",
+      "NZ",
+      "NZ-CHAT",
+      "Pacific/Apia",
+      "Pacific/Auckland",
+      "Pacific/Chatham",
+      "Pacific/Easter",
+      "Pacific/Efate",
+      "Pacific/Enderbury",
+      "Pacific/Fakaofo",
+      "Pacific/Fiji",
+      "Pacific/Funafuti",
+      "Pacific/Galapagos",
+      "Pacific/Gambier",
+      "Pacific/Guadalcanal",
+      "Pacific/Guam",
+      "Pacific/Honolulu",
+      "Pacific/Johnston",
+      "Pacific/Kiritimati",
+      "Pacific/Kosrae",
+      "Pacific/Kwajalein",
+      "Pacific/Majuro",
+      "Pacific/Marquesas",
+      "Pacific/Midway",
+      "Pacific/Nauru",
+      "Pacific/Niue",
+      "Pacific/Norfolk",
+      "Pacific/Noumea",
+      "Pacific/Pago_Pago",
+      "Pacific/Palau",
+      "Pacific/Pitcairn",
+      "Pacific/Ponape",
+      "Pacific/Port_Moresby",
+      "Pacific/Rarotonga",
+      "Pacific/Saipan",
+      "Pacific/Samoa",
+      "Pacific/Tahiti",
+      "Pacific/Tarawa",
+      "Pacific/Tongatapu",
+      "Pacific/Truk",
+      "Pacific/Wake",
+      "Pacific/Wallis",
+      "Pacific/Yap",
+      "Poland",
+      "Portugal",
+      "PRC",
+      "PST8PDT",
+      "ROC",
+      "ROK",
+      "Singapore",
+      "SystemV/AST4",
+      "SystemV/AST4ADT",
+      "SystemV/CST6",
+      "SystemV/CST6CDT",
+      "SystemV/EST5",
+      "SystemV/EST5EDT",
+      "SystemV/HST10",
+      "SystemV/MST7",
+      "SystemV/MST7MDT",
+      "SystemV/PST8",
+      "SystemV/PST8PDT",
+      "SystemV/YST9",
+      "SystemV/YST9YDT",
+      "Turkey",
+      "UCT",
+      "Universal",
+      "US/Alaska",
+      "US/Aleutian",
+      "US/Arizona",
+      "US/Central",
+      "US/East-Indiana",
+      "US/Eastern",
+      "US/Hawaii",
+      "US/Indiana-Starke",
+      "US/Michigan",
+      "US/Mountain",
+      "US/Pacific",
+      "US/Samoa",
+      "UTC",
+      "W-SU",
+      "WET",
+      "Zulu"
+        );
 
 
 
   function oxchangeAccount ($config, $dn= NULL)
   {
-       plugin::plugin ($config, $dn);
-       for ($i=0;$i<count($this->config->data['TABS']['CONNECTIVITY']);$i++){
-           if($this->config->data['TABS']['CONNECTIVITY'][$i]['CLASS']=='oxchangeAccount')
-           {
-               $this->oxconf=$this->config->data['TABS']['CONNECTIVITY'][$i];
-               break;
-           }
-       }
+    plugin::plugin ($config, $dn);
+    for ($i=0;$i<count($this->config->data['TABS']['CONNECTIVITY']);$i++){
+      if($this->config->data['TABS']['CONNECTIVITY'][$i]['CLASS']=='oxchangeAccount')
+      {
+        $this->oxconf=$this->config->data['TABS']['CONNECTIVITY'][$i];
+        break;
+      }
+    }
   }
 
   function execute()
   {
- 
-       /* Show tab dialog headers */
-       $display= "";
-
-       /* Show main page */
-       $smarty= get_smarty();
-
-       if (function_exists("pg_connect")){
-               $smarty->assign("pg", true);
-       }else{
-               $smarty->assign("pg", false);
-       }
-
-       /* Load attributes */
-        foreach($this->attributes as $val){
-                $smarty->assign("$val", $this->$val);
-                $smarty->assign($val."ACL", chkacl($this->acl, "$val"));
-        }
-       if ($this->is_account){
-               $smarty->assign("oxchangeState", "checked");
-       } else {
-               $smarty->assign("fstate", "disabled");
-       }
-       
-//     if ($this->is_account){
-               $smarty->assign("timezones", $this->timezones);
-//     } else {
-//             $smarty->assign("timezones", array("GMT"));
-//     }
-       
-
-       if ($this->parent != NULL){
-               $smarty->assign("tabbed", 1);
-       }
-
-       $display.= $smarty->fetch (get_template_path('oxchange.tpl', TRUE, dirname(__FILE__)));
-       return ($display);
+
+    /* Show tab dialog headers */
+    $display= "";
+
+    /* Show main page */
+    $smarty= get_smarty();
+
+    if (function_exists("pg_connect")){
+      $smarty->assign("pg", true);
+    }else{
+      $smarty->assign("pg", false);
+    }
+
+    /* Load attributes */
+    foreach($this->attributes as $val){
+      $smarty->assign("$val", $this->$val);
+      $smarty->assign($val."ACL", chkacl($this->acl, "$val"));
+    }
+    $smarty->assign("oxchangeAccountACL", chkacl($this->acl, "oxchangeAccount"));
+    if ($this->is_account){
+      $smarty->assign("oxchangeState", "checked");
+    } else {
+      $smarty->assign("oxchangeState", "");
+      $smarty->assign("fstate", "disabled");
+    }
+
+    // if ($this->is_account){
+    $smarty->assign("timezones", $this->timezones);
+    // } else {
+    //         $smarty->assign("timezones", array("GMT"));
+    // }
+
+
+    if ($this->parent != NULL){
+      $smarty->assign("tabbed", 1);
+    }
+
+    $display.= $smarty->fetch (get_template_path('oxchange.tpl', TRUE, dirname(__FILE__)));
+    return ($display);
   }
 
   function remove_from_parent()
   {
-       $sqldeluser=array(
-       "delete from prg_notes where (user_right like '".$this->attrs['cn'][0]."') and (group_right like 's')",
-       "delete from prg_documents_read where (user_right like '".$this->attrs['cn'][0]."')",
-       "delete from prg_documents_mod where (user_right like '".$this->attrs['cn'][0]."')",
-       "delete from prg_docufolders_read where (user_right like '".$this->attrs['cn'][0]."')",
-       "delete from prg_docufolders_mod where (user_right like '".$this->attrs['cn'][0]."')",
-       "delete from prg_date_rights where (user_right like '".$this->attrs['cn'][0]."')",
-       "delete from prg_date_notification where (member_uid like '".$this->attrs['cn'][0]."')",
-       "delete from prg_dates_members where (member_uid like '".$this->attrs['cn'][0]."')",
-       "delete from prg_knowledge_read where (user_right like '".$this->attrs['cn'][0]."')",
-       "delete from prg_knowledge_mod where (user_right like '".$this->attrs['cn'][0]."')",
-       "delete from prg_knowledge_folder_read where (user_right like '".$this->attrs['cn'][0]."')",
-       "delete from prg_knowledge_folder_mod where (user_right like '".$this->attrs['cn'][0]."')",
-       "delete from prg_pin_board_read where (user_right like '".$this->attrs['cn'][0]."')",
-       "delete from prg_pin_board_mod where (user_right like '".$this->attrs['cn'][0]."')",
-       "delete from prg_bookmarks_read where (user_right like '".$this->attrs['cn'][0]."')",
-       "delete from prg_bookmarks_mod where (user_right like '".$this->attrs['cn'][0]."')",
-       "delete from prg_bookmarks_folder_read where (user_right like '".$this->attrs['cn'][0]."')",
-       "delete from prg_bookmarks_folder_mod where (user_right like '".$this->attrs['cn'][0]."')",
-       "delete from prg_tasks_rights where (user_right like '".$this->attrs['cn'][0]."')",
-       "delete from prg_tasks_notification where (member_uid like '".$this->attrs['cn'][0]."')",
-       "delete from prg_tasks_members where (member_uid like '".$this->attrs['cn'][0]."')",
-       "delete from prg_projects_rights where (user_right like '".$this->attrs['cn'][0]."')",
-       "delete from prg_projects_notification where (member_uid like '".$this->attrs['cn'][0]."')",
-       "delete from prg_projects_members where (member_uid like '".$this->attrs['cn'][0]."')",
-       "delete from oxfolder_permissions where (entity like '".$this->attrs['cn'][0]."') AND ((role = 256) OR (role = 1024))",
-       "delete from oxfolder_standardfolders where owner like '".$this->attrs['cn'][0]."'",
-       "delete from prg_forum_read where user_right = '".$this->attrs['cn'][0]."'",
-       "delete from prg_forum_mod where user_right = '".$this->attrs['cn'][0]."'",
-       "delete from prg_forum_abo where user_right = '".$this->attrs['cn'][0]."'",
-       "delete from prg_forum_seen where username = '".$this->attrs['cn'][0]."'",
-       "delete from sys_holiday where (userid like '".$this->attrs['cn'][0]."')",
-       "delete from usr_holiday where (userid like '".$this->attrs['cn'][0]."')");
-
-       /* Trying to open a Postgresql Database Server */
-       if (function_exists("pg_connect")){
-               if(isset($this->oxconf["PGUSER"]) and isset($this->oxconf["PGHOST"]) and isset($this->oxconf["PGDBNAME"]) and isset($this->oxconf["PGPASSWD"])){
-                       $pgcon = pg_connect("host=".$this->oxconf["PGHOST"]." user=".$this->oxconf["PGUSER"]." password=".$this->oxconf["PGPASSWD"]." dbname=".$this->oxconf["PGDBNAME"]);
-                       if (! $pgcon){
-                           print_red(_("Couldn't Connect To Postgresql Database"));
-                           return;
-                       }
-               }else{
-                       print_red(_("Needed Parameters to openexchange connectivity plugin failed!"));
-                       return;
-               }
-       }else{
-               print_red(_("PHP4 module for Postgresql Database Failed!"));
-               return;
-       }
-
-       plugin::remove_from_parent();
-       $ldap= $this->config->get_ldap_link();
-
-        $ldap->cd($this->dn);
-        @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
-                $this->attributes, "Save");
-       $ldap->modify($this->attrs);
-       show_ldap_error($ldap->get_error());
-
-       /* Optionally execute a command after we're done */
-       $this->postremove();
-
-       /* Finally remove data from postgresql server */
-       foreach ($sqldeluser as $sqls){
-               pg_exec($pgcon,$sqls);
-       }
-       pg_close();
+    $sqldeluser=array(
+        "delete from prg_notes where (user_right like '".$this->attrs['cn'][0]."') and (group_right like 's')",
+        "delete from prg_documents_read where (user_right like '".$this->attrs['cn'][0]."')",
+        "delete from prg_documents_mod where (user_right like '".$this->attrs['cn'][0]."')",
+        "delete from prg_docufolders_read where (user_right like '".$this->attrs['cn'][0]."')",
+        "delete from prg_docufolders_mod where (user_right like '".$this->attrs['cn'][0]."')",
+        "delete from prg_date_rights where (user_right like '".$this->attrs['cn'][0]."')",
+        "delete from prg_date_notification where (member_uid like '".$this->attrs['cn'][0]."')",
+        "delete from prg_dates_members where (member_uid like '".$this->attrs['cn'][0]."')",
+        "delete from prg_knowledge_read where (user_right like '".$this->attrs['cn'][0]."')",
+        "delete from prg_knowledge_mod where (user_right like '".$this->attrs['cn'][0]."')",
+        "delete from prg_knowledge_folder_read where (user_right like '".$this->attrs['cn'][0]."')",
+        "delete from prg_knowledge_folder_mod where (user_right like '".$this->attrs['cn'][0]."')",
+        "delete from prg_pin_board_read where (user_right like '".$this->attrs['cn'][0]."')",
+        "delete from prg_pin_board_mod where (user_right like '".$this->attrs['cn'][0]."')",
+        "delete from prg_bookmarks_read where (user_right like '".$this->attrs['cn'][0]."')",
+        "delete from prg_bookmarks_mod where (user_right like '".$this->attrs['cn'][0]."')",
+        "delete from prg_bookmarks_folder_read where (user_right like '".$this->attrs['cn'][0]."')",
+        "delete from prg_bookmarks_folder_mod where (user_right like '".$this->attrs['cn'][0]."')",
+        "delete from prg_tasks_rights where (user_right like '".$this->attrs['cn'][0]."')",
+        "delete from prg_tasks_notification where (member_uid like '".$this->attrs['cn'][0]."')",
+        "delete from prg_tasks_members where (member_uid like '".$this->attrs['cn'][0]."')",
+        "delete from prg_projects_rights where (user_right like '".$this->attrs['cn'][0]."')",
+        "delete from prg_projects_notification where (member_uid like '".$this->attrs['cn'][0]."')",
+        "delete        from prg_projects_members where (member_uid like '".$this->attrs['cn'][0]."')",
+        "delete from oxfolder_permissions where (entity like '".$this->attrs['cn'][0]."') AND ((role = 256) OR (role = 1024))",
+        "delete from oxfolder_standardfolders where owner like '".$this->attrs['cn'][0]."'",
+        "delete from prg_forum_read where user_right = '".$this->attrs['cn'][0]."'",
+        "delete from prg_forum_mod where user_right = '".$this->attrs['cn'][0]."'",
+        "delete from prg_forum_abo where user_right = '".$this->attrs['cn'][0]."'",
+        "delete from prg_forum_seen where username = '".$this->attrs['cn'][0]."'",
+        "delete from sys_holiday where (userid like '".$this->attrs['cn'][0]."')",
+        "delete from usr_holiday where (userid like '".$this->attrs['cn'][0]."')");
+
+    /* Trying to open a Postgresql Database Server */
+    if (function_exists("pg_connect")){
+      if(isset($this->oxconf["PGUSER"]) and isset($this->oxconf["PGHOST"]) and isset($this->oxconf["PGDBNAME"]) and isset($this->oxconf["PGPASSWD"])){
+        $pgcon = pg_connect("host=".$this->oxconf["PGHOST"]." user=".$this->oxconf["PGUSER"]." password=".$this->oxconf["PGPASSWD"]." dbname=".$this->oxconf["PGDBNAME"]);
+        if (! $pgcon){
+          print_red(_("Couldn't Connect To Postgresql Database"));
+          return;
+        }
+      }else{
+        print_red(_("Needed Parameters to openexchange connectivity plugin failed!"));
+        return;
+      }
+    }else{
+      print_red(_("PHP4 module for Postgresql Database Failed!"));
+      return;
+    }
+
+    plugin::remove_from_parent();
+    $ldap= $this->config->get_ldap_link();
+
+    $ldap->cd($this->dn);
+    @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
+        $this->attributes, "Save");
+    $ldap->modify($this->attrs);
+    show_ldap_error($ldap->get_error());
+
+    /* Optionally execute a command after we're done */
+    $this->postremove();
+
+    /* Finally remove data from postgresql server */
+    foreach ($sqldeluser as $sqls){
+      pg_exec($pgcon,$sqls);
+    }
+    pg_close();
   }
 
   /* Save data to object */
   function save_object()
   {
-        /* Do we need to flip is_account state? */
-        if (isset($_POST['connectivityTab'])){
-                if (isset($_POST['oxchange'])){
-                        if (!$this->is_account && $_POST['oxchange'] == "B"){
-                                $this->is_account= TRUE;
-                        }
-                } else {
-                        $this->is_account= FALSE;
-                }
+    /* Do we need to flip is_account state? */
+    if (isset($_POST['connectivityTab'])){
+      if (isset($_POST['oxchange'])){
+        if (!$this->is_account && $_POST['oxchange'] == "B"){
+          $this->is_account= TRUE;
         }
+      } else {
+        $this->is_account= FALSE;
+      }
+    }
 
-       plugin::save_object();
-       if (isset($_POST["oxchangeStatus"])){
-               $this->oxchangeStatus = "disabled";
-       } else {
-               $this->oxchangeStatus = "enabled";
-       }
+    plugin::save_object();
+    if (isset($_POST["oxchangeStatus"])){
+      $this->oxchangeStatus = "disabled";
+    } else {
+      $this->oxchangeStatus = "enabled";
+    }
   }
 
 
@@ -718,68 +720,69 @@ class oxchangeAccount extends plugin
   function save()
   {
 
-       /* Trying to open a Postgresql Database Server */
-       if (function_exists("pg_connect")){
-               if(isset($this->oxconf["PGUSER"]) and isset($this->oxconf["PGHOST"]) and isset($this->oxconf["PGDBNAME"]) and isset($this->oxconf["PGPASSWD"])){
-                       $pgcon = pg_connect("host=".$this->oxconf["PGHOST"]." user=".$this->oxconf["PGUSER"]." password=".$this->oxconf["PGPASSWD"]." dbname=".$this->oxconf["PGDBNAME"]);
-                       if (! $pgcon){
-                           print_red(_("Couldn't Connect To Postgresql Database"));
-                           return;
-                       }
-               }else{
-                       print_red(_("Needed Parameters to openexchange connectivity plugin failed!"));
-                       return;
-               }
-       }else{
-               print_red(_("PHP4 module for Postgresql Database Failed!"));
-               return;
-       }
-       
-       $uid=$this->attrs['cn'][0];
-       
-       plugin::save();
-
-       /* Write back to ldap */
-       $ldap= $this->config->get_ldap_link();
-       $ldap->cd($this->dn);
-       $ldap->modify($this->attrs);
-       show_ldap_error($ldap->get_error());
-
-       /* Optionally execute a command after we're done */
-       $this->postcreate();
-
-       /* Finally save data to postgresql server */
-       pg_set_client_encoding ("UNICODE");
-       $nv = "SELECT nextval ('serial_id')";
-       $ot = "insert into oxfolder_tree (fuid, parent, fname, module, type, owner, creator, creating_date, created_from, changing_date, changed_from) VALUES (%d, 1, '%s', '%s', 'private', '%s', '%s', 'now', 'System', 'now', 'System')";
-       $op = "INSERT INTO oxfolder_permissions (puid, pid, role, entity, sealed, fp, orp, owp, odp) VALUES (%d, %d, 32768,  '%s', 0, 128, 128, 128, 128)";
-       $os = "insert into oxfolder_standardfolders (owner,module_calendar,module_contact,module_task) VALUES ('%s',%d,%d,%d)";
-       $ugr= "INSERT INTO usr_general_rights SELECT creating_date, created_from, changing_date, changed_from,text('%s'),  addr_u, addr_r, addr_d, cont_u, cont_r, cont_d, data_u, data_r, data_d, serie_u, serie_r, serie_d, task_u, task_r, task_d,  refer, proj_u, proj_r, proj_d, dfolder_u, dfolder_r, dfolder_d, doc_u, doc_r, doc_d, knowl_u, knowl_r, knowl_d, bfolder_u,  bfolder_r, bfolder_d, bookm_u, bookm_r, bookm_d, pin_u, pin_r, pin_d, forum_n, fentrie_n, setup, pin_public, internal,  int_groups, kfolder_u, kfolder_r, kfolder_d, webmail FROM sys_gen_rights_template WHERE login LIKE 'default_template'";
-
-       $res=pg_exec($pgcon,$nv); $calendarid=pg_fetch_row($res); pg_freeresult($res);
-       $q=sprintf($ot,$calendarid[0],'My Appointments','calendar',$uid,$uid);
-       pg_exec($pgcon,$q);
-       $res=pg_exec($pgcon,$nv); $nid=pg_fetch_row($res); pg_freeresult($res);
-       $q=sprintf($op,$nid[0],$calendarid[0],$uid);
-       pg_exec($pgcon,$q);
-       $res=pg_exec($pgcon,$nv); $contactsid=pg_fetch_row($res); pg_freeresult($res);
-       $q=sprintf($ot,$contactsid[0],'My Contacts','contact',$uid,$uid);
-       pg_exec($pgcon,$q);
-       $res=pg_exec($pgcon,$nv); $nid=pg_fetch_row($res); pg_freeresult($res);
-       $q=sprintf($op,$nid[0],$contactsid[0],$uid);
-       pg_exec($pgcon,$q);
-       $res=pg_exec($pgcon,$nv); $tasksid=pg_fetch_row($res); pg_freeresult($res);
-       $q=sprintf($ot,$tasksid[0],'My Tasks','task',$uid,$uid);
-       pg_exec($pgcon,$q);
-       $res=pg_exec($pgcon,$nv); $nid=pg_fetch_row($res); pg_freeresult($res);
-       $q=sprintf($op,$nid[0],$tasksid[0],$uid);
-       pg_exec($pgcon,$q);
-       $q=sprintf($os,$uid,$calendarid[0],$contactsid[0],$tasksid[0]);
-       pg_exec($pgcon,$q);
-       $q=sprintf($ugr,$uid);
-       pg_exec($pgcon,$q);
-       pg_close($pgcon);
+    /* Trying to open a Postgresql Database Server */
+    if (function_exists("pg_connect")){
+      if(isset($this->oxconf["PGUSER"]) and isset($this->oxconf["PGHOST"]) and isset($this->oxconf["PGDBNAME"]) and isset($this->oxconf["PGPASSWD"])){
+        $pgcon = pg_connect("host=".$this->oxconf["PGHOST"]." user=".$this->oxconf["PGUSER"]." password=".$this->oxconf["PGPASSWD"]." dbname=".$this->oxconf["PGDBNAME"]);
+        if (! $pgcon){
+          print_red(_("Couldn't Connect To Postgresql Database"));
+          return;
+        }
+      }else{
+        print_red(_("Needed Parameters to openexchange connectivity plugin failed!"));
+        return;
+      }
+    }else{
+      print_red(_("PHP4 module for Postgresql Database Failed!"));
+      return;
+    }
+
+    $uid=$this->attrs['cn'][0];
+
+    plugin::save();
+
+    /* Write back to ldap */
+    $ldap= $this->config->get_ldap_link();
+    $ldap->cd($this->dn);
+    $ldap->modify($this->attrs);
+    show_ldap_error($ldap->get_error());
+
+    /* Optionally execute a command after we're done */
+    $this->postcreate();
+
+    /* Finally save data to postgresql server */
+    pg_set_client_encoding ("UNICODE");
+    $nv = "SELECT nextval ('serial_id')";
+    $ot = "insert into oxfolder_tree (fuid, parent, fname, module, type, owner, creator, creating_date, created_from, changing_date, changed_from) VALUES (%d, 1, '%s', '%s', 'private', '%s', '%s', 'now', 'System', 'now', 'System')";
+    $op = "INSERT INTO oxfolder_permissions (puid, pid, role, entity, sealed, fp, orp, owp, odp) VALUES (%d, %d, 32768,  '%s', 0, 128, 128, 128, 128)";
+    $os = "insert into oxfolder_standardfolders (owner,module_calendar,module_contact,module_task) VALUES ('%s',%d,%d,%d)";
+    $ugr= "INSERT INTO usr_general_rights SELECT creating_date, created_from, changing_date, changed_from,text('%s'),  addr_u, addr_r, addr_d, cont_u, cont_r, cont_d, data_u, data_r, data_d, serie_u, serie_r, serie_d, task_u, task_r, task_d,  refer, proj_u, proj_r, proj_d, dfolder_u, dfolder_r, dfolder_d, doc_u, doc_r, doc_d, knowl_u, knowl_r, knowl_d, bfolder_u,  bfolder_r, bfolder_d, bookm_u, bookm_r, bookm_d, pin_u, pin_r, pin_d, forum_n, fentrie_n, setup, pin_public, internal,  int_groups, kfolder_u, kfolder_r, kfolder_d, webmail FROM sys_gen_rights_template WHERE login LIKE 'default_template'";
+
+    $res=pg_exec($pgcon,$nv); $calendarid=pg_fetch_row($res); pg_freeresult($res);
+    $q=sprintf($ot,$calendarid[0],'My Appointments','calendar',$uid,$uid);
+    pg_exec($pgcon,$q);
+    $res=pg_exec($pgcon,$nv); $nid=pg_fetch_row($res); pg_freeresult($res);
+    $q=sprintf($op,$nid[0],$calendarid[0],$uid);
+    pg_exec($pgcon,$q);
+    $res=pg_exec($pgcon,$nv); $contactsid=pg_fetch_row($res); pg_freeresult($res);
+    $q=sprintf($ot,$contactsid[0],'My Contacts','contact',$uid,$uid);
+    pg_exec($pgcon,$q);
+    $res=pg_exec($pgcon,$nv); $nid=pg_fetch_row($res); pg_freeresult($res);
+    $q=sprintf($op,$nid[0],$contactsid[0],$uid);
+    pg_exec($pgcon,$q);
+    $res=pg_exec($pgcon,$nv); $tasksid=pg_fetch_row($res); pg_freeresult($res);
+    $q=sprintf($ot,$tasksid[0],'My Tasks','task',$uid,$uid);
+    pg_exec($pgcon,$q);
+    $res=pg_exec($pgcon,$nv); $nid=pg_fetch_row($res); pg_freeresult($res);
+    $q=sprintf($op,$nid[0],$tasksid[0],$uid);
+    pg_exec($pgcon,$q);
+    $q=sprintf($os,$uid,$calendarid[0],$contactsid[0],$tasksid[0]);
+    pg_exec($pgcon,$q);
+    $q=sprintf($ugr,$uid);
+    pg_exec($pgcon,$q);
+    pg_close($pgcon);
   }
 }
 
+// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>

diff --git a/plugins/personal/connectivity/oxchange.tpl b/plugins/personal/connectivity/oxchange.tpl
index 6891e815e54ff371241a38d68a096f2b93c814c4..f2e56e47b6a268ed568b1557d934e69908254596 100644 (file)
--- a/plugins/personal/connectivity/oxchange.tpl
+++ b/plugins/personal/connectivity/oxchange.tpl
@@ -1,7 +1,7 @@
 { if !$pg }
 <h2>{t}Open-Xchange Account{/t} - {t}disabled, no Postgresql support detected{/t}</h2>
 {else}
-<h2>{if $tabbed eq 1}<input type="checkbox" name="oxchange" value="B" {$oxchangeState} {$oxchangeAccount} onCLick="changeState('OXAppointmentDays');changeState('OXTaskDays');changeState('OXTimeZone');" >{/if}{t}Open-Xchange account{/t}</h2>
+<h2>{if $tabbed eq 1}<input type="checkbox" name="oxchange" value="B" {$oxchangeState} {$oxchangeAccountACL} onCLick="changeState('OXAppointmentDays');changeState('OXTaskDays');changeState('OXTimeZone');" >{/if}{t}Open-Xchange account{/t}</h2>
 <table style="width:100%; vertical-align:top; text-align:left;" cellpadding=0 border=0>
 
  <!-- Headline container -->
@@ -35,7 +35,7 @@
        </tr>
        <tr>
          <td>{t}User Timezone{/t}</td>
-        <td><select size="1" name="OXTimeZone" id="OXTimeZone" {$OXTimeZoneAcl} {$fstate}> 
+        <td><select size="1" name="OXTimeZone" id="OXTimeZone" {$OXTimeZoneACL} {$fstate}> 
         {html_options values=$timezones output=$timezones selected=$OXTimeZone}
         </select>
         </td>