From aad43fe8c211184f5852ac643818f8b006b7e426 Mon Sep 17 00:00:00 2001
From: Tymat <tymat@pris.im>
Date: Mon, 31 Mar 2014 09:34:48 -0400
Subject: [PATCH] add configuration settings for alert e-mail sender

---
 var/www/inc/functions.inc.php  | 10 +++----
 var/www/partials/settings.html | 52 +++++++++++++++++++---------------
 2 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/var/www/inc/functions.inc.php b/var/www/inc/functions.inc.php
index 1ab5a0b..b373487 100644
--- a/var/www/inc/functions.inc.php
+++ b/var/www/inc/functions.inc.php
@@ -3,7 +3,7 @@
 require_once('Mail.php');
 
 /**********************************
- 
+
 Generic functions theat may be called from many differant places
 
 */
@@ -11,20 +11,20 @@
 function sendEmail($settings, $subject, $body) {
 
     $mailSettings = array(
-        'host' => $settings['alertSmtp'], 
+        'host' => $settings['alertSmtp'],
         'debug' => false,
         'auth' => true,
         'username' => $settings['alertSmtpUser'],
         'password' => $settings['alertSmtpPwd'],
         'port' => $settings['alertSmtpPort'],
-        
+
       );
-  
+
     //$settings['alertDevice']
 
     $mail = Mail::factory('smtp', $mailSettings );
 
-    $headers = array('From'=>$settings['alertEmail'], 'Subject'=>$subject);
+    $headers = array('From'=>$settings['alertEmail'], 'Subject'=>$subject, 'From'=>$settings['alertSender']);
     $esito = $mail->send($settings['alertEmail'], $headers, $body);
 	if (PEAR::isError($esito)) { print($esito->getMessage());}else{print "end";}
 }
diff --git a/var/www/partials/settings.html b/var/www/partials/settings.html
index 562330a..07ded55 100644
--- a/var/www/partials/settings.html
+++ b/var/www/partials/settings.html
@@ -88,11 +88,11 @@ <h3>Mining</h3>
         <label class="checkbox-inline">
           <input type="checkbox" id="alertEnable" ng-model="settings.alertEnable"> E-mail alerts
         </label>
-		
+
         <!-- <label class="checkbox-inline">
-			<input type="checkbox" id="donateEnable" ng-model="settings.donateEnable"> Enable Donation 
+			<input type="checkbox" id="donateEnable" ng-model="settings.donateEnable"> Enable Donation
         </label> -->
-		
+
         <p class="help-block" ng-show="settings.userHelp">
           <b>Remote control</b> shares stats with a remote server. Scripta will accept commands from the server.<br />
           <b>Automatic recovery</b> responds to alert events by restarting the miner. First gently, then rough.<br />
@@ -100,7 +100,7 @@ <h3>Mining</h3>
           <b>Donation</b> donates a couple of mining minutes to the Scripta project.
         </p>
       </div>
-    </div> 
+    </div>
     <div class="form-group" ng-show="settings.recoverEnable">
       <label for="miningExpHash" class="control-label col-sm-3 col-md-2">Lower limit (hashrate)</label>
       <div class="col-sm-3 col-md-4">
@@ -140,30 +140,30 @@ <h3>Remote control</h3>
       </div>
     </div>
   </fieldset>
-  
-    <h3>Donate</h3> 
+
+    <h3>Donate</h3>
     <fieldset>
 		<div class="form-group">
 			<label for="remoteEnable" class="control-label col-sm-3 col-md-2">Enable</label>
 			<div class="col-sm-9 col-md-10">
 				<label class="checkbox-inline">
-					<input type="checkbox" id="donateEnable" ng-model="settings.donateEnable"> 
+					<input type="checkbox" id="donateEnable" ng-model="settings.donateEnable">
 				</label>
 			</div>
 		</div>
 	</fieldset>
-	<fieldset ng-show="settings.donateEnable"> 
-		<div class="form-group" ng-show="settings.donateEnable"> 
-		  <label for="donateAmount" class="control-label col-sm-3 col-md-2">Donation minutes</label> 
-		  <div class="col-sm-9 col-md-10"> 
-			<input type="number" id="donateAmount" ng-model="settings.donateAmount" class="form-control"> 
-			<p class="help-block" ng-show="settings.userHelp"> 
-			  Please donate! 
-			</p> 
-		  </div> 
-		</div> 
-	</fieldset> 
-  
+	<fieldset ng-show="settings.donateEnable">
+		<div class="form-group" ng-show="settings.donateEnable">
+		  <label for="donateAmount" class="control-label col-sm-3 col-md-2">Donation minutes</label>
+		  <div class="col-sm-9 col-md-10">
+			<input type="number" id="donateAmount" ng-model="settings.donateAmount" class="form-control">
+			<p class="help-block" ng-show="settings.userHelp">
+			  Please donate!
+			</p>
+		  </div>
+		</div>
+	</fieldset>
+
   <fieldset ng-show="settings.alertEnable">
     <h3>E-mail alerts</h3>
     <div class="form-group">
@@ -171,26 +171,32 @@ <h3>E-mail alerts</h3>
       <div class="col-sm-9 col-md-10">
         <input type="text" id="alertDevice" ng-model="settings.alertDevice" ng-required="settings.alertEnable" class="form-control">
       </div>
-    </div> 
+    </div>
     <div class="form-group">
       <label for="alertEmail" class="control-label col-sm-3 col-md-2">E-mail</label>
       <div class="col-sm-9 col-md-10">
         <input type="email" id="alertEmail" ng-model="settings.alertEmail" ng-required="settings.alertEnable" class="form-control">
       </div>
     </div>
+    <div class="form-group">
+      <label for="alertSender" class="control-label col-sm-3 col-md-2">Alert Sender E-mail</label>
+      <div class="col-sm-9 col-md-10">
+        <input type="email" id="alertSender" ng-model="settings.alertSender" ng-required="settings.alertEnable" class="form-control">
+      </div>
+    </div>
     <div class="form-group">
       <label for="alertSmtp" class="control-label col-sm-3 col-md-2">SMTP Server address</label>
       <div class="col-sm-9 col-md-10">
         <input type="text" id="alertSmtp" ng-model="settings.alertSmtp" ng-required="settings.alertEnable" class="form-control">
         <p class="help-block" ng-show="settings.userHelp">Please choose your own SMTP server ip address.</p>
-      </div> 
+      </div>
     </div>
 	<div class="form-group">
       <label for="alertSmtp" class="control-label col-sm-3 col-md-2">SMTP Server port</label>
       <div class="col-sm-9 col-md-10">
         <input type="text" id="alertSmtpPort" ng-model="settings.alertSmtpPort" ng-required="settings.alertEnable" class="form-control" placeholder="25" value="25">
         <p class="help-block" ng-show="settings.userHelp">Please choose your own SMTP server port.</p>
-      </div> 
+      </div>
     </div>
 
 	 <div class="form-group">
@@ -208,7 +214,7 @@ <h3>E-mail alerts</h3>
       </div>
     </div>
   </fieldset>
-   
+
   <p class="clearfix text-right">
     <button type="button" class="btn btn-success" ng-click="sync('settings',settings,1);formMods.$setPristine()" ng-show="formMods.$dirty">Save settings</button>
   </p>