From 05a0f5333dcd3fd1b88278ed0ae0ee53b7bc8f0d Mon Sep 17 00:00:00 2001
From: Andreas <6977712+AndreasK79@users.noreply.github.com>
Date: Fri, 4 Aug 2023 13:55:47 +0200
Subject: [PATCH] [Winkeyer] Fixed url when Cloudlog is in a subfolder

---
 application/views/qso/components/winkeysettings.php       | 2 +-
 .../views/qso/components/winkeysettings_results.php       | 2 +-
 application/views/qso/index.php                           | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/views/qso/components/winkeysettings.php b/application/views/qso/components/winkeysettings.php
index c65c402a..a563bd31 100644
--- a/application/views/qso/components/winkeysettings.php
+++ b/application/views/qso/components/winkeysettings.php
@@ -1,6 +1,6 @@
 <div id="modal-backdrop" class="modal-backdrop fade show" style="display:block;"></div>
 <div id="modal" class="modal fade show" tabindex="-1" style="display:block;">
-<form hx-post="/index.php/qso/cwmacrosave" hx-target=".modal-body">
+<form hx-post="<?php echo base_url();?>index.php/qso/cwmacrosave" hx-target=".modal-body">
 	<div class="modal-dialog modal-dialog-centered">
 	  <div class="modal-content">
 		<div class="modal-header">
diff --git a/application/views/qso/components/winkeysettings_results.php b/application/views/qso/components/winkeysettings_results.php
index cd6031c9..aa7c957c 100644
--- a/application/views/qso/components/winkeysettings_results.php
+++ b/application/views/qso/components/winkeysettings_results.php
@@ -1,6 +1,6 @@
 <div id="modal-backdrop" class="modal-backdrop fade show" style="display:block;"></div>
 <div id="modal" class="modal fade show" tabindex="-1" style="display:block;">
-<form hx-post="/index.php/qso/cwmacrosave" hx-target=".modal-body">
+<form hx-post="<?php echo base_url();?>index.php/qso/cwmacrosave" hx-target=".modal-body">
 	<div class="modal-dialog modal-dialog-centered">
 	  <div class="modal-content">
 		<div class="modal-header">
diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index 76443bee..0624e8ab 100755
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -526,13 +526,13 @@
 
     <div id="winkey" class="card winkey-settings" style="margin-bottom: 10px;">
         <div class="card-header">
-          <h4 style="font-size: 16px; font-weight: bold;" class="card-title">Winkey 
+          <h4 style="font-size: 16px; font-weight: bold;" class="card-title">Winkey
 
           <button id="connectButton" class="btn btn-primary">Connect</button>
 
           <button type="button" class="btn btn-light"
-          hx-get="/index.php/qso/winkeysettings" 
-          hx-target="#modals-here" 
+          hx-get="<?php echo base_url(); ?>index.php/qso/winkeysettings"
+          hx-target="#modals-here"
           hx-trigger="click"
           class="btn btn-primary"
           _="on htmx:afterOnLoad wait 10ms then add .show to #modal then add .show to #modal-backdrop"><i class="fas fa-cog"></i> Settings</button>
@@ -609,7 +609,7 @@
 			  }
 
 			  $i = 0;
-            if($query != false) {  
+            if($query != false) {
             foreach ($query->result() as $row) {
               	echo '<tr class="tr'.($i & 1).'">';
                     echo '<td>';