This repository has been archived by the owner on Jan 6, 2023. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 204
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
b508d09
commit d5812f1
Showing
56 changed files
with
1,387 additions
and
332 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
migrations/upgrades/schemas/20190702092323_add_login_attempts_allowed_setting.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
<?php | ||
|
||
|
||
use Phinx\Migration\AbstractMigration; | ||
|
||
class AddLoginAttemptsAllowedSetting extends AbstractMigration | ||
{ | ||
public function up() | ||
{ | ||
$fieldObject = [ | ||
'field' => 'login_attempts_allowed', | ||
'type' => 'integer', | ||
'interface' => 'numeric', | ||
]; | ||
$collection = 'directus_settings'; | ||
|
||
$checkSql = sprintf('SELECT 1 FROM `directus_fields` WHERE `collection` = "%s" AND `field` = "%s";', $collection, $fieldObject['field']); | ||
$result = $this->query($checkSql)->fetch(); | ||
|
||
if (!$result) { | ||
$insertSqlFormat = 'INSERT INTO `directus_fields` (`collection`, `field`, `type`, `interface`) VALUES ("%s", "%s", "%s", "%s");'; | ||
$insertSql = sprintf($insertSqlFormat, $collection, $fieldObject['field'], $fieldObject['type'], $fieldObject['interface']); | ||
$this->execute($insertSql); | ||
} | ||
|
||
} | ||
} |
168 changes: 168 additions & 0 deletions
168
migrations/upgrades/schemas/20190704063752_update_istanbul_timezone.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,168 @@ | ||
<?php | ||
|
||
|
||
use Phinx\Migration\AbstractMigration; | ||
|
||
class UpdateIstanbulTimezone extends AbstractMigration | ||
{ | ||
public function up() | ||
{ | ||
$options = json_encode([ | ||
'choices' => [ | ||
'Pacific/Midway' => '(UTC-11:00) Midway Island', | ||
'Pacific/Samoa' => '(UTC-11:00) Samoa', | ||
'Pacific/Honolulu' => '(UTC-10:00) Hawaii', | ||
'US/Alaska' => '(UTC-09:00) Alaska', | ||
'America/Los_Angeles' => '(UTC-08:00) Pacific Time (US & Canada)', | ||
'America/Tijuana' => '(UTC-08:00) Tijuana', | ||
'US/Arizona' => '(UTC-07:00) Arizona', | ||
'America/Chihuahua' => '(UTC-07:00) Chihuahua', | ||
'America/Mexico/La_Paz' => '(UTC-07:00) La Paz', | ||
'America/Mazatlan' => '(UTC-07:00) Mazatlan', | ||
'US/Mountain' => '(UTC-07:00) Mountain Time (US & Canada)', | ||
'America/Managua' => '(UTC-06:00) Central America', | ||
'US/Central' => '(UTC-06:00) Central Time (US & Canada)', | ||
'America/Guadalajara' => '(UTC-06:00) Guadalajara', | ||
'America/Mexico_City' => '(UTC-06:00) Mexico City', | ||
'America/Monterrey' => '(UTC-06:00) Monterrey', | ||
'Canada/Saskatchewan' => '(UTC-06:00) Saskatchewan', | ||
'America/Bogota' => '(UTC-05:00) Bogota', | ||
'US/Eastern' => '(UTC-05:00) Eastern Time (US & Canada)', | ||
'US/East-Indiana' => '(UTC-05:00) Indiana (East)', | ||
'America/Lima' => '(UTC-05:00) Lima', | ||
'America/Quito' => '(UTC-05:00) Quito', | ||
'Canada/Atlantic' => '(UTC-04:00) Atlantic Time (Canada)', | ||
'America/New_York' => '(UTC-04:00) New York', | ||
'America/Caracas' => '(UTC-04:30) Caracas', | ||
'America/La_Paz' => '(UTC-04:00) La Paz', | ||
'America/Santiago' => '(UTC-04:00) Santiago', | ||
'America/Santo_Domingo' => '(UTC-04:00) Santo Domingo', | ||
'Canada/Newfoundland' => '(UTC-03:30) Newfoundland', | ||
'America/Sao_Paulo' => '(UTC-03:00) Brasilia', | ||
'America/Argentina/Buenos_Aires' => '(UTC-03:00) Buenos Aires', | ||
'America/Argentina/GeorgeTown' => '(UTC-03:00) Georgetown', | ||
'America/Godthab' => '(UTC-03:00) Greenland', | ||
'America/Noronha' => '(UTC-02:00) Mid-Atlantic', | ||
'Atlantic/Azores' => '(UTC-01:00) Azores', | ||
'Atlantic/Cape_Verde' => '(UTC-01:00) Cape Verde Is.', | ||
'Africa/Casablanca' => '(UTC+00:00) Casablanca', | ||
'Europe/Edinburgh' => '(UTC+00:00) Edinburgh', | ||
'Etc/Greenwich' => '(UTC+00:00) Greenwich Mean Time : Dublin', | ||
'Europe/Lisbon' => '(UTC+00:00) Lisbon', | ||
'Europe/London' => '(UTC+00:00) London', | ||
'Africa/Monrovia' => '(UTC+00:00) Monrovia', | ||
'UTC' => '(UTC+00:00) UTC', | ||
'Europe/Amsterdam' => '(UTC+01:00) Amsterdam', | ||
'Europe/Belgrade' => '(UTC+01:00) Belgrade', | ||
'Europe/Berlin' => '(UTC+01:00) Berlin', | ||
'Europe/Bern' => '(UTC+01:00) Bern', | ||
'Europe/Bratislava' => '(UTC+01:00) Bratislava', | ||
'Europe/Brussels' => '(UTC+01:00) Brussels', | ||
'Europe/Budapest' => '(UTC+01:00) Budapest', | ||
'Europe/Copenhagen' => '(UTC+01:00) Copenhagen', | ||
'Europe/Ljubljana' => '(UTC+01:00) Ljubljana', | ||
'Europe/Madrid' => '(UTC+01:00) Madrid', | ||
'Europe/Paris' => '(UTC+01:00) Paris', | ||
'Europe/Prague' => '(UTC+01:00) Prague', | ||
'Europe/Rome' => '(UTC+01:00) Rome', | ||
'Europe/Sarajevo' => '(UTC+01:00) Sarajevo', | ||
'Europe/Skopje' => '(UTC+01:00) Skopje', | ||
'Europe/Stockholm' => '(UTC+01:00) Stockholm', | ||
'Europe/Vienna' => '(UTC+01:00) Vienna', | ||
'Europe/Warsaw' => '(UTC+01:00) Warsaw', | ||
'Africa/Lagos' => '(UTC+01:00) West Central Africa', | ||
'Europe/Zagreb' => '(UTC+01:00) Zagreb', | ||
'Europe/Athens' => '(UTC+02:00) Athens', | ||
'Europe/Bucharest' => '(UTC+02:00) Bucharest', | ||
'Africa/Cairo' => '(UTC+02:00) Cairo', | ||
'Africa/Harare' => '(UTC+02:00) Harare', | ||
'Europe/Helsinki' => '(UTC+02:00) Helsinki', | ||
'Asia/Jerusalem' => '(UTC+02:00) Jerusalem', | ||
'Europe/Kyiv' => '(UTC+02:00) Kyiv', | ||
'Africa/Johannesburg' => '(UTC+02:00) Pretoria', | ||
'Europe/Riga' => '(UTC+02:00) Riga', | ||
'Europe/Sofia' => '(UTC+02:00) Sofia', | ||
'Europe/Tallinn' => '(UTC+02:00) Tallinn', | ||
'Europe/Vilnius' => '(UTC+02:00) Vilnius', | ||
'Europe/Istanbul' => '(UTC+03:00) Istanbul', | ||
'Asia/Baghdad' => '(UTC+03:00) Baghdad', | ||
'Asia/Kuwait' => '(UTC+03:00) Kuwait', | ||
'Europe/Minsk' => '(UTC+03:00) Minsk', | ||
'Africa/Nairobi' => '(UTC+03:00) Nairobi', | ||
'Asia/Riyadh' => '(UTC+03:00) Riyadh', | ||
'Europe/Volgograd' => '(UTC+03:00) Volgograd', | ||
'Asia/Tehran' => '(UTC+03:30) Tehran', | ||
'Asia/Abu_Dhabi' => '(UTC+04:00) Abu Dhabi', | ||
'Asia/Baku' => '(UTC+04:00) Baku', | ||
'Europe/Moscow' => '(UTC+04:00) Moscow', | ||
'Asia/Muscat' => '(UTC+04:00) Muscat', | ||
'Europe/St_Petersburg' => '(UTC+04:00) St. Petersburg', | ||
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi', | ||
'Asia/Yerevan' => '(UTC+04:00) Yerevan', | ||
'Asia/Kabul' => '(UTC+04:30) Kabul', | ||
'Asia/Islamabad' => '(UTC+05:00) Islamabad', | ||
'Asia/Karachi' => '(UTC+05:00) Karachi', | ||
'Asia/Tashkent' => '(UTC+05:00) Tashkent', | ||
'Asia/Calcutta' => '(UTC+05:30) Chennai', | ||
'Asia/Kolkata' => '(UTC+05:30) Kolkata', | ||
'Asia/Mumbai' => '(UTC+05:30) Mumbai', | ||
'Asia/New_Delhi' => '(UTC+05:30) New Delhi', | ||
'Asia/Sri_Jayawardenepura' => '(UTC+05:30) Sri Jayawardenepura', | ||
'Asia/Katmandu' => '(UTC+05:45) Kathmandu', | ||
'Asia/Almaty' => '(UTC+06:00) Almaty', | ||
'Asia/Astana' => '(UTC+06:00) Astana', | ||
'Asia/Dhaka' => '(UTC+06:00) Dhaka', | ||
'Asia/Yekaterinburg' => '(UTC+06:00) Ekaterinburg', | ||
'Asia/Rangoon' => '(UTC+06:30) Rangoon', | ||
'Asia/Bangkok' => '(UTC+07:00) Bangkok', | ||
'Asia/Hanoi' => '(UTC+07:00) Hanoi', | ||
'Asia/Jakarta' => '(UTC+07:00) Jakarta', | ||
'Asia/Novosibirsk' => '(UTC+07:00) Novosibirsk', | ||
'Asia/Beijing' => '(UTC+08:00) Beijing', | ||
'Asia/Chongqing' => '(UTC+08:00) Chongqing', | ||
'Asia/Hong_Kong' => '(UTC+08:00) Hong Kong', | ||
'Asia/Krasnoyarsk' => '(UTC+08:00) Krasnoyarsk', | ||
'Asia/Kuala_Lumpur' => '(UTC+08:00) Kuala Lumpur', | ||
'Australia/Perth' => '(UTC+08:00) Perth', | ||
'Asia/Singapore' => '(UTC+08:00) Singapore', | ||
'Asia/Taipei' => '(UTC+08:00) Taipei', | ||
'Asia/Ulan_Bator' => '(UTC+08:00) Ulaan Bataar', | ||
'Asia/Urumqi' => '(UTC+08:00) Urumqi', | ||
'Asia/Irkutsk' => '(UTC+09:00) Irkutsk', | ||
'Asia/Osaka' => '(UTC+09:00) Osaka', | ||
'Asia/Sapporo' => '(UTC+09:00) Sapporo', | ||
'Asia/Seoul' => '(UTC+09:00) Seoul', | ||
'Asia/Tokyo' => '(UTC+09:00) Tokyo', | ||
'Australia/Adelaide' => '(UTC+09:30) Adelaide', | ||
'Australia/Darwin' => '(UTC+09:30) Darwin', | ||
'Australia/Brisbane' => '(UTC+10:00) Brisbane', | ||
'Australia/Canberra' => '(UTC+10:00) Canberra', | ||
'Pacific/Guam' => '(UTC+10:00) Guam', | ||
'Australia/Hobart' => '(UTC+10:00) Hobart', | ||
'Australia/Melbourne' => '(UTC+10:00) Melbourne', | ||
'Pacific/Port_Moresby' => '(UTC+10:00) Port Moresby', | ||
'Australia/Sydney' => '(UTC+10:00) Sydney', | ||
'Asia/Yakutsk' => '(UTC+10:00) Yakutsk', | ||
'Asia/Vladivostok' => '(UTC+11:00) Vladivostok', | ||
'Pacific/Auckland' => '(UTC+12:00) Auckland', | ||
'Pacific/Fiji' => '(UTC+12:00) Fiji', | ||
'Pacific/Kwajalein' => '(UTC+12:00) International Date Line West', | ||
'Asia/Kamchatka' => '(UTC+12:00) Kamchatka', | ||
'Asia/Magadan' => '(UTC+12:00) Magadan', | ||
'Pacific/Marshall_Is' => '(UTC+12:00) Marshall Is.', | ||
'Asia/New_Caledonia' => '(UTC+12:00) New Caledonia', | ||
'Asia/Solomon_Is' => '(UTC+12:00) Solomon Is.', | ||
'Pacific/Wellington' => '(UTC+12:00) Wellington', | ||
'Pacific/Tongatapu' => '(UTC+13:00) Nuku\'alofa' | ||
], | ||
'placeholder' => 'Choose a timezone...' | ||
]); | ||
|
||
$this->execute(\Directus\phinx_update( | ||
$this->getAdapter(), | ||
'directus_fields', | ||
['options' => $options], | ||
['collection' => 'directus_users', 'field' => 'timezone'] | ||
)); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
src/core/Directus/Authentication/Exception/UserSuspendedException.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
<?php | ||
|
||
namespace Directus\Authentication\Exception; | ||
|
||
use Directus\Exception\NotFoundException; | ||
|
||
class UserSuspendedException extends NotFoundException | ||
{ | ||
const ERROR_CODE = 103; | ||
|
||
public function __construct() | ||
{ | ||
parent::__construct('Your account is suspended due to maximum allowed login attempts. Please contact your administrator to activate your account.', static::ERROR_CODE); | ||
} | ||
} |
Oops, something went wrong.