Make the instance name and domain configurable.

4 files changed, 25 insertions, 19 deletions

diff --git a/web/html/home.php b/web/html/home.php
index 475370b..d4bbc0e 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', 'aur_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', 'aur_shortname'),
 				'<a href="https://wiki.archlinux.org/index.php/AUR_User_Guidelines">',
+				config_get('options', 'aur_shortname'),
 				'</a>',
 				'<a href="https://wiki.archlinux.org/index.php/AUR_Trusted_User_Guidelines">',
+				config_get('options', 'aur_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', 'aur_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', 'aur_shortname'),
 				'<a href="https://wiki.archlinux.org/index.php/Arch_User_Repository#Submitting_packages">',
 				'</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', 'aur_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', 'aur_longname'),
+				config_get('options', 'aur_shortname'),
+				'<a href="https://mailman.archlinux.org/mailman/listinfo/aur-general">aur-general</a>',
+				config_get('options', 'aur_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 web interface %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', 'aur_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 7345439..6617489 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', 'aur_shortname') . ' ' . __("Login"));
 ?>
 <div id="dev-login" class="box">
-	<h2>AUR <?= __('Login') ?></h2>
+	<h2><?= config_get('options', 'aur_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/pkgdel.php b/web/html/pkgdel.php
index 21a2677..a52f568 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') ?>: <? 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', 'aur_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 8585d81..85df447 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', 'aur_shortname') . " Newest Packages";
+$rss->description = "The latest and greatest packages in the " . config_get('options', 'aur_shortname');
 $rss->link = "${protocol}://{$host}";
 $rss->syndicationURL = "{$protocol}://{$host}" . get_uri('/rss/');
 $image = new FeedImage();
-$image->title = "AUR";
+$image->title = config_get('options', 'aur_shortname');
 $image->url = "{$protocol}://{$host}/css/archnavbar/aurlogo.png";
 $image->link = $rss->link;
-$image->description = "AUR Newest Packages Feed";
+$image->description = config_get('options', 'aur_shortname') . " Newest Packages Feed";
 $rss->image = $image;
 
 #Get the latest packages and add items for them