From cb8bdfc539959728ac1ff6240aa781d4639646d2 Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Wed, 19 Jun 2019 15:24:07 +0100
Subject: [PATCH] Fixed bug, forgot to update a model

---
 application/controllers/Clublog.php | 26 +++++++++++++++++++++++++-
 application/models/User_model.php   |  9 ++++++++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/application/controllers/Clublog.php b/application/controllers/Clublog.php
index 4a3a691e..d8be57b9 100644
--- a/application/controllers/Clublog.php
+++ b/application/controllers/Clublog.php
@@ -26,7 +26,6 @@ class Clublog extends CI_Controller {
 			exit;
 		}
 
-
 		print_r($clublog_info);
 
 		$data['qsos'] = $this->logbook_model->get_clublog_qsos();
@@ -41,6 +40,31 @@ class Clublog extends CI_Controller {
 		    echo "uploads/clublog.adi file created.";
 		}
 
+		$file_info = get_file_info('uploads/clublog.adi');
+
+		// initialise the curl request
+		$request = curl_init('https://clublog.org/putlogs.php');
+
+		// send a file
+		curl_setopt($request, CURLOPT_POST, true);
+		curl_setopt(
+		    $request,
+		    CURLOPT_POSTFIELDS,
+		    array(
+		      'email' => $clublog_info['user_clublog_name'],
+		      'password' => $clublog_info['user_clublog_password'],
+		      'callsign' => $clublog_info['user_clublog_callsign'],
+		      'api' => "",
+		      'file' => '@' . $file_info['server_path']
+		    ));
+
+		// output the response
+		curl_setopt($request, CURLOPT_RETURNTRANSFER, true);
+		echo curl_exec($request);
+
+		// close the session
+		curl_close($request);
+
 
 	}
 	
diff --git a/application/models/User_model.php b/application/models/User_model.php
index ee4fd035..267edb75 100644
--- a/application/models/User_model.php
+++ b/application/models/User_model.php
@@ -125,7 +125,9 @@ class User_Model extends CI_Model {
 					'user_timezone' => $fields['user_timezone'],
 					'user_lotw_name' => $fields['user_lotw_name'],
 					'user_eqsl_name' => $fields['user_eqsl_name'],
-					'user_eqsl_qth_nickname' => $fields['user_eqsl_qth_nickname']
+					'user_eqsl_qth_nickname' => $fields['user_eqsl_qth_nickname'],
+					'user_clublog_name' => $fields['user_clublog_name'],
+					'user_clublog_callsign' => $fields['user_clublog_callsign'],
 				);
 	
 				// Check to see if the user is allowed to change user levels
@@ -155,6 +157,11 @@ class User_Model extends CI_Model {
 				{
 					$data['user_lotw_password'] = $fields['user_lotw_password'];
 				}
+
+				if($fields['user_clublog_password'] != NULL)
+				{
+					$data['user_clublog_password'] = $fields['user_clublog_password'];
+				}
 				
 				if($fields['user_eqsl_password'] != NULL)
 				{