Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trying to fix the 404 issue #12

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Trying to fix the 404 issue #12

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5522480
Trying to fix the 404 issue
lewis-wf Jan 27, 2024
e7e76b8
escape characters return
lewis-wf Jan 29, 2024
968ab5e
adding escape character 2: the empire strikes back
lewis-wf Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions controlpanel/bobguiAdminister.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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:[email protected]\">contact the System Administrator</a>.</p>
<p>Jump below to:</p>
<ul>
<li><a href=\"#overview\">Overview</a></li>
Expand Down Expand Up @@ -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:[email protected]\">feedback</a> on this system or this documentation, including any suggestions for improvement.</p>";

# Show the HTML
echo $html;
Expand All @@ -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:[email protected]\">get in touch</a> and we will update the documentation.</p>
";

# Show the HTML
Expand Down Expand Up @@ -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:[email protected]\">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>
Expand Down Expand Up @@ -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:[email protected]\">contact the system administrator</a>.");
}

# Add each organisation
Expand Down