Merge branch 'master' of github.com:magicbug/Cloudlog

.gitignore

@@ -4,3 +4,4 @@
 /uploads/*.ADI
 /uploads/*.tq8
 /uploads/*.TQ8
+/install/*

application/controllers/eqsl.php

@@ -353,7 +353,24 @@ class eqsl extends CI_Controller {
 				
 				# End all the required fields
 				
-				
+                // adding comment as QSLMSG
+				$adif .= "%3C";
+				$adif .= "QSLMSG";
+				$adif .= "%3A";
+				$adif .= strlen($qsl['COL_COMMENT']);
+				$adif .= "%3E";
+				$adif .= $qsl['COL_COMMENT'];
+				$adif .= "%20";
+
+				// adding RST_Sent
+				$adif .= "%3C";
+				$adif .= "RST%5FSENT";
+				$adif .= "%3A";
+				$adif .= strlen($qsl['COL_RST_SENT']);
+				$adif .= "%3E";
+				$adif .= $qsl['COL_RST_SENT'];
+				$adif .= "%20";
+
 				# Tie a bow on it!
 				$adif .= "%3C";
 				$adif .= "EOR";
@@ -488,4 +505,4 @@ class eqsl extends CI_Controller {
 		$this->load->view('layout/footer');
 	}
 	
-} // end class
+} // end class

application/controllers/qso.php

@@ -47,14 +47,17 @@ class QSO extends CI_Controller {
       // This solves the problem of CI dumping out the session
       // cookie each time set_userdata is called.
       // For more info, see http://bizhole.com/codeigniter-nginx-error-502-bad-gateway/
-      $qso_data = [
+      // $qso_data = [
+      // 18-Jan-2016 - make php v5.3 friendly!
+      $sqo_data = array(
         'band' => $this->input->post('band'),
         'freq' => $this->input->post('freq'),
         'mode' => $this->input->post('mode'),
         'sat_name' => $this->input->post('sat_name'),
         'sat_mode' => $this->input->post('sat_mode'),
         'radio' => $this->input->post('radio')
-      ];
+      );
+      // ];
 
       $this->session->set_userdata($qso_data);
 			
@@ -111,14 +114,17 @@ class QSO extends CI_Controller {
 			$this->logbook_model->create_qso();
 			
 			// Store Basic QSO Info for reuse
-      $qso_data = [
+      //$qso_data = [
+      // 18-Jan-2016 - make php v5.3 friendly!
+      $qso_data = array(
         'band' => $this->input->post('band'),
         'freq' => $this->input->post('freq'),
         'mode' => $this->input->post('mode'),
         'sat_name' => $this->input->post('sat_name'),
         'sat_mode' => $this->input->post('sat_mode'),
         'radio' => $this->input->post('radio')
-      ];
+      );
+      //];
 
       $this->session->set_userdata($qso_data);
 			

application/models/logbook_model.php

@@ -645,7 +645,13 @@ class Logbook_model extends CI_Model {
     	$query = $this->db->get($this->config->item('table_name'));
     	$row = $query->row();
 
-   		return $row->COL_EQSL_QSLRDATE;
+    	if (isset($row->COL_EQSL_QSLDATE)){
+       		return $row->COL_EQSL_QSLRDATE;
+       	}else{
+       	    // No previous date (first time import has run?), so choose UNIX EPOCH!
+       	    // Note: date is yyyy/mm/dd format
+            return '1970/01/01';
+       	}
   	}
 
   	// Determine if we've already received an eQSL for this QSO
@@ -674,7 +680,7 @@ class Logbook_model extends CI_Model {
   	// Show all QSOs we need to send to eQSL
   	function eqsl_not_yet_sent() {
   		//$this->db->select("COL_PRIMARY_KEY, DATE_FORMAT(COL_TIME_ON,\'%Y%m%d\') AS COL_QSO_DATE, DATE_FORMAT(COL_TIME_ON,\'%H%i\') AS TIME_ON, COL_CALL, COL_MODE, COL_BAND");
-  		$this->db->select("COL_PRIMARY_KEY, COL_TIME_ON, COL_CALL, COL_MODE, COL_BAND");
+  		$this->db->select("COL_PRIMARY_KEY, COL_TIME_ON, COL_CALL, COL_MODE, COL_BAND, COL_COMMENT, COL_RST_SENT");
   		$this->db->where('COL_EQSL_QSL_SENT', 'N');
 
   		return $this->db->get($this->config->item('table_name'));
@@ -695,8 +701,13 @@ class Logbook_model extends CI_Model {
         }
 
         // Store Freq
-        $cleanfreq = preg_replace('#\W#', '', $record['freq']);
-        $freqlng = strlen($cleanfreq);
+        // Check if 'freq' is defined in the import?
+        if (isset($record['freq'])){
+            $cleanfreq = preg_replace('#\W#', '', $record['freq']);
+            $freqlng = strlen($cleanfreq);
+        }else{
+            $freqlng = 0;
+        }
         if(isset($record['freq']) && $freqlng < 7 ) {
             $cleansedstring = preg_replace('#\W#', '', $record['freq']);
             $freq = $cleansedstring."000";