Merge branch 'fix_admin_email' of https://github.com/diasporg/Poduptime into fix_admin_email

db/edit.php

@@ -45,7 +45,7 @@ while ($row = pg_fetch_array($result)) {
     }
     $to      = $_email;
     $subject = 'Edit notice from poduptime ';
-    $message = 'Data for ' . $_domain . " Updated. If it was not you reply and let me know! \n\n"; 
+    $message = 'Data for ' . $_domain . " Updated. If it was not you reply and let me know! \n\n";
     $headers = "From: " . $adminemail . "\r\nCc:" . $adminemail . "," . $_oldemail . "\r\n";
     @mail($to, $subject, $message, $headers);
     pg_free_result($result);

db/gettoken.php

@@ -31,7 +31,7 @@ while ($row = pg_fetch_array($result)) {
 
     $to      = $_email;
     $subject = 'Temporary edit key for podupti.me';
-    $message = 'Link: https://podupti.me/db/edit.php?domain=' . $_domain . '&token=' . $uuid . ' Expires: ' . $expire . ' ' . $systemTimeZone . "\n\n"; 
+    $message = 'Link: https://podupti.me/db/edit.php?domain=' . $_domain . '&token=' . $uuid . ' Expires: ' . $expire . ' ' . $systemTimeZone . "\n\n";
     $headers = "From: " . $adminemail . "\r\nBcc: " . $adminemail . "\r\n";
     @mail($to, $subject, $message, $headers);
     echo 'Link sent to your email';
@@ -44,7 +44,7 @@ while ($row = pg_fetch_array($result)) {
 
     $to      = $adminemail;
     $subject = 'FORWARD REQUEST: Temporary edit key for podupti.me';
-    $message = 'User trying to edit pod without email address. Email found: ' . $row['email'] . ' Link: https://podupti.me/db/edit.php?domain=' . $_domain . '&token=' . $uuid . ' Expires: ' . $expire . ' ' . $systemTimeZone . "\n\n"; 
+    $message = 'User trying to edit pod without email address. Email found: ' . $row['email'] . ' Link: https://podupti.me/db/edit.php?domain=' . $_domain . '&token=' . $uuid . ' Expires: ' . $expire . ' ' . $systemTimeZone . "\n\n";
     $headers = "From: " . $adminemail . "\r\nBcc: " . $adminemail . "\r\n";
     @mail($to, $subject, $message, $headers);
     echo 'Link sent to administrator to review and verify, if approved they will forward the edit key to you.';

db/kill.php

@@ -29,7 +29,7 @@ while ($row = pg_fetch_array($result)) {
     if ($row['email']) {
       $to      = $row['email'];
       $subject = 'Pod deleted from poduptime ';
-      $message = 'Pod ' . $_domain . ' was deleted from podupti.me as it was dead on the list. ' . $_comments . " Feel free to add back at any time. \n\n"; 
+      $message = 'Pod ' . $_domain . ' was deleted from podupti.me as it was dead on the list. ' . $_comments . " Feel free to add back at any time. \n\n";
       $headers = "From: " . $adminemail ."\r\nCc:" . $adminemail . "," . $row['email'] . "\r\n";
       @mail($to, $subject, $message, $headers);
     }
@@ -38,7 +38,7 @@ while ($row = pg_fetch_array($result)) {
     if ($row['email']) {
       $to      = $row['email'];
       $subject = 'Pod removal warning from poduptime ';
-      $message = 'Pod ' . $_domain . ' is on the list to be deleted now because:  ' . $_comments . ". \n\n Please let me know if you need help fixing before it is removed. \n\n"; 
+      $message = 'Pod ' . $_domain . ' is on the list to be deleted now because:  ' . $_comments . ". \n\n Please let me know if you need help fixing before it is removed. \n\n";
       $headers = "From: " . $adminemail ."\r\nCc:" . $adminemail . "," . $row['email'] . "\r\n";
       @mail($to, $subject, $message, $headers);
     }