From 89bee3ca1815a94e57c4c42ee4e8eb9ad5b5c8e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?= Date: Thu, 17 Sep 2020 14:53:34 +0200 Subject: [PATCH] Fix OVH SMS sender name Fix admins pagination Update the dependencies Update RPM release number to 27 --- flexiapi/.env.example | 1 + flexiapi/app/Libraries/OvhSMS.php | 5 +- flexiapi/composer.json | 14 ++-- flexiapi/composer.lock | 83 +++++++++---------- flexiapi/config/ovh.php | 1 + flexiapi/public/css/style.css | 11 +-- .../views/admin/account/index.blade.php | 10 +-- flexisip-account-manager.spec | 2 +- 8 files changed, 63 insertions(+), 64 deletions(-) diff --git a/flexiapi/.env.example b/flexiapi/.env.example index 09dc03c..e4399b1 100644 --- a/flexiapi/.env.example +++ b/flexiapi/.env.example @@ -49,6 +49,7 @@ OVH_APP_KEY= OVH_APP_SECRET= OVH_APP_ENDPOINT=ovh-eu OVH_APP_CONSUMER_KEY= +OVH_APP_SENDER= NOCAPTCHA_SECRET=secret-key NOCAPTCHA_SITEKEY=site-key \ No newline at end of file diff --git a/flexiapi/app/Libraries/OvhSMS.php b/flexiapi/app/Libraries/OvhSMS.php index e585651..08a6e9b 100644 --- a/flexiapi/app/Libraries/OvhSMS.php +++ b/flexiapi/app/Libraries/OvhSMS.php @@ -47,10 +47,11 @@ class OvhSMS 'class' => 'phoneDisplay', 'coding' => '7bit', 'message' => $message, - 'noStopClause' => false, + 'noStopClause' => true, 'priority' => 'high', 'receivers' => [ $to ], - 'senderForResponse' => true, + 'sender' => config('ovh.app_sender'), + 'senderForResponse' => false, 'validityPeriod' => 2880 ]; diff --git a/flexiapi/composer.json b/flexiapi/composer.json index f4433b3..6a9dbb2 100644 --- a/flexiapi/composer.json +++ b/flexiapi/composer.json @@ -9,18 +9,18 @@ "license": "MIT", "require": { "php": "^7.3", - "anhskohbo/no-captcha": "^3.2", - "fideloper/proxy": "^4.0", + "anhskohbo/no-captcha": "^3.3", + "fideloper/proxy": "^4.4", "laravel/framework": "^8.0", - "laravel/tinker": "^2.0", - "laravelcollective/html": "^6.1", + "laravel/tinker": "^2.4", + "laravelcollective/html": "^6.2", "ovh/ovh": "^2.0", "propaganistas/laravel-phone": "^4.2" }, "require-dev": { - "facade/ignition": "^2.0", - "fzaninotto/faker": "^1.4", - "mockery/mockery": "^1.0", + "facade/ignition": "^2.3", + "fzaninotto/faker": "^1.9", + "mockery/mockery": "^1.4", "nunomaduro/collision": "^5.0", "phpunit/phpunit": "^9.0" }, diff --git a/flexiapi/composer.lock b/flexiapi/composer.lock index 0f95f57..03adba7 100644 --- a/flexiapi/composer.lock +++ b/flexiapi/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "17d2e990653a52f96ded50de171aea77", + "content-hash": "5063139d9245c72528e7b86c22887d58", "packages": [ { "name": "anhskohbo/no-captcha", @@ -374,16 +374,16 @@ }, { "name": "egulias/email-validator", - "version": "2.1.20", + "version": "2.1.21", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "f46887bc48db66c7f38f668eb7d6ae54583617ff" + "reference": "563d0cdde5d862235ffe24a158497f4d490191b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/f46887bc48db66c7f38f668eb7d6ae54583617ff", - "reference": "f46887bc48db66c7f38f668eb7d6ae54583617ff", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/563d0cdde5d862235ffe24a158497f4d490191b5", + "reference": "563d0cdde5d862235ffe24a158497f4d490191b5", "shasum": "" }, "require": { @@ -428,7 +428,7 @@ "validation", "validator" ], - "time": "2020-09-06T13:44:32+00:00" + "time": "2020-09-19T14:37:56+00:00" }, { "name": "fideloper/proxy", @@ -854,16 +854,16 @@ }, { "name": "laravel/framework", - "version": "v8.3.0", + "version": "v8.5.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "7f8ac4f4abee41215b7f421f0dc491c844aea7b9" + "reference": "5a748eecae35fd453e0b1e4d4b6f4fadf0d3e7ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/7f8ac4f4abee41215b7f421f0dc491c844aea7b9", - "reference": "7f8ac4f4abee41215b7f421f0dc491c844aea7b9", + "url": "https://api.github.com/repos/laravel/framework/zipball/5a748eecae35fd453e0b1e4d4b6f4fadf0d3e7ac", + "reference": "5a748eecae35fd453e0b1e4d4b6f4fadf0d3e7ac", "shasum": "" }, "require": { @@ -1013,7 +1013,7 @@ "framework", "laravel" ], - "time": "2020-09-15T14:50:30+00:00" + "time": "2020-09-18T21:27:11+00:00" }, { "name": "laravel/tinker", @@ -1531,16 +1531,16 @@ }, { "name": "nesbot/carbon", - "version": "2.39.2", + "version": "2.40.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "326efde1bc09077a26cb77f6e2e32e13f06c27f2" + "reference": "6c7646154181013ecd55e80c201b9fd873c6ee5d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/326efde1bc09077a26cb77f6e2e32e13f06c27f2", - "reference": "326efde1bc09077a26cb77f6e2e32e13f06c27f2", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/6c7646154181013ecd55e80c201b9fd873c6ee5d", + "reference": "6c7646154181013ecd55e80c201b9fd873c6ee5d", "shasum": "" }, "require": { @@ -1616,20 +1616,20 @@ "type": "tidelift" } ], - "time": "2020-09-10T12:16:42+00:00" + "time": "2020-09-11T19:00:58+00:00" }, { "name": "nikic/php-parser", - "version": "v4.9.1", + "version": "v4.10.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "88e519766fc58bd46b8265561fb79b54e2e00b28" + "reference": "1c13d05035deff45f1230ca68bd7d74d621762d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/88e519766fc58bd46b8265561fb79b54e2e00b28", - "reference": "88e519766fc58bd46b8265561fb79b54e2e00b28", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1c13d05035deff45f1230ca68bd7d74d621762d9", + "reference": "1c13d05035deff45f1230ca68bd7d74d621762d9", "shasum": "" }, "require": { @@ -1668,7 +1668,7 @@ "parser", "php" ], - "time": "2020-08-30T16:15:20+00:00" + "time": "2020-09-19T14:52:48+00:00" }, { "name": "opis/closure", @@ -4915,16 +4915,16 @@ }, { "name": "facade/flare-client-php", - "version": "1.3.5", + "version": "1.3.6", "source": { "type": "git", "url": "https://github.com/facade/flare-client-php.git", - "reference": "25907a113bfc212a38d458ae365bfb902b4e7fb8" + "reference": "451fadf38e9f635e7f8e1f5b3cf5c9eb82f11799" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/flare-client-php/zipball/25907a113bfc212a38d458ae365bfb902b4e7fb8", - "reference": "25907a113bfc212a38d458ae365bfb902b4e7fb8", + "url": "https://api.github.com/repos/facade/flare-client-php/zipball/451fadf38e9f635e7f8e1f5b3cf5c9eb82f11799", + "reference": "451fadf38e9f635e7f8e1f5b3cf5c9eb82f11799", "shasum": "" }, "require": { @@ -4937,7 +4937,6 @@ }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.14", - "larapack/dd": "^1.1", "phpunit/phpunit": "^7.5.16", "spatie/phpunit-snapshot-assertions": "^2.0" }, @@ -4973,7 +4972,7 @@ "type": "github" } ], - "time": "2020-08-26T18:06:23+00:00" + "time": "2020-09-18T06:35:11+00:00" }, { "name": "facade/ignition", @@ -5614,16 +5613,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.2.1", + "version": "5.2.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "d870572532cd70bc3fab58f2e23ad423c8404c44" + "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d870572532cd70bc3fab58f2e23ad423c8404c44", - "reference": "d870572532cd70bc3fab58f2e23ad423c8404c44", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556", + "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556", "shasum": "" }, "require": { @@ -5662,20 +5661,20 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2020-08-15T11:14:08+00:00" + "time": "2020-09-03T19:13:55+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "1.3.0", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "e878a14a65245fbe78f8080eba03b47c3b705651" + "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e878a14a65245fbe78f8080eba03b47c3b705651", - "reference": "e878a14a65245fbe78f8080eba03b47c3b705651", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0", + "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0", "shasum": "" }, "require": { @@ -5707,7 +5706,7 @@ } ], "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", - "time": "2020-06-27T10:12:23+00:00" + "time": "2020-09-17T18:55:26+00:00" }, { "name": "phpspec/prophecy", @@ -5774,16 +5773,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.1.9", + "version": "9.1.11", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "cf6582906d4b2502c5f4c6be6a3d0b4cd5b3ef7f" + "reference": "c9394cb9d07ecfa9351b96f2e296bad473195f4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/cf6582906d4b2502c5f4c6be6a3d0b4cd5b3ef7f", - "reference": "cf6582906d4b2502c5f4c6be6a3d0b4cd5b3ef7f", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c9394cb9d07ecfa9351b96f2e296bad473195f4d", + "reference": "c9394cb9d07ecfa9351b96f2e296bad473195f4d", "shasum": "" }, "require": { @@ -5843,7 +5842,7 @@ "type": "github" } ], - "time": "2020-09-15T06:14:11+00:00" + "time": "2020-09-19T05:29:17+00:00" }, { "name": "phpunit/php-file-iterator", diff --git a/flexiapi/config/ovh.php b/flexiapi/config/ovh.php index c586f86..97434ad 100644 --- a/flexiapi/config/ovh.php +++ b/flexiapi/config/ovh.php @@ -5,4 +5,5 @@ return [ 'app_secret' => env('OVH_APP_SECRET', ''), 'app_endpoint' => env('OVH_APP_ENDPOINT', 'ovh-eu'), 'app_consumer_key' => env('OVH_APP_CONSUMER_KEY', ''), + 'app_sender' => env('OVH_APP_SENDER', ''), ]; \ No newline at end of file diff --git a/flexiapi/public/css/style.css b/flexiapi/public/css/style.css index 3ac2f4c..11661e1 100644 --- a/flexiapi/public/css/style.css +++ b/flexiapi/public/css/style.css @@ -42,13 +42,8 @@ body > footer::before { height: 9rem; } - -@media screen and (max-width: 991px) { - nav.navbar { - display: none; - } -} - +.page-link, +.page-link:hover, h1, h2, h3, a, label { color: #ff733b; } @@ -97,7 +92,9 @@ body > header nav { background-color: #f44a26; } +.page-item.active .page-link, body > footer { + border-color: #ff733b; background-color: #ff733b; } diff --git a/flexiapi/resources/views/admin/account/index.blade.php b/flexiapi/resources/views/admin/account/index.blade.php index 48ed090..30e8144 100644 --- a/flexiapi/resources/views/admin/account/index.blade.php +++ b/flexiapi/resources/views/admin/account/index.blade.php @@ -7,16 +7,16 @@ @section('content')
-
+

Accounts

-
+
{!! Form::open(['route' => 'admin.account.search']) !!}
-
+
{!! Form::text('search', $search, ['class' => 'form-control', 'placeholder' => 'Search by username: +1234, foo_bar…']) !!}
-
+
@@ -60,6 +60,6 @@ -{{ $accounts->links() }} +{{ $accounts->links('pagination::bootstrap-4') }} @endsection \ No newline at end of file diff --git a/flexisip-account-manager.spec b/flexisip-account-manager.spec index 480eb83..dfa62cf 100644 --- a/flexisip-account-manager.spec +++ b/flexisip-account-manager.spec @@ -8,7 +8,7 @@ #%define _datadir %{_datarootdir} #%define _docdir %{_datadir}/doc -%define build_number 26 +%define build_number 27 %define var_dir /var/opt/belledonne-communications %define opt_dir /opt/belledonne-communications/share/flexisip-account-manager %define env_file "$RPM_BUILD_ROOT/etc/flexisip-account-manager/flexiapi.env"