Skip to content

Commit

Permalink
Remove unused old code, fix old links.
Browse files Browse the repository at this point in the history
  • Loading branch information
dracos committed Jan 2, 2019
1 parent 8d47101 commit 98821b0
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 252 deletions.
18 changes: 0 additions & 18 deletions bin/admin_reminder_mail
Expand Up @@ -131,24 +131,6 @@ if ($councils_not_matched > 0) {
";
}

// Outstanding customer support mail
/*
verbose("querying rt for count of outstanding support mail");
$rt_messages = `psql rt rt --pset t -c "
select count(*) from tickets
left join queues on queues.id = tickets.queue
where status = 'new' or status = 'open' and queues.name = 'WriteToThem';
;"`;
$rt_messages = trim($rt_messages);
if ($rt_messages > 0) {
$mail .= "
* $rt_messages people are waiting for replies to support mails
Resolve some tickets now:
https://secure.mysociety.org/rt/
";
}
*/

// Combine the first part.
if ($mail) {
$mail = "Here are some thing to do to make our service smoother and lovelier...
Expand Down
2 changes: 1 addition & 1 deletion bin/stats-yearly-response
Expand Up @@ -681,7 +681,7 @@ sub display_rep($$) {
print sprintf("%s (%s) of %s\n", $rep_name, $party, $area_name);
print "\tPerson: $person_id Rep ids: $repids\n";
foreach my $url_rep_id (@{$reps_by_person->{$person_id}}) {
print "\thttps://secure.mysociety.org/admin/fyr/index.php?page=reps&rep_id=$url_rep_id\n";
print "\thttps://www.writetothem.com/admin/?page=reps&rep_id=$url_rep_id\n";
}
print sprintf("\tMessages sent in year: %d Response rate: %d/%d First time: %d/%d\n",
$sent_m, $q_data->[0], $q_data->[1], $q_data->[2], $q_data->[3]);
Expand Down
4 changes: 2 additions & 2 deletions conf/general-example
Expand Up @@ -56,7 +56,7 @@ define('OPTION_BASE_URL', 'http://sometesthost.' . OPTION_WEB_DOMAIN);
// Is the site running in HTTPS mode?
define('OPTION_HTTPS_ONLY', 1);

define('OPTION_ADMIN_URL', 'https://secure.../admin');
define('OPTION_ADMIN_URL', 'https://.../admin/');
define('OPTION_ADMIN_AUTH_USER', undef);
define('OPTION_ADMIN_AUTH_PASSWORD', undef);

Expand Down Expand Up @@ -116,7 +116,7 @@ define('OPTION_MAX_BODY_LENGTH', 20000);
define('OPTION_PHP_DEBUG_LEVEL', 0);

// URLS of admin scripts
define('OPTION_ADMIN_SERVICES_CGI', 'https://secure.mysociety.org/admin/services');
define('OPTION_ADMIN_SERVICES_CGI', 'https://../admin/services/');

// Log file (used in test harness, and later in admin scripts)
define('OPTION_HTTPD_ERROR_LOG', '/var/log/apache/error.log');
Expand Down
3 changes: 2 additions & 1 deletion conf/httpd.conf
Expand Up @@ -54,7 +54,8 @@ RewriteEngine on
# Example simple rewrite rule
#RewriteRule /test /index.php [PT]


SSLProxyEngine on
ProxyPass /admin/services/ https://services.mysociety.org/admin/

RewriteRule ^/lord/?$ /lords [R]
RewriteRule ^/lords/$ /lords [R]
Expand Down
2 changes: 1 addition & 1 deletion phplib/admin-fyrqueue.php
Expand Up @@ -247,7 +247,7 @@ private function printMessages($messages, $msgid = null)
}
print "</td>";

print "<td><a href=\"ipaddrinfo.cgi?ipaddr=${message['sender_ipaddr']}\">${message['sender_ipaddr']}</a>".
print "<td><a rel=\"noreferrer\" href=\"https://whatismyipaddress.com/ip/${message['sender_ipaddr']}\">${message['sender_ipaddr']}</a>".
"<br>" . trim_url($message['sender_referrer']) .
"<br>" . $message['cobrand'] . " " . $message['cocode'] .
"</td>";
Expand Down
28 changes: 14 additions & 14 deletions templates/website/stats-methodology.html
Expand Up @@ -60,7 +60,7 @@ <h3>Messages to MPs during 2005</h3>

<map name="imap">
<area shape="rect" coords="172,66,250,86" href="http://www.feedmebetter.com/getinvolved/lobbymp.php">
<area shape="rect" coords="404,10,424,130" href="http://www.owos.info/how_you_can_help/contact_MP.php">
<area shape="rect" coords="404,10,424,130" href="http://www.ourworldoursay.org/">
<area shape="rect" coords="522,140,562,160" href="http://www.no2id.net/">
<area shape="rect" coords="622,5,718,25" href="http://www.animalsasia.org/">
</map>
Expand Down Expand Up @@ -96,7 +96,7 @@ <h3>Messages to MPs during 2005</h3>
representative.
<? if ($values['year'] == 2006) { ?>
(Actually the text of the survey changed slightly in both March and April 2006. You
can <a href="https://secure.mysociety.org/cvstrac/rlog?f=mysociety/fyr/templates/emails/questionnaire">see in our
can <a href="https://github.com/mysociety/writetothem/blob/master/templates/emails/questionnaire">see in our
source code repository</a> when this happened, and what changed).
<? } ?>
<? } ?>
Expand Down Expand Up @@ -142,18 +142,18 @@ <h3 id="referrers">What do people write letters about?</h3>

<table>
<tr><th>Month in 2006</th><th>Top campaign site linking to WriteToThem</th>
<tr><td>January</td><td><a href="http://smokefree.ash.positive-dedicated.net/action.html">Smokefree ACTION</a></td>
<tr><td>February</td><td><a href="http://www.natfhe.org.uk">National Association of Teachers in Further and Higher Education</a></td>
<tr><td>March</td><td><a href="http://www.saveparliament.org.uk/index.php">Save Parliament</a></td>
<tr><td>April</td><td><a href="http://www.pressureworks.org/">Pressureworks (Christian Aid)</a></td>
<tr><td>January</td><td><a href="http://smokefreeaction.org.uk/">Smokefree ACTION</a></td>
<tr><td>February</td><td>National Association of Teachers in Further and Higher Education</td>
<tr><td>March</td><td><a rel="nofollow" href="http://www.saveparliament.org.uk/">Save Parliament</a></td>
<tr><td>April</td><td>Pressureworks (Christian Aid)</td>
<tr><td>May</td><td><a href="http://forums.moneysavingexpert.com/">Money Saving Expert forums</a></td>
<tr><td>June</td><td><a href="http://www.pistonheads.com/news/default.asp">PistonHeads &ndash; Speed Matters</a></td>
<tr><td>July</td><td><a href="http://www.voice4sportsw.org/site/">Voice4SportsSW</a></td>
<tr><td>June</td><td><a href="http://www.pistonheads.com/">PistonHeads &ndash; Speed Matters</a></td>
<tr><td>July</td><td>Voice4SportsSW</td>
<tr><td>August</td><td><a href="http://www.savethechildren.org.uk/">Save the Children (ceasefire day)</a></td>
<tr><td>September</td><td><a href="http://www.traidcraftinteractive.com/news.php">Traidcraft InterActive</a></td>
<tr><td>October</td><td><a href="http://www.saveourwaterways.org/campaign/write.htm">Save our Waterways</a></td>
<tr><td>September</td><td>Traidcraft InterActive</td>
<tr><td>October</td><td>Save our Waterways</td>
<tr><td>November</td><td><a href="http://www.immigrationboards.com/">Immigrationboards.com</a></td>
<tr><td>December</td><td><a href="http://www.antislavery.org/2007/actionmp.html">anti-slavery</a></td>
<tr><td>December</td><td><a href="http://www.antislavery.org/">anti-slavery</a></td>
</table>

<p><small>Where a site was top for more than one month, it has been excluded
Expand Down Expand Up @@ -211,13 +211,13 @@ <h3 id="referrers">What do people write letters about?</h3>
<tr><td>February</td><td><a href="http://www.animalaid.org.uk/h/f/ACTIVE/writetothem_redirector/">Animal Aid</a> &dagger; ("the UK’s largest animal rights group")</td>
<tr><td>March</td><td><a href="http://www.ourworldoursay.org/trident_replacement_action.php">Our World Our Say</a> (on Trident replacement)</td>
<tr><td>April</td><td><a href="http://www.ctc.org.uk/DesktopDefault.aspx">CTC</a> ("the UK’s National Cyclists’ Organisation")</td>
<tr><td>May</td><td><a href="http://www.ourcampaign.org.uk/foi">Liberal Democrats</a> (on Freedom of Information and Parliament)</td>
<tr><td>May</td><td>Liberal Democrats (on Freedom of Information and Parliament)</td>
<tr><td>June</td><td><a href="http://www.oxfam.org.uk/get_involved/campaign/index.html">Oxfam</a> (an international development NGO)</td>
<tr><td>July</td><td><a href="http://www.republic.org.uk/">Republic</a> ("the Campaign for an Elected Head of State")</td>
<tr><td>August</td><td><a href="http://getactive.peta.org/PETA/home.html">People for the Ethical Treatment of Animals</a> (on foie gras)</td>
<tr><td>September &Dagger;</td><td><a href="http://www.iwantareferendum.com/involved.aspx">I want a referendum</a> (on "EU’s constitutional treaty")</td>
<tr><td>September &Dagger;</td><td>I want a referendum (on "EU’s constitutional treaty")</td>
<tr><td>October</td><td><a href="http://www.radiohead.com/deadairspace/">Radiohead</a> (an English alternative rock band)</td>
<tr><td>November</td><td><a href="http://www.unsubscribe-me.org/actionofthemonth.php?">unsubscribe-me</a> (an Amnesty International campaign)</td>
<tr><td>November</td><td>unsubscribe-me (an Amnesty International campaign)</td>
<tr><td>December</td><td><a href="http://www.no2id.net/">NO2ID</a> ("Stop ID cards and the database state")</td></tr>
</table>

Expand Down
91 changes: 0 additions & 91 deletions web-admin/ipaddrinfo.cgi

This file was deleted.

124 changes: 0 additions & 124 deletions web/fcgi/problemreport

This file was deleted.

0 comments on commit 98821b0

Please sign in to comment.