diff --git a/syndicate.php b/syndicate.php
index b2511c5667..b0b7e2d564 100644
--- a/syndicate.php
+++ b/syndicate.php
@@ -1,73 +1,79 @@
-<?PHP header("Content-Type: application/xml; charset=UTF-8"); 
+<?php
+header("Content-Type: application/xml; charset=UTF-8"); 
+require_once "config.php";
 
-   require "config.php";
+include $xerte_toolkits_site->php_library_path . "database_library.php";
+include $xerte_toolkits_site->php_library_path . "url_library.php";
 
-   include $xerte_toolkits_site->php_library_path . "database_library.php";
-   include $xerte_toolkits_site->php_library_path . "url_library.php";
+function normal_date($string){
+    $temp = explode("-", $string);
+    return $temp[2] . " " . $temp[1] . " " . $temp[0] . " 12:00:00 GMT";
+}
 
-   function normal_date($string){
+$database_id = database_connect("syndication worked","syndication failed");
 
-	$temp = explode("-", $string);
+$query = "SELECT {$xerte_toolkits_site->database_table_prefix}originaltemplatesdetails.template_name as origname, username, {$xerte_toolkits_site->database_table_prefix}logindetails.login_id, 
+                 {$xerte_toolkits_site->database_table_prefix}templatedetails.template_id, keywords, creator_id, date_created, {$xerte_toolkits_site->database_table_prefix}templatedetails.template_name, 
+                    license, category, export, {$xerte_toolkits_site->database_table_prefix}templatesyndication.description, firstname, surname 
+         FROM {$xerte_toolkits_site->database_table_prefix}templatedetails, {$xerte_toolkits_site->database_table_prefix}templatesyndication, {$xerte_toolkits_site->database_table_prefix}logindetails, 
+              {$xerte_toolkits_site->database_table_prefix}originaltemplatesdetails 
+         WHERE syndication="true" 
+         AND login_id = creator_id 
+         AND {$xerte_toolkits_site->database_table_prefix}templatedetails.template_id = {$xerte_toolkits_site->database_table_prefix}templatesyndication.template_id 
+         AND {$xerte_toolkits_site->database_table_prefix}templatedetails.template_type_id = {$xerte_toolkits_site->database_table_prefix}originaltemplatesdetails.template_type_id";
 
-	return $temp[2] . " " . $temp[1] . " " . $temp[0] . " 12:00:00 GMT";
+$rows = db_query($query);
 
-   }
+echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?><rss version=\"2.0\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:cc=\"http://web.resource.org/cc/\"><channel><title>" .$xerte_toolkits_site->rss_title . "</title><link>" . $xerte_toolkits_site->site_url . "</link><description>This RSS feed contains a list of all the syndicated content from the Xerte Online Toolkits installation at " . $xerte_toolkits_site->synd_publisher . "</description><generator>Xerte Online Toolkits</generator><language>en-gb</language><copyright>http://creativecommons.org/licenses/by-nc-sa/2.0/uk/ </copyright><lastBuildDate>" . date("D, d M Y H:i:s", time()-20000) . " GMT</lastBuildDate><pubDate>" . date("D, d M Y H:i:s", time()-20000) . " GMT</pubDate><dc:publisher>" . $xerte_toolkits_site->synd_publisher . "</dc:publisher><cc:license>" . $xerte_toolkits_site->synd_license . "</cc:license>"; 
 
-   $database_id = database_connect("syndication worked","syndication failed");
+foreach($rows as $row) {
+    $_dataxml = $xerte_toolkits_site->root_file_path . $xerte_toolkits_site->users_file_area_short . $row['template_id'] . '-' . $row['username'] . '-' . $row['origname'] . '/data.xml';
 
-$query = "select " . $xerte_toolkits_site->database_table_prefix . "originaltemplatesdetails.template_name as origname, username," . $xerte_toolkits_site->database_table_prefix . "logindetails.login_id, " . $xerte_toolkits_site->database_table_prefix . "templatedetails.template_id, keywords, creator_id, date_created, " . $xerte_toolkits_site->database_table_prefix . "templatedetails.template_name, license, category, export, " . $xerte_toolkits_site->database_table_prefix . "templatesyndication.description, firstname, surname from " . $xerte_toolkits_site->database_table_prefix . "templatedetails, " . $xerte_toolkits_site->database_table_prefix . "templatesyndication, " . $xerte_toolkits_site->database_table_prefix . "logindetails, " . $xerte_toolkits_site->database_table_prefix . "originaltemplatesdetails where syndication=\"true\" and login_id = creator_id and " . $xerte_toolkits_site->database_table_prefix . "templatedetails.template_id = " . $xerte_toolkits_site->database_table_prefix . "templatesyndication.template_id and " . $xerte_toolkits_site->database_table_prefix . "templatedetails.template_type_id = " . $xerte_toolkits_site->database_table_prefix . "originaltemplatesdetails.template_type_id";
-   
-   $query_response = mysql_query($query);
+    echo "<item><title>" . str_replace("_"," ",$row['template_name']) . "</title>
+        <link>" . $xerte_toolkits_site->site_url . url_return("play" , $row['template_id']) . "</link>
+        <dc:date>" . date("D, d M y H:i:s O ", filemtime($_dataxml) . "</dc:date>
+        <description><![CDATA[" . $row['description'] . "<br>" . str_replace("_"," ",$row['template_name']) . " was developed by " . $row['firstname'] . " " . $row['surname'] . " <br/> This content has the following license - " . $row['license'];
 
-    echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?><rss version=\"2.0\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:cc=\"http://web.resource.org/cc/\"><channel><title>" .$xerte_toolkits_site->rss_title . "</title><link>" . $xerte_toolkits_site->site_url . "</link><description>This RSS feed contains a list of all the syndicated content from the Xerte Online Toolkits installation at " . $xerte_toolkits_site->synd_publisher . "</description><generator>Xerte Online Toolkits</generator><language>en-gb</language><copyright>http://creativecommons.org/licenses/by-nc-sa/2.0/uk/ </copyright><lastBuildDate>" . date("D, d M Y H:i:s", time()-20000) . " GMT</lastBuildDate><pubDate>" . date("D, d M Y H:i:s", time()-20000) . " GMT</pubDate><dc:publisher>" . $xerte_toolkits_site->synd_publisher . "</dc:publisher><cc:license>" . $xerte_toolkits_site->synd_license . "</cc:license>"; 
+    if($row['export']=="true"){
 
-   while($row = mysql_fetch_array($query_response)){
+        echo "<br> Download this content from " . $xerte_toolkits_site->site_url . url_return("export", $row['template_id']);
+        echo "<br> Download this as a scorm package from " . $xerte_toolkits_site->site_url . url_return("scorm", $row['template_id']);		
 
-		echo "<item><title>" . str_replace("_"," ",$row['template_name']) . "</title><link>" . $xerte_toolkits_site->site_url . url_return("play" , $row['template_id']) . "</link><dc:date>" . date("Y-m-d",filemtime($xerte_toolkits_site->root_file_path . $xerte_toolkits_site->users_file_area_short . $row['template_id'] . "-" . $row['username'] . "-" . $row['origname'] . "/data.xml")) . "T" . date("H:i:s",filemtime($xerte_toolkits_site->root_file_path . $xerte_toolkits_site->users_file_area_short . $row['template_id'] . "-" . $row['username'] . "-" . $row['origname'] . "/data.xml")) . "Z</dc:date><description><![CDATA[" . $row['description'] . "<br>" . str_replace("_"," ",$row['template_name']) . " was developed by " . $row['firstname'] . " " . $row['surname'] . "<Br> This content has the following license - " . $row['license'];
+    }
 
-		if($row['export']=="true"){
-			
-			echo "<br> Download this content from " . $xerte_toolkits_site->site_url . url_return("export", $row['template_id']);
-			echo "<br> Download this as a scorm package from " . $xerte_toolkits_site->site_url . url_return("scorm", $row['template_id']);		
+    echo "]]></description><guid isPermaLink=\"true\">" . $xerte_toolkits_site->site_url . url_return("play",  $row['template_id']) . "</guid><dc:contributor>" . $xerte_toolkits_site->synd_publisher . "</dc:contributor><dc:creator>" . $row['surname'] . ", " . $row['firstname'] . " </dc:creator><dc:title>" . $row['template_name'] . "</dc:title><dc:type>Course</dc:type><dc:description><![CDATA[" . $row['description'] . "<br>" . str_replace("_"," ",$row['template_name']) . " was developed by " . $row['firstname'] . " " . $row['surname'] . "<Br> This content has the following license - " . $row['license'];
 
-		}
+    if($row['export']=="true"){
 
-		echo "]]></description><guid isPermaLink=\"true\">" . $xerte_toolkits_site->site_url . url_return("play",  $row['template_id']) . "</guid><dc:contributor>" . $xerte_toolkits_site->synd_publisher . "</dc:contributor><dc:creator>" . $row['surname'] . ", " . $row['firstname'] . " </dc:creator><dc:title>" . $row['template_name'] . "</dc:title><dc:type>Course</dc:type><dc:description><![CDATA[" . $row['description'] . "<br>" . str_replace("_"," ",$row['template_name']) . " was developed by " . $row['firstname'] . " " . $row['surname'] . "<Br> This content has the following license - " . $row['license'];
+        echo "<br> Download this content from " . $xerte_toolkits_site->site_url . url_return("export", $row['template_id']);
+        echo "<br> Download this as a scorm package from " . $xerte_toolkits_site->site_url . url_return("scorm", $row['template_id']);		
 
-		if($row['export']=="true"){
-			
-			echo "<br> Download this content from " . $xerte_toolkits_site->site_url . url_return("export", $row['template_id']);
-			echo "<br> Download this as a scorm package from " . $xerte_toolkits_site->site_url . url_return("scorm", $row['template_id']);		
 
+    }
 
-		}
+    echo "]]></dc:description><dc:format>text/html</dc:format><dc:language>en-gb</dc:language><dc:relation><![CDATA[";
 
-		echo "]]></dc:description><dc:format>text/html</dc:format><dc:language>en-gb</dc:language><dc:relation><![CDATA[";
+    if($row['export']=="true"){
 
-		if($row['export']=="true"){
-			
-			echo $xerte_toolkits_site->site_url . url_return("export", $row['template_id']) . "</dc:relation><dc:relation>";
-			echo $xerte_toolkits_site->site_url . url_return("scorm", $row['template_id']);		
+        echo $xerte_toolkits_site->site_url . url_return("export", $row['template_id']) . "</dc:relation><dc:relation>";
+        echo $xerte_toolkits_site->site_url . url_return("scorm", $row['template_id']);		
 
-		}
+    }
 
 
-		echo "]]></dc:relation><dc:publisher>" . $xerte_toolkits_site->synd_publisher . "</dc:publisher><dc:rights>" . $row['license'] . "</dc:rights>";
+    echo "]]></dc:relation><dc:publisher>" . $xerte_toolkits_site->synd_publisher . "</dc:publisher><dc:rights>" . $row['license'] . "</dc:rights>";
 
-		$new_array = explode(",",$row['keywords']);
+    $new_array = explode(",",$row['keywords']);
 
-		while($word = array_pop($new_array)){
+    while($word = array_pop($new_array)){
 
-		   echo "<dc:subject>" . $word . "</dc:subject>";
+        echo "<dc:subject>" . $word . "</dc:subject>";
 
-		}
+    }
 
-	    echo "<cc:license><![CDATA[" . $xerte_toolkits_site->synd_license . "]]></cc:license></item>";
+    echo "<cc:license><![CDATA[" . $xerte_toolkits_site->synd_license . "]]></cc:license></item>";
 
-	}
+}
 
-	echo "</channel></rss>";
+echo "</channel></rss>";
 
-	mysql_close($database_id);
-
-?>
\ No newline at end of file