FGFS-4.1/phpvms
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HTTP/HTTPS mixed content errors #612 (#613)

Browse Source 
* Configure TrustProxies middleware
* Add trusted proxies to deps
* Replace jquery request with axios request code
* Trust current user IP for forwarded headers
* Update dependencies
* Downgrade self-updater package for PHP 7.2
This commit is contained in:
Nabeel S
2020-03-03 10:20:13 -05:00
committed by GitHub
parent dcf9f48364
commit 89481b5fa1
26 changed files with 219 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/Importer/Resources/views/app.blade.php
View File

@@ -42,14 +42,17 @@
<div class="row">
<div class="col-md-8 ml-auto mr-auto content-center">
<div class="p-10" style="padding: 10px 0;">
<img src="{{ public_asset('/assets/img/logo_blue_bg.svg') }}" width="135px" style="" alt=""/>
<div class="row">
<div class="col-4">
<img src="{{ public_asset('/assets/img/logo_blue_bg.svg') }}" width="135px" style="" alt=""/>
</div>
<div class="col-8 text-right">
<h4 class="text-white mb-0 mr-0 ml-0" style="margin-top: 5px;">@yield('title')</h4>
</div>
</div>
</div>
<div class="card card-login card-plain" style="background: #FFF">
<div class="card-header text-center">
<h3 class="card-title title">@yield('title')</h3>
</div>
<div class="card-body">
<hr />
@include('importer::flash.message')
@yield('content')
</div>
@@ -63,9 +66,8 @@
{{--<script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>--}}
<script src="{{ public_mix('/assets/global/js/vendor.js') }}"></script>
<script src="{{ public_mix('/assets/frontend/js/vendor.js') }}"></script>
<script src="{{ public_mix('/assets/frontend/js/app.js') }}"></script>
<script src="{{ public_asset('/assets/installer/js/vendor.js') }}" type="text/javascript"></script>
<script src="{{ public_mix('/assets/installer/js/vendor.js') }}"></script>
<script src="{{ public_mix('/assets/installer/js/app.js') }}"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
<script>

27
modules/Importer/Resources/views/step1-configure.blade.php
View File

@@ -102,12 +102,14 @@
@endsection
@section('scripts')
<script>
$(document).ready(() => {
$("#dbtest_button").click((e) => {
e.preventDefault();
const opts = {
<script>
$(document).ready(() => {
$("#dbtest_button").click((e) => {
e.preventDefault();
const opts = {
method: 'POST',
url: '/importer/dbtest',
data: {
_token: "{{ csrf_token() }}",
db_conn: 'mysql',
db_host: $("input[name=db_host]").val(),
@@ -115,12 +117,13 @@
db_name: $("input[name=db_name]").val(),
db_user: $("input[name=db_user]").val(),
db_pass: $("input[name=db_pass]").val(),
};
},
};
$.post("{{ route('importer.dbtest') }}", opts, (data) => {
$("#dbtest").html(data);
})
})
phpvms.request(opts).then(response => {
$("#dbtest").html(response.data);
});
});
</script>
});
</script>
@endsection

35
modules/Installer/Resources/views/app.blade.php
View File

@@ -36,37 +36,23 @@
</head>
<body class="login-page" style="background: #067ec1;">
<!-- Navbar -->
{{--<nav class="navbar navbar-toggleable-md" style="background: #067ec1;">
<div class="container" style="width: 85%!important;">
<div class="navbar-translate">
<p class="navbar-brand text-white" data-placement="bottom" target="_blank">
<a href="{{ url('/') }}">
<img src="{{ public_asset('/assets/img/logo_blue_bg.svg') }}" width="135px" style=""/>
</a>
</p>
</div>
<div class="justify-content-center" id="navigation" style="margin-left: 50px; color: white; font-size: 20px;">
@yield('title')
</div>
</div>
</nav>--}}
<!-- End Navbar -->
<div class="page-header clear-filter">
{{-- <div class="page-header-image" style="background-image:url({{ public_asset('/assets/installer/bg.jpg') }})"></div>--}}
<div class="content">
<div class="container">
<div class="row">
<div class="col-md-8 ml-auto mr-auto content-center">
<div class="p-10" style="padding: 10px 0;">
<img src="{{ public_asset('/assets/img/logo_blue_bg.svg') }}" width="135px" style="" alt=""/>
<div class="row">
<div class="col-4">
<img src="{{ public_asset('/assets/img/logo_blue_bg.svg') }}" width="135px" style="" alt=""/>
</div>
<div class="col-8 text-right">
<h4 class="text-white mb-0 mr-0 ml-0" style="margin-top: 5px;">@yield('title')</h4>
</div>
</div>
</div>
<div class="card card-login card-plain" style="background: #FFF">
<div class="card-header text-center">
<h3 class="card-title title">@yield('title')</h3>
</div>
<div class="card-body">
<hr />
@include('installer::flash.message')
@yield('content')
</div>
@@ -80,9 +66,8 @@
{{--<script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>--}}
<script src="{{ public_mix('/assets/global/js/vendor.js') }}"></script>
<script src="{{ public_mix('/assets/frontend/js/vendor.js') }}"></script>
<script src="{{ public_mix('/assets/frontend/js/app.js') }}"></script>
<script src="{{ public_asset('/assets/installer/js/vendor.js') }}" type="text/javascript"></script>
<script src="{{ public_mix('/assets/installer/js/vendor.js') }}"></script>
<script src="{{ public_mix('/assets/installer/js/app.js') }}"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
<script>

24
modules/Installer/Resources/views/install/steps/step2-db.blade.php
View File

@@ -139,18 +139,22 @@
$("#dbtest_button").click((e) => {
e.preventDefault();
const opts = {
_token: "{{ csrf_token() }}",
db_conn: $("#db_conn option:selected").text(),
db_host: $("input[name=db_host]").val(),
db_port: $("input[name=db_port]").val(),
db_name: $("input[name=db_name]").val(),
db_user: $("input[name=db_user]").val(),
db_pass: $("input[name=db_pass]").val(),
method: 'POST',
url: '/importer/dbtest',
data: {
_token: "{{ csrf_token() }}",
db_conn: 'mysql',
db_host: $("input[name=db_host]").val(),
db_port: $("input[name=db_port]").val(),
db_name: $("input[name=db_name]").val(),
db_user: $("input[name=db_user]").val(),
db_pass: $("input[name=db_pass]").val(),
},
};
$.post("{{ route('installer.dbtest') }}", opts, (data) => {
$("#dbtest").html(data);
})
phpvms.request(opts).then(response => {
$("#dbtest").html(response.data);
});
})
});
</script>

12
modules/Installer/Resources/views/update/index-start.blade.php
View File

@@ -1,12 +0,0 @@
@extends('installer::app')
@section('title', 'Update phpVMS')
@section('content')
<h2>phpvms updater</h2>
<p>Press continue to check if there are any updates available.</p>
{{ Form::open(['route' => 'update.step1', 'method' => 'post']) }}
<p style="text-align: right">
{{ Form::submit('Start >>', ['class' => 'btn btn-success']) }}
</p>
{{ Form::close() }}
@endsection

13
modules/Installer/Resources/views/update/steps/step1-no-update.blade.php
View File

@@ -1,13 +0,0 @@
@extends('installer::app')
@section('title', 'Update phpVMS')
@section('content')
<h2>phpvms updater</h2>
<p>It seems like you're up to date!</p>
{{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
<p style="text-align: right">
{{ Form::submit('Complete >>', ['class' => 'btn btn-success']) }}
</p>
{{ Form::close() }}
@endsection

12
modules/Installer/Resources/views/update/steps/step1-update-available.blade.php
View File

@@ -1,12 +0,0 @@
@extends('installer::app')
@section('title', 'Update phpVMS')
@section('content')
<h2>phpvms updater</h2>
<p>Click run to complete the update!.</p>
{{ Form::open(['route' => 'update.run_migrations', 'method' => 'post']) }}
<p style="text-align: right">
{{ Form::submit('Run >>', ['class' => 'btn btn-success']) }}
</p>
{{ Form::close() }}
@endsection

18
modules/Installer/Resources/views/update/steps/step2-migrations-done.blade.php
View File

@@ -1,18 +0,0 @@
@extends('installer::app')
@section('title', 'Update Completed')
@section('content')
<div style="align-content: center;">
{{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
<pre class="lang-sh">
<code class="lang-sh">
{{ $console_output }}
</code>
</pre>
<p style="text-align: right">
{{ Form::submit('Complete >>', ['class' => 'btn btn-success']) }}
</p>
{{ Form::close() }}
</div>
@endsection

13
modules/Installer/Resources/views/update/steps/step3-update-complete.blade.php
View File

@@ -1,13 +0,0 @@
@extends('installer::app')
@section('title', 'Update Completed')
@section('content')
<h2>phpvms updater</h2>
<p>Update completed!.</p>
{{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
<p style="text-align: right">
{{ Form::submit('Finish >>', ['class' => 'btn btn-success']) }}
</p>
{{ Form::close() }}
@endsection

6
modules/Updater/Resources/views/app.blade.php
View File

@@ -49,7 +49,6 @@
<h3 class="card-title title">@yield('title')</h3>
</div>
<div class="card-body">
<hr />
@include('updater::flash.message')
@yield('content')
</div>
@@ -63,9 +62,8 @@
{{--<script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>--}}
<script src="{{ public_mix('/assets/global/js/vendor.js') }}"></script>
<script src="{{ public_mix('/assets/frontend/js/vendor.js') }}"></script>
<script src="{{ public_mix('/assets/frontend/js/app.js') }}"></script>
<script src="{{ public_asset('/assets/installer/js/vendor.js') }}" type="text/javascript"></script>
<script src="{{ public_mix('/assets/installer/js/vendor.js') }}"></script>
<script src="{{ public_mix('/assets/installer/js/app.js') }}"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
<script>