Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5546 from turbo124/v5-develop

Browse Source 
Custom domain validation update
This commit is contained in:
David Bomba 2021-04-28 13:14:00 +10:00 committed by GitHub
commit cf1e844114
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/SubdomainController.php
View File

@ -15,6 +15,18 @@ use App\Libraries\MultiDB;
class SubdomainController extends BaseController
{
private $protected = [
'www',
'app',
'ninja',
'sentry',
'staging',
'pdf',
'demo',
'docs',
'client_domain',
'custom_domain',
];
public function __construct()
{
@ -29,7 +41,7 @@ class SubdomainController extends BaseController
public function index()
{
if( MultiDB::findAndSetDbByDomain(request()->input('subdomain')) )
if(in_array(request()->input('subdomain'), $this->protected) || MultiDB::findAndSetDbByDomain(request()->input('subdomain')))
return response()->json(['message' => 'Domain not available'] , 401);
return response()->json(['message' => 'Domain available'], 200);

4
app/Http/Requests/Company/StoreCompanyRequest.php
View File

@ -34,13 +34,15 @@ class StoreCompanyRequest extends Request
public function rules()
{
$input = $this->all();
$rules = [];
$rules['name'] = new ValidCompanyQuantity();
$rules['company_logo'] = 'mimes:jpeg,jpg,png,gif|max:10000'; // max 10000kb
$rules['settings'] = new ValidSettingsRule();
if (isset($rules['portal_mode']) && ($rules['portal_mode'] == 'domain' || $rules['portal_mode'] == 'iframe')) {
if (isset($input['portal_mode']) && ($input['portal_mode'] == 'domain' || $input['portal_mode'] == 'iframe')) {
$rules['portal_domain'] = 'sometimes|url';
} else {
$rules['portal_domain'] = 'nullable|alpha_num';

2
app/Http/Requests/Company/UpdateCompanyRequest.php
View File

@ -32,6 +32,8 @@ class UpdateCompanyRequest extends Request
public function rules()
{
$input = $this->all();
$rules = [];
$rules['company_logo'] = 'mimes:jpeg,jpg,png,gif|max:10000'; // max 10000kb