Merge pull request #179 from teabreakninja/master

Bug updates to fix php 5.3 support and check freq is there on import.

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

@@ -695,8 +695,13 @@ class Logbook_model extends CI_Model {
         }
 
         // Store Freq
-        $cleanfreq = preg_replace('#\W#', '', $record['freq']);
+        // Check if 'freq' is defined in the import?
-        $freqlng = strlen($cleanfreq);
+        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";