diff --git a/calendar/phpgroupware.org/accept_holiday.php b/calendar/egroupware.org/accept_holiday.php similarity index 97% rename from calendar/phpgroupware.org/accept_holiday.php rename to calendar/egroupware.org/accept_holiday.php index 6ff2f6de36..4ff14c2522 100644 --- a/calendar/phpgroupware.org/accept_holiday.php +++ b/calendar/egroupware.org/accept_holiday.php @@ -18,7 +18,7 @@ } $send_back_to = str_replace('&locale='.$_POST['locale'],'',$send_back_to); - $file = './holidays.'.$_POST['locale']; + $file = './holidays.'.$_POST['locale'].'.csv'; if(!file_exists($file)) { if (count($_POST['name'])) diff --git a/calendar/setup/holidays.AU b/calendar/egroupware.org/holidays.AU.csv old mode 100755 new mode 100644 similarity index 100% rename from calendar/setup/holidays.AU rename to calendar/egroupware.org/holidays.AU.csv diff --git a/calendar/egroupware.org/holidays.BR.csv b/calendar/egroupware.org/holidays.BR.csv new file mode 100644 index 0000000000..6498f6eaf2 --- /dev/null +++ b/calendar/egroupware.org/holidays.BR.csv @@ -0,0 +1,6 @@ +BR Dia do Trabalho 1 5 0 0 0 +BR Dia da Independência 7 9 0 0 0 +BR Proclamação da República 15 11 0 0 0 +BR Nossa Senhora Aparecida 12 10 0 0 0 +BR Confraternização Universal 1 1 0 0 0 +BR Revolução Constitucionalista de 32 9 7 0 0 0 diff --git a/calendar/egroupware.org/holidays.BW.csv b/calendar/egroupware.org/holidays.BW.csv new file mode 100644 index 0000000000..1d3335b350 --- /dev/null +++ b/calendar/egroupware.org/holidays.BW.csv @@ -0,0 +1,7 @@ +BW Neujahr 1 1 2004 0 0 +BW Heilige 3 Könige 6 1 2004 0 0 +BW Fronleichnahm 19 6 2003 0 0 +BW Tag der deutschen Einheit 3 10 2003 0 0 +BW Allerheiligen 1 11 2003 0 0 +BW 1. Weihnachtsfeiertag 25 12 2003 0 0 +BW 2. Weihnachtsfeiertag 26 12 2003 0 0 diff --git a/calendar/setup/holidays.CA b/calendar/egroupware.org/holidays.CA.csv old mode 100755 new mode 100644 similarity index 100% rename from calendar/setup/holidays.CA rename to calendar/egroupware.org/holidays.CA.csv diff --git a/calendar/egroupware.org/holidays.CL.csv b/calendar/egroupware.org/holidays.CL.csv new file mode 100644 index 0000000000..6e4a5ec045 --- /dev/null +++ b/calendar/egroupware.org/holidays.CL.csv @@ -0,0 +1,5 @@ +CL Fiestas Patrias 18 9 0 0 0 +CL Día del ejercito 19 9 0 0 0 +CL Día de la Raza 15 10 0 0 0 +CL Navidad 25 12 0 0 0 +CL Día de la virgen 8 12 0 0 0 diff --git a/calendar/egroupware.org/holidays.CO.csv b/calendar/egroupware.org/holidays.CO.csv new file mode 100644 index 0000000000..f2980be743 --- /dev/null +++ b/calendar/egroupware.org/holidays.CO.csv @@ -0,0 +1,6 @@ +CO DIA DE LA RAZA 15 10 0 0 0 +CO DIA DE TODOS LOS SANTOS 5 11 0 0 0 +CO INDEPENDENCIA CARTAGENA 12 11 0 0 0 +CO DIA DE LAS LUCES 8 12 0 0 0 +CO NAVIDAD 25 12 0 0 0 +CO AÑO NUEVO 1 1 0 0 0 diff --git a/calendar/egroupware.org/holidays.CZ.csv b/calendar/egroupware.org/holidays.CZ.csv new file mode 100644 index 0000000000..59ab499e4f --- /dev/null +++ b/calendar/egroupware.org/holidays.CZ.csv @@ -0,0 +1,8 @@ +CZ Nový rok 1 1 0 0 0 +CZ Nový rok 1 1 0 0 0 +CZ den osvobození 8 5 0 0 0 +CZ Cyril a Metodìj 5 7 0 0 0 +CZ Jan Hus 6 7 0 0 0 +CZ sv.Václava 28 9 0 0 0 +CZ den boje za svobodu 17 11 0 0 0 +CZ den boje za svobodu 17 11 0 0 0 diff --git a/calendar/setup/holidays.DE b/calendar/egroupware.org/holidays.DE.csv similarity index 100% rename from calendar/setup/holidays.DE rename to calendar/egroupware.org/holidays.DE.csv diff --git a/calendar/setup/holidays.FR b/calendar/egroupware.org/holidays.FR.csv similarity index 100% rename from calendar/setup/holidays.FR rename to calendar/egroupware.org/holidays.FR.csv diff --git a/calendar/setup/holidays.IE b/calendar/egroupware.org/holidays.IE.csv similarity index 100% rename from calendar/setup/holidays.IE rename to calendar/egroupware.org/holidays.IE.csv diff --git a/calendar/setup/holidays.JP b/calendar/egroupware.org/holidays.JP.csv old mode 100755 new mode 100644 similarity index 80% rename from calendar/setup/holidays.JP rename to calendar/egroupware.org/holidays.JP.csv index 316e54e82f..c9516b0f87 --- a/calendar/setup/holidays.JP +++ b/calendar/egroupware.org/holidays.JP.csv @@ -4,9 +4,10 @@ JP JP ½Õʬ¤ÎÆü 0 3 0 0 1 JP ¤ß¤É¤ê¤ÎÆü 29 4 0 0 1 JP ·ûË¡µ­Ç°Æü 3 5 0 0 1 +JP ¹ṉ̃¤Î½ËÆü 4 5 0 0 1 JP ¤³¤É¤â¤ÎÆü 5 5 0 0 1 -JP ³¤¤ÎÆü 0 7 3 1 1 -JP ·ÉÏ·¤ÎÆü 0 9 3 1 1 +JP ³¤¤ÎÆü 20 7 0 0 1 +JP ·ÉÏ·¤ÎÆü 15 9 0 0 1 JP ½©Ê¬¤ÎÆü 0 9 0 0 1 JP Âΰé¤ÎÆü 0 10 2 1 1 JP ʸ²½¤ÎÆü 3 11 0 0 1 diff --git a/calendar/egroupware.org/holidays.MU.csv b/calendar/egroupware.org/holidays.MU.csv new file mode 100644 index 0000000000..6827b5ee35 --- /dev/null +++ b/calendar/egroupware.org/holidays.MU.csv @@ -0,0 +1,12 @@ +MU Fallas 19 3 0 0 0 +MU Fallas 18 3 0 0 0 +MU Fallas 20 3 0 0 0 +MU Semana Santa 28 3 0 0 0 +MU Semana Santa 29 3 0 0 0 +MU Semana Santa 1 4 0 0 0 +MU Semana Santa 2 4 0 0 0 +MU Semana Santa 3 4 0 0 0 +MU Semana Santa 4 4 0 0 0 +MU Semana Santa 5 4 0 0 0 +MU Semana Santa 8 4 0 0 0 +MU Día del trabajador 1 5 0 0 0 diff --git a/calendar/egroupware.org/holidays.MX.csv b/calendar/egroupware.org/holidays.MX.csv new file mode 100644 index 0000000000..631178c742 --- /dev/null +++ b/calendar/egroupware.org/holidays.MX.csv @@ -0,0 +1,10 @@ +MX Año Nuevo 1 1 0 0 0 +MX Día de la Constitución 5 2 0 0 0 +MX N. Benito Juárez 21 3 0 0 0 +MX Día del Trabajo 1 5 0 0 0 +MX Día de las Madres 10 5 0 0 0 +MX Día de la Independencia 16 9 0 0 0 +MX Día de Muertos 2 11 0 0 0 +MX Revolución Mexicana 20 11 0 0 0 +MX Virgen de Guadalupe 12 12 0 0 0 +MX Navidad 25 12 0 0 0 diff --git a/calendar/egroupware.org/holidays.MY.csv b/calendar/egroupware.org/holidays.MY.csv new file mode 100644 index 0000000000..148a841a87 --- /dev/null +++ b/calendar/egroupware.org/holidays.MY.csv @@ -0,0 +1,15 @@ +MY New Year 1 1 0 0 0 +MY Chinese New Year 24 1 0 0 0 +MY Chinese New Year 25 1 0 0 0 +MY FT Day 1 2 0 0 0 +MY Hari Raya Haji 6 3 0 0 0 +MY Awal Muharram 26 3 0 0 0 +MY Labour Day 1 5 0 0 0 +MY Wesak Day 7 5 0 0 0 +MY Agong\'s Birthday 0 6 1 6 0 +MY Maulud Nabi 4 6 0 0 0 +MY Hari Merdeka 31 8 0 0 0 +MY Hari Raya Puasa 16 12 0 0 0 +MY Hari Raya Puasa 17 12 0 0 0 +MY Christmas Day 25 12 0 0 0 +MY Deepavali 14 11 0 0 0 diff --git a/calendar/egroupware.org/holidays.PL.csv b/calendar/egroupware.org/holidays.PL.csv new file mode 100644 index 0000000000..1c60874cad --- /dev/null +++ b/calendar/egroupware.org/holidays.PL.csv @@ -0,0 +1,8 @@ +PL ¦wiêto Konstytucji 3-go Maje 3 5 0 0 0 +PL Dzieñ Niepodleg³o¶ci 15 8 0 0 0 +PL Nowy Rok 1 1 0 0 0 +PL Bo¿e Narodzenie - 1 dzieñ ¶wi±t 25 12 0 0 0 +PL Bo¿e Narodzenie - 2 dzieñ ¶wi±t 26 12 0 0 0 +PL ¦wietej Barbary 4 12 0 0 0 +PL ¦wiêto Pracy 1 5 0 0 0 +PL ¦wiêto Konstytucji 3-go Maje 3 5 0 0 0 diff --git a/calendar/egroupware.org/holidays.TH.csv b/calendar/egroupware.org/holidays.TH.csv new file mode 100644 index 0000000000..bcb9055b23 --- /dev/null +++ b/calendar/egroupware.org/holidays.TH.csv @@ -0,0 +1,15 @@ +TH Çѹ¢Öé¹»ÕãËÁè 1 1 0 0 0 +TH ÁÒ¦ºÙªÒ 26 2 0 0 0 +TH Çѹ¨Ñ¡ÃÕ 8 4 0 0 0 +TH ʧ¡ÃÒ¹µì 15 4 0 0 0 +TH ʧ¡ÃÒ¹µì 16 4 0 0 0 +TH ª´àªÂÇѹ©ÑµÃÁ§¤Å 6 5 0 0 0 +TH Çѹ¾×ªÁ§¤Å 9 5 0 0 0 +TH ª´àªÂÇѹÇÔÊÒ¢ºÙªÒ 27 5 0 0 0 +TH ÇѹÍÒÊÒÌËºÙªÒ 24 7 0 0 0 +TH à¢éÒ¾ÃÃÉÒ 25 7 0 0 0 +TH Çѹà©ÅÔÁ¾ÃЪ¹Á¾ÃÃÉÒÊÁà´ç¨¾ÃÐÃÒªÔ¹Õ 12 8 0 0 0 +TH Çѹ»ÔÂÁËÒÃÒª 23 10 0 0 0 +TH Çѹà©ÅÔÁ¾ÃЪ¹Áì¾ÃÃÉÒÊÁà´ç¨¾ÃÐà¨éÒÍÂÙèËÑÇ 5 12 0 0 0 +TH ÇѹÃÑ°¸ÃÃÁ¹Ù­ 10 12 0 0 0 +TH ÇѹÊÔé¹»Õ 31 12 0 0 0 diff --git a/calendar/setup/holidays.FI b/calendar/egroupware.org/holidays.US.csv similarity index 100% rename from calendar/setup/holidays.FI rename to calendar/egroupware.org/holidays.US.csv diff --git a/calendar/inc/class.boholiday.inc.php b/calendar/inc/class.boholiday.inc.php index 9469566d99..abf31b1f9e 100755 --- a/calendar/inc/class.boholiday.inc.php +++ b/calendar/inc/class.boholiday.inc.php @@ -237,10 +237,10 @@ } else { - $pos = strpos(' '.$GLOBALS['phpgw_info']['server']['webserver_url'],$HTTP_HOST); + $pos = strpos(' '.$GLOBALS['phpgw_info']['server']['webserver_url'],$_SERVER['HTTP_HOST']); if($pos == 0) { - switch($SERVER_PORT) + switch($_SERVER['SERVER_PORT']) { case 80: $http_protocol = 'http://'; @@ -249,16 +249,16 @@ $http_protocol = 'https://'; break; } - $server_host = $http_protocol.$HTTP_HOST.$GLOBALS['phpgw_info']['server']['webserver_url']; + $server_host = $http_protocol.$_SERVER['HTTP_HOST'].$GLOBALS['phpgw_info']['server']['webserver_url']; } else { $server_host = $GLOBALS['phpgw_info']['server']['webserver_url']; } - $load_from = $server_host.'/calendar/setup'; + $load_from = $server_host.'/calendar/egroupware.org'; } // echo 'Loading from: '.$load_from.'/holidays.'.strtoupper($locale)."
\n"; - $lines = $network->gethttpsocketfile($load_from.'/holidays.'.strtoupper($locale)); + $lines = $network->gethttpsocketfile($load_from.'/holidays.'.strtoupper($locale).'csv'); if (!$lines) { return false; diff --git a/calendar/setup/holidays.US b/calendar/setup/holidays.US deleted file mode 100755 index 2e65730728..0000000000 --- a/calendar/setup/holidays.US +++ /dev/null @@ -1,13 +0,0 @@ -US New Years 1 1 0 0 1 -US Martin Luther King's Birthday 0 1 3 1 0 -US Inauguration Day 20 1 0 0 0 -US Presidents Day 0 2 3 1 0 -US Armed Forces Day 0 5 3 6 0 -US Memorial Day 0 5 99 1 0 -US Flag Day 14 6 0 0 0 -US Independence Day 4 7 0 0 1 -US Labor Day 0 9 1 1 0 -US Columbus Day 0 10 2 1 0 -US Veterans Day 11 11 0 0 1 -US Thanksgiving Day 0 11 4 4 0 -US Christmas Day 25 12 0 0 1