these changes were sitting herepurweb/master0

1 files changed, 14 insertions, 14 deletions

diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php
index 92202bf..09312ec 100644
--- a/web/lib/pkgbasefuncs.inc.php
+++ b/web/lib/pkgbasefuncs.inc.php
@@ -118,16 +118,16 @@ function pkgbase_add_comment($base_id, $uid, $comment) {
 		. "\n\n---\nIf you no longer wish to receive notifications about this package, please go the the above package page and click the UnNotify button.";
 		$body = wordwrap($body, 70);
 		$bcc = implode(', ', $bcc);
-		$thread_id = "<pkg-notifications-" . $row['Name'] . "@aur.archlinux.org>";
+		$thread_id = "<pkg-notifications-" . $row['Name'] . "@".config_get('options', 'email_domain').">";
 		$headers = "MIME-Version: 1.0\r\n" .
 			   "Content-type: text/plain; charset=UTF-8\r\n" .
 			   "Bcc: $bcc\r\n" .
-			   "Reply-to: noreply@aur.archlinux.org\r\n" .
-			   "From: notify@aur.archlinux.org\r\n" .
+			   "Reply-to: noreply@".config_get('options', 'email_domain')."\r\n" .
+			   "From: notify@".config_get('options', 'email_domain')."\r\n" .
 			   "In-Reply-To: $thread_id\r\n" .
 			   "References: $thread_id\r\n" .
-			   "X-Mailer: AUR";
-		@mail('undisclosed-recipients: ;', "AUR Comment for " . $row['Name'], $body, $headers);
+			   "X-Mailer: " . config_get('options', 'branding_shortname');
+		@mail('undisclosed-recipients: ;', config_get('options', 'branding_shortname') . " Comment for " . $row['Name'], $body, $headers);
 	}
 }
 
@@ -375,11 +375,11 @@ function pkgbase_flag($base_ids) {
 				$body = wordwrap($body, 70);
 				$headers = "MIME-Version: 1.0\r\n" .
 					   "Content-type: text/plain; charset=UTF-8\r\n" .
-					   "Reply-to: noreply@aur.archlinux.org\r\n" .
-					   "From: notify@aur.archlinux.org\r\n" .
+					   "Reply-to: noreply@".config_get('options', 'email_domain')."\r\n" .
+					   "From: notify@".config_get('options', 'email_domain')."\r\n" .
 					   "X-Mailer: PHP\r\n" .
-					   "X-MimeOLE: Produced By AUR";
-				@mail($row['Email'], "AUR Out-of-date Notification for ".$row['Name'], $body, $headers);
+					   "X-MimeOLE: Produced By " . config_get('options', 'branding_shortname');
+				@mail($row['Email'], config_get('options', 'branding_shortname') . " Out-of-date Notification for ".$row['Name'], $body, $headers);
 			}
 		}
 	}
@@ -475,7 +475,7 @@ function pkgbase_delete ($base_ids, $merge_base_id, $via, $grant=false) {
 			$body = "";
 			if ($merge_base_id) {
 				$body .= username_from_sid($_COOKIE['AURSID']) . " merged \"".$pkgbase_name."\" into \"$merge_base_name\".\n\n";
-				$body .= "You will no longer receive notifications about this package, please go to https://aur.archlinux.org" . get_pkgbase_uri($merge_base_name) . " and click the Notify button if you wish to recieve them again.";
+				$body .= "You will no longer receive notifications about this package, please go to " . config_get('options', 'aur_location') . get_pkgbase_uri($merge_base_name) . " and click the Notify button if you wish to recieve them again.";
 			} else {
 				$body .= username_from_sid($_COOKIE['AURSID']) . " deleted \"".$pkgbase_name."\".\n\n";
 				$body .= "You will no longer receive notifications about this package.";
@@ -485,10 +485,10 @@ function pkgbase_delete ($base_ids, $merge_base_id, $via, $grant=false) {
 			$headers = "MIME-Version: 1.0\r\n" .
 				   "Content-type: text/plain; charset=UTF-8\r\n" .
 				   "Bcc: $bcc\r\n" .
-				   "Reply-to: noreply@aur.archlinux.org\r\n" .
-				   "From: notify@aur.archlinux.org\r\n" .
-				   "X-Mailer: AUR";
-			@mail('undisclosed-recipients: ;', "AUR Package deleted: " . $pkgbase_name, $body, $headers);
+				   "Reply-to: noreply@".config_get('options', 'email_domain')."\r\n" .
+				   "From: notify@".config_get('options', 'email_domain')."\r\n" .
+				   "X-Mailer: " . config_get('options', 'branding_shortname');
+			@mail('undisclosed-recipients: ;', config_get('options', 'branding_shortname') . " Package deleted: " . $pkgbase_name, $body, $headers);
 		}
 	}