mirror of
https://gitlab.linphone.org/BC/public/flexisip-account-manager.git
synced 2026-01-17 10:08:05 +00:00
Apply the same workaround than for the email registration for the phone ones
This commit is contained in:
parent
eb2e93f77f
commit
03741bda83
12 changed files with 594 additions and 616 deletions
|
|
@ -1,6 +1,6 @@
|
|||
variables:
|
||||
ROCKY_8_IMAGE_VERSION: 20230330_163028_remove_remi
|
||||
DEBIAN_11_IMAGE_VERSION: 20230322_172926_missing_tools
|
||||
DEBIAN_11_IMAGE_VERSION: 20231127_160206_refresh_php_packages
|
||||
DEBIAN_12_IMAGE_VERSION: 20230925_143235_enable_debian12_packaging
|
||||
PHP_REDIS_REMI_VERSION: php-pecl-redis5-5.3.6-1
|
||||
PHP_IGBINARY_REMI_VERSION: php-pecl-igbinary-3.2.14-1
|
||||
|
|
|
|||
2
Makefile
2
Makefile
|
|
@ -78,7 +78,7 @@ deb-only:
|
|||
fakeroot alien -g -k --scripts $(OUTPUT_DIR)/rpmbuild/tmp.rpm
|
||||
rm -r $(OUTPUT_DIR)/rpmbuild
|
||||
rm -rf $(OUTPUT_DIR)/*.orig
|
||||
sed -i 's/Depends:.*/Depends: $${shlibs:Depends}, php (>= 8.0), php-xml, php-pdo, php-gd, php-redis, php-mysql, php-mbstring, php-sqlite3/g' $(OUTPUT_DIR)/bc-flexisip-account-manager*/debian/control
|
||||
sed -i 's/Depends:.*/Depends: $${shlibs:Depends}, php8.2-xml, php8.2-pdo, php8.2-gd, php8.2-redis, php8.2-mysql, php8.2-mbstring, php8.2-sqlite3/g' $(OUTPUT_DIR)/bc-flexisip-account-manager*/debian/control
|
||||
|
||||
cd `ls -rt $(OUTPUT_DIR) | tail -1` && dpkg-buildpackage --no-sign
|
||||
@echo "📦✅ DEB Package Created"
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ class RegisterController extends Controller
|
|||
|
||||
public function storePhone(Request $request)
|
||||
{
|
||||
$request->validate([
|
||||
$validator = Validator::make($request->all(), [
|
||||
'terms' => 'accepted',
|
||||
'privacy' => 'accepted',
|
||||
'username' => [
|
||||
|
|
@ -155,6 +155,15 @@ class RegisterController extends Controller
|
|||
'g-recaptcha-response' => 'required|captcha',
|
||||
]);
|
||||
|
||||
// Weird workaround to force the injections of the validation errors,
|
||||
// the redirection seems to clear them when the captcha is used
|
||||
if ($validator->fails()) {
|
||||
return view('account.register.phone', [
|
||||
'errors' => $validator->messages(),
|
||||
'domain' => '@' . config('app.sip_domain')
|
||||
]);
|
||||
}
|
||||
|
||||
$account = new Account;
|
||||
$account->username = !empty($request->get('username'))
|
||||
? $request->get('username')
|
||||
|
|
|
|||
1195
flexiapi/composer.lock
generated
1195
flexiapi/composer.lock
generated
File diff suppressed because it is too large
Load diff
0
flexiapi/storage/app/.gitignore
vendored
Normal file → Executable file
0
flexiapi/storage/app/.gitignore
vendored
Normal file → Executable file
0
flexiapi/storage/app/public/.gitignore
vendored
Normal file → Executable file
0
flexiapi/storage/app/public/.gitignore
vendored
Normal file → Executable file
0
flexiapi/storage/framework/.gitignore
vendored
Normal file → Executable file
0
flexiapi/storage/framework/.gitignore
vendored
Normal file → Executable file
0
flexiapi/storage/framework/cache/.gitignore
vendored
Normal file → Executable file
0
flexiapi/storage/framework/cache/.gitignore
vendored
Normal file → Executable file
0
flexiapi/storage/framework/cache/data/.gitignore
vendored
Normal file → Executable file
0
flexiapi/storage/framework/cache/data/.gitignore
vendored
Normal file → Executable file
0
flexiapi/storage/framework/sessions/.gitignore
vendored
Normal file → Executable file
0
flexiapi/storage/framework/sessions/.gitignore
vendored
Normal file → Executable file
0
flexiapi/storage/framework/testing/.gitignore
vendored
Normal file → Executable file
0
flexiapi/storage/framework/testing/.gitignore
vendored
Normal file → Executable file
0
flexiapi/storage/framework/views/.gitignore
vendored
Normal file → Executable file
0
flexiapi/storage/framework/views/.gitignore
vendored
Normal file → Executable file
Loading…
Add table
Reference in a new issue