Merge branch 'master' into qslcard_small_fixes

application/controllers/Eqsl.php

@@ -629,4 +629,33 @@ class eqsl extends CI_Controller {
 
 	}
 
+	public function tools() {
+
+		// Check logged in
+		$this->load->model('user_model');
+		if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); }
+
+		$data['page_title'] = "eQSL Tools";
+
+		// Load frontend
+		$this->load->view('interface_assets/header', $data);
+		$this->load->view('eqsl/tools');
+		$this->load->view('interface_assets/footer');
+	}
+
+	public function mark_all_sent() {
+		
+		// Check logged in
+		$this->load->model('user_model');
+		if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); }
+		
+		// mark all eqsls as sent
+		$this->load->model('eqslmethods_model');
+		$this->eqslmethods_model->mark_all_as_sent();
+
+		$this->session->set_flashdata('success', 'All eQSLs Marked as Uploaded');
+
+		redirect('eqsl/tools');
+	}
+	
 } // end class

application/controllers/Logbook.php

@@ -413,7 +413,7 @@ class Logbook extends CI_Controller {
 
         $this->load->model('Qsl_model');
         $data['qslimages'] = $this->Qsl_model->getQslForQsoId($id);
-
+		$data['max_upload'] = ini_get('upload_max_filesize');
 		$this->load->view('interface_assets/mini_header', $data);
 		$this->load->view('view_log/qso');
 		$this->load->view('interface_assets/footer');

application/models/Eqslmethods_model.php

@@ -0,0 +1,21 @@
+<?php
+
+class Eqslmethods_model extends CI_Model {
+
+	function __construct()
+	{
+		parent::__construct();
+	}
+	
+	function mark_all_as_sent() {
+		$data = array(
+            'COL_EQSL_QSL_SENT' => 'Y',
+            'COL_EQSL_QSLSDATE'  => date('Y-m-d')." 00:00:00",
+        );
+        
+        $this->db->replace($this->config->item('table_name'), $data);
+	}
+
+}
+
+?>

application/views/eqsl/analysis.php

@@ -10,6 +10,9 @@
       <li class="nav-item">
         <a class="nav-link" href="<?php echo site_url('eqsl/Export');?>">Upload QSOs</a>
       </li>
+      <li class="nav-item">
+        <a class="nav-link" href="<?php echo site_url('eqsl/tools');?>">Tools</a>
+      </li>
     </ul>
   </div>
 

application/views/eqsl/export.php

@@ -10,6 +10,9 @@
       </li>
       <li class="nav-item">
         <a class="nav-link active" href="<?php echo site_url('eqsl/Export');?>">Upload QSOs</a>
+      </li>
+	  <li class="nav-item">
+        <a class="nav-link" href="<?php echo site_url('eqsl/tools');?>">Tools</a>
       </li>
     </ul>
   </div>

application/views/eqsl/import.php

@@ -9,6 +9,10 @@
       </li>
       <li class="nav-item">
         <a class="nav-link" href="<?php echo site_url('eqsl/Export');?>">Upload QSOs</a>
+      </li>
+
+	  <li class="nav-item">
+        <a class="nav-link" href="<?php echo site_url('eqsl/tools');?>">Tools</a>
       </li>
     </ul>
   </div>

application/views/eqsl/tools.php

@@ -0,0 +1,28 @@
+<div class="container eqsl">
+<h2><?php echo $page_title; ?></h2>
+<div class="card">
+  <div class="card-header">
+  	<div class="card-title">eQSL Tools</div>
+    <ul class="nav nav-tabs card-header-tabs">
+      <li class="nav-item">
+        <a class="nav-link" href="<?php echo site_url('eqsl/import');?>">Download QSOs</a>
+      </li>
+
+      <li class="nav-item">
+        <a class="nav-link" href="<?php echo site_url('eqsl/Export');?>">Upload QSOs</a>
+      </li>
+
+      <li class="nav-item">
+        <a class="nav-link active" href="<?php echo site_url('eqsl/tools');?>">Tools</a>
+      </li>
+    </ul>
+  </div>
+
+  <div class="card-body">
+		<?php $this->load->view('layout/messages'); ?>
+
+        <p><a class="btn btn-primary" href="<?php echo site_url('eqsl/mark_all_sent'); ?>">Mark All QSOs as Sent to eQSL</a> use this if you have lots of QSOs to upload to eQSL it will save the server timing out.</p>
+  </div>
+</div>
+
+</div>

application/views/layout/messages.php

@@ -1,34 +1,34 @@
 <!-- Display Success -->
 <?php if($this->session->flashdata('success') != '') { ?>
-<div class="alert-message success">
+<div class="alert alert-success" role="alert">
         <?php echo $this->session->flashdata('success'); ?>
 </div>
 <?php } ?>
 
 <!-- Display Notices -->
 <?php if($this->session->flashdata('notice') != '') { ?>
-<div class="alert-message info">
+<div class="alert alert-info" role="alert">
         <?php echo $this->session->flashdata('notice'); ?>
 </div>
 <?php } ?>
 
 <!-- Display Warnings -->
 <?php if($this->session->flashdata('warning') != '') { ?>
-<div class="alert-message warning">
+<div class="alert alert-warning" role="alert">
         <?php echo $this->session->flashdata('warning'); ?>
 </div>
 <?php } ?>
 
 <!-- Display Errors -->
 <?php if($this->session->flashdata('error') != '') { ?>
-<div class="alert-message error">
+<div class="alert alert-danger" role="alert">
         <?php echo $this->session->flashdata('error'); ?>
 </div>
 <?php } ?>
 
 <!-- Display form validation errors -->
 <?php if(validation_errors()) { ?>
-<div class="alert-message error">
+<div class="alert alert-danger" role="alert">
         <?php echo validation_errors(); ?>
 </div>
 <?php } ?>

application/views/view_log/qso.php

@@ -319,17 +319,20 @@
                 echo '</tbody></table>';
             }
             ?>
+
+            <p><div class="alert alert-warning" role="alert"><span class="badge badge-warning">Warning</span> Maximum file upload size is <?php echo $max_upload; ?>B.</div></p>
+
             <form class="form" id="fileinfo" name="fileinfo" enctype="multipart/form-data">
                 <fieldset>
 
                     <div class="form-group">
                         <label for="qslcardfront">Upload QSL Card front image</label>
-                        <input class="form-control-file" type="file" id="qslcardfront" name="qslcardfront" accept="image/*" capture="environment">
+                        <input class="form-control-file" type="file" id="qslcardfront" name="qslcardfront" accept="image/*" >
                     </div>
 
                     <div class="form-group">
                         <label for="qslcardback">Upload QSL Card back image</label>
-                        <input class="form-control-file" type="file" id="qslcardback" name="qslcardback" accept="image/*" capture="environment">
+                        <input class="form-control-file" type="file" id="qslcardback" name="qslcardback" accept="image/*">
                     </div>
 
                     <input type="hidden" class="form-control" id="qsoinputid" name="qsoid" value="<?php echo $row->COL_PRIMARY_KEY; ?>">

robots.txt

@@ -0,0 +1,4 @@
+User-Agent: *
+Disallow: /assets
+Disallow: /images
+Disallow: /index.php/logbook/qso_map