Personal/cops
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use rawurlencode so that the spaces are remplaced by %20 and not +. Will hopefully help with IIS URL Rewriting

Browse source
This commit is contained in:
Sébastien Lucas 2016-02-13 06:28:56 +01:00
parent 188b15b1b8
commit 2bd02496fe
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data.php
View file

@ -132,9 +132,9 @@ class Data extends Base {
if ($config['cops_provide_kepub'] == "1" && if ($config['cops_provide_kepub'] == "1" &&
$this->isEpubValidOnKobo () && $this->isEpubValidOnKobo () &&
preg_match("/Kobo/", $_SERVER['HTTP_USER_AGENT'])) { preg_match("/Kobo/", $_SERVER['HTTP_USER_AGENT'])) {
$href .= urlencode ($this->getUpdatedFilenameKepub ()); $href .= rawurlencode ($this->getUpdatedFilenameKepub ());
} else { } else {
$href .= urlencode ($this->getFilename ()); $href .= rawurlencode ($this->getFilename ());
} }
return new Link ($href, $this->getMimeType (), Link::OPDS_ACQUISITION_TYPE, $title); return new Link ($href, $this->getMimeType (), Link::OPDS_ACQUISITION_TYPE, $title);
} }

8
test/bookTest.php
View file

@ -261,7 +261,7 @@ class BookTest extends PHPUnit_Framework_TestCase
$linkArray = $book->getLinkArray (); $linkArray = $book->getLinkArray ();
foreach ($linkArray as $link) { foreach ($linkArray as $link) {
if ($link->rel == Link::OPDS_ACQUISITION_TYPE && $link->title == "EPUB" ) { if ($link->rel == Link::OPDS_ACQUISITION_TYPE && $link->title == "EPUB" ) {
$this->assertEquals ("download/1/The+Return+of+Sherlock+Holmes+-+Arthur+Conan+Doyle.epub", $link->href); $this->assertEquals ("download/1/The%20Return%20of%20Sherlock%20Holmes%20-%20Arthur%20Conan%20Doyle.epub", $link->href);
return; return;
} }
} }
@ -368,10 +368,10 @@ class BookTest extends PHPUnit_Framework_TestCase
$config['cops_use_url_rewriting'] = "1"; $config['cops_use_url_rewriting'] = "1";
$config['cops_provide_kepub'] = "1"; $config['cops_provide_kepub'] = "1";
$_SERVER["HTTP_USER_AGENT"] = "Kobo"; $_SERVER["HTTP_USER_AGENT"] = "Kobo";
$this->assertEquals ("download/20/Carroll%2C+Lewis+-+Alice%27s+Adventures+in+Wonderland.kepub.epub", $epub->getHtmlLink ()); $this->assertEquals ("download/20/Carroll%2C%20Lewis%20-%20Alice%27s%20Adventures%20in%20Wonderland.kepub.epub", $epub->getHtmlLink ());
$this->assertEquals ("download/17/Alice%27s+Adventures+in+Wonderland+-+Lewis+Carroll.mobi", $mobi->getHtmlLink ()); $this->assertEquals ("download/17/Alice%27s%20Adventures%20in%20Wonderland%20-%20Lewis%20Carroll.mobi", $mobi->getHtmlLink ());
$_SERVER["HTTP_USER_AGENT"] = "Firefox"; $_SERVER["HTTP_USER_AGENT"] = "Firefox";
$this->assertEquals ("download/20/Alice%27s+Adventures+in+Wonderland+-+Lewis+Carroll.epub", $epub->getHtmlLink ()); $this->assertEquals ("download/20/Alice%27s%20Adventures%20in%20Wonderland%20-%20Lewis%20Carroll.epub", $epub->getHtmlLink ());
$config['cops_use_url_rewriting'] = "0"; $config['cops_use_url_rewriting'] = "0";
$this->assertEquals ("fetch.php?data=20&type=epub&id=17", $epub->getHtmlLink ()); $this->assertEquals ("fetch.php?data=20&type=epub&id=17", $epub->getHtmlLink ());
} }