hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 04:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set User_Query object as a service

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-09-09 19:34:51 +02:00
parent ec4d2c364f
commit 2ad315cfb2
23 changed files with 1336 additions and 1335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Command/CreateCollection.php
View File

@@ -46,7 +46,7 @@ class CreateCollection extends Command
if ($new_collection && $input->getOption('base_id_rights')) { if ($new_collection && $input->getOption('base_id_rights')) {
$query = new \User_Query($this->container); $query = $this->container['phraseanet.user-query'];
$total = $query->on_base_ids([$input->getOption('base_id_rights')])->get_total(); $total = $query->on_base_ids([$input->getOption('base_id_rights')])->get_total();
$n = 0; $n = 0;

4
lib/Alchemy/Phrasea/Controller/Admin/Collection.php
View File

@@ -136,7 +136,7 @@ class Collection implements ControllerProviderInterface
$admins = []; $admins = [];
if ($app['acl']->get($app['authentication']->getUser())->has_right_on_base($bas_id, 'manage')) { if ($app['acl']->get($app['authentication']->getUser())->has_right_on_base($bas_id, 'manage')) {
$query = new \User_Query($app); $query = $app['phraseanet.user-query'];
$admins = $query->on_base_ids([$bas_id]) $admins = $query->on_base_ids([$bas_id])
->who_have_right(['order_master']) ->who_have_right(['order_master'])
->execute() ->execute()
@@ -198,7 +198,7 @@ class Collection implements ControllerProviderInterface
$conn->beginTransaction(); $conn->beginTransaction();
try { try {
$userQuery = new \User_Query($app); $userQuery = $app['phraseanet.user-query'];
$result = $userQuery->on_base_ids([$bas_id]) $result = $userQuery->on_base_ids([$bas_id])
->who_have_right(['order_master']) ->who_have_right(['order_master'])

4
lib/Alchemy/Phrasea/Controller/Admin/Databox.php
View File

@@ -400,7 +400,7 @@ class Databox implements ControllerProviderInterface
$othCollSel = (int) $request->request->get("othcollsel") ?: null; $othCollSel = (int) $request->request->get("othcollsel") ?: null;
if (null !== $othCollSel) { if (null !== $othCollSel) {
$query = new \User_Query($app); $query = $app['phraseanet.user-query'];
$n = 0; $n = 0;
while ($n < $query->on_base_ids([$othCollSel])->get_total()) { while ($n < $query->on_base_ids([$othCollSel])->get_total()) {
@@ -798,7 +798,7 @@ class Databox implements ControllerProviderInterface
if (($request->request->get('ccusrothercoll') === "on") if (($request->request->get('ccusrothercoll') === "on")
&& (null !== $othcollsel = $request->request->get('othcollsel'))) { && (null !== $othcollsel = $request->request->get('othcollsel'))) {
$query = new \User_Query($app); $query = $app['phraseanet.user-query'];
$total = $query->on_base_ids([$othcollsel])->get_total(); $total = $query->on_base_ids([$othcollsel])->get_total();
$n = 0; $n = 0;
while ($n < $total) { while ($n < $total) {

5
lib/Alchemy/Phrasea/Controller/Admin/Users.php
View File

@@ -215,8 +215,7 @@ class Users implements ControllerProviderInterface
$controllers->get('/typeahead/search/', function (Application $app) { $controllers->get('/typeahead/search/', function (Application $app) {
$request = $app['request']; $request = $app['request'];
$user_query = new \User_Query($app); $user_query = $app['phraseanet.user-query'];
$like_value = $request->query->get('term'); $like_value = $request->query->get('term');
$rights = $request->query->get('filter_rights') ? : []; $rights = $request->query->get('filter_rights') ? : [];
$have_right = $request->query->get('have_right') ? : []; $have_right = $request->query->get('have_right') ? : [];
@@ -279,7 +278,7 @@ class Users implements ControllerProviderInterface
$controllers->post('/export/csv/', function (Application $app) { $controllers->post('/export/csv/', function (Application $app) {
$request = $app['request']; $request = $app['request'];
$user_query = new \User_Query($app); $user_query = $app['phraseanet.user-query'];
$like_value = $request->request->get('like_value'); $like_value = $request->request->get('like_value');
$like_field = $request->request->get('like_field'); $like_field = $request->request->get('like_field');

4
lib/Alchemy/Phrasea/Controller/Prod/Order.php
View File

@@ -101,8 +101,6 @@ class Order implements ControllerProviderInterface
$order->setDeadline((null !== $deadLine = $request->request->get('deadline')) ? new \DateTime($deadLine) : $deadLine); $order->setDeadline((null !== $deadLine = $request->request->get('deadline')) ? new \DateTime($deadLine) : $deadLine);
$order->setOrderUsage($request->request->get('use', '')); $order->setOrderUsage($request->request->get('use', ''));
foreach ($records as $key => $record) { foreach ($records as $key => $record) {
$query = new \User_Query($app);
if ($collectionHasOrderAdmins->containsKey($record->get_base_id())) { if ($collectionHasOrderAdmins->containsKey($record->get_base_id())) {
if (!$collectionHasOrderAdmins->get($record->get_base_id())) { if (!$collectionHasOrderAdmins->get($record->get_base_id())) {
$records->remove($key); $records->remove($key);
@@ -110,7 +108,7 @@ class Order implements ControllerProviderInterface
} }
if (!isset($hasOneAdmin[$record->get_base_id()])) { if (!isset($hasOneAdmin[$record->get_base_id()])) {
$query = new \User_Query($app); $query = $app['phraseanet.user-query'];
$hasOneAdmin[$record->get_base_id()] = (Boolean) count($query->on_base_ids([$record->get_base_id()]) $hasOneAdmin[$record->get_base_id()] = (Boolean) count($query->on_base_ids([$record->get_base_id()])
->who_have_right(['order_master']) ->who_have_right(['order_master'])
->execute()->get_results()); ->execute()->get_results());

6
lib/Alchemy/Phrasea/Controller/Prod/Push.php
View File

@@ -447,7 +447,7 @@ class Push implements ControllerProviderInterface
$request = $app['request']; $request = $app['request'];
$query = new \User_Query($app); $query = new $app['phraseanet.user-query'];
$query->on_bases_where_i_am($app['acl']->get($app['authentication']->getUser()), ['canpush']); $query->on_bases_where_i_am($app['acl']->get($app['authentication']->getUser()), ['canpush']);
@@ -558,7 +558,7 @@ class Push implements ControllerProviderInterface
$controllers->get('/search-user/', function (Application $app) use ($userFormatter, $listFormatter) { $controllers->get('/search-user/', function (Application $app) use ($userFormatter, $listFormatter) {
$request = $app['request']; $request = $app['request'];
$query = new \User_Query($app); $query = $app['phraseanet.user-query'];
$query->on_bases_where_i_am($app['acl']->get($app['authentication']->getUser()), ['canpush']); $query->on_bases_where_i_am($app['acl']->get($app['authentication']->getUser()), ['canpush']);
@@ -598,7 +598,7 @@ class Push implements ControllerProviderInterface
$list = $repository->findUserListByUserAndId($app['authentication']->getUser(), $list_id); $list = $repository->findUserListByUserAndId($app['authentication']->getUser(), $list_id);
$query = new \User_Query($app); $query = $app['phraseanet.user-query'];
$query->on_bases_where_i_am($app['acl']->get($app['authentication']->getUser()), ['canpush']); $query->on_bases_where_i_am($app['acl']->get($app['authentication']->getUser()), ['canpush']);

2
lib/Alchemy/Phrasea/Core/Event/Subscriber/FeedEntrySubscriber.php
View File

@@ -36,7 +36,7 @@ class FeedEntrySubscriber extends AbstractNotificationSubscriber
$datas = json_encode($params); $datas = json_encode($params);
$Query = new \User_Query($this->app); $Query = $this->app['phraseanet.user-query'];
$Query->include_phantoms(true) $Query->include_phantoms(true)
->include_invite(false) ->include_invite(false)

3
lib/Alchemy/Phrasea/Core/Event/Subscriber/LazaretSubscriber.php
View File

@@ -35,8 +35,7 @@ class LazaretSubscriber extends AbstractNotificationSubscriber
$this->notifyUser($user, json_encode($params)); $this->notifyUser($user, json_encode($params));
} else { //No lazaretSession user, fil is uploaded via automated tasks etc .. } else { //No lazaretSession user, fil is uploaded via automated tasks etc ..
$query = new \User_Query($this->app); $query = $this->app['phraseanet.user-query'];
$users = $query $users = $query
->on_base_ids([$lazaretFile->getBaseId()]) ->on_base_ids([$lazaretFile->getBaseId()])
->who_have_right(['canaddrecord']) ->who_have_right(['canaddrecord'])

2
lib/Alchemy/Phrasea/Core/Event/Subscriber/OrderSubscriber.php
View File

@@ -34,7 +34,7 @@ class OrderSubscriber extends AbstractNotificationSubscriber
return $element->getBaseId(); return $element->getBaseId();
}, iterator_to_array($event->getOrder()->getElements()))); }, iterator_to_array($event->getOrder()->getElements())));
$query = new \User_Query($this->app); $query = $this->app['phraseanet.user-query'];
$users = $query->on_base_ids($base_ids) $users = $query->on_base_ids($base_ids)
->who_have_right(['order_master']) ->who_have_right(['order_master'])
->execute()->get_results(); ->execute()->get_results();

4
lib/Alchemy/Phrasea/Core/Provider/PhraseanetServiceProvider.php
View File

@@ -61,6 +61,10 @@ class PhraseanetServiceProvider implements ServiceProviderInterface
$app['phraseanet.metadata-setter'] = $app->share(function (SilexApplication $app) { $app['phraseanet.metadata-setter'] = $app->share(function (SilexApplication $app) {
return new PhraseanetMetadataSetter(); return new PhraseanetMetadataSetter();
}); });
$app['phraseanet.user-query'] = function (SilexApplication $app) {
return new \User_Query($app);
};
} }
public function boot(SilexApplication $app) public function boot(SilexApplication $app)

2
lib/Alchemy/Phrasea/Helper/User/Edit.php
View File

@@ -164,7 +164,7 @@ class Edit extends \Alchemy\Phrasea\Helper\Helper
} }
} }
$query = new \User_Query($this->app); $query = $this->app['phraseanet.user-query'];
$templates = $query $templates = $query
->only_templates(true) ->only_templates(true)
->execute()->get_results(); ->execute()->get_results();

6
lib/Alchemy/Phrasea/Helper/User/Manage.php
View File

@@ -57,7 +57,7 @@ class Manage extends Helper
, 'offset_start' => 0 , 'offset_start' => 0
]; ];
$query = new \User_Query($this->app); $query = $this->app['phraseanet.user-query'];
if (is_array($this->query_parms['base_id'])) if (is_array($this->query_parms['base_id']))
$query->on_base_ids($this->query_parms['base_id']); $query->on_base_ids($this->query_parms['base_id']);
@@ -95,7 +95,7 @@ class Manage extends Helper
, 'offset_start' => $offset_start , 'offset_start' => $offset_start
]; ];
$query = new \User_Query($this->app); $query = $this->app['phraseanet.user-query'];
if (is_array($this->query_parms['base_id'])) if (is_array($this->query_parms['base_id']))
$query->on_base_ids($this->query_parms['base_id']); $query->on_base_ids($this->query_parms['base_id']);
@@ -124,7 +124,7 @@ class Manage extends Helper
$this->query_parms[$k] = false; $this->query_parms[$k] = false;
} }
$query = new \User_Query($this->app); $query = $this->app['phraseanet.user-query'];
$templates = $query $templates = $query
->only_templates(true) ->only_templates(true)
->execute()->get_results(); ->execute()->get_results();

518
lib/Alchemy/Phrasea/Utilities/Countries.php Normal file
View File

@@ -0,0 +1,518 @@
<?php
namespace Alchemy\Phrasea\Utilities;
class Countries
{
public static function getCountries($lng = 'fr')
{
$countries['en'] = [
'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',
'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',
'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' => 'LIBYAN ARAB JAMAHIRIYA',
'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',
'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',
'BL' => 'SAINT BARTHÉLEMY',
'SH' => 'SAINT HELENA',
'KN' => 'SAINT KITTS AND NEVIS',
'LC' => 'SAINT LUCIA',
'MF' => 'SAINT MARTIN',
'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',
'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, 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',
'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',
];
$countries['us'] = $countries['en'];
$countries['fr'] = [
'AF' => 'AFGHANISTAN',
'ZA' => 'AFRIQUE DU SUD',
'AX' => 'ÅLAND, ÎLES',
'AL' => 'ALBANIE',
'DZ' => 'ALGÉRIE',
'DE' => 'ALLEMAGNE',
'AD' => 'ANDORRE',
'AO' => 'ANGOLA',
'AI' => 'ANGUILLA',
'AQ' => 'ANTARCTIQUE',
'AG' => 'ANTIGUA-ET-BARBUDA',
'AN' => 'ANTILLES NÉERLANDAISES',
'SA' => 'ARABIE SAOUDITE',
'AR' => 'ARGENTINE',
'AM' => 'ARMÉNIE',
'AW' => 'ARUBA',
'AU' => 'AUSTRALIE',
'AT' => 'AUTRICHE',
'AZ' => 'AZERBAÏDJAN',
'BS' => 'BAHAMAS',
'BH' => 'BAHREÏN',
'BD' => 'BANGLADESH',
'BB' => 'BARBADE',
'BY' => 'BÉLARUS',
'BE' => 'BELGIQUE',
'BZ' => 'BELIZE',
'BJ' => 'BÉNIN',
'BM' => 'BERMUDES',
'BT' => 'BHOUTAN',
'BO' => 'BOLIVIE',
'BA' => 'BOSNIE-HERZÉGOVINE',
'BW' => 'BOTSWANA',
'BV' => 'BOUVET, ÎLE',
'BR' => 'BRÉSIL',
'BN' => 'BRUNÉI DARUSSALAM',
'BG' => 'BULGARIE',
'BF' => 'BURKINA FASO',
'BI' => 'BURUNDI',
'KY' => 'CAÏMANES, ÎLES',
'KH' => 'CAMBODGE',
'CM' => 'CAMEROUN',
'CA' => 'CANADA',
'CV' => 'CAP-VERT',
'CF' => 'CENTRAFRICAINE, RÉPUBLIQUE',
'CL' => 'CHILI',
'CN' => 'CHINE',
'CX' => 'CHRISTMAS, ÎLE',
'CY' => 'CHYPRE',
'CC' => 'COCOS (KEELING), ÎLES',
'CO' => 'COLOMBIE',
'KM' => 'COMORES',
'CG' => 'CONGO',
'CD' => 'CONGO, LA RÉPUBLIQUE DÉMOCRATIQUE DU',
'CK' => 'COOK, ÎLES',
'KR' => 'CORÉE, RÉPUBLIQUE DE',
'KP' => 'CORÉE, RÉPUBLIQUE POPULAIRE DÉMOCRATIQUE DE',
'CR' => 'COSTA RICA',
'CI' => 'CÔTE D\'IVOIRE',
'HR' => 'CROATIE',
'CU' => 'CUBA',
'DK' => 'DANEMARK',
'DJ' => 'DJIBOUTI',
'DO' => 'DOMINICAINE, RÉPUBLIQUE',
'DM' => 'DOMINIQUE',
'EG' => 'ÉGYPTE',
'SV' => 'EL SALVADOR',
'AE' => 'ÉMIRATS ARABES UNIS',
'EC' => 'ÉQUATEUR',
'ER' => 'ÉRYTHRÉE',
'ES' => 'ESPAGNE',
'EE' => 'ESTONIE',
'US' => 'ÉTATS-UNIS',
'ET' => 'ÉTHIOPIE',
'FK' => 'FALKLAND, ÎLES (MALVINAS)',
'FO' => 'FÉROÉ, ÎLES',
'FJ' => 'FIDJI',
'FI' => 'FINLANDE',
'FR' => 'FRANCE',
'GA' => 'GABON',
'GM' => 'GAMBIE',
'GE' => 'GÉORGIE',
'GS' => 'GÉORGIE DU SUD ET LES ÎLES SANDWICH DU SUD',
'GH' => 'GHANA',
'GI' => 'GIBRALTAR',
'GR' => 'GRÈCE',
'GD' => 'GRENADE',
'GL' => 'GROENLAND',
'GP' => 'GUADELOUPE',
'GU' => 'GUAM',
'GT' => 'GUATEMALA',
'GG' => 'GUERNESEY',
'GN' => 'GUINÉE',
'GW' => 'GUINÉE-BISSAU',
'GQ' => 'GUINÉE ÉQUATORIALE',
'GY' => 'GUYANA',
'GF' => 'GUYANE FRANÇAISE',
'HT' => 'HAÏTI',
'HM' => 'HEARD, ÎLE ET MCDONALD, ÎLES',
'HN' => 'HONDURAS',
'HK' => 'HONG-KONG',
'HU' => 'HONGRIE',
'IM' => 'ÎLE DE MAN',
'UM' => 'ÎLES MINEURES ÉLOIGNÉES DES ÉTATS-UNIS',
'VG' => 'ÎLES VIERGES BRITANNIQUES',
'VI' => 'ÎLES VIERGES DES ÉTATS-UNIS',
'IN' => 'INDE',
'ID' => 'INDONÉSIE',
'IR' => 'IRAN, RÉPUBLIQUE ISLAMIQUE D\'',
'IQ' => 'IRAQ',
'IE' => 'IRLANDE',
'IS' => 'ISLANDE',
'IL' => 'ISRAËL',
'IT' => 'ITALIE',
'JM' => 'JAMAÏQUE',
'JP' => 'JAPON',
'JE' => 'JERSEY',
'JO' => 'JORDANIE',
'KZ' => 'KAZAKHSTAN',
'KE' => 'KENYA',
'KG' => 'KIRGHIZISTAN',
'KI' => 'KIRIBATI',
'KW' => 'KOWEÏT',
'LA' => 'LAO, RÉPUBLIQUE DÉMOCRATIQUE POPULAIRE',
'LS' => 'LESOTHO',
'LV' => 'LETTONIE',
'LB' => 'LIBAN',
'LR' => 'LIBÉRIA',
'LY' => 'LIBYENNE, JAMAHIRIYA ARABE',
'LI' => 'LIECHTENSTEIN',
'LT' => 'LITUANIE',
'LU' => 'LUXEMBOURG',
'MO' => 'MACAO',
'MK' => 'MACÉDOINE, L\'EX-RÉPUBLIQUE YOUGOSLAVE DE',
'MG' => 'MADAGASCAR',
'MY' => 'MALAISIE',
'MW' => 'MALAWI',
'MV' => 'MALDIVES',
'ML' => 'MALI',
'MT' => 'MALTE',
'MP' => 'MARIANNES DU NORD, ÎLES',
'MA' => 'MAROC',
'MH' => 'MARSHALL, ÎLES',
'MQ' => 'MARTINIQUE',
'MU' => 'MAURICE',
'MR' => 'MAURITANIE',
'YT' => 'MAYOTTE',
'MX' => 'MEXIQUE',
'FM' => 'MICRONÉSIE, ÉTATS FÉDÉRÉS DE',
'MD' => 'MOLDOVA, RÉPUBLIQUE DE',
'MC' => 'MONACO',
'MN' => 'MONGOLIE',
'ME' => 'MONTÉNÉGRO',
'MS' => 'MONTSERRAT',
'MZ' => 'MOZAMBIQUE',
'MM' => 'MYANMAR',
'NA' => 'NAMIBIE',
'NR' => 'NAURU',
'NP' => 'NÉPAL',
'NI' => 'NICARAGUA',
'NE' => 'NIGER',
'NG' => 'NIGÉRIA',
'NU' => 'NIUÉ',
'NF' => 'NORFOLK, ÎLE',
'NO' => 'NORVÈGE',
'NC' => 'NOUVELLE-CALÉDONIE',
'NZ' => 'NOUVELLE-ZÉLANDE',
'IO' => 'OCÉAN INDIEN, TERRITOIRE BRITANNIQUE DE L\'',
'OM' => 'OMAN',
'UG' => 'OUGANDA',
'UZ' => 'OUZBÉKISTAN',
'PK' => 'PAKISTAN',
'PW' => 'PALAOS',
'PS' => 'PALESTINIEN OCCUPÉ, TERRITOIRE',
'PA' => 'PANAMA',
'PG' => 'PAPOUASIE-NOUVELLE-GUINÉE',
'PY' => 'PARAGUAY',
'NL' => 'PAYS-BAS',
'PE' => 'PÉROU',
'PH' => 'PHILIPPINES',
'PN' => 'PITCAIRN',
'PL' => 'POLOGNE',
'PF' => 'POLYNÉSIE FRANÇAISE',
'PR' => 'PORTO RICO',
'PT' => 'PORTUGAL',
'QA' => 'QATAR',
'RE' => 'RÉUNION',
'RO' => 'ROUMANIE',
'GB' => 'ROYAUME-UNI',
'RU' => 'RUSSIE, FÉDÉRATION DE',
'RW' => 'RWANDA',
'EH' => 'SAHARA OCCIDENTAL',
'BL' => 'SAINT-BARTHÉLEMY',
'SH' => 'SAINTE-HÉLÈNE',
'LC' => 'SAINTE-LUCIE',
'KN' => 'SAINT-KITTS-ET-NEVIS',
'SM' => 'SAINT-MARIN',
'MF' => 'SAINT-MARTIN',
'PM' => 'SAINT-PIERRE-ET-MIQUELON',
'VA' => 'SAINT-SIÈGE (ÉTAT DE LA CITÉ DU VATICAN)',
'VC' => 'SAINT-VINCENT-ET-LES GRENADINES',
'SB' => 'SALOMON, ÎLES',
'WS' => 'SAMOA',
'AS' => 'SAMOA AMÉRICAINES',
'ST' => 'SAO TOMÉ-ET-PRINCIPE',
'SN' => 'SÉNÉGAL',
'RS' => 'SERBIE',
'SC' => 'SEYCHELLES',
'SL' => 'SIERRA LEONE',
'SG' => 'SINGAPOUR',
'SK' => 'SLOVAQUIE',
'SI' => 'SLOVÉNIE',
'SO' => 'SOMALIE',
'SD' => 'SOUDAN',
'LK' => 'SRI LANKA',
'SE' => 'SUÈDE',
'CH' => 'SUISSE',
'SR' => 'SURINAME',
'SJ' => 'SVALBARD ET ÎLE JAN MAYEN',
'SZ' => 'SWAZILAND',
'SY' => 'SYRIENNE, RÉPUBLIQUE ARABE',
'TJ' => 'TADJIKISTAN',
'TW' => 'TAÏWAN, PROVINCE DE CHINE',
'TZ' => 'TANZANIE, RÉPUBLIQUE-UNIE DE',
'TD' => 'TCHAD',
'CZ' => 'TCHÈQUE, RÉPUBLIQUE',
'TF' => 'TERRES AUSTRALES FRANÇAISES',
'TH' => 'THAÏLANDE',
'TL' => 'TIMOR-LESTE',
'TG' => 'TOGO',
'TK' => 'TOKELAU',
'TO' => 'TONGA',
'TT' => 'TRINITÉ-ET-TOBAGO',
'TN' => 'TUNISIE',
'TM' => 'TURKMÉNISTAN',
'TC' => 'TURKS ET CAÏQUES, ÎLES',
'TR' => 'TURQUIE',
'TV' => 'TUVALU',
'UA' => 'UKRAINE',
'UY' => 'URUGUAY',
'VU' => 'VANUATU',
'VE' => 'VENEZUELA',
'VN' => 'VIET NAM',
'WF' => 'WALLIS ET FUTUNA',
'YE' => 'YÉMEN',
'ZM' => 'ZAMBIE',
'ZW' => 'ZIMBABWE'
];
if (!isset($countries[$lng])) {
$lng = 'us';
}
foreach ($countries[$lng] as $k => $country) {
$countries[$lng][$k] = mb_strtolower($country);
}
return $countries[$lng];
}
}

2
lib/Alchemy/Phrasea/Vocabulary/ControlProvider/UserProvider.php
View File

@@ -52,7 +52,7 @@ class UserProvider implements ControlProviderInterface
*/ */
public function find($query, User $for_user,\databox $on_databox = null) public function find($query, User $for_user,\databox $on_databox = null)
{ {
$user_query = new \User_Query($this->app); $user_query = $this->app['phraseanet.user-query'];
$users = $user_query $users = $user_query
->like(\User_Query::LIKE_EMAIL, $query) ->like(\User_Query::LIKE_EMAIL, $query)

2
lib/Alchemy/Phrasea/Webhook/Processor/FeedEntryProcessor.php
View File

@@ -22,7 +22,7 @@ class FeedEntryProcessor extends AbstractProcessor implements ProcessorInterface
$feed = $entry->getFeed(); $feed = $entry->getFeed();
$query = new \User_Query($this->app); $query = $this->app['phraseanet.user-query'];
$query->include_phantoms(true) $query->include_phantoms(true)
->include_invite(false) ->include_invite(false)

1558
lib/classes/User/Query.php
View File

File diff suppressed because it is too large Load Diff

1
lib/classes/User/QueryInterface.php
View File

@@ -13,7 +13,6 @@ use Alchemy\Phrasea\Application;
interface User_QueryInterface interface User_QueryInterface
{ {
public function __construct(Application $app); public function __construct(Application $app);
public function get_results(); public function get_results();

2
lib/classes/collection.php
View File

@@ -515,7 +515,7 @@ class collection implements cache_cacheableInterface
{ {
$params = [':base_id' => $this->get_base_id()]; $params = [':base_id' => $this->get_base_id()];
$query = new User_Query($app); $query = $app['phraseanet.user-query'];
$total = $query->on_base_ids([$this->get_base_id()]) $total = $query->on_base_ids([$this->get_base_id()])
->include_phantoms(false) ->include_phantoms(false)
->include_special_users(true) ->include_special_users(true)

2
lib/classes/databox.php
View File

@@ -458,7 +458,7 @@ class databox extends base
$collection->unmount_collection($this->app); $collection->unmount_collection($this->app);
} }
$query = new User_Query($this->app); $query = $this->app['phraseanet.user-query'];
$total = $query->on_sbas_ids([$this->id]) $total = $query->on_sbas_ids([$this->id])
->include_phantoms(false) ->include_phantoms(false)
->include_special_users(true) ->include_special_users(true)

519
lib/classes/deprecated/countries.php
View File

@@ -1,519 +0,0 @@
<?php
/*
* This file is part of Phraseanet
*
* (c) 2005-2014 Alchemy
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
function getCountries($lng = 'fr')
{
$countries['en'] = [
'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',
'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',
'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' => 'LIBYAN ARAB JAMAHIRIYA',
'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',
'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',
'BL' => 'SAINT BARTHÉLEMY',
'SH' => 'SAINT HELENA',
'KN' => 'SAINT KITTS AND NEVIS',
'LC' => 'SAINT LUCIA',
'MF' => 'SAINT MARTIN',
'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',
'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, 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',
'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',
];
$countries['us'] = $countries['en'];
$countries['fr'] = [
'AF' => 'AFGHANISTAN',
'ZA' => 'AFRIQUE DU SUD',
'AX' => 'ÅLAND, ÎLES',
'AL' => 'ALBANIE',
'DZ' => 'ALGÉRIE',
'DE' => 'ALLEMAGNE',
'AD' => 'ANDORRE',
'AO' => 'ANGOLA',
'AI' => 'ANGUILLA',
'AQ' => 'ANTARCTIQUE',
'AG' => 'ANTIGUA-ET-BARBUDA',
'AN' => 'ANTILLES NÉERLANDAISES',
'SA' => 'ARABIE SAOUDITE',
'AR' => 'ARGENTINE',
'AM' => 'ARMÉNIE',
'AW' => 'ARUBA',
'AU' => 'AUSTRALIE',
'AT' => 'AUTRICHE',
'AZ' => 'AZERBAÏDJAN',
'BS' => 'BAHAMAS',
'BH' => 'BAHREÏN',
'BD' => 'BANGLADESH',
'BB' => 'BARBADE',
'BY' => 'BÉLARUS',
'BE' => 'BELGIQUE',
'BZ' => 'BELIZE',
'BJ' => 'BÉNIN',
'BM' => 'BERMUDES',
'BT' => 'BHOUTAN',
'BO' => 'BOLIVIE',
'BA' => 'BOSNIE-HERZÉGOVINE',
'BW' => 'BOTSWANA',
'BV' => 'BOUVET, ÎLE',
'BR' => 'BRÉSIL',
'BN' => 'BRUNÉI DARUSSALAM',
'BG' => 'BULGARIE',
'BF' => 'BURKINA FASO',
'BI' => 'BURUNDI',
'KY' => 'CAÏMANES, ÎLES',
'KH' => 'CAMBODGE',
'CM' => 'CAMEROUN',
'CA' => 'CANADA',
'CV' => 'CAP-VERT',
'CF' => 'CENTRAFRICAINE, RÉPUBLIQUE',
'CL' => 'CHILI',
'CN' => 'CHINE',
'CX' => 'CHRISTMAS, ÎLE',
'CY' => 'CHYPRE',
'CC' => 'COCOS (KEELING), ÎLES',
'CO' => 'COLOMBIE',
'KM' => 'COMORES',
'CG' => 'CONGO',
'CD' => 'CONGO, LA RÉPUBLIQUE DÉMOCRATIQUE DU',
'CK' => 'COOK, ÎLES',
'KR' => 'CORÉE, RÉPUBLIQUE DE',
'KP' => 'CORÉE, RÉPUBLIQUE POPULAIRE DÉMOCRATIQUE DE',
'CR' => 'COSTA RICA',
'CI' => 'CÔTE D\'IVOIRE',
'HR' => 'CROATIE',
'CU' => 'CUBA',
'DK' => 'DANEMARK',
'DJ' => 'DJIBOUTI',
'DO' => 'DOMINICAINE, RÉPUBLIQUE',
'DM' => 'DOMINIQUE',
'EG' => 'ÉGYPTE',
'SV' => 'EL SALVADOR',
'AE' => 'ÉMIRATS ARABES UNIS',
'EC' => 'ÉQUATEUR',
'ER' => 'ÉRYTHRÉE',
'ES' => 'ESPAGNE',
'EE' => 'ESTONIE',
'US' => 'ÉTATS-UNIS',
'ET' => 'ÉTHIOPIE',
'FK' => 'FALKLAND, ÎLES (MALVINAS)',
'FO' => 'FÉROÉ, ÎLES',
'FJ' => 'FIDJI',
'FI' => 'FINLANDE',
'FR' => 'FRANCE',
'GA' => 'GABON',
'GM' => 'GAMBIE',
'GE' => 'GÉORGIE',
'GS' => 'GÉORGIE DU SUD ET LES ÎLES SANDWICH DU SUD',
'GH' => 'GHANA',
'GI' => 'GIBRALTAR',
'GR' => 'GRÈCE',
'GD' => 'GRENADE',
'GL' => 'GROENLAND',
'GP' => 'GUADELOUPE',
'GU' => 'GUAM',
'GT' => 'GUATEMALA',
'GG' => 'GUERNESEY',
'GN' => 'GUINÉE',
'GW' => 'GUINÉE-BISSAU',
'GQ' => 'GUINÉE ÉQUATORIALE',
'GY' => 'GUYANA',
'GF' => 'GUYANE FRANÇAISE',
'HT' => 'HAÏTI',
'HM' => 'HEARD, ÎLE ET MCDONALD, ÎLES',
'HN' => 'HONDURAS',
'HK' => 'HONG-KONG',
'HU' => 'HONGRIE',
'IM' => 'ÎLE DE MAN',
'UM' => 'ÎLES MINEURES ÉLOIGNÉES DES ÉTATS-UNIS',
'VG' => 'ÎLES VIERGES BRITANNIQUES',
'VI' => 'ÎLES VIERGES DES ÉTATS-UNIS',
'IN' => 'INDE',
'ID' => 'INDONÉSIE',
'IR' => 'IRAN, RÉPUBLIQUE ISLAMIQUE D\'',
'IQ' => 'IRAQ',
'IE' => 'IRLANDE',
'IS' => 'ISLANDE',
'IL' => 'ISRAËL',
'IT' => 'ITALIE',
'JM' => 'JAMAÏQUE',
'JP' => 'JAPON',
'JE' => 'JERSEY',
'JO' => 'JORDANIE',
'KZ' => 'KAZAKHSTAN',
'KE' => 'KENYA',
'KG' => 'KIRGHIZISTAN',
'KI' => 'KIRIBATI',
'KW' => 'KOWEÏT',
'LA' => 'LAO, RÉPUBLIQUE DÉMOCRATIQUE POPULAIRE',
'LS' => 'LESOTHO',
'LV' => 'LETTONIE',
'LB' => 'LIBAN',
'LR' => 'LIBÉRIA',
'LY' => 'LIBYENNE, JAMAHIRIYA ARABE',
'LI' => 'LIECHTENSTEIN',
'LT' => 'LITUANIE',
'LU' => 'LUXEMBOURG',
'MO' => 'MACAO',
'MK' => 'MACÉDOINE, L\'EX-RÉPUBLIQUE YOUGOSLAVE DE',
'MG' => 'MADAGASCAR',
'MY' => 'MALAISIE',
'MW' => 'MALAWI',
'MV' => 'MALDIVES',
'ML' => 'MALI',
'MT' => 'MALTE',
'MP' => 'MARIANNES DU NORD, ÎLES',
'MA' => 'MAROC',
'MH' => 'MARSHALL, ÎLES',
'MQ' => 'MARTINIQUE',
'MU' => 'MAURICE',
'MR' => 'MAURITANIE',
'YT' => 'MAYOTTE',
'MX' => 'MEXIQUE',
'FM' => 'MICRONÉSIE, ÉTATS FÉDÉRÉS DE',
'MD' => 'MOLDOVA, RÉPUBLIQUE DE',
'MC' => 'MONACO',
'MN' => 'MONGOLIE',
'ME' => 'MONTÉNÉGRO',
'MS' => 'MONTSERRAT',
'MZ' => 'MOZAMBIQUE',
'MM' => 'MYANMAR',
'NA' => 'NAMIBIE',
'NR' => 'NAURU',
'NP' => 'NÉPAL',
'NI' => 'NICARAGUA',
'NE' => 'NIGER',
'NG' => 'NIGÉRIA',
'NU' => 'NIUÉ',
'NF' => 'NORFOLK, ÎLE',
'NO' => 'NORVÈGE',
'NC' => 'NOUVELLE-CALÉDONIE',
'NZ' => 'NOUVELLE-ZÉLANDE',
'IO' => 'OCÉAN INDIEN, TERRITOIRE BRITANNIQUE DE L\'',
'OM' => 'OMAN',
'UG' => 'OUGANDA',
'UZ' => 'OUZBÉKISTAN',
'PK' => 'PAKISTAN',
'PW' => 'PALAOS',
'PS' => 'PALESTINIEN OCCUPÉ, TERRITOIRE',
'PA' => 'PANAMA',
'PG' => 'PAPOUASIE-NOUVELLE-GUINÉE',
'PY' => 'PARAGUAY',
'NL' => 'PAYS-BAS',
'PE' => 'PÉROU',
'PH' => 'PHILIPPINES',
'PN' => 'PITCAIRN',
'PL' => 'POLOGNE',
'PF' => 'POLYNÉSIE FRANÇAISE',
'PR' => 'PORTO RICO',
'PT' => 'PORTUGAL',
'QA' => 'QATAR',
'RE' => 'RÉUNION',
'RO' => 'ROUMANIE',
'GB' => 'ROYAUME-UNI',
'RU' => 'RUSSIE, FÉDÉRATION DE',
'RW' => 'RWANDA',
'EH' => 'SAHARA OCCIDENTAL',
'BL' => 'SAINT-BARTHÉLEMY',
'SH' => 'SAINTE-HÉLÈNE',
'LC' => 'SAINTE-LUCIE',
'KN' => 'SAINT-KITTS-ET-NEVIS',
'SM' => 'SAINT-MARIN',
'MF' => 'SAINT-MARTIN',
'PM' => 'SAINT-PIERRE-ET-MIQUELON',
'VA' => 'SAINT-SIÈGE (ÉTAT DE LA CITÉ DU VATICAN)',
'VC' => 'SAINT-VINCENT-ET-LES GRENADINES',
'SB' => 'SALOMON, ÎLES',
'WS' => 'SAMOA',
'AS' => 'SAMOA AMÉRICAINES',
'ST' => 'SAO TOMÉ-ET-PRINCIPE',
'SN' => 'SÉNÉGAL',
'RS' => 'SERBIE',
'SC' => 'SEYCHELLES',
'SL' => 'SIERRA LEONE',
'SG' => 'SINGAPOUR',
'SK' => 'SLOVAQUIE',
'SI' => 'SLOVÉNIE',
'SO' => 'SOMALIE',
'SD' => 'SOUDAN',
'LK' => 'SRI LANKA',
'SE' => 'SUÈDE',
'CH' => 'SUISSE',
'SR' => 'SURINAME',
'SJ' => 'SVALBARD ET ÎLE JAN MAYEN',
'SZ' => 'SWAZILAND',
'SY' => 'SYRIENNE, RÉPUBLIQUE ARABE',
'TJ' => 'TADJIKISTAN',
'TW' => 'TAÏWAN, PROVINCE DE CHINE',
'TZ' => 'TANZANIE, RÉPUBLIQUE-UNIE DE',
'TD' => 'TCHAD',
'CZ' => 'TCHÈQUE, RÉPUBLIQUE',
'TF' => 'TERRES AUSTRALES FRANÇAISES',
'TH' => 'THAÏLANDE',
'TL' => 'TIMOR-LESTE',
'TG' => 'TOGO',
'TK' => 'TOKELAU',
'TO' => 'TONGA',
'TT' => 'TRINITÉ-ET-TOBAGO',
'TN' => 'TUNISIE',
'TM' => 'TURKMÉNISTAN',
'TC' => 'TURKS ET CAÏQUES, ÎLES',
'TR' => 'TURQUIE',
'TV' => 'TUVALU',
'UA' => 'UKRAINE',
'UY' => 'URUGUAY',
'VU' => 'VANUATU',
'VE' => 'VENEZUELA',
'VN' => 'VIET NAM',
'WF' => 'WALLIS ET FUTUNA',
'YE' => 'YÉMEN',
'ZM' => 'ZAMBIE',
'ZW' => 'ZIMBABWE'
];
if ( ! isset($countries[$lng]))
$lng = 'us';
foreach ($countries[$lng] as $k => $country)
$countries[$lng][$k] = mb_strtolower($country);
return $countries[$lng];
}

2
lib/classes/record/exportElement.php
View File

@@ -116,7 +116,7 @@ class record_exportElement extends record_adapter
$go_dl['preview'] = true; $go_dl['preview'] = true;
} }
$query = new User_Query($this->app); $query = $this->app['phraseanet.user-query'];
$masters = $query->on_base_ids([$this->base_id]) $masters = $query->on_base_ids([$this->base_id])
->who_have_right(['order_master']) ->who_have_right(['order_master'])

14
tests/Alchemy/Tests/Phrasea/Controller/Prod/OrderTest.php
View File

@@ -3,6 +3,7 @@
namespace Alchemy\Tests\Phrasea\Controller\Prod; namespace Alchemy\Tests\Phrasea\Controller\Prod;
use Alchemy\Phrasea\Core\PhraseaEvents; use Alchemy\Phrasea\Core\PhraseaEvents;
use Doctrine\Common\Collections\ArrayCollection;
use Symfony\Component\EventDispatcher\Event; use Symfony\Component\EventDispatcher\Event;
use Alchemy\Phrasea\Model\Entities\Order; use Alchemy\Phrasea\Model\Entities\Order;
use Alchemy\Phrasea\Model\Entities\OrderElement; use Alchemy\Phrasea\Model\Entities\OrderElement;
@@ -22,6 +23,12 @@ class OrderTest extends \PhraseanetAuthenticatedWebTestCase
*/ */
public function testCreateOrder() public function testCreateOrder()
{ {
self::$DI['app']['phraseanet.user-query'] = $this->getMockBuilder('\User_Query')->disableOriginalConstructor()->getMock();
self::$DI['app']['phraseanet.user-query']->expects($this->any())->method('get_results')->will($this->returnValue(new ArrayCollection([self::$DI['user_alt2']])));
self::$DI['app']['phraseanet.user-query']->expects($this->any())->method('on_base_ids')->will($this->returnSelf());
self::$DI['app']['phraseanet.user-query']->expects($this->any())->method('who_have_right')->will($this->returnSelf());
self::$DI['app']['phraseanet.user-query']->expects($this->any())->method('execute')->will($this->returnSelf());
self::$DI['app']['notification.deliverer'] = $this->getMockBuilder('Alchemy\Phrasea\Notification\Deliverer') self::$DI['app']['notification.deliverer'] = $this->getMockBuilder('Alchemy\Phrasea\Notification\Deliverer')
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
@@ -47,6 +54,13 @@ class OrderTest extends \PhraseanetAuthenticatedWebTestCase
*/ */
public function testCreateOrderJson() public function testCreateOrderJson()
{ {
self::$DI['app']['phraseanet.user-query'] = $this->getMockBuilder('\User_Query')->disableOriginalConstructor()->getMock();
self::$DI['app']['phraseanet.user-query']->expects($this->any())->method('get_results')->will($this->returnValue(new ArrayCollection([self::$DI['user_alt2']])));
self::$DI['app']['phraseanet.user-query']->expects($this->any())->method('on_base_ids')->will($this->returnSelf());
self::$DI['app']['phraseanet.user-query']->expects($this->any())->method('who_have_right')->will($this->returnSelf());
self::$DI['app']['phraseanet.user-query']->expects($this->any())->method('execute')->will($this->returnSelf());
self::$DI['app']['notification.deliverer'] = $this->getMockBuilder('Alchemy\Phrasea\Notification\Deliverer') self::$DI['app']['notification.deliverer'] = $this->getMockBuilder('Alchemy\Phrasea\Notification\Deliverer')
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();

7
tests/classes/record/adapterTest.php
View File

@@ -3,6 +3,7 @@
use Rhumsaa\Uuid\Uuid; use Rhumsaa\Uuid\Uuid;
use Alchemy\Phrasea\Core\PhraseaEvents; use Alchemy\Phrasea\Core\PhraseaEvents;
use Symfony\Component\EventDispatcher\Event; use Symfony\Component\EventDispatcher\Event;
use Doctrine\Common\Collections\ArrayCollection;
class record_adapterTest extends \PhraseanetAuthenticatedTestCase class record_adapterTest extends \PhraseanetAuthenticatedTestCase
{ {
@@ -67,6 +68,12 @@ class record_adapterTest extends \PhraseanetAuthenticatedTestCase
self::$DI['app']['acl'] = $aclProvider; self::$DI['app']['acl'] = $aclProvider;
self::$DI['app']['phraseanet.user-query'] = $this->getMockBuilder('\User_Query')->disableOriginalConstructor()->getMock();
self::$DI['app']['phraseanet.user-query']->expects($this->any())->method('get_results')->will($this->returnValue(new ArrayCollection([self::$DI['user_alt2']])));
self::$DI['app']['phraseanet.user-query']->expects($this->any())->method('on_base_ids')->will($this->returnSelf());
self::$DI['app']['phraseanet.user-query']->expects($this->any())->method('who_have_right')->will($this->returnSelf());
self::$DI['app']['phraseanet.user-query']->expects($this->any())->method('execute')->will($this->returnSelf());
self::$DI['app']['notification.deliverer'] = $this->getMockBuilder('Alchemy\Phrasea\Notification\Deliverer') self::$DI['app']['notification.deliverer'] = $this->getMockBuilder('Alchemy\Phrasea\Notification\Deliverer')
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();