From 1fc3ca62eeb334f55fc1ac6503df00f7e06edbb1 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Wed, 23 Nov 2016 00:12:05 -0500
Subject: Make the instance name and domain configurable.

---
 conf/config.proto                    |  3 +++
 git-interface/git-serve.py           |  3 ++-
 scripts/mkpkglists.py                |  6 ++++--
 web/html/home.php                    | 28 +++++++++++++++++-----------
 web/html/login.php                   |  4 ++--
 web/html/passreset.php               |  2 +-
 web/html/pkgdel.php                  |  4 ++--
 web/html/rss.php                     |  8 ++++----
 web/lib/DB.class.php                 |  2 +-
 web/lib/acctfuncs.inc.php            |  8 ++++----
 web/lib/pkgbasefuncs.inc.php         | 28 ++++++++++++++--------------
 web/lib/pkgreqfuncs.inc.php          | 17 +++++++++--------
 web/template/account_delete.php      |  3 ++-
 web/template/account_edit_form.php   |  2 +-
 web/template/header.php              |  8 ++++----
 web/template/stats/updates_table.php |  2 +-
 16 files changed, 71 insertions(+), 57 deletions(-)

diff --git a/conf/config.proto b/conf/config.proto
index 2fbc27a..32b3e5d 100644
--- a/conf/config.proto
+++ b/conf/config.proto
@@ -30,6 +30,9 @@ log_uri = https://aur.archlinux.org/cgit/aur.git/log/?h=%s
 snapshot_uri = /cgit/aur.git/snapshot/%s.tar.gz
 enable-maintenance = 1
 maintenance-exceptions = 127.0.0.1
+email_domain = aur.parabola.nu
+branding_shortname = AUR
+branding_longname = Arch User Repository
 
 [fingerprints]
 Ed25519 = SHA256:HQ03dn6EasJHNDlt51KpQpFkT3yBX83x7BoIkA1iv2k
diff --git a/git-interface/git-serve.py b/git-interface/git-serve.py
index 8316cf7..0798b74 100755
--- a/git-interface/git-serve.py
+++ b/git-interface/git-serve.py
@@ -23,6 +23,7 @@ ssh_cmdline = config.get('serve', 'ssh-cmdline')
 
 enable_maintenance = config.getboolean('options', 'enable-maintenance')
 maintenance_exc = config.get('options', 'maintenance-exceptions').split()
+branding_name = config.get('options', 'branding_shortname')
 
 def pkgbase_exists(pkgbase):
     db = mysql.connector.connect(host=aur_db_host, user=aur_db_user,
@@ -115,7 +116,7 @@ action = cmdargv[0]
 if enable_maintenance:
     remote_addr = os.environ["SSH_CLIENT"].split(" ")[0]
     if not remote_addr in maintenance_exc:
-        die("The AUR is down due to maintenance. We will be back soon.")
+        die("The %s is down due to maintenance. We will be back soon." % branding_name)
 
 if action == 'git-upload-pack' or action == 'git-receive-pack':
     if len(cmdargv) < 2:
diff --git a/scripts/mkpkglists.py b/scripts/mkpkglists.py
index a6f8a19..291b82e 100755
--- a/scripts/mkpkglists.py
+++ b/scripts/mkpkglists.py
@@ -11,6 +11,8 @@ docroot = os.path.dirname(os.path.realpath(__file__)) + "/../web/html/"
 config = configparser.RawConfigParser()
 config.read(os.path.dirname(os.path.realpath(__file__)) + "/../conf/config")
 
+branding_name = config.get('options', 'branding_shortname');
+
 aur_db_host = config.get('database', 'host')
 aur_db_name = config.get('database', 'name')
 aur_db_user = config.get('database', 'user')
@@ -23,8 +25,8 @@ db = mysql.connector.connect(host=aur_db_host, user=aur_db_user,
 cur = db.cursor()
 
 datestr = datetime.datetime.utcnow().strftime("%a, %d %b %Y %H:%M:%S GMT")
-pkglist_header = "# AUR package list, generated on " + datestr
-pkgbaselist_header = "# AUR package base list, generated on " + datestr
+pkglist_header = "# " + branding_name + " package list, generated on " + datestr
+pkgbaselist_header = "# " + branding_name + " package base list, generated on " + datestr
 
 with gzip.open(docroot + "packages.gz", "w") as f:
     f.write(bytes(pkglist_header + "\n", "UTF-8"))
diff --git a/web/html/home.php b/web/html/home.php
index 3252876..6a2de59 100644
--- a/web/html/home.php
+++ b/web/html/home.php
@@ -15,14 +15,17 @@ html_header( __("Home") );
 <div id="content-left-wrapper">
 	<div id="content-left">
 		<div id="intro" class="box">
-			<h2>AUR <?= __("Home"); ?></h2>
+			<h2><?= config_get('options', 'branding_shortname'); ?> <?= __("Home"); ?></h2>
 			<p>
 			<?php
 			echo __(
-				'Welcome to the AUR! Please read the %sAUR User Guidelines%s and %sAUR TU Guidelines%s for more information.',
+				'Welcome to the %s! Please read the %s%s User Guidelines%s and %s%s TU Guidelines%s for more information.',
+				config_get('options', 'branding_shortname'),
 				'<a href="https://wiki.archlinux.org/index.php/AUR_User_Guidelines">',
+				config_get('options', 'branding_shortname'),
 				'</a>',
 				'<a href="https://wiki.archlinux.org/index.php/AUR_Trusted_User_Guidelines">',
+				config_get('options', 'branding_shortname'),
 				'</a>'
 				);
 			?>
@@ -58,7 +61,7 @@ html_header( __("Home") );
 			</p>
 			<ul>
 				<li><em><?= __('Orphan Request') ?></em>: <?= __('Request a package to be disowned, e.g. when the maintainer is inactive and the package has been flagged out-of-date for a long time.') ?></li>
-				<li><em><?= __('Deletion Request') ?></em>: <?= __('Request a package to be removed from the Arch User Repository. Please do not use this if a package is broken and can be fixed easily. Instead, contact the package maintainer and file orphan request if necessary.') ?></li>
+				<li><em><?= __('Deletion Request') ?></em>: <?= __('Request a package to be removed from the %s. Please do not use this if a package is broken and can be fixed easily. Instead, contact the package maintainer and file orphan request if necessary.', config_get('options', 'branding_longname')) ?></li>
 				<li><em><?= __('Merge Request') ?></em>: <?= __('Request a package to be merged into another one. Can be used when a package needs to be renamed or replaced by a split package.') ?></li>
 			</ul>
 			<p>
@@ -76,7 +79,8 @@ html_header( __("Home") );
 			<p>
 			<?php
 			echo __(
-				'Git over SSH is now used to submit packages to the AUR. See the %sSubmitting packages%s section of the Arch User Repository ArchWiki page for more details.',
+				'Git over SSH is now used to submit packages to the %s. See the %sSubmitting packages%s section of the Arch User Repository ArchWiki page for more details.',
+				config_get('options', 'branding_shortname'),
 				'<a href="https://wiki.archlinux.org/index.php/Arch_User_Repository#AUR_4">',
 				'</a>'
 				);
@@ -84,7 +88,7 @@ html_header( __("Home") );
 			</p>
 			<?php if (config_section_exists('fingerprints')): ?>
 			<p>
-				<?= __('The following SSH fingerprints are used for the AUR:') ?>
+				<?= __('The following SSH fingerprints are used for the %s:', config_get('options', 'branding_shortname')) ?>
 			</p>
 			<ul>
 				<?php foreach (config_items('fingerprints') as $type => $fingerprint): ?>
@@ -98,11 +102,12 @@ html_header( __("Home") );
 			<p>
 			<?php
 			echo __(
-				'General discussion regarding the Arch User Repository (AUR) and Trusted User structure takes place on %saur-general%s. For discussion relating to the development of the AUR web interface, use the %saur-dev%s mailing list.',
-				'<a href="https://mailman.archlinux.org/mailman/listinfo/aur-general">',
-				'</a>',
-				'<a href="https://mailman.archlinux.org/mailman/listinfo/aur-dev">',
-				'</a>'
+				'General discussion regarding the %s (%s) and Trusted User structure takes place on %s. For discussion relating to the development of the %s web interface (aurweb), use the %s mailing list.',
+				config_get('options', 'branding_longname'),
+				config_get('options', 'branding_shortname'),
+				'<a href="https://mailman.archlinux.org/mailman/listinfo/aur-general">aur-general</a>',
+				config_get('options', 'branding_shortname'),
+				'<a href="https://mailman.archlinux.org/mailman/listinfo/aur-dev">aur-dev</a>'
 				);
 			?>
 			</p>
@@ -112,7 +117,8 @@ html_header( __("Home") );
 			<p>
 			<?php
 			echo __(
-				'If you find a bug in the AUR web interface, please fill out a bug report on our %sbug tracker%s. Use the tracker to report bugs in the AUR %sonly%s. To report packaging bugs contact the package maintainer or leave a comment on the appropriate package page.',
+				'If you find a bug in the %s web interface (aurweb), please fill out a bug report on our %sbug tracker%s. Use the tracker to report bugs in aurweb %sonly%s. To report packaging bugs contact the package maintainer or leave a comment on the appropriate package page.',
+				config_get('options', 'branding_shortname'),
 				'<a href="https://bugs.archlinux.org/index.php?project=2">',
 				'</a>',
 				'<strong>',
diff --git a/web/html/login.php b/web/html/login.php
index ab7bac9..f0dbb7c 100644
--- a/web/html/login.php
+++ b/web/html/login.php
@@ -11,10 +11,10 @@ if (!$disable_http_login || (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'])) {
 	$login_error = $login['error'];
 }
 
-html_header('AUR ' . __("Login"));
+html_header(config_get('options', 'branding_shortname') . ' ' . __("Login"));
 ?>
 <div id="dev-login" class="box">
-	<h2>AUR <?= __('Login') ?></h2>
+	<h2><?= config_get('options', 'branding_shortname'); ?> <?= __('Login') ?></h2>
 	<?php if (isset($_COOKIE["AURSID"])): ?>
 	<p>
 		<?= __("Logged-in as: %s", '<strong>' . username_from_sid($_COOKIE["AURSID"]) . '</strong>'); ?>
diff --git a/web/html/passreset.php b/web/html/passreset.php
index 951266a..e77e5b6 100644
--- a/web/html/passreset.php
+++ b/web/html/passreset.php
@@ -46,7 +46,7 @@ if (isset($_GET['resetkey'], $_POST['email'], $_POST['password'], $_POST['confir
 	if (empty($email)) {
 		$error = __('Missing a required field.');
 	} else {
-		$subject = 'AUR Password Reset';
+		$subject = __('%s Password Reset', config_get('options', 'branding_shortname'));
 		$body = __('A password reset request was submitted for the ' .
 			   'account %s associated with your e-mail address. ' .
 			   'If you wish to reset your password follow the ' .
diff --git a/web/html/pkgdel.php b/web/html/pkgdel.php
index eb20967..f631af2 100644
--- a/web/html/pkgdel.php
+++ b/web/html/pkgdel.php
@@ -14,8 +14,8 @@ if (has_credential(CRED_PKGBASE_DELETE)): ?>
 <div class="box">
 	<h2><?= __('Delete Package: %s', htmlspecialchars($pkgbase_name)) ?></h2>
 	<p>
-		<?= __('Use this form to delete the package base %s%s%s and the following packages from the AUR: ',
-			'<strong>', htmlspecialchars($pkgbase_name), '</strong>'); ?>
+		<?= __('Use this form to delete the package base %s%s%s and the following packages from the %s: ',
+			'<strong>', htmlspecialchars($pkgbase_name), '</strong>', config_get('options', 'branding_shortname')); ?>
 	</p>
 	<ul>
 		<?php foreach(pkgbase_get_pkgnames($base_id) as $pkgname): ?>
diff --git a/web/html/rss.php b/web/html/rss.php
index 2470d99..a88a6ef 100644
--- a/web/html/rss.php
+++ b/web/html/rss.php
@@ -26,15 +26,15 @@ $rss->xslStyleSheet = false;
 $rss->encoding = "UTF-8";
 
 #All the general RSS setup
-$rss->title = "AUR Newest Packages";
-$rss->description = "The latest and greatest packages in the AUR";
+$rss->title = config_get('options', 'branding_shortname') . " Newest Packages";
+$rss->description = "The latest and greatest packages in the " . config_get('options', 'branding_shortname');
 $rss->link = "${protocol}://{$host}";
 $rss->syndicationURL = "{$protocol}://{$host}" . get_uri('/rss/');
 $image = new FeedImage();
-$image->title = "AUR";
+$image->title = config_get('options', 'branding_shortname');
 $image->url = "{$protocol}://{$host}/images/AUR-logo-80.png";
 $image->link = $rss->link;
-$image->description = "AUR Newest Packages Feed";
+$image->description = config_get('options', 'branding_shortname') . " Newest Packages Feed";
 $rss->image = $image;
 
 #Get the latest packages and add items for them
diff --git a/web/lib/DB.class.php b/web/lib/DB.class.php
index b538e0d..4c58c3c 100644
--- a/web/lib/DB.class.php
+++ b/web/lib/DB.class.php
@@ -32,7 +32,7 @@ class DB {
 				self::$dbh = new PDO($dsn, $user, $password);
 				self::$dbh->exec("SET NAMES 'utf8' COLLATE 'utf8_general_ci';");
 			} catch (PDOException $e) {
-				die('Error - Could not connect to AUR database');
+				die('Error - Could not connect to ' . config_get('options', 'branding_shortname') . ' database');
 			}
 		}
 
diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php
index 81118e8..abc40c3 100644
--- a/web/lib/acctfuncs.inc.php
+++ b/web/lib/acctfuncs.inc.php
@@ -294,7 +294,7 @@ function process_account_form($TYPE,$A,$U="",$T="",$S="",$E="",$P="",$C="",
 			return;
 		}
 
-		$subject = 'Welcome to the Arch User Repository';
+		$subject = __('Welcome to the %s', config_get('options', 'branding_longname'));
 		$body = __('Welcome to %s! In order ' .
 			'to set an initial password ' .
 			'for your new account, ' .
@@ -726,10 +726,10 @@ function send_resetkey($email, $subject, $body) {
 		  "?resetkey={$resetkey}";
 	$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";
+		   "X-MimeOLE: Produced By ".config_get('options', 'branding_shortname');
 	@mail($email, $subject, $body, $headers);
 }
 
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);
 		}
 	}
 
diff --git a/web/lib/pkgreqfuncs.inc.php b/web/lib/pkgreqfuncs.inc.php
index c056d68..ea4a5eb 100644
--- a/web/lib/pkgreqfuncs.inc.php
+++ b/web/lib/pkgreqfuncs.inc.php
@@ -199,10 +199,10 @@ function pkgreq_file($ids, $type, $merge_into, $comments) {
 	$headers = "MIME-Version: 1.0\r\n" .
 		   "Content-type: text/plain; charset=UTF-8\r\n" .
 		   "Cc: " . implode(', ', $cc) . "\r\n";
-	$thread_id = "<pkg-request-" . $request_id . "@aur.archlinux.org>";
-	$headers .= "From: notify@aur.archlinux.org\r\n" .
+	$thread_id = "<pkg-request-" . $request_id . "@".config_get('options', 'email_domain').">";
+	$headers .= "From: notify@".config_get('options', 'email_domain')."\r\n" .
 		    "Message-ID: $thread_id\r\n" .
-		    "X-Mailer: AUR";
+		    "X-Mailer: " . config_get('options', 'branding_shortname');
 	$ml = config_get('options', 'aur_request_ml');
 	@mail($ml, "[PRQ#" . $request_id . "] " . ucfirst($type) .
 		   " Request for " .  $row['Name'], $body, $headers);
@@ -302,8 +302,9 @@ function pkgreq_close($id, $reason, $comments, $auto_close=false) {
 	 */
 	if ($auto_close) {
 		$body = "Request #" . intval($id) . " has been " . $reason .
-			" automatically by the Arch User Repository package " .
-			"request system";
+			" automatically by the " .
+			config_get('options', 'branding_longname') .
+			" package request system";
 	} else {
 		$username = username_from_sid($_COOKIE['AURSID']);
 		$body = "Request #" . intval($id) . " has been " . $reason .
@@ -324,11 +325,11 @@ function pkgreq_close($id, $reason, $comments, $auto_close=false) {
 	$headers = "MIME-Version: 1.0\r\n" .
 		   "Content-type: text/plain; charset=UTF-8\r\n" .
 		   "Cc: " . implode(', ', $cc) . "\r\n";
-	$thread_id = "<pkg-request-" . $id . "@aur.archlinux.org>";
-	$headers .= "From: notify@aur.archlinux.org\r\n" .
+	$thread_id = "<pkg-request-" . $id . "@".config_get('options', 'email_domain').">";
+	$headers .= "From: notify@".config_get('options', 'email_domain')."\r\n" .
 		    "In-Reply-To: $thread_id\r\n" .
 		    "References: $thread_id\r\n" .
-		    "X-Mailer: AUR";
+		    "X-Mailer: " . config_get('options', 'branding_shortname');
 	$ml = config_get('options', 'aur_request_ml');
 	@mail($ml, "[PRQ#" . $id . "] Request " . ucfirst($reason),
 	      $body, $headers);
diff --git a/web/template/account_delete.php b/web/template/account_delete.php
index 74f386d..6a874f5 100644
--- a/web/template/account_delete.php
+++ b/web/template/account_delete.php
@@ -1,5 +1,6 @@
 <p>
-	<?= __('You can use this form to permanently delete the AUR account %s.', '<strong>' . htmlspecialchars($username) . '</strong>') ?>
+	<?= __('You can use this form to permanently delete the %s account %s.',
+	       config_get('options', 'branding_shortname'), '<strong>' . htmlspecialchars($username) . '</strong>') ?>
 </p>
 <p>
 	<?= __('%sWARNING%s: This action cannot be undone.', '<strong>', '</strong>') ?>
diff --git a/web/template/account_edit_form.php b/web/template/account_edit_form.php
index 56bdd45..df1b355 100644
--- a/web/template/account_edit_form.php
+++ b/web/template/account_edit_form.php
@@ -117,7 +117,7 @@
 	</fieldset>
 
 	<fieldset>
-		<legend><?= __("The following information is only required if you want to submit packages to the Arch User Repository.") ?></legend>
+		<legend><?= __("The following information is only required if you want to submit packages to the %s.", config_get('options', 'branding_longname')) ?></legend>
 		<p>
 			<label for="id_ssh"><?= __("SSH Public Key") ?>:</label>
 			<textarea name="PK" id="id_ssh" rows="5" cols="30"><?= htmlspecialchars($PK) ?></textarea>
diff --git a/web/template/header.php b/web/template/header.php
index 874109a..2ab1d6b 100644
--- a/web/template/header.php
+++ b/web/template/header.php
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 	xml:lang="<?= htmlspecialchars($LANG, ENT_QUOTES) ?>" lang="<?= htmlspecialchars($LANG, ENT_QUOTES) ?>">
   <head>
-    <title>AUR (<?= htmlspecialchars($LANG); ?>)<?php if ($title != "") { print " - " . htmlspecialchars($title); } ?></title>
+    <title><?= config_get('options', 'branding_shortname'); ?> (<?= htmlspecialchars($LANG); ?>)<?php if ($title != "") { print " - " . htmlspecialchars($title); } ?></title>
 	<link rel='stylesheet' type='text/css' href='/css/archweb.css' />
 	<link rel='stylesheet' type='text/css' href='/css/aurweb.css' />
 	<link rel='shortcut icon' href='/images/favicon.ico' />
@@ -16,7 +16,7 @@
   </head>
 	<body>
 		<div id="archnavbar" class="anb-aur">
-			<div id="archnavbarlogo"><h1><a href="/" title="Return to the main page">Arch Linux User Repository</a></h1></div>
+			<div id="archnavbarlogo"><h1><a href="/" title="Return to the main page"><?= config_get('options', 'branding_longname'); ?></a></h1></div>
 			<div id="archnavbarmenu">
 				<ul id="archnavbarlist">
 					<li id="anb-home"><a href="https://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li>
@@ -24,7 +24,7 @@
 					<li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li>
 					<li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li>
 					<li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and track bugs">Bugs</a></li>
-					<li id="anb-aur"><a href="/" title="Arch Linux User Repository">AUR</a></li>
+					<li id="anb-aur"><a href="/" title="<?= config_get('options', 'branding_longname'); ?>"><?= config_get('options', 'branding_shortname'); ?></a></li>
 					<li id="anb-download"><a href="https://www.archlinux.org/download/" title="Get Arch Linux">Download</a></li>
 				</ul>
 			</div>
@@ -53,7 +53,7 @@
 			</div>
 			<div id="archdev-navbar">
 				<ul>
-					<li><a href="<?= get_uri('/'); ?>">AUR <?= __("Home"); ?></a></li>
+					<li><a href="<?= get_uri('/'); ?>"><?= config_get('options', 'branding_shortname'); ?> <?= __("Home"); ?></a></li>
 					<li><a href="<?= get_uri('/packages/'); ?>"><?= __("Packages"); ?></a></li>
 					<?php if (isset($_COOKIE['AURSID'])): ?>
 						<li><a href="<?= get_uri('/packages/'); ?>?SeB=m&amp;K=<?= username_from_sid($_COOKIE["AURSID"]); ?>"><?= __("My Packages"); ?></a></li>
diff --git a/web/template/stats/updates_table.php b/web/template/stats/updates_table.php
index a4b31c5..29ba869 100644
--- a/web/template/stats/updates_table.php
+++ b/web/template/stats/updates_table.php
@@ -1,6 +1,6 @@
 <h3><?= __("Recent Updates") ?></h3>
 
-<a href="<?= get_uri('/rss/') ?>" title="Arch Package Updates RSS Feed" class="rss-icon"><img src="/images/feed-icon-14x14.png" alt="RSS Feed" /></a>
+<a href="<?= get_uri('/rss/') ?>" title="<?= config_get('options', 'branding_longname'); ?> Package Updates RSS Feed" class="rss-icon"><img src="/images/feed-icon-14x14.png" alt="RSS Feed" /></a>
 
 <table>
 	<tbody>
-- 
cgit v1.2.3