diff --git a/components/front.php b/components/front.php
index d138ecf38039aef012614fdea3ffdd8daf0fb9a7..9e1034a7edc5a55d1a1201e997a238dba55bd002 100644
--- a/components/front.php
+++ b/components/front.php
@@ -19,5 +19,8 @@ include('forumposts.php');
$output .= $result;
}
+
+$output .= "<div class=\"cbb\"><h3>SUCS Tools</h3><p>Download the SUCS Tools to make it easier to access SUCS services from your computer.</p><ul><li><a href=\"/files/sucstools-latest.exe\">SUCS Tools for Windows</a></li><li><a href=\"/files/SUCS-latest.dmg\">SUCS Tools for Mac OS X</a></li></ul><p>More information about the tools is available in \"<a href=\"/Knowledge/Help/SUCS%20Services/Using%20the%20SUCS%20Tools\">Using the SUCS Tools</a>\".</p></div>";
+
$smarty->assign("secondary",$output);
?>
diff --git a/components/motd.php b/components/motd.php
index 272f2287cd093beb87d2d32f3f6f63b4af6ad8db..b9905b5d3a46115efd7da0341a78c12de0079723 100644
--- a/components/motd.php
+++ b/components/motd.php
@@ -1,5 +1,5 @@
<?php
-$motd_file = "/tmp/motd.txt";
+$motd_file = "/etc/motd";
function decode_entities($text, $quote_style = ENT_COMPAT) {
if (function_exists('html_entity_decode')) {
diff --git a/components/mw.php b/components/mw.php
index 77f4aed691630470b91f1cc1d4a24c3dcb166e15..e1aa3e14bcee6d07b433fb99437ae69f9c8bca49 100755
--- a/components/mw.php
+++ b/components/mw.php
@@ -4,7 +4,7 @@ define("TOOBIG",102400);
function load_folders()
{
- $f = fopen("/usr/lib64/mw/folders.bb", "r");
+ $f = fopen("/var/lib/mw/folders.bb", "r");
$folders = array();
while (!feof($f) && $fol=fread($f,64)) {
@@ -35,8 +35,8 @@ function cleanup(&$foo)
function load_index($folname, $getbody=FALSE)
{
$index = array();
- $f = @fopen("/usr/lib64/mw/$folname.i", "r");
- $body = @fopen("/usr/lib64/mw/$folname.t", "r");
+ $f = @fopen("/var/lib/mw/$folname.i", "r");
+ $body = @fopen("/var/lib/mw/$folname.t", "r");
if ($f === FALSE || $body === FALSE) return array();
diff --git a/components/pastebin.php b/components/pastebin.php
index 0e3ac90b895abe7fbc3e6bb9124eb142beb7c891..6ac5006e63a740c462151fc43892a4440ac6c9a5 100755
--- a/components/pastebin.php
+++ b/components/pastebin.php
@@ -217,7 +217,10 @@ if (!empty($id) || !empty($code)) {
// an else
if (!empty($code)) {
// Highlight the code
- $renderer = new Text_Highlighter_Renderer_Array();
+ if ($pblang == 'NONE') {
+ $pblang = 'HTML';
+ }
+ $renderer = new Text_Highlighter_Renderer_Array_dez();
$hl = &Text_Highlighter::factory($pblang);
$hl->setRenderer($renderer);
// Have to decode again here for the highlighting
diff --git a/components/planetconfig.php b/components/planetconfig.php
index b3e1f50da62ff30f718ef7b4855155fcf2b2109d..079b4dba115ba92d87985b7194d5a2899face12d 100644
--- a/components/planetconfig.php
+++ b/components/planetconfig.php
@@ -14,7 +14,7 @@ $hackergotchipath = "/var/www/sucssite/htdocs/pictures/people/";
// open connection to sucs database
$sucsDB = NewADOConnection('postgres8');
-$sucsDB->Connect('dbname='.$sucsdbname);
+$sucsDB->Connect('dbname='.$sucsdbname.' user=apache');
$sucsDB->SetFetchMode(ADODB_FETCH_ASSOC);
// fetch blogroll
diff --git a/htdocs/files/Help/mw-script.tar.gz b/htdocs/files/Help/mw-script.tar.gz
index a2e701d0d52f0b06d49760935dc95545c047d5dc..66c4ddeb4d021ccd42ae7cc0d013bdb5beb2e1e7 100644
Binary files a/htdocs/files/Help/mw-script.tar.gz and b/htdocs/files/Help/mw-script.tar.gz differ
diff --git a/htdocs/images/bananas/banana-bunch.png b/htdocs/images/bananas/banana-bunch.png
index 880a41bbc8ac6415f5222fea51784fa4d521c27e..f718b8496c3558bf4ccc65723f25c81e26e93644 100644
Binary files a/htdocs/images/bananas/banana-bunch.png and b/htdocs/images/bananas/banana-bunch.png differ
diff --git a/htdocs/images/bananas/banana-crate.png b/htdocs/images/bananas/banana-crate.png
index d8677be397af20898c83a3d70f5fed75bc6fdb5d..f735dd3151e89d5fa9400b3996956e7468895521 100644
Binary files a/htdocs/images/bananas/banana-crate.png and b/htdocs/images/bananas/banana-crate.png differ
diff --git a/htdocs/images/bananas/banana-g-1.png b/htdocs/images/bananas/banana-g-1.png
index 420b94b03e40e540c4897adb7782241b94f03f28..09c3ac76b6147e8004d3eea47ee9ffdfbf441872 100644
Binary files a/htdocs/images/bananas/banana-g-1.png and b/htdocs/images/bananas/banana-g-1.png differ
diff --git a/htdocs/images/bananas/banana-g-2.png b/htdocs/images/bananas/banana-g-2.png
index 15b81f3c1e14a6d46b3ce3f8174f46e373b78322..91b6f047439a195868a7691fbd2b4d1c7b786732 100644
Binary files a/htdocs/images/bananas/banana-g-2.png and b/htdocs/images/bananas/banana-g-2.png differ
diff --git a/htdocs/images/bananas/banana-g-3.png b/htdocs/images/bananas/banana-g-3.png
index bb25155e447ec891b1209dd0d7f849a0f82881f0..04f41ea57eced58936d3450fc1bf59960f37eaad 100644
Binary files a/htdocs/images/bananas/banana-g-3.png and b/htdocs/images/bananas/banana-g-3.png differ
diff --git a/htdocs/images/bananas/banana-g-bunch.png b/htdocs/images/bananas/banana-g-bunch.png
index 23488f8ef94dd5f5ea067f4cc9c4811a207ba58b..0c4f8e15dea7fca3069a5fed41ba5f2535a82c9b 100644
Binary files a/htdocs/images/bananas/banana-g-bunch.png and b/htdocs/images/bananas/banana-g-bunch.png differ
diff --git a/htdocs/images/bananas/banana-g-crate.png b/htdocs/images/bananas/banana-g-crate.png
index 83fc0fac9713612c3f33100fbd4591a510ec61f8..b63ce3721a671a5a2a8f5d4d4c75983b5342b79b 100644
Binary files a/htdocs/images/bananas/banana-g-crate.png and b/htdocs/images/bananas/banana-g-crate.png differ
diff --git a/htdocs/images/bananas/banana-g-one.png b/htdocs/images/bananas/banana-g-one.png
index 7a3fcbb2ae47ad5df1b7384bdbc7c3a17fa523ef..4b7a16329792c470292379221e1209c515891679 100644
Binary files a/htdocs/images/bananas/banana-g-one.png and b/htdocs/images/bananas/banana-g-one.png differ
diff --git a/htdocs/images/bananas/banana-one.png b/htdocs/images/bananas/banana-one.png
index 895f84f70473f47c59e13f371ec3817b5b2a282f..044b541433b490ade907934f25e88caef418599e 100644
Binary files a/htdocs/images/bananas/banana-one.png and b/htdocs/images/bananas/banana-one.png differ
diff --git a/htdocs/images/bananas/banana-zero.png b/htdocs/images/bananas/banana-zero.png
index 8c1473e1dd157a4bd0e833bf83cdd9c6e2143e02..ab30ad33d75db12f7d27cd18cef7f82665d866f8 100644
Binary files a/htdocs/images/bananas/banana-zero.png and b/htdocs/images/bananas/banana-zero.png differ
diff --git a/htdocs/images/bananas/banana1.png b/htdocs/images/bananas/banana1.png
index 8ad42b4a99bca1fe783b189024d0ffcee1ac674c..1ac758124afeb45f1f5d3fad3c05680bce2ea634 100644
Binary files a/htdocs/images/bananas/banana1.png and b/htdocs/images/bananas/banana1.png differ
diff --git a/htdocs/images/bananas/banana2.png b/htdocs/images/bananas/banana2.png
index c2336f594d29a60a9a3475f0e92c946055dbf070..2a7b00cde596c0658b804fd4f5c10cf54424096d 100644
Binary files a/htdocs/images/bananas/banana2.png and b/htdocs/images/bananas/banana2.png differ
diff --git a/htdocs/images/bananas/banana3.png b/htdocs/images/bananas/banana3.png
index 1ee353cb65b10519a691576fe35dba635d390134..3f6287aad0124006ea08acfb0014aa6f0fc778fc 100644
Binary files a/htdocs/images/bananas/banana3.png and b/htdocs/images/bananas/banana3.png differ
diff --git a/htdocs/images/border-bottom-left.png b/htdocs/images/border-bottom-left.png
index 8d7efba4403fd37e07e7eda7007350c31405494a..92ae1f2a7ad133f860c318710dded62ab4abd2bb 100644
Binary files a/htdocs/images/border-bottom-left.png and b/htdocs/images/border-bottom-left.png differ
diff --git a/htdocs/images/border-bottom-right.png b/htdocs/images/border-bottom-right.png
index 4bf7875dbdfd664c55a0cf5b28ed641893185762..d837e807aef3edb91a7d42873034ee87386f52d9 100644
Binary files a/htdocs/images/border-bottom-right.png and b/htdocs/images/border-bottom-right.png differ
diff --git a/htdocs/images/border-bottom.png b/htdocs/images/border-bottom.png
index 9db117c63b33b484629732696fabad25f2608a18..83fbfa071ae98c4800272367544db8a5bd8c525d 100644
Binary files a/htdocs/images/border-bottom.png and b/htdocs/images/border-bottom.png differ
diff --git a/htdocs/images/border-top-left.png b/htdocs/images/border-top-left.png
index 7e8f2f34ec43858355c3ef13d7628dea1d9e0802..3a12c5a6a17e5aa25778f7e0d79ea50ad0b19db2 100644
Binary files a/htdocs/images/border-top-left.png and b/htdocs/images/border-top-left.png differ
diff --git a/htdocs/images/border-top-right.png b/htdocs/images/border-top-right.png
index 5cd896c3633cb2f4a9a52f201657562b551539c6..48b5781107efd92a63c7bf0ca6b128816ef87e4d 100644
Binary files a/htdocs/images/border-top-right.png and b/htdocs/images/border-top-right.png differ
diff --git a/htdocs/images/borders.png b/htdocs/images/borders.png
index 974a6110e455c496e3a1db189cff956679c12b32..7a405e52e896853eca32059045e05e141decdf7f 100644
Binary files a/htdocs/images/borders.png and b/htdocs/images/borders.png differ
diff --git a/htdocs/images/box.png b/htdocs/images/box.png
index 428ea759844a564e686399655421254b651615ad..e2a342fc05414952eba3a1fd65802c28c53026f2 100644
Binary files a/htdocs/images/box.png and b/htdocs/images/box.png differ
diff --git a/htdocs/images/google.png b/htdocs/images/google.png
index 1feeb5e20fab309f5c52ed00bc64c61d8cd6a5ca..4c4c0c5cd07e8a68e9f424ee00dd69aeff705c1e 100644
Binary files a/htdocs/images/google.png and b/htdocs/images/google.png differ
diff --git a/htdocs/images/hostedby.png b/htdocs/images/hostedby.png
index d148c557d45c3997016d66c41d3f203b6a9f5d37..df8bbd90f26b0a68d95444dd29ef1bda93a3c8eb 100644
Binary files a/htdocs/images/hostedby.png and b/htdocs/images/hostedby.png differ
diff --git a/htdocs/images/left-bottom-corner.png b/htdocs/images/left-bottom-corner.png
index 25fdf1502eba8e0aba428b12100e871a6b7dde1f..133f3a5811e6692bf207f4f2b12ef95e213fb7f7 100644
Binary files a/htdocs/images/left-bottom-corner.png and b/htdocs/images/left-bottom-corner.png differ
diff --git a/htdocs/images/left-top-corner.png b/htdocs/images/left-top-corner.png
index a2e140856cff4925ba2574a1e3846ae1f0891fa5..ff91d0e1022356c025776a5f3586c4743cddec61 100644
Binary files a/htdocs/images/left-top-corner.png and b/htdocs/images/left-top-corner.png differ
diff --git a/htdocs/images/menu-bottom-left.png b/htdocs/images/menu-bottom-left.png
index c9fa4ac04a77323b83b4b383e2552a50250f04e4..0ddbcdfb687081c8683e5017b223c7dc2cb746f3 100644
Binary files a/htdocs/images/menu-bottom-left.png and b/htdocs/images/menu-bottom-left.png differ
diff --git a/htdocs/images/menu-bottom-right.png b/htdocs/images/menu-bottom-right.png
index 6aaef6f7eec56006b4e8ea5907a63a038b15674d..bc13016e62b23d9f6361db9de4c1e0890e4cf2f6 100644
Binary files a/htdocs/images/menu-bottom-right.png and b/htdocs/images/menu-bottom-right.png differ
diff --git a/htdocs/images/menu-top-left.png b/htdocs/images/menu-top-left.png
index bcc8de6789c954318dd4cc2997dac7bef5fc1c39..4a529624586cb42e752ce1ed5c63e463069d068d 100644
Binary files a/htdocs/images/menu-top-left.png and b/htdocs/images/menu-top-left.png differ
diff --git a/htdocs/images/menu-top-right.png b/htdocs/images/menu-top-right.png
index 898d04789f2e4cf23ffa428a01a3dd1919d5b59e..585c35c1164fdc978004e6f4edeb77e0e3f4b8ea 100644
Binary files a/htdocs/images/menu-top-right.png and b/htdocs/images/menu-top-right.png differ
diff --git a/htdocs/images/orangefade-left.png b/htdocs/images/orangefade-left.png
index 39d923a7a005d07a959051517f08ab43159cd3fa..cd8ebc6976afc24d040f5df3864d3f999e6bf32e 100644
Binary files a/htdocs/images/orangefade-left.png and b/htdocs/images/orangefade-left.png differ
diff --git a/htdocs/images/right-bottom-corner.png b/htdocs/images/right-bottom-corner.png
index 50e3aad168f46391637d2a8ed37ed1ba3df6e35e..d09ef7511bc79f50b58d5e5091d8b69157ffb651 100644
Binary files a/htdocs/images/right-bottom-corner.png and b/htdocs/images/right-bottom-corner.png differ
diff --git a/htdocs/images/right-top-corner.png b/htdocs/images/right-top-corner.png
index 1d622c4edd092bee6b1a9cdb39da1e86bc5b2989..4c1726a279b36e7df21902bd044720c36e5a594a 100644
Binary files a/htdocs/images/right-top-corner.png and b/htdocs/images/right-top-corner.png differ
diff --git a/htdocs/images/sucslogo-halo.png b/htdocs/images/sucslogo-halo.png
index 471caa21f4f084ec9bea7daa57205c192fb02967..52f10700062ffc95da5378784c0d1e5dcc12b241 100644
Binary files a/htdocs/images/sucslogo-halo.png and b/htdocs/images/sucslogo-halo.png differ
diff --git a/htdocs/images/sucslogo-main.png b/htdocs/images/sucslogo-main.png
index 8234e9975ac6ab6550fd2f00ba9fac4775cf0591..200dad694bdabe8c4a8076e9f1f5978ba26db851 100644
Binary files a/htdocs/images/sucslogo-main.png and b/htdocs/images/sucslogo-main.png differ
diff --git a/htdocs/images/sucslogo-opaque.png b/htdocs/images/sucslogo-opaque.png
index 047bac2b1653c0aa842c47cd6c6448cd5c3ea87f..21cb8b4a3cc59e110e3c2f2f5043406d00d8e5e9 100644
Binary files a/htdocs/images/sucslogo-opaque.png and b/htdocs/images/sucslogo-opaque.png differ
diff --git a/htdocs/images/sucslogo.png b/htdocs/images/sucslogo.png
index 1fd2621e28519224d39a1b2d29d2a10dd511817f..9544fcae0dc6e7dca346e9ef88f85845563afe3f 100644
Binary files a/htdocs/images/sucslogo.png and b/htdocs/images/sucslogo.png differ
diff --git a/lib/ArrayRenderer.php b/lib/ArrayRenderer.php
index addb4087a3f22078be72cbe6536c82c48c94d00a..cfe21b1f0ad7e0295d2baa47468749e8ee978c71 100644
--- a/lib/ArrayRenderer.php
+++ b/lib/ArrayRenderer.php
@@ -43,7 +43,7 @@ require_once 'Text/Highlighter/Renderer.php';
* @link http://pear.php.net/package/Text_Highlighter
*/
-class Text_Highlighter_Renderer_Array extends Text_Highlighter_Renderer
+class Text_Highlighter_Renderer_Array_dez extends Text_Highlighter_Renderer
{
/**#@+
diff --git a/lib/blog/blog.lib.php b/lib/blog/blog.lib.php
index c4ac8f58a0e7d762041b7f977ae15e6f6718697f..bbdc8a816ec72ba4f1fbdbf8e33adf230264bdbe 100644
--- a/lib/blog/blog.lib.php
+++ b/lib/blog/blog.lib.php
@@ -8,9 +8,9 @@
error_reporting(E_ALL ^ E_NOTICE);
// Initialise the database
-require_once("/usr/share/adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
$BlogDB = NewADOConnection('postgres8');
-$BlogDB->Connect('dbname=blogs');
+$BlogDB->Connect('dbname=blogs user=apache');
$BlogDB->SetFetchMode(ADODB_FETCH_ASSOC);
// Some useful validation functions
@@ -71,7 +71,7 @@ class blogs {
//Constructor - checks we've been given a valid username, and pulls in generic blog info
function blogs($user) {
- global $BlogDB, $baseurl;
+ global $BlogDB;
//set the error string first, so we dont wipe out any errors
$this->error = null;
$this->errormsg = null;
@@ -100,13 +100,13 @@ class blogs {
$this->shortDateFormat = "%x %X";
$this->longDateFormat = "%c";
//set path for all http stuff.. ie images, css and so on
- $this->httpPath = $baseurl."/Blogs/";
+ $this->httpPath = "/Blogs/";
//make the httpPath work nicely if we're not in a subdir
//if(substr($this->httpPath, -1)!="/") {
// $this->httpPath .= "/";
//}
//path for the blog viewer with no user
- $this->basePath = $baseurl."/Blogs/";
+ $this->basePath = "/Blogs/";
//path to this blog
$this->blogPath = $this->basePath.$this->userName."/";
//path to the admin bits
@@ -547,7 +547,7 @@ class blogs {
echo "</div>\n";
echo "<div class=\"row\">\n";
echo "<span class=\"textinput\"><input name=\"submit\" type=\"submit\" id=\"submit\" tabindex=\"4\" value=\"Submit Comment\" /></span>";
- echo "<img src=\"".$baseurl."/images/spinner.gif\" alt=\"\" id=\"spinner\"/>\n";
+ echo "<img src=\"".$this->httpPath."img/spinner.gif\" alt=\"\" id=\"spinner\"/>\n";
echo "<label class=\"invalid\" for=\"submit\" id=\"errors\"></label>\n";
echo "</div>\n<div class=\"clear\"></div>";
echo "</form>\n";
@@ -762,15 +762,13 @@ class bloglist {
// don't do anything apart from setting up default variables
function bloglist()
{
- global $baseurl;
-
$this->title = _("Blogs");
$this->description = _("Swansea University Computer Society member web logs");
- $this->httpPath = $baseurl."/Blogs/";
+ $this->httpPath = "/Blogs/";
//if(substr($this->httpPath, -1)!="/") {
// $this->httpPath .= "/";
//}
- $this->basePath = $baseurl."/Blogs/";
+ $this->basePath = "/Blogs/";
$this->adminPath = $this->httpPath."Admin/";
$this->cssFile = "blog.css";
$this->svnRevision = getSVNRevision();
diff --git a/lib/blog/miscfunctions.lib.php b/lib/blog/miscfunctions.lib.php
index 1683296957d7dbdb048a88f766b0e3124aec3f10..0e932d92b025593caf4d6d4b9947b7e59c6339a1 100644
--- a/lib/blog/miscfunctions.lib.php
+++ b/lib/blog/miscfunctions.lib.php
@@ -80,7 +80,7 @@ function checkSpamURLs($text) {
$text = ereg_replace($match[0],"",$text);
}
//pull in list of two level tlds, make an array from them. from http://spamcheck.freeapp.net/two-level-tlds
- $twoLevelTLD = file("/var/www/blog/two-level-tlds");
+ $twoLevelTLD = file("/var/www/sucssite/lib/blog/two-level-tlds");
foreach($twoLevelTLD as $TLD) {
$two_level_tlds[trim($TLD)] = true;
}
diff --git a/templates/feedback.tpl b/templates/feedback.tpl
index 05aef8c70c82b318db127ac3417e82e62c9e374f..541f325f82ef0952e7679551cbce93d3764e8a6c 100644
--- a/templates/feedback.tpl
+++ b/templates/feedback.tpl
@@ -5,7 +5,7 @@
<h3>Thanks!</h3>
<p>Your comments have been sent to the SUCS admin team</p>
{else}
- <h4>Something you think we should know?</h4>
+ <h3>Something you think we should know?</h3>
<form action="{$baseurl}{$path}" method="post">
<input type="hidden" name="action" value="feedback" />
<p>Spotted a mistake on this page? Have some useful info? Let us know below:</p>
@@ -13,7 +13,7 @@
<span class="textinput"><textarea id="pagefeedback" name="feedback" cols="25" rows="6"></textarea></span>
</div>
<div>
- <span class="textinput"><input type="submit" value="Feed-back!" /></span>
+ <span class="textinput"><input type="submit" value="Feed back!" /></span>
</div>
</form>
{/if}
diff --git a/templates/head.tpl b/templates/head.tpl
index aab0f5c0e4fddef453b4dade4e6c313d34ba84f0..0665d16f34b0c6bf47e3eb000674296756891aa9 100644
--- a/templates/head.tpl
+++ b/templates/head.tpl
@@ -5,10 +5,11 @@
<head>
<title>{$title} - SUCS</title>
<link rel="SHORTCUT ICON" href="/favicon.ico" />
+ <link rel="apple-touch-icon" href="/images/apple-touch-icon.png" />
<script type="text/javascript" src="/js/cb.js"></script>
<script type="text/javascript" src="/videos/talks/ufo.js"></script>
-
+
<link rel="stylesheet" type="text/css" href="{$baseurl}/css/common.css" media="screen,print" />
<link rel="stylesheet" type="text/css" href="{$baseurl}/css/sucs.css" media="screen" />
<link rel="stylesheet" type="text/css" href="{$baseurl}/css/box.css" media="screen" />
@@ -28,7 +29,6 @@
{/if}
<meta name="author" content="Denis Walker" />
<meta name="description" content="Swansea University Computer Society - providing student computing facilities and personal web pages." />
-<!-- <meta name="keywords" content="" /> -->
{if $refresh} <meta http-equiv="REFRESH" content="{$refresh}" />{/if}
{if $action=="edit"}
diff --git a/templates/milliways.tpl b/templates/milliways.tpl
index 70c7b53564f2f657e815c80756dc75877283cc23..a8972d0ed5be9fc8dcb22de4b23273e3ca52f6dc 100644
--- a/templates/milliways.tpl
+++ b/templates/milliways.tpl
@@ -15,7 +15,7 @@
<h3><a href="{$mwpath}/URI">Recent URIs</a></h3>
<ul>
{foreach name=list from=$urilist item=uri}
- <li style="white-space: nowrap"><a href="{$uri.url|escape:"html"}" title="{$uri.title|escape:"html"}">{$uri.title|truncate:28:"..":true:false|escape:"html"}</a></li>
+ <li style="white-space: nowrap">{$uri.user} <small><a href="{$uri.url|escape:'html'}" title="{$uri.title|escape:'htmlall'}">{$uri.title|truncate:18:"..":true:false|escape:'htmlall'}</a></small></li>
{/foreach}
</ul>
</div>
diff --git a/templates/news.tpl b/templates/news.tpl
index 9279d3662aa0f709f0f6dd9a8c8838c8086a71ce..3055216d824f8523dd4da40fd93f0df2178561a8 100644
--- a/templates/news.tpl
+++ b/templates/news.tpl
@@ -8,10 +8,10 @@
{if $editable}
<div class="edit">
<ul>
-<li><a href="{$item.title}?action=delete-query">Delete</a></li>
-<li><a href="{$item.title}?action=edit">Edit</a></li>
+<li><a href="{$item.title|escape:'url'}?action=delete-query">Delete</a></li>
+<li><a href="{$item.title|escape:'url'}?action=edit">Edit</a></li>
{if $item.expirytime > $smarty.now}
-<li><a href="{$item.title}?action=expire-query">Expire</a></li>
+<li><a href="{$item.title|escape:'url'}?action=expire-query">Expire</a></li>
{/if}
</ul>
<div class="clear"></div>