diff --git a/INSTALL.md b/INSTALL.md index 0406ba0..5042d57 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -2,7 +2,7 @@ FlexiAPI relies on [DotEnv](https://github.com/vlucas/phpdotenv) to be configured. This configuration can be accessed using the existing `.env` file that can be itself overwritten by an environnement variables. -Thoses variables can then be set using Docker-Compose, a bash script or a web-server. +Those variables can then be set using Docker-Compose, a bash script or a web-server. If you're installing FlexiAPI from the RedHat or Debian package you can find the configuration file at `/etc/flexisip-account-manager/flexiapi.env`. @@ -33,7 +33,7 @@ To know more about the web server configuration part, you can directly [visit th # 3. .env file configuration -Complete all the variables in the `.env` file (from the `.env.example` one if you setup the instance manually) or by overwritting them in your Docker or web-server configuration. +Complete all the variables in the `.env` file (from the `.env.example` one if you setup the instance manually) or by overwriting them in your Docker or web-server configuration. ## 3.1. Mandatory `APP_ROOT_HOST` variable @@ -74,7 +74,7 @@ For example: ## 5. Create a first administrator and finish the setup -Create a first administator account: +Create a first administrator account: php artisan accounts:create-admin-account {-u|username=} {-p|password=} {-d|domain=} diff --git a/README.md b/README.md index 6afa2ac..2f2ce04 100644 --- a/README.md +++ b/README.md @@ -95,19 +95,19 @@ Once one account is declared as administrator, you can directly configure the ot ### Seed liblinphone test accounts -You can also seed the tables with test accounts for the liblinphone test suite with the following command (check LiblinphoneTesterAccoutSeeder for the JSON syntax): +You can also seed the tables with test accounts for the liblinphone test suite with the following command (check LiblinphoneTesterAccountSeeder for the JSON syntax): php artisan accounts:seed /path/to/accounts.json ## SMS templates -To send SMS to the USA some providers need to validate their templates before transfering them, see [Sending SMS messages to the USA - OVH](https://help.ovhcloud.com/csm/en-ie-sms-sending-sms-to-usa?id=kb_article_view&sysparm_article=KB0051359). +To send SMS to the USA some providers need to validate their templates before transferring them, see [Sending SMS messages to the USA - OVH](https://help.ovhcloud.com/csm/en-ie-sms-sending-sms-to-usa?id=kb_article_view&sysparm_article=KB0051359). Here are the currently used SMS templates in the app to declare in your provider panel: - Validation code: `Your #APP_NAME# validation code is #CODE#`. Sent to validate the phone change by SMS. - Validation code with expiration: `Your #APP_NAME# validation code is #CODE#. The code is available for #CODE_MINUTES# minutes`. Sent to validate the phone change by SMS, include an expiration time. -## Custom email templaces +## Custom email templates Some email templates can be customized. diff --git a/flexiapi/app/Libraries/StatisticsGraphFactory.php b/flexiapi/app/Libraries/StatisticsGraphFactory.php index 6fc1b6e..1a5e993 100644 --- a/flexiapi/app/Libraries/StatisticsGraphFactory.php +++ b/flexiapi/app/Libraries/StatisticsGraphFactory.php @@ -57,7 +57,7 @@ class StatisticsGraphFactory $fromQuery = StatisticsMessage::query(); $toQuery = StatisticsMessage::query(); - if (!Auth::user()?->isAdmin) { + if (!Auth::user()?->admin) { $fromQuery->where('from_domain', space()->domain); $toQuery->toDomain($this->domain); } elseif ($this->domain) { @@ -126,7 +126,7 @@ class StatisticsGraphFactory // Accounts doesn't have a from and to $this->domain = $this->domain ?? $this->fromDomain; - if (!Auth::user()?->isAdmin) { + if (!Auth::user()?->admin) { $this->data->where('domain', space()->domain); } elseif ($this->domain) { $this->data->where('domain', $this->domain); diff --git a/flexiapi/resources/views/account/email/validate.blade.php b/flexiapi/resources/views/account/email/validate.blade.php index 52dbe01..8b83883 100644 --- a/flexiapi/resources/views/account/email/validate.blade.php +++ b/flexiapi/resources/views/account/email/validate.blade.php @@ -28,8 +28,7 @@

- - {{ __('You didn't receive the code?') }} + {{ __("You didn't receive the code?") }} {{ __('Resend') }}

diff --git a/flexiapi/resources/views/account/phone/validate.blade.php b/flexiapi/resources/views/account/phone/validate.blade.php index f98e8d1..c097490 100644 --- a/flexiapi/resources/views/account/phone/validate.blade.php +++ b/flexiapi/resources/views/account/phone/validate.blade.php @@ -28,7 +28,7 @@

- {{ __("You didn't receive the code?"") }} + {{ __("You didn't receive the code?") }} {{ __('Resend') }}

diff --git a/flexiapi/resources/views/admin/account/show.blade.php b/flexiapi/resources/views/admin/account/show.blade.php index 2aac800..e3ba141 100644 --- a/flexiapi/resources/views/admin/account/show.blade.php +++ b/flexiapi/resources/views/admin/account/show.blade.php @@ -89,7 +89,7 @@ @if ($account->external) @if ($account->external->username) -

user {{ __('Usernale') }}: {{ $account->external->username }}

+

user {{ __('Username') }}: {{ $account->external->username }}

@endif @if ($account->external->domain)

hard-drive {{ __('Domain') }}: {{ $account->external->domain }}

diff --git a/flexiapi/resources/views/admin/space/configuration.blade.php b/flexiapi/resources/views/admin/space/configuration.blade.php index 23b3471..0a15f61 100644 --- a/flexiapi/resources/views/admin/space/configuration.blade.php +++ b/flexiapi/resources/views/admin/space/configuration.blade.php @@ -67,6 +67,13 @@ @include('parts.errors', ['name' => 'account_proxy_registrar_address']) +
+ + + A custom realm for the Space accounts + @include('parts.errors', ['name' => 'account_realm']) +
+

{{ __('Remote provisioning') }}