R55584 - in /trunk: egroupware/api/src/ egroupware/api/src/Contacts/ egroupware/api/src/Etemplate/Widget/ phpgwapi/inc/

ralfbecker_sf 2016-03-31 19:41:39 UTC #1

Author: ralfbecker
New Revision: 55584

URL: http://svn.stylite.de/viewvc/egroupware?rev=55584&view=rev
Log:
move country class to api, made all methods static and update country list with current (lowercase) ISO 3166 list

Added:
trunk/egroupware/api/src/Country.php
- copied, changed from r55571, trunk/phpgwapi/inc/class.country.inc.php
Modified:
trunk/egroupware/api/src/Contacts.php
trunk/egroupware/api/src/Contacts/Tracking.php
trunk/egroupware/api/src/Etemplate/Widget/Select.php
trunk/phpgwapi/inc/class.applications.inc.php
trunk/phpgwapi/inc/class.asyncservice.inc.php
trunk/phpgwapi/inc/class.country.inc.php

Modified: trunk/egroupware/api/src/Contacts.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Contacts.php?rev=55584&r1=55583&r2=55584&view=diff

— trunk/egroupware/api/src/Contacts.php (original)
+++ trunk/egroupware/api/src/Contacts.php Thu Mar 31 21:41:39 2016
@@ -903,7 +903,7 @@
// Update country codes
foreach(array(‘adr_one_’, ‘adr_two_’) as $c_prefix) {
if($contact[$c_prefix.‘countryname’] && !$contact[$c_prefix.‘countrycode’] &&

  		$code = $GLOBALS['egw']->country->country_code($contact[$c_prefix.'countryname']))

  		$code = Country::country_code($contact[$c_prefix.'countryname']))
  	{
  		if(strlen($code) == 2)
  		{

@@ -1087,10 +1087,10 @@

		// Update country name from code
		if($data['adr_one_countrycode'] != null) {

  		$data['adr_one_countryname'] = $GLOBALS['egw']->country->get_full_name($data['adr_one_countrycode'], true);

  		$data['adr_one_countryname'] = Country::get_full_name($data['adr_one_countrycode'], true);
  	}
  	if($data['adr_two_countrycode'] != null) {

  		$data['adr_two_countryname'] = $GLOBALS['egw']->country->get_full_name($data['adr_two_countrycode'], true);

  		$data['adr_two_countryname'] = Country::get_full_name($data['adr_two_countrycode'], true);
  	}
  }
  if (isset($cf_backup))

@@ -1961,7 +1961,7 @@
*/
function addr_format_by_country($country)
{

  $code = $GLOBALS['egw']->country->country_code($country);

  $code = Country::country_code($country);

  switch($code)
  {

Modified: trunk/egroupware/api/src/Contacts/Tracking.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Contacts/Tracking.php?rev=55584&r1=55583&r2=55584&view=diff

— trunk/egroupware/api/src/Contacts/Tracking.php (original)
+++ trunk/egroupware/api/src/Contacts/Tracking.php Thu Mar 31 21:41:39 2016
@@ -166,7 +166,7 @@
{
if($data[$code])
{

  			$data[$name] = $GLOBALS['egw']->country->get_full_name($data[$code], true);

  			$data[$name] = Api\Country::get_full_name($data[$code], true);
  		}
  		unset($changed_fields[array_search($code, $changed_fields)]);
  	}

Copied: trunk/egroupware/api/src/Country.php (from r55571, trunk/phpgwapi/inc/class.country.inc.php)
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Country.php?p2=trunk/egroupware/api/src/Country.php&p1=trunk/phpgwapi/inc/class.country.inc.php&r1=55571&r2=55584&rev=55584&view=diff

— trunk/phpgwapi/inc/class.country.inc.php (original)
+++ trunk/egroupware/api/src/Country.php Thu Mar 31 21:41:39 2016
@@ -1,287 +1,298 @@

<?php
-/**************************************************************************
-* eGroupWare - Country Codes *
-* http://www.egroupware.org *
-* Written by Mark Peters skeeter@phpgroupware.org *
-* -------------------------------------------- *
-* This program is free software; you can redistribute it and/or modify it *
-* under the terms of the GNU General Public License as published by the *
-* Free Software Foundation; either version 2 of the License, or (at your *
-* option) any later version. *
-**************************************************************************/

-/* $Id$ /
+/*

- EGroupware API - Country codes
- @link http://www.egroupware.org
- @author Mark Peters skeeter@phpgroupware.org
- @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
- @package api
- @subpackage country
- @access public
- @version $Id$
*/

+namespace EGroupware\Api;

/**

2-digit ISO 3166 Country codes

- http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html

- All methods are static now, no need to instanciate it via $GLOBALS[‘egw’]->country->method(),
- just use Api\Country::method().
- @see http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html
- @see https://github.com/datasets/country-list
  /
  -class country
  +class Country
  {
  /*
  - array with 2-letter iso-3166 country-code => country-name pairs
  - @var array
    */

var $country_array = array(
```
  'AX' => 'AALAND ISLANDS',
```
```
  'AF' => 'AFGHANISTAN',
```
```
  'AL' => 'ALBANIA',
```
```
  'DZ' => 'ALGERIA',
```
```
  'AS' => 'AMERICAN SAMOA',
```
```
  'AD' => 'ANDORRA',
```
```
  'AO' => 'ANGOLA',
```
```
  'AI' => 'ANGUILLA',
```
```
  'AQ' => 'ANTARCTICA',
```
```
  'AG' => 'ANTIGUA AND BARBUDA',
```
```
  'AR' => 'ARGENTINA',
```
```
  'AM' => 'ARMENIA',
```
```
  'AW' => 'ARUBA',
```
```
  'AU' => 'AUSTRALIA',
```
```
  'AT' => 'AUSTRIA',
```
```
  'AZ' => 'AZERBAIJAN',
```
```
  'BS' => 'BAHAMAS',
```
```
  'BH' => 'BAHRAIN',
```
```
  'BD' => 'BANGLADESH',
```
```
  'BB' => 'BARBADOS',
```
```
  'BY' => 'BELARUS',
```
```
  'BE' => 'BELGIUM',
```
```
  'BZ' => 'BELIZE',
```
```
  'BJ' => 'BENIN',
```
```
  'BM' => 'BERMUDA',
```
```
  'BT' => 'BHUTAN',
```
```
  'BO' => 'BOLIVIA',
```
```
  'BA' => 'BOSNIA AND HERZEGOVINA',
```
```
  'BW' => 'BOTSWANA',
```
```
  'BV' => 'BOUVET ISLAND',
```
```
  'BR' => 'BRAZIL',
```

  'IO' => 'BRITISH INDIAN OCEAN TERRITORY',

```
  'BN' => 'BRUNEI DARUSSALAM',
```
```
  'BG' => 'BULGARIA',
```
```
  'BF' => 'BURKINA FASO',
```
```
  'BI' => 'BURUNDI',
```
```
  'KH' => 'CAMBODIA',
```
```
  'CM' => 'CAMEROON',
```
```
  'CA' => 'CANADA',
```
```
  'CV' => 'CAPE VERDE',
```
```
  'KY' => 'CAYMAN ISLANDS',
```
```
  'CF' => 'CENTRAL AFRICAN REPUBLIC',
```
```
  'TD' => 'CHAD',
```
```
  'CL' => 'CHILE',
```
```
  'CN' => 'CHINA',
```
```
  'CX' => 'CHRISTMAS ISLAND',
```
```
  'CC' => 'COCOS (KEELING) ISLANDS',
```
```
  'CO' => 'COLOMBIA',
```
```
  'KM' => 'COMOROS',
```
```
  'CG' => 'CONGO',
```

  'CD' => 'CONGO, THE DEMOCRATIC REPUBLIC OF THE',

```
  'CK' => 'COOK ISLANDS',
```
```
  'CR' => 'COSTA RICA',
```
```
  'CI' => 'COTE D IVOIRE',
```
```
  'HR' => 'CROATIA',
```
```
  'CU' => 'CUBA',
```
```
  'CY' => 'CYPRUS',
```
```
  'CZ' => 'CZECH REPUBLIC',
```
```
  'DK' => 'DENMARK',
```
```
  'DJ' => 'DJIBOUTI',
```
```
  'DM' => 'DOMINICA',
```
```
  'DO' => 'DOMINICAN REPUBLIC',
```
```
  'TP' => 'FORMER EAST TIMOR',
```
```
  'EC' => 'ECUADOR',
```
```
  'EG' => 'EGYPT',
```
```
  'SV' => 'EL SALVADOR',
```
```
  'GQ' => 'EQUATORIAL GUINEA',
```
```
  'ER' => 'ERITREA',
```
```
  'EE' => 'ESTONIA',
```
```
  'ET' => 'ETHIOPIA',
```

  'FK' => 'FALKLAND ISLANDS (MALVINAS)',

```
  'FO' => 'FAROE ISLANDS',
```
```
  'FJ' => 'FIJI',
```
```
  'FI' => 'FINLAND',
```
```
  'FR' => 'FRANCE',
```
```
  'GF' => 'FRENCH GUIANA',
```
```
  'PF' => 'FRENCH POLYNESIA',
```

  'TF' => 'FRENCH SOUTHERN TERRITORIES',

```
  'GA' => 'GABON',
```
```
  'GM' => 'GAMBIA',
```
```
  'GE' => 'GEORGIA',
```
```
  'DE' => 'GERMANY',
```
```
  'GH' => 'GHANA',
```
```
  'GI' => 'GIBRALTAR',
```
```
  'GR' => 'GREECE',
```
```
  'GL' => 'GREENLAND',
```
```
  'GD' => 'GRENADA',
```
```
  'GP' => 'GUADELOUPE',
```
```
  'GU' => 'GUAM',
```
```
  'GT' => 'GUATEMALA',
```
```
  'GN' => 'GUINEA',
```
```
  'GW' => 'GUINEA-BISSAU',
```
```
  'GY' => 'GUYANA',
```
```
  'HT' => 'HAITI',
```

  'HM' => 'HEARD ISLAND AND MCDONALD ISLANDS',

  'VA' => 'HOLY SEE (VATICAN CITY STATE)',

```
  'HN' => 'HONDURAS',
```
```
  'HK' => 'HONG KONG',
```
```
  'HU' => 'HUNGARY',
```
```
  'IS' => 'ICELAND',
```
```
  'IN' => 'INDIA',
```
```
  'ID' => 'INDONESIA',
```
```
  'IR' => 'IRAN, ISLAMIC REPUBLIC OF',
```
```
  'IQ' => 'IRAQ',
```
```
  'IE' => 'IRELAND',
```
```
  'IL' => 'ISRAEL',
```
```
  'IT' => 'ITALY',
```
```
  'JM' => 'JAMAICA',
```
```
  'JP' => 'JAPAN',
```
```
  'JO' => 'JORDAN',
```
```
  'KZ' => 'KAZAKSTAN',
```
```
  'KE' => 'KENYA',
```
```
  'KI' => 'KIRIBATI',
```

  'KP' => 'KOREA DEMOCRATIC PEOPLES REPUBLIC OF',

```
  'KR' => 'KOREA REPUBLIC OF',
```
```
  'KW' => 'KUWAIT',
```
```
  'KG' => 'KYRGYZSTAN',
```

  'LA' => 'LAO PEOPLES DEMOCRATIC REPUBLIC',

```
  'LV' => 'LATVIA',
```
```
  'LB' => 'LEBANON',
```
```
  'LS' => 'LESOTHO',
```
```
  'LR' => 'LIBERIA',
```
```
  'LY' => 'LIBYAN ARAB JAMAHIRIYA',
```
```
  'LI' => 'LIECHTENSTEIN',
```
```
  'LT' => 'LITHUANIA',
```
```
  'LU' => 'LUXEMBOURG',
```
```
  'MO' => 'MACAU',
```

  'MK' => 'MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF',

```
  'MG' => 'MADAGASCAR',
```
```
  'MW' => 'MALAWI',
```
```
  'MY' => 'MALAYSIA',
```
```
  'MV' => 'MALDIVES',
```
```
  'ML' => 'MALI',
```
```
  'MT' => 'MALTA',
```
```
  'MH' => 'MARSHALL ISLANDS',
```
```
  'MQ' => 'MARTINIQUE',
```
```
  'MR' => 'MAURITANIA',
```
```
  'MU' => 'MAURITIUS',
```
```
  'YT' => 'MAYOTTE',
```
```
  'MX' => 'MEXICO',
```

  'FM' => 'MICRONESIA, FEDERATED STATES OF',

```
  'MD' => 'MOLDOVA, REPUBLIC OF',
```
```
  'MC' => 'MONACO',
```
```
  'ME' => 'MONTENEGRO',
```
```
  'MN' => 'MONGOLIA',
```
```
  'MS' => 'MONTSERRAT',
```
```
  'MA' => 'MOROCCO',
```
```
  'MZ' => 'MOZAMBIQUE',
```
```
  'MM' => 'MYANMAR',
```
```
  'NA' => 'NAMIBIA',
```
```
  'NR' => 'NAURU',
```
```
  'NP' => 'NEPAL',
```
```
  'NL' => 'NETHERLANDS',
```
```
  'AN' => 'NETHERLANDS ANTILLES',
```
```
  'NC' => 'NEW CALEDONIA',
```
```
  'NZ' => 'NEW ZEALAND',
```
```
  'NI' => 'NICARAGUA',
```
```
  'NE' => 'NIGER',
```
```
  'NG' => 'NIGERIA',
```
```
  'NU' => 'NIUE',
```
```
  'NF' => 'NORFOLK ISLAND',
```
```
  'MP' => 'NORTHERN MARIANA ISLANDS',
```
```
  'NO' => 'NORWAY',
```
```
  'OM' => 'OMAN',
```
```
  'PK' => 'PAKISTAN',
```
```
  'PW' => 'PALAU',
```

  'PS' => 'PALESTINIAN TERRITORY, OCCUPIED',

```
  'PA' => 'PANAMA',
```
```
  'PG' => 'PAPUA NEW GUINEA',
```
```
  'PY' => 'PARAGUAY',
```
```
  'PE' => 'PERU',
```
```
  'PH' => 'PHILIPPINES',
```
```
  'PN' => 'PITCAIRN',
```
```
  'PL' => 'POLAND',
```
```
  'PT' => 'PORTUGAL',
```
```
  'PR' => 'PUERTO RICO',
```
```
  'QA' => 'QATAR',
```
```
  'RE' => 'REUNION',
```
```
  'RO' => 'ROMANIA',
```
```
  'RU' => 'RUSSIAN FEDERATION',
```
```
  'RW' => 'RWANDA',
```
```
  'SH' => 'SAINT HELENA',
```
```
  'KN' => 'SAINT KITTS AND NEVIS',
```
```
  'LC' => 'SAINT LUCIA',
```
```
  'PM' => 'SAINT PIERRE AND MIQUELON',
```

  'VC' => 'SAINT VINCENT AND THE GRENADINES',

```
  'WS' => 'SAMOA',
```
```
  'SM' => 'SAN MARINO',
```
```
  'ST' => 'SAO TOME AND PRINCIPE',
```
```
  'SA' => 'SAUDI ARABIA',
```
```
  'SN' => 'SENEGAL',
```

  'CS' =>	'FORMER SERBIA AND MONTENEGRO',

```
  'RS' => 'SERBIA',
```
```
  'SC' => 'SEYCHELLES',
```
```
  'SL' => 'SIERRA LEONE',
```
```
  'SG' => 'SINGAPORE',
```
```
  'SK' => 'SLOVAKIA',
```
```
  'SI' => 'SLOVENIA',
```
```
  'SB' => 'SOLOMON ISLANDS',
```
```
  'SO' => 'SOMALIA',
```
```
  'ZA' => 'SOUTH AFRICA',
```

  'GS' => 'SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS',

```
  'ES' => 'SPAIN',
```
```
  'LK' => 'SRI LANKA',
```
```
  'SD' => 'SUDAN',
```
```
  'SR' => 'SURINAME',
```
```
  'SJ' => 'SVALBARD AND JAN MAYEN',
```
```
  'SZ' => 'SWAZILAND',
```
```
  'SE' => 'SWEDEN',
```
```
  'CH' => 'SWITZERLAND',
```
```
  'SY' => 'SYRIAN ARAB REPUBLIC',
```
```
  'TW' => 'TAIWAN',
```
```
  'TJ' => 'TAJIKISTAN',
```

  'TZ' => 'TANZANIA, UNITED REPUBLIC OF',

```
  'TH' => 'THAILAND',
```
```
  'TL' =>	'TIMOR-LESTE',
```
```
  'TG' => 'TOGO',
```
```
  'TK' => 'TOKELAU',
```
```
  'TO' => 'TONGA',
```
```
  'TT' => 'TRINIDAD AND TOBAGO',
```
```
  'TN' => 'TUNISIA',
```
```
  'TR' => 'TURKEY',
```
```
  'TM' => 'TURKMENISTAN',
```
```
  'TC' => 'TURKS AND CAICOS ISLANDS',
```
```
  'TV' => 'TUVALU',
```
```
  'UG' => 'UGANDA',
```
```
  'UA' => 'UKRAINE',
```
```
  'AE' => 'UNITED ARAB EMIRATES',
```
```
  'GB' => 'UNITED KINGDOM',
```
```
  'US' => 'UNITED STATES',
```

  'UM' => 'UNITED STATES MINOR OUTLYING ISLANDS',

```
  'UY' => 'URUGUAY',
```
```
  'UZ' => 'UZBEKISTAN',
```
```
  'VU' => 'VANUATU',
```
```
  'VE' => 'VENEZUELA',
```
```
  'VN' => 'VIET NAM',
```
```
  'VG' => 'VIRGIN ISLANDS, BRITISH',
```
```
  'VI' => 'VIRGIN ISLANDS, U.S.',
```
```
  'WF' => 'WALLIS AND FUTUNA',
```
```
  'EH' => 'WESTERN SAHARA',
```
```
  'YE' => 'YEMEN',
```
```
  'YU' => 'FORMER YUGOSLAVIA',
```
```
  'ZM' => 'ZAMBIA',
```
```
  'ZW' => 'ZIMBABWE'
```

protected static $country_array = array(
```
  'AF' => 'Afghanistan',
```
```
  'AX' => 'Ã
```

land Islands’,

```
  'AL' => 'Albania',
```
```
  'DZ' => 'Algeria',
```
```
  'AS' => 'American Samoa',
```
```
  'AD' => 'Andorra',
```
```
  'AO' => 'Angola',
```
```
  'AI' => 'Anguilla',
```
```
  'AQ' => 'Antarctica',
```
```
  'AG' => 'Antigua and Barbuda',
```
```
  'AR' => 'Argentina',
```
```
  'AM' => 'Armenia',
```
```
  'AW' => 'Aruba',
```
```
  'AU' => 'Australia',
```
```
  'AT' => 'Austria',
```
```
  'AZ' => 'Azerbaijan',
```
```
  'BS' => 'Bahamas',
```
```
  'BH' => 'Bahrain',
```
```
  'BD' => 'Bangladesh',
```
```
  'BB' => 'Barbados',
```
```
  'BY' => 'Belarus',
```
```
  'BE' => 'Belgium',
```
```
  'BZ' => 'Belize',
```
```
  'BJ' => 'Benin',
```
```
  'BM' => 'Bermuda',
```
```
  'BT' => 'Bhutan',
```

  'BO' => 'Bolivia, Plurinational State of',

  'BQ' => 'Bonaire, Sint Eustatius and Saba',

```
  'BA' => 'Bosnia and Herzegovina',
```
```
  'BW' => 'Botswana',
```
```
  'BV' => 'Bouvet Island',
```
```
  'BR' => 'Brazil',
```

  'IO' => 'British Indian Ocean Territory',

```
  'BN' => 'Brunei Darussalam',
```
```
  'BG' => 'Bulgaria',
```
```
  'BF' => 'Burkina Faso',
```
```
  'BI' => 'Burundi',
```
```
  'KH' => 'Cambodia',
```
```
  'CM' => 'Cameroon',
```
```
  'CA' => 'Canada',
```
```
  'CV' => 'Cape Verde',
```
```
  'KY' => 'Cayman Islands',
```
```
  'CF' => 'Central African Republic',
```
```
  'TD' => 'Chad',
```
```
  'CL' => 'Chile',
```
```
  'CN' => 'China',
```
```
  'CX' => 'Christmas Island',
```
```
  'CC' => 'Cocos (Keeling) Islands',
```
```
  'CO' => 'Colombia',
```
```
  'KM' => 'Comoros',
```
```
  'CG' => 'Congo',
```

  'CD' => 'Congo, the Democratic Republic of the',

```
  'CK' => 'Cook Islands',
```
```
  'CR' => 'Costa Rica',
```
```
  'CI' => "CÃ´te d'Ivoire",
```
```
  'HR' => 'Croatia',
```
```
  'CU' => 'Cuba',
```
```
  'CW' => 'CuraÃ§ao',
```
```
  'CY' => 'Cyprus',
```
```
  'CZ' => 'Czech Republic',
```
```
  'DK' => 'Denmark',
```
```
  'DJ' => 'Djibouti',
```
```
  'DM' => 'Dominica',
```
```
  'DO' => 'Dominican Republic',
```
```
  'EC' => 'Ecuador',
```
```
  'EG' => 'Egypt',
```
```
  'SV' => 'El Salvador',
```
```
  'GQ' => 'Equatorial Guinea',
```
```
  'ER' => 'Eritrea',
```
```
  'EE' => 'Estonia',
```
```
  'ET' => 'Ethiopia',
```

  'FK' => 'Falkland Islands (Malvinas)',

```
  'FO' => 'Faroe Islands',
```
```
  'FJ' => 'Fiji',
```
```
  'FI' => 'Finland',
```
```
  'FR' => 'France',
```
```
  'GF' => 'French Guiana',
```
```
  'PF' => 'French Polynesia',
```

  'TF' => 'French Southern Territories',

```
  'GA' => 'Gabon',
```
```
  'GM' => 'Gambia',
```
```
  'GE' => 'Georgia',
```
```
  'DE' => 'Germany',
```
```
  'GH' => 'Ghana',
```
```
  'GI' => 'Gibraltar',
```
```
  'GR' => 'Greece',
```
```
  'GL' => 'Greenland',
```
```
  'GD' => 'Grenada',
```
```
  'GP' => 'Guadeloupe',
```
```
  'GU' => 'Guam',
```
```
  'GT' => 'Guatemala',
```
```
  'GG' => 'Guernsey',
```
```
  'GN' => 'Guinea',
```
```
  'GW' => 'Guinea-Bissau',
```
```
  'GY' => 'Guyana',
```
```
  'HT' => 'Haiti',
```

  'HM' => 'Heard Island and McDonald Islands',

  'VA' => 'Holy See (Vatican City State)',

```
  'HN' => 'Honduras',
```
```
  'HK' => 'Hong Kong',
```
```
  'HU' => 'Hungary',
```
```
  'IS' => 'Iceland',
```
```
  'IN' => 'India',
```
```
  'ID' => 'Indonesia',
```
```
  'IR' => 'Iran, Islamic Republic of',
```
```
  'IQ' => 'Iraq',
```
```
  'IE' => 'Ireland',
```
```
  'IM' => 'Isle of Man',
```
```
  'IL' => 'Israel',
```
```
  'IT' => 'Italy',
```
```
  'JM' => 'Jamaica',
```
```
  'JP' => 'Japan',
```
```
  'JE' => 'Jersey',
```
```
  'JO' => 'Jordan',
```
```
  'KZ' => 'Kazakhstan',
```
```
  'KE' => 'Kenya',
```
```
  'KI' => 'Kiribati',
```

  'KP' => "Korea, Democratic People's Republic of",

```
  'KR' => 'Korea, Republic of',
```
```
  'KW' => 'Kuwait',
```
```
  'KG' => 'Kyrgyzstan',
```

  'LA' => "Lao People's Democratic Republic",

```
  'LV' => 'Latvia',
```
```
  'LB' => 'Lebanon',
```
```
  'LS' => 'Lesotho',
```
```
  'LR' => 'Liberia',
```
```
  'LY' => 'Libya',
```
```
  'LI' => 'Liechtenstein',
```
```
  'LT' => 'Lithuania',
```
```
  'LU' => 'Luxembourg',
```
```
  'MO' => 'Macao',
```

  'MK' => 'Macedonia, the Former Yugoslav Republic of',

```
  'MG' => 'Madagascar',
```
```
  'MW' => 'Malawi',
```
```
  'MY' => 'Malaysia',
```
```
  'MV' => 'Maldives',
```
```
  'ML' => 'Mali',
```
```
  'MT' => 'Malta',
```
```
  'MH' => 'Marshall Islands',
```
```
  'MQ' => 'Martinique',
```
```
  'MR' => 'Mauritania',
```
```
  'MU' => 'Mauritius',
```
```
  'YT' => 'Mayotte',
```
```
  'MX' => 'Mexico',
```

  'FM' => 'Micronesia, Federated States of',

```
  'MD' => 'Moldova, Republic of',
```
```
  'MC' => 'Monaco',
```
```
  'MN' => 'Mongolia',
```
```
  'ME' => 'Montenegro',
```
```
  'MS' => 'Montserrat',
```
```
  'MA' => 'Morocco',
```
```
  'MZ' => 'Mozambique',
```
```
  'MM' => 'Myanmar',
```
```
  'NA' => 'Namibia',
```
```
  'NR' => 'Nauru',
```
```
  'NP' => 'Nepal',
```
```
  'NL' => 'Netherlands',
```
```
  'NC' => 'New Caledonia',
```
```
  'NZ' => 'New Zealand',
```
```
  'NI' => 'Nicaragua',
```
```
  'NE' => 'Niger',
```
```
  'NG' => 'Nigeria',
```
```
  'NU' => 'Niue',
```
```
  'NF' => 'Norfolk Island',
```
```
  'MP' => 'Northern Mariana Islands',
```
```
  'NO' => 'Norway',
```
```
  'OM' => 'Oman',
```
```
  'PK' => 'Pakistan',
```
```
  'PW' => 'Palau',
```
```
  'PS' => 'Palestine, State of',
```
```
  'PA' => 'Panama',
```
```
  'PG' => 'Papua New Guinea',
```
```
  'PY' => 'Paraguay',
```
```
  'PE' => 'Peru',
```
```
  'PH' => 'Philippines',
```
```
  'PN' => 'Pitcairn',
```
```
  'PL' => 'Poland',
```
```
  'PT' => 'Portugal',
```
```
  'PR' => 'Puerto Rico',
```
```
  'QA' => 'Qatar',
```
```
  'RE' => 'RÃ©union',
```
```
  'RO' => 'Romania',
```
```
  'RU' => 'Russian Federation',
```
```
  'RW' => 'Rwanda',
```
```
  'BL' => 'Saint BarthÃ©lemy',
```

  'SH' => 'Saint Helena, Ascension and Tristan da Cunha',

```
  'KN' => 'Saint Kitts and Nevis',
```
```
  'LC' => 'Saint Lucia',
```

  'MF' => 'Saint Martin (French part)',

```
  'PM' => 'Saint Pierre and Miquelon',
```

  'VC' => 'Saint Vincent and the Grenadines',

```
  'WS' => 'Samoa',
```
```
  'SM' => 'San Marino',
```
```
  'ST' => 'Sao Tome and Principe',
```
```
  'SA' => 'Saudi Arabia',
```
```
  'SN' => 'Senegal',
```
```
  'RS' => 'Serbia',
```
```
  'SC' => 'Seychelles',
```
```
  'SL' => 'Sierra Leone',
```
```
  'SG' => 'Singapore',
```
```
  'SX' => 'Sint Maarten (Dutch part)',
```
```
  'SK' => 'Slovakia',
```
```
  'SI' => 'Slovenia',
```
```
  'SB' => 'Solomon Islands',
```
```
  'SO' => 'Somalia',
```
```
  'ZA' => 'South Africa',
```

  'GS' => 'South Georgia and the South Sandwich Islands',

```
  'SS' => 'South Sudan',
```
```
  'ES' => 'Spain',
```
```
  'LK' => 'Sri Lanka',
```
```
  'SD' => 'Sudan',
```
```
  'SR' => 'Suriname',
```
```
  'SJ' => 'Svalbard and Jan Mayen',
```
```
  'SZ' => 'Swaziland',
```
```
  'SE' => 'Sweden',
```
```
  'CH' => 'Switzerland',
```
```
  'SY' => 'Syrian Arab Republic',
```
```
  'TW' => 'Taiwan, Province of China',
```
```
  'TJ' => 'Tajikistan',
```

  'TZ' => 'Tanzania, United Republic of',

```
  'TH' => 'Thailand',
```
```
  'TL' => 'Timor-Leste',
```
```
  'TG' => 'Togo',
```
```
  'TK' => 'Tokelau',
```
```
  'TO' => 'Tonga',
```
```
  'TT' => 'Trinidad and Tobago',
```
```
  'TN' => 'Tunisia',
```
```
  'TR' => 'Turkey',
```
```
  'TM' => 'Turkmenistan',
```
```
  'TC' => 'Turks and Caicos Islands',
```
```
  'TV' => 'Tuvalu',
```
```
  'UG' => 'Uganda',
```
```
  'UA' => 'Ukraine',
```
```
  'AE' => 'United Arab Emirates',
```
```
  'GB' => 'United Kingdom',
```
```
  'US' => 'United States',
```

  'UM' => 'United States Minor Outlying Islands',

```
  'UY' => 'Uruguay',
```
```
  'UZ' => 'Uzbekistan',
```
```
  'VU' => 'Vanuatu',
```

  'VE' => 'Venezuela, Bolivarian Republic of',

```
  'VN' => 'Viet Nam',
```
```
  'VG' => 'Virgin Islands, British',
```
```
  'VI' => 'Virgin Islands, U.S.',
```
```
  'WF' => 'Wallis and Futuna',
```
```
  'EH' => 'Western Sahara',
```
```
  'YE' => 'Yemen',
```
```
  'ZM' => 'Zambia',
```
```
  'ZW' => 'Zimbabwe',
```
);
/**
- translated list, set by country::_translate
- @var array
  */

var $countries_translated;

protected static $countries_translated;
/**
- List of US states as 2-letter code => name pairs
- @var array
  */

var $us_states_array = array(

protected static $us_states_array = array(
’–’ => ‘non US’,
‘AL’ => ‘Alabama’,
‘AK’ => ‘Alaska’,
@@ -341,40 +352,27 @@
- @return array with code => name pairs
  */

function us_states()

public static function us_states()
{

```
  return $this->us_states_array;
```

```
  return self::$us_states_array;
```
}

/**

- Selectbox for country-selection
- @deprecated use html::select with country_array
- @param string $selected 2-letter iso country-code
- @param string $name=‘country’

- Get country-name from the 2-letter iso code
- @param string $code 2-letter iso country-code
- @param boolean $translated =true use translated name or english
- @return string
  */

function form_select($code,$name=‘country’)
{

  return html::select($name,strtoupper($code),$this->country_array);

}
/**
- Get country-name from the 2-letter iso code
- @param string $selected 2-letter iso country-code
- @param boolean $translated=true use translated name or english
- @return string
*/
function get_full_name($code,$translated=true)

public static function get_full_name($code,$translated=true)
{
if ($translated)
{

  	if (!$this->countries_translated) $this->_translate_countries();

  	return $this->countries_translated[strtoupper($code)];

```
  }
```

  return $this->country_array[strtoupper($code)];

  	if (!self::$countries_translated) self::_translate_countries();

  	return self::$countries_translated[strtoupper($code)];

```
  }
```
```
  return self::$country_array[strtoupper($code)];
```
}

/**
@@ -383,23 +381,23 @@
- @param string $name
- @return string 2-letter code or $name if no code found
  */

function country_code($name)

public static function country_code($name)
{
if (!$name) return ‘’; // nothing to do

  if (strlen($name) == 2 && isset($this->country_array[$name]))

  if (strlen($name) == 2 && isset(self::$country_array[$name]))
  {
  	return $name;	// $name is already a country-code
  }

  if (($code = array_search(strtoupper($name),$this->country_array)) !== false)

  if (($code = array_search(strtoupper($name),self::$country_array)) !== false)
  {
  	return $code;
  }

  if (!$this->countries_translated) $this->_translate_countries();

  if (($code = array_search(strtoupper($name),$this->countries_translated)) !== false ||

  	($code = array_search($name,$this->countries_translated)) !== false)

  if (!self::$countries_translated) self::_translate_countries();

  if (($code = array_search(strtoupper($name),self::$countries_translated)) !== false ||

  	($code = array_search($name,self::$countries_translated)) !== false)
  {
  	return $code;
  }

@@ -410,11 +408,11 @@
{
$name = $en_names[$name];
}

  elseif (($name_en = $GLOBALS['egw']->translation->get_message_id($name,'common')))

  elseif (($name_en = Translation::get_message_id($name,'common')))
  {
  	$name = $en_names[$name] = strtoupper($name_en);
  }

  if (($code = array_search(strtoupper($name),$this->country_array)) !== false)

  if (($code = array_search(strtoupper($name),self::$country_array)) !== false)
  {
  	return $code;
  }

@@ -424,18 +422,18 @@
/**
* Get list of country names
*

- @param boolean $translated=true use translated names or english

- @param boolean $translated =true use translated names or english
- @return array with 2-letter code => name pairs
  */

function countries($translated=true)

public static function countries($translated=true)
{
if ($translated)
{

```
  	$this->_translate_countries();
```
```
  	return $this->countries_translated;
```
```
  }
```
```
  return $this->country_array;
```

  	if (!self::$countries_translated) self::_translate_countries();

```
  	return self::$countries_translated;
```
```
  }
```
```
  return self::$country_array;
```
}

/**
@@ -443,28 +441,25 @@
*
- @internal
  */

function _translate_countries()

protected static function _translate_countries()
{

  if ($this->countries_translated) return;

  $this->countries_translated = $this->country_array;

  if (self::$countries_translated) return;

  self::$countries_translated = self::$country_array;
  // try to translate them and sort alphabetic

  foreach($this->countries_translated as $k => $name)

```
  {
```

  	if (($translated = lang($name)) != $name.'*')

```
  	{
```

  		$this->countries_translated[$k] = $translated;

```
  	}
```

  foreach(self::$countries_translated as $k => $name)

```
  {
```

  	self::$countries_translated[$k] = lang($name);
  }

  if(class_exists('Collator') && class_exists('Locale'))
  {

  	$col = new \Collator(common::setlocale());

  	$col->asort($this->countries_translated);

  	$col = new \Collator(Preferences::setlocale());

  	$col->asort(self::$countries_translated);
  }
  else
  {

  	natcasesort($this->countries_translated);

  	natcasesort(self::$countries_translated);
  }

}
}

Modified: trunk/egroupware/api/src/Etemplate/Widget/Select.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Etemplate/Widget/Select.php?rev=55584&r1=55583&r2=55584&view=diff

— trunk/egroupware/api/src/Etemplate/Widget/Select.php (original)
+++ trunk/egroupware/api/src/Etemplate/Widget/Select.php Thu Mar 31 21:41:39 2016
@@ -211,7 +211,7 @@
list(,$country_use_name) = explode(’,’, $legacy_options);
if ($country_use_name && $value)
{

  				$value = $GLOBALS['egw']->country->get_full_name($value);

  				$value = Api\Country::get_full_name($value);
  			}
  			break;

@@ -529,15 +529,15 @@
if($type == 0 && $type2)
{
$custom_label = is_numeric($type2) ? ‘Custom’ : $type2;

  			$options = array('-custom-' => lang($custom_label)) + $GLOBALS['egw']->country->countries();

  			$options = array('-custom-' => lang($custom_label)) + Api\Country::countries();
  		}
  		else
  		{

  			$options = $GLOBALS['egw']->country->countries();

  			$options = Api\Country::countries();
  		}
  		if ($type && $value)
  		{

  			$value = $GLOBALS['egw']->country->country_code($value);

  			$value = Api\Country::country_code($value);
  			if (!isset($options[$value]))
  			{
  				if($type2)

@@ -550,7 +550,7 @@
break;

		case 'select-state':

  		$options = $GLOBALS['egw']->country->us_states();

  		$options = Api\Country::us_states();
  		$no_lang = True;
  		break;

Modified: trunk/phpgwapi/inc/class.applications.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/inc/class.applications.inc.php?rev=55584&r1=55583&r2=55584&view=diff

— trunk/phpgwapi/inc/class.applications.inc.php (original)
+++ trunk/phpgwapi/inc/class.applications.inc.php Thu Mar 31 21:41:39 2016
@@ -26,11 +26,6 @@
*/
var $db;
var $table_name = ‘egw_applications’;

/*var $public_functions = array(
```
  'list_methods' => True,
```
```
  'read'         => True
```
);*/
var $xmlrpc_methods = array();

/**************************************************************************\
- Standard constructor for setting $this->account_id *
  @@ -53,48 +48,6 @@
  }
  
  $this->account_id = get_account_id($account_id);
```
  $this->xmlrpc_methods[] = array(
```
```
  	'name'        => 'read',
```

  	'description' => 'Return a list of applications the current user has access to'

```
  );
```
}
function NOT_list_methods($_type=‘xmlrpc’)
{
```
  /*
```

  	This handles introspection or discovery by the logged in client,

  	in which case the input might be an array.  The server always calls

  	this function to fill the server dispatch map using a string.

```
  */
```
```
  if (is_array($_type))
```
```
  {
```

  	$_type = $_type['type'] ? $_type['type'] : $_type[0];

```
  }
```
```
  switch($_type)
```
```
  {
```
```
  	case 'xmlrpc':
```
```
  		$xml_functions = array(
```
```
  			'read' => array(
```
```
  				'function'  => 'read',
```

  				'signature' => array(array(xmlrpcStruct)),

  				'docstring' => lang('Returns struct of users application access')

```
  			),
```
```
  			'list_methods' => array(
```
```
  				'function'  => 'list_methods',
```

  				'signature' => array(array(xmlrpcStruct,xmlrpcString)),

  				'docstring' => lang('Read this list of methods.')

```
  			)
```
```
  		);
```
```
  		return $xml_functions;
```
```
  		break;
```
```
  	case 'soap':
```
```
  		return $this->soap_functions;
```
```
  		break;
```
```
  	default:
```
```
  		return array();
```
```
  		break;
```
```
  }
```
}

/**************************************************************************
@@ -194,7 +147,7 @@
*/
function save_repository()
{

  $num_rows = $GLOBALS['egw']->acl->delete_repository("%%", 'run', $this->account_id);

  $GLOBALS['egw']->acl->delete_repository("%%", 'run', $this->account_id);
  foreach($this->data as $app => $data)
  {
  	if(!$this->is_system_enabled($app))

@@ -229,7 +182,7 @@
{
$this->read_installed_apps();
}

  if ($app_list = $GLOBALS['egw']->acl->get_app_list_for_id('run',1,$this->account_id))

  if (($app_list = $GLOBALS['egw']->acl->get_app_list_for_id('run',1,$this->account_id)))
  {
  	foreach($app_list as $app)
  	{

Modified: trunk/phpgwapi/inc/class.asyncservice.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/inc/class.asyncservice.inc.php?rev=55584&r1=55583&r2=55584&view=diff

— trunk/phpgwapi/inc/class.asyncservice.inc.php (original)
+++ trunk/phpgwapi/inc/class.asyncservice.inc.php Thu Mar 31 21:41:39 2016
@@ -1,6 +1,6 @@

<?php /** - * API - Timed Asynchron Services for eGroupWare + * EGroupware API - Timed Asynchron Services * * @link http://www.egroupware.org * @author Ralf Becker @@ -622,7 +622,7 @@ } //echo "

$name = '".$this->$name."'

\n"; } - if ($this->php5{0} == '/') // we found a php5 binary + if ($this->php5[0] == '/') // we found a php5 binary { $this->php = $this->php5; } Modified: trunk/phpgwapi/inc/class.country.inc.php URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/inc/class.country.inc.php?rev=55584&r1=55583&r2=55584&view=diff ============================================================================== --- trunk/phpgwapi/inc/class.country.inc.php (original) +++ trunk/phpgwapi/inc/class.country.inc.php Thu Mar 31 21:41:39 2016 @@ -1,470 +1,40 @@ <?php -/**************************************************************************\ -* eGroupWare - Country Codes * -* http://www.egroupware.org * -* Written by Mark Peters * -* -------------------------------------------- * -* This program is free software; you can redistribute it and/or modify it * -* under the terms of the GNU General Public License as published by the * -* Free Software Foundation; either version 2 of the License, or (at your * -* option) any later version. * -\**************************************************************************/ +/** + * EGroupware API - Country codes + * + * @link http://www.egroupware.org + * @author Mark Peters + * + * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License + * @package api + * @subpackage country + * @access public + * @version $Id$ + */ -/* $Id$ */ +use EGroupware\Api; /** * 2-digit ISO 3166 Country codes * - * http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html + * All methods are static now, no need to instanciate it via $GLOBALS['egw']->country->method(), + * just use Api\Country::method(). + * + * @see http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html + * @see https://github.com/datasets/country-list */ -class country +class country extends Api\Country { - /** - * array with 2-letter iso-3166 country-code => country-name pairs - * - * @var array - */ - var $country_array = array( - 'AX' => 'AALAND ISLANDS', - 'AF' => 'AFGHANISTAN', - 'AL' => 'ALBANIA', - 'DZ' => 'ALGERIA', - 'AS' => 'AMERICAN SAMOA', - 'AD' => 'ANDORRA', - 'AO' => 'ANGOLA', - 'AI' => 'ANGUILLA', - 'AQ' => 'ANTARCTICA', - 'AG' => 'ANTIGUA AND BARBUDA', - 'AR' => 'ARGENTINA', - 'AM' => 'ARMENIA', - 'AW' => 'ARUBA', - 'AU' => 'AUSTRALIA', - 'AT' => 'AUSTRIA', - 'AZ' => 'AZERBAIJAN', - 'BS' => 'BAHAMAS', - 'BH' => 'BAHRAIN', - 'BD' => 'BANGLADESH', - 'BB' => 'BARBADOS', - 'BY' => 'BELARUS', - 'BE' => 'BELGIUM', - 'BZ' => 'BELIZE', - 'BJ' => 'BENIN', - 'BM' => 'BERMUDA', - 'BT' => 'BHUTAN', - 'BO' => 'BOLIVIA', - 'BA' => 'BOSNIA AND HERZEGOVINA', - 'BW' => 'BOTSWANA', - 'BV' => 'BOUVET ISLAND', - 'BR' => 'BRAZIL', - 'IO' => 'BRITISH INDIAN OCEAN TERRITORY', - 'BN' => 'BRUNEI DARUSSALAM', - 'BG' => 'BULGARIA', - 'BF' => 'BURKINA FASO', - 'BI' => 'BURUNDI', - 'KH' => 'CAMBODIA', - 'CM' => 'CAMEROON', - 'CA' => 'CANADA', - 'CV' => 'CAPE VERDE', - 'KY' => 'CAYMAN ISLANDS', - 'CF' => 'CENTRAL AFRICAN REPUBLIC', - 'TD' => 'CHAD', - 'CL' => 'CHILE', - 'CN' => 'CHINA', - 'CX' => 'CHRISTMAS ISLAND', - 'CC' => 'COCOS (KEELING) ISLANDS', - 'CO' => 'COLOMBIA', - 'KM' => 'COMOROS', - 'CG' => 'CONGO', - 'CD' => 'CONGO, THE DEMOCRATIC REPUBLIC OF THE', - 'CK' => 'COOK ISLANDS', - 'CR' => 'COSTA RICA', - 'CI' => 'COTE D IVOIRE', - 'HR' => 'CROATIA', - 'CU' => 'CUBA', - 'CY' => 'CYPRUS', - 'CZ' => 'CZECH REPUBLIC', - 'DK' => 'DENMARK', - 'DJ' => 'DJIBOUTI', - 'DM' => 'DOMINICA', - 'DO' => 'DOMINICAN REPUBLIC', - 'TP' => 'FORMER EAST TIMOR', - 'EC' => 'ECUADOR', - 'EG' => 'EGYPT', - 'SV' => 'EL SALVADOR', - 'GQ' => 'EQUATORIAL GUINEA', - 'ER' => 'ERITREA', - 'EE' => 'ESTONIA', - 'ET' => 'ETHIOPIA', - 'FK' => 'FALKLAND ISLANDS (MALVINAS)', - 'FO' => 'FAROE ISLANDS', - 'FJ' => 'FIJI', - 'FI' => 'FINLAND', - 'FR' => 'FRANCE', - 'GF' => 'FRENCH GUIANA', - 'PF' => 'FRENCH POLYNESIA', - 'TF' => 'FRENCH SOUTHERN TERRITORIES', - 'GA' => 'GABON', - 'GM' => 'GAMBIA', - 'GE' => 'GEORGIA', - 'DE' => 'GERMANY', - 'GH' => 'GHANA', - 'GI' => 'GIBRALTAR', - 'GR' => 'GREECE', - 'GL' => 'GREENLAND', - 'GD' => 'GRENADA', - 'GP' => 'GUADELOUPE', - 'GU' => 'GUAM', - 'GT' => 'GUATEMALA', - 'GN' => 'GUINEA', - 'GW' => 'GUINEA-BISSAU', - 'GY' => 'GUYANA', - 'HT' => 'HAITI', - 'HM' => 'HEARD ISLAND AND MCDONALD ISLANDS', - 'VA' => 'HOLY SEE (VATICAN CITY STATE)', - 'HN' => 'HONDURAS', - 'HK' => 'HONG KONG', - 'HU' => 'HUNGARY', - 'IS' => 'ICELAND', - 'IN' => 'INDIA', - 'ID' => 'INDONESIA', - 'IR' => 'IRAN, ISLAMIC REPUBLIC OF', - 'IQ' => 'IRAQ', - 'IE' => 'IRELAND', - 'IL' => 'ISRAEL', - 'IT' => 'ITALY', - 'JM' => 'JAMAICA', - 'JP' => 'JAPAN', - 'JO' => 'JORDAN', - 'KZ' => 'KAZAKSTAN', - 'KE' => 'KENYA', - 'KI' => 'KIRIBATI', - 'KP' => 'KOREA DEMOCRATIC PEOPLES REPUBLIC OF', - 'KR' => 'KOREA REPUBLIC OF', - 'KW' => 'KUWAIT', - 'KG' => 'KYRGYZSTAN', - 'LA' => 'LAO PEOPLES DEMOCRATIC REPUBLIC', - 'LV' => 'LATVIA', - 'LB' => 'LEBANON', - 'LS' => 'LESOTHO', - 'LR' => 'LIBERIA', - 'LY' => 'LIBYAN ARAB JAMAHIRIYA', - 'LI' => 'LIECHTENSTEIN', - 'LT' => 'LITHUANIA', - 'LU' => 'LUXEMBOURG', - 'MO' => 'MACAU', - 'MK' => 'MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF', - 'MG' => 'MADAGASCAR', - 'MW' => 'MALAWI', - 'MY' => 'MALAYSIA', - 'MV' => 'MALDIVES', - 'ML' => 'MALI', - 'MT' => 'MALTA', - 'MH' => 'MARSHALL ISLANDS', - 'MQ' => 'MARTINIQUE', - 'MR' => 'MAURITANIA', - 'MU' => 'MAURITIUS', - 'YT' => 'MAYOTTE', - 'MX' => 'MEXICO', - 'FM' => 'MICRONESIA, FEDERATED STATES OF', - 'MD' => 'MOLDOVA, REPUBLIC OF', - 'MC' => 'MONACO', - 'ME' => 'MONTENEGRO', - 'MN' => 'MONGOLIA', - 'MS' => 'MONTSERRAT', - 'MA' => 'MOROCCO', - 'MZ' => 'MOZAMBIQUE', - 'MM' => 'MYANMAR', - 'NA' => 'NAMIBIA', - 'NR' => 'NAURU', - 'NP' => 'NEPAL', - 'NL' => 'NETHERLANDS', - 'AN