Move from Xhtml to Html. re #73

This commit is contained in:
Sébastien Lucas 2013-06-25 08:40:08 +02:00
parent e833172e99
commit d3ce31c6be
5 changed files with 8 additions and 9 deletions

View file

@ -208,7 +208,7 @@ class Link
} }
public function hrefXhtml () { public function hrefXhtml () {
return str_replace ("&", "&", $this->href); return $this->href;
} }
} }

View file

@ -173,7 +173,6 @@ class Book extends Base {
global $config; global $config;
$urlParam = $this->getUri (); $urlParam = $this->getUri ();
if (!is_null (GetUrlParam (DB))) $urlParam = addURLParameter ($urlParam, DB, GetUrlParam (DB)); if (!is_null (GetUrlParam (DB))) $urlParam = addURLParameter ($urlParam, DB, GetUrlParam (DB));
$urlParam = str_replace ("&", "&", $urlParam);
return 'index.php' . $urlParam; return 'index.php' . $urlParam;
} }

View file

@ -105,7 +105,7 @@ class Data extends Base {
} }
else else
{ {
return str_replace ("&", "&", self::getLink ($this->book, $this->extension, $this->getMimeType (), NULL, $this->getFilename (), $this->id, NULL)->href); return self::getLink ($this->book, $this->extension, $this->getMimeType (), NULL, $this->getFilename (), $this->id, NULL)->href;
} }
} }

View file

@ -75,9 +75,9 @@
"sortorderAsc" => localize("search.sortorder.asc"), "sortorderAsc" => localize("search.sortorder.asc"),
"sortorderDesc" => localize("search.sortorder.desc")), "sortorderDesc" => localize("search.sortorder.desc")),
"url" => array ( "url" => array (
"detailUrl" => "index.php?page=13&id={0}&db={1}", "detailUrl" => "index.php?page=13&id={0}&db={1}",
"coverUrl" => "fetch.php?id={0}&db={1}", "coverUrl" => "fetch.php?id={0}&db={1}",
"thumbnailUrl" => "fetch.php?height=70&id={0}&db={1}"), "thumbnailUrl" => "fetch.php?height=70&id={0}&db={1}"),
"config" => array ( "config" => array (
"use_fancyapps" => $config ["cops_use_fancyapps"], "use_fancyapps" => $config ["cops_use_fancyapps"],
"max_item_per_page" => $config['cops_max_item_per_page'])); "max_item_per_page" => $config['cops_max_item_per_page']));
@ -89,7 +89,7 @@
} }
$out["abouturl"] = "about.xml"; $out["abouturl"] = "about.xml";
if (getCurrentOption ('use_fancyapps') == 0) { if (getCurrentOption ('use_fancyapps') == 0) {
$out["abouturl"] = "index.php" . str_replace ("&", "&", addURLParameter ("?page=16", DB, $database)); $out["abouturl"] = "index.php" . addURLParameter ("?page=16", DB, $database);
} }
$out ["homeurl"] = "index.php"; $out ["homeurl"] = "index.php";

View file

@ -22,7 +22,7 @@
exit (); exit ();
} }
header ("Content-Type:application/xhtml+xml;charset=utf-8"); header ("Content-Type:text/html;charset=utf-8");
$page = getURLParam ("page", Base::PAGE_INDEX); $page = getURLParam ("page", Base::PAGE_INDEX);
$query = getURLParam ("query"); $query = getURLParam ("query");
$qid = getURLParam ("id"); $qid = getURLParam ("id");
@ -52,7 +52,7 @@
$(document).ready(function() { $(document).ready(function() {
// Handler for .ready() called. // Handler for .ready() called.
var url = "<?php echo "getJSON.php?" . str_replace ("&", "&amp;", addURLParameter ($_SERVER["QUERY_STRING"], "complete", 1)); ?>"; var url = "<?php echo "getJSON.php?" . addURLParameter ($_SERVER["QUERY_STRING"], "complete", 1); ?>";
$.when($.get('templates/default/header.html'), $.when($.get('templates/default/header.html'),
$.get('templates/default/footer.html'), $.get('templates/default/footer.html'),