Merge pull request #27 from magicbug/dev

Dev

application/controllers/Options.php

@@ -272,7 +272,11 @@ class Options extends CI_Controller {
 				$smtpEncryptionupdate = $this->optionslib->update('smtpEncryption', $this->input->post('smtpEncryption'), 'yes');
 
 				// Update email sender name within the options system
-				$emailSenderNameupdate = $this->optionslib->update('emailSenderName', $this->input->post('emailSenderName'), 'yes');
+				$emailSenderName_value = $this->input->post('emailSenderName');
+				if (empty($emailSenderName_value)) {
+					$emailSenderName_value = 'Cloudlog';
+				}
+				$emailSenderNameupdate = $this->optionslib->update('emailSenderName', $emailSenderName_value, 'yes');
 
 				// Update email address choice within the options system
 				$emailAddressupdate = $this->optionslib->update('emailAddress', $this->input->post('emailAddress'), 'yes');
@@ -360,6 +364,8 @@ class Options extends CI_Controller {
 					'smtp_port' => $this->optionslib->get_option('smtpPort'),
 					'smtp_user' => $this->optionslib->get_option('smtpUsername'),
 					'smtp_pass' => $this->optionslib->get_option('smtpPassword'),
+					'crlf' => "\r\n",
+					'newline' => "\r\n"
 				);
 
 				$this->email->initialize($config);

application/controllers/Oqrs.php

@@ -174,6 +174,8 @@ class Oqrs extends CI_Controller {
 						'smtp_port' => $this->optionslib->get_option('smtpPort'),
 						'smtp_user' => $this->optionslib->get_option('smtpUsername'),
 						'smtp_pass' => $this->optionslib->get_option('smtpPassword'),
+						'crlf' => "\r\n",
+						'newline' => "\r\n"
 					);
 
 					$this->email->initialize($config);

application/controllers/User.php

@@ -718,6 +718,8 @@ class User extends CI_Controller {
 						'smtp_port' => $this->optionslib->get_option('smtpPort'),
 						'smtp_user' => $this->optionslib->get_option('smtpUsername'),
 						'smtp_pass' => $this->optionslib->get_option('smtpPassword'),
+						'crlf' => "\r\n",
+						'newline' => "\r\n"
 					  );
 
 					  $this->email->initialize($config);

application/views/logbooks/index.php

@@ -76,7 +76,7 @@
 				</tr>
 				<?php } ?>
 			</tbody>
-		<table>
+			</table>
 		</div>
 		<?php } ?>
   </div>

application/views/options/email.php

@@ -63,7 +63,7 @@
                         <div class="mb-3 row">
                         <label for="emailSenderName" class="col-sm-2 col-form-label"><?php echo lang('options_email_sender_name'); ?></label>
                             <div class="col-sm-10">
-                                <input type="text" name="emailSenderName" class="form-control" id="emailSenderName" value="<?php echo ($this->optionslib->get_option('emailSenderName') == "" ? 'Cloudlog' : $this->optionslib->get_option('emailSenderName'));?>">
+                                <input type="text" name="emailSenderName" class="form-control" id="emailSenderName" value="<?php if($this->optionslib->get_option('emailSenderName') != "") { echo $this->optionslib->get_option('emailSenderName'); } ?>">
                                 <small class="form-text text-muted"><?php echo lang('options_email_sender_name_hint'); ?></small>
                             </div>
                         </div>

application/views/station_profile/index.php

@@ -17,7 +17,7 @@
 	<p class="card-text"><?php echo lang('station_location_header_ln3'); ?></p>
 
 	  <p><a href="<?php echo site_url('station/create'); ?>" class="btn btn-primary"><i class="fas fa-plus"></i> <?php echo lang('station_location_create'); ?></a></p>
-	  
+
 		<?php if ($stations->num_rows() > 0) { ?>
 
 		<?php if($current_active == 0) { ?>
@@ -33,7 +33,7 @@
 				<?php echo lang('station_location_reassign_at'); ?> <a href="<?php echo site_url('maintenance/'); ?>" class="btn btn-warning"><i class="fas fa-sync"></i><?php echo lang('account_word_admin') . "/" . lang('general_word_maintenance'); ?></a>
 			</div>
 		<?php } ?>
-	  
+
 		<div class="table-responsive">
 		<table id="station_locations_table" class="table table-sm table-striped">
 			<thead>
@@ -90,7 +90,7 @@
 
 				<?php } ?>
 			</tbody>
-		<table>
+		</table>
 		</div>
 		<?php } ?>
   </div>