FGFS-4.1/phpvms
3
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