From 55224802c1f0048591e41c270441f66404e3450a Mon Sep 17 00:00:00 2001
From: Lewis <15088984+lewis-wf@users.noreply.github.com>
Date: Sat, 27 Jan 2024 17:58:20 +0000
Subject: [PATCH 1/3] Trying to fix the 404 issue

---
 controlpanel/bobguiAdminister.php | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/controlpanel/bobguiAdminister.php b/controlpanel/bobguiAdminister.php
index 2a211a1..04d8ca1 100644
--- a/controlpanel/bobguiAdminister.php
+++ b/controlpanel/bobguiAdminister.php
@@ -200,12 +200,6 @@ public function actions ()
 				'description' => 'Submit / view votes',
 				'authentication' => false,
 			),
-			'feedback' => array (
-				'tab' => '',
-				'icon' => 'email',
-				'description' => 'Feedback',
-				'authentication' => false,
-			),
 			'organisation' => array (
 				'description' => false,
 				'authentication' => true,
@@ -622,7 +616,7 @@ function about ()
 		
 		# Assemble the HTML
 		$html  = "<h2>How it works</h2>
-		<p>We hope to answer all your questions here about how to set up votes, and what is and is not possible.<br />If you have any questions, please do not hesitate to <a href=\"{$this->baseUrl}/feedback.html\">contact the System Administrator</a>.</p>
+		<p>We hope to answer all your questions here about how to set up votes, and what is and is not possible.<br />If you have any questions, please do not hesitate to <a href="mailto:sysadmins@camvote.org">contact the System Administrator</a>.</p>
 		<p>Jump below to:</p>
 		<ul>
 			<li><a href=\"#overview\">Overview</a></li>
@@ -697,7 +691,7 @@ function about ()
 		" . ($this->settings['faqAdditionalEntry'] ? "\n\n<h3 id=\"additional\">{$this->settings['faqAdditionalEntry'][0]}</h3>\n<p>{$this->settings['faqAdditionalEntry'][1]}</p>" : '') . "
 		
 		<h3 id=\"feedback\">Feedback</h3>
-		<p>We welcome any <a href=\"{$this->baseUrl}/feedback.html\">feedback</a> on this system or this documentation, including any suggestions for improvement.</p>";
+		<p>We welcome any <a href="mailto:sysadmins@camvote.org">feedback</a> on this system or this documentation, including any suggestions for improvement.</p>";
 		
 		# Show the HTML
 		echo $html;
@@ -722,7 +716,7 @@ function security ()
 		<ul>
 			<li><a href=\"{$this->baseUrl}/security.pdf\">Voting system security architecture</a></li>
 		</ul>
-		<p>If you have questions on any points not mentioned in the documentation, do <a href=\"{$this->baseUrl}/feedback.html\">get in touch</a> and we will update the documentation.</p>
+		<p>If you have questions on any points not mentioned in the documentation, do <a href="mailto:sysadmins@camvote.org">get in touch</a> and we will update the documentation.</p>
 		";
 		
 		# Show the HTML
@@ -1854,7 +1848,7 @@ private function understandText ($ballotUrl = false)
 		<p>This page aims to describe, for the benefit of the Returning Officer, how the voting process works. </p>
 		" . ($ballotUrl ? '' : "<p>You'll get a customised version of these instructions (containing links), via the Administer page, if/when you've created a vote.</p>") . "
 		<p>The main public <a href=\"{$this->baseUrl}/about.html\"><img src=\"/images/icons/help.png\" alt=\"\" class=\"icon\" /> How it works</a> page gives more information, but the main information of relevance to the Returning Officer is as follows:</p>
-		<p>If, having read all of this page, you have any questions, please do <a href=\"{$this->baseUrl}/feedback.html\">contact us</a>.</p>
+		<p>If, having read all of this page, you have any questions, please do <a href="mailto:sysadmins@camvote.org">contact us</a>.</p>
 		<h3>1. Setup</h3>
 		<ol type=\"a\">
 			<li>You should start by clicking on the 'add a new ballot' link.</li>
@@ -2641,7 +2635,7 @@ private function organisationSelectionTable ($organisationsOfUser, $providerMeta
 			# Add the title for this type of provider, if multiple organisations are expected
 			if (!$this->settings['singleOrganisationMode']) {
 				$html .= "\n<h3 class=\"selectlist\">" . htmlspecialchars ($providerMetadata[$providerId]['name']) . ':</h3>';
-				$html .= "\n<p>" . ($organisations ? "If you think you should be the manager for a {$providerMetadata[$providerId]['typeSingularUcfirst']} not listed here" : "You do not appear to be not registered as the manager for any {$providerMetadata[$providerId]['typeSingularUcfirst']}.<br />If you think you should be") . ", please " . ($providerMetadata[$providerId]['managerClaimFormLocation'] ? "use the <a href=\"{$providerMetadata[$providerId]['baseUrl']}{$providerMetadata[$providerId]['managerClaimFormLocation']}\">{$providerMetadata[$providerId]['typeSingularUcfirst']} manager claim form</a> elsewhere on the website.</p>" : "<a href=\"{$this->baseUrl}/feedback.html\">contact the system administrator</a>.");
+				$html .= "\n<p>" . ($organisations ? "If you think you should be the manager for a {$providerMetadata[$providerId]['typeSingularUcfirst']} not listed here" : "You do not appear to be not registered as the manager for any {$providerMetadata[$providerId]['typeSingularUcfirst']}.<br />If you think you should be") . ", please " . ($providerMetadata[$providerId]['managerClaimFormLocation'] ? "use the <a href=\"{$providerMetadata[$providerId]['baseUrl']}{$providerMetadata[$providerId]['managerClaimFormLocation']}\">{$providerMetadata[$providerId]['typeSingularUcfirst']} manager claim form</a> elsewhere on the website.</p>" : "<a href="mailto:sysadmins@camvote.org">contact the system administrator</a>.");
 			}
 
 			# Add each organisation

From e7e76b860aee20c4ad6387a4fd9e1278ee69f160 Mon Sep 17 00:00:00 2001
From: Lewis <15088984+lewis-wf@users.noreply.github.com>
Date: Mon, 29 Jan 2024 20:21:11 +0000
Subject: [PATCH 2/3] escape characters return

---
 controlpanel/bobguiAdminister.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/controlpanel/bobguiAdminister.php b/controlpanel/bobguiAdminister.php
index 04d8ca1..f3166fb 100644
--- a/controlpanel/bobguiAdminister.php
+++ b/controlpanel/bobguiAdminister.php
@@ -616,7 +616,7 @@ function about ()
 		
 		# Assemble the HTML
 		$html  = "<h2>How it works</h2>
-		<p>We hope to answer all your questions here about how to set up votes, and what is and is not possible.<br />If you have any questions, please do not hesitate to <a href="mailto:sysadmins@camvote.org">contact the System Administrator</a>.</p>
+		<p>We hope to answer all your questions here about how to set up votes, and what is and is not possible.<br />If you have any questions, please do not hesitate to <a href=\"mailto:sysadmins@camvote.org">contact the System Administrator</a>.</p>
 		<p>Jump below to:</p>
 		<ul>
 			<li><a href=\"#overview\">Overview</a></li>
@@ -691,7 +691,7 @@ function about ()
 		" . ($this->settings['faqAdditionalEntry'] ? "\n\n<h3 id=\"additional\">{$this->settings['faqAdditionalEntry'][0]}</h3>\n<p>{$this->settings['faqAdditionalEntry'][1]}</p>" : '') . "
 		
 		<h3 id=\"feedback\">Feedback</h3>
-		<p>We welcome any <a href="mailto:sysadmins@camvote.org">feedback</a> on this system or this documentation, including any suggestions for improvement.</p>";
+		<p>We welcome any <a href=\"mailto:sysadmins@camvote.org">feedback</a> on this system or this documentation, including any suggestions for improvement.</p>";
 		
 		# Show the HTML
 		echo $html;
@@ -716,7 +716,7 @@ function security ()
 		<ul>
 			<li><a href=\"{$this->baseUrl}/security.pdf\">Voting system security architecture</a></li>
 		</ul>
-		<p>If you have questions on any points not mentioned in the documentation, do <a href="mailto:sysadmins@camvote.org">get in touch</a> and we will update the documentation.</p>
+		<p>If you have questions on any points not mentioned in the documentation, do <a href=\"mailto:sysadmins@camvote.org">get in touch</a> and we will update the documentation.</p>
 		";
 		
 		# Show the HTML
@@ -1848,7 +1848,7 @@ private function understandText ($ballotUrl = false)
 		<p>This page aims to describe, for the benefit of the Returning Officer, how the voting process works. </p>
 		" . ($ballotUrl ? '' : "<p>You'll get a customised version of these instructions (containing links), via the Administer page, if/when you've created a vote.</p>") . "
 		<p>The main public <a href=\"{$this->baseUrl}/about.html\"><img src=\"/images/icons/help.png\" alt=\"\" class=\"icon\" /> How it works</a> page gives more information, but the main information of relevance to the Returning Officer is as follows:</p>
-		<p>If, having read all of this page, you have any questions, please do <a href="mailto:sysadmins@camvote.org">contact us</a>.</p>
+		<p>If, having read all of this page, you have any questions, please do <a href=\"mailto:sysadmins@camvote.org">contact us</a>.</p>
 		<h3>1. Setup</h3>
 		<ol type=\"a\">
 			<li>You should start by clicking on the 'add a new ballot' link.</li>
@@ -2635,7 +2635,7 @@ private function organisationSelectionTable ($organisationsOfUser, $providerMeta
 			# Add the title for this type of provider, if multiple organisations are expected
 			if (!$this->settings['singleOrganisationMode']) {
 				$html .= "\n<h3 class=\"selectlist\">" . htmlspecialchars ($providerMetadata[$providerId]['name']) . ':</h3>';
-				$html .= "\n<p>" . ($organisations ? "If you think you should be the manager for a {$providerMetadata[$providerId]['typeSingularUcfirst']} not listed here" : "You do not appear to be not registered as the manager for any {$providerMetadata[$providerId]['typeSingularUcfirst']}.<br />If you think you should be") . ", please " . ($providerMetadata[$providerId]['managerClaimFormLocation'] ? "use the <a href=\"{$providerMetadata[$providerId]['baseUrl']}{$providerMetadata[$providerId]['managerClaimFormLocation']}\">{$providerMetadata[$providerId]['typeSingularUcfirst']} manager claim form</a> elsewhere on the website.</p>" : "<a href="mailto:sysadmins@camvote.org">contact the system administrator</a>.");
+				$html .= "\n<p>" . ($organisations ? "If you think you should be the manager for a {$providerMetadata[$providerId]['typeSingularUcfirst']} not listed here" : "You do not appear to be not registered as the manager for any {$providerMetadata[$providerId]['typeSingularUcfirst']}.<br />If you think you should be") . ", please " . ($providerMetadata[$providerId]['managerClaimFormLocation'] ? "use the <a href=\"{$providerMetadata[$providerId]['baseUrl']}{$providerMetadata[$providerId]['managerClaimFormLocation']}\">{$providerMetadata[$providerId]['typeSingularUcfirst']} manager claim form</a> elsewhere on the website.</p>" : "<a href=\"mailto:sysadmins@camvote.org">contact the system administrator</a>.");
 			}
 
 			# Add each organisation

From 968ab5e45c5a0d8f50bf2a7676cf17c5e8b01f38 Mon Sep 17 00:00:00 2001
From: Lewis <15088984+lewis-wf@users.noreply.github.com>
Date: Mon, 26 Feb 2024 20:46:20 +0000
Subject: [PATCH 3/3] adding escape character 2: the empire strikes back

---
 controlpanel/bobguiAdminister.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/controlpanel/bobguiAdminister.php b/controlpanel/bobguiAdminister.php
index f3166fb..0cdadd4 100644
--- a/controlpanel/bobguiAdminister.php
+++ b/controlpanel/bobguiAdminister.php
@@ -616,7 +616,7 @@ function about ()
 		
 		# Assemble the HTML
 		$html  = "<h2>How it works</h2>
-		<p>We hope to answer all your questions here about how to set up votes, and what is and is not possible.<br />If you have any questions, please do not hesitate to <a href=\"mailto:sysadmins@camvote.org">contact the System Administrator</a>.</p>
+		<p>We hope to answer all your questions here about how to set up votes, and what is and is not possible.<br />If you have any questions, please do not hesitate to <a href=\"mailto:sysadmins@camvote.org\">contact the System Administrator</a>.</p>
 		<p>Jump below to:</p>
 		<ul>
 			<li><a href=\"#overview\">Overview</a></li>
@@ -691,7 +691,7 @@ function about ()
 		" . ($this->settings['faqAdditionalEntry'] ? "\n\n<h3 id=\"additional\">{$this->settings['faqAdditionalEntry'][0]}</h3>\n<p>{$this->settings['faqAdditionalEntry'][1]}</p>" : '') . "
 		
 		<h3 id=\"feedback\">Feedback</h3>
-		<p>We welcome any <a href=\"mailto:sysadmins@camvote.org">feedback</a> on this system or this documentation, including any suggestions for improvement.</p>";
+		<p>We welcome any <a href=\"mailto:sysadmins@camvote.org\">feedback</a> on this system or this documentation, including any suggestions for improvement.</p>";
 		
 		# Show the HTML
 		echo $html;
@@ -716,7 +716,7 @@ function security ()
 		<ul>
 			<li><a href=\"{$this->baseUrl}/security.pdf\">Voting system security architecture</a></li>
 		</ul>
-		<p>If you have questions on any points not mentioned in the documentation, do <a href=\"mailto:sysadmins@camvote.org">get in touch</a> and we will update the documentation.</p>
+		<p>If you have questions on any points not mentioned in the documentation, do <a href=\"mailto:sysadmins@camvote.org\">get in touch</a> and we will update the documentation.</p>
 		";
 		
 		# Show the HTML
@@ -1848,7 +1848,7 @@ private function understandText ($ballotUrl = false)
 		<p>This page aims to describe, for the benefit of the Returning Officer, how the voting process works. </p>
 		" . ($ballotUrl ? '' : "<p>You'll get a customised version of these instructions (containing links), via the Administer page, if/when you've created a vote.</p>") . "
 		<p>The main public <a href=\"{$this->baseUrl}/about.html\"><img src=\"/images/icons/help.png\" alt=\"\" class=\"icon\" /> How it works</a> page gives more information, but the main information of relevance to the Returning Officer is as follows:</p>
-		<p>If, having read all of this page, you have any questions, please do <a href=\"mailto:sysadmins@camvote.org">contact us</a>.</p>
+		<p>If, having read all of this page, you have any questions, please do <a href=\"mailto:sysadmins@camvote.org\">contact us</a>.</p>
 		<h3>1. Setup</h3>
 		<ol type=\"a\">
 			<li>You should start by clicking on the 'add a new ballot' link.</li>
@@ -2635,7 +2635,7 @@ private function organisationSelectionTable ($organisationsOfUser, $providerMeta
 			# Add the title for this type of provider, if multiple organisations are expected
 			if (!$this->settings['singleOrganisationMode']) {
 				$html .= "\n<h3 class=\"selectlist\">" . htmlspecialchars ($providerMetadata[$providerId]['name']) . ':</h3>';
-				$html .= "\n<p>" . ($organisations ? "If you think you should be the manager for a {$providerMetadata[$providerId]['typeSingularUcfirst']} not listed here" : "You do not appear to be not registered as the manager for any {$providerMetadata[$providerId]['typeSingularUcfirst']}.<br />If you think you should be") . ", please " . ($providerMetadata[$providerId]['managerClaimFormLocation'] ? "use the <a href=\"{$providerMetadata[$providerId]['baseUrl']}{$providerMetadata[$providerId]['managerClaimFormLocation']}\">{$providerMetadata[$providerId]['typeSingularUcfirst']} manager claim form</a> elsewhere on the website.</p>" : "<a href=\"mailto:sysadmins@camvote.org">contact the system administrator</a>.");
+				$html .= "\n<p>" . ($organisations ? "If you think you should be the manager for a {$providerMetadata[$providerId]['typeSingularUcfirst']} not listed here" : "You do not appear to be not registered as the manager for any {$providerMetadata[$providerId]['typeSingularUcfirst']}.<br />If you think you should be") . ", please " . ($providerMetadata[$providerId]['managerClaimFormLocation'] ? "use the <a href=\"{$providerMetadata[$providerId]['baseUrl']}{$providerMetadata[$providerId]['managerClaimFormLocation']}\">{$providerMetadata[$providerId]['typeSingularUcfirst']} manager claim form</a> elsewhere on the website.</p>" : "<a href=\"mailto:sysadmins@camvote.org\">contact the system administrator</a>.");
 			}
 
 			# Add each organisation