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

Should fix url rewriting with multi database. re #40

Browse source
This commit is contained in:
Sébastien Lucas 2013-04-05 08:14:44 +02:00
parent d01b23b615
commit ad115f08c3
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.htaccess
View file

@ -19,8 +19,10 @@
<IfModule mod_rewrite.c> <IfModule mod_rewrite.c>
RewriteEngine on RewriteEngine on
RewriteRule ^download/(.*)/.*\.kepub\.epub$ fetch.php?data=$1&type=epub [L] RewriteRule ^download/(\d*)/(\d*)/.*\.kepub\.epub$ fetch.php?data=$1&db=$2&type=epub [L]
RewriteRule ^download/(.*)/.*\.(.*)$ fetch.php?data=$1&type=$2 [L] RewriteRule ^download/(\d*)/(\d*)/.*\.(.*)$ fetch.php?data=$1&db=$2&type=$3 [L]
RewriteRule ^download/(\d*)/.*\.kepub\.epub$ fetch.php?data=$1&type=epub [L]
RewriteRule ^download/(\d*)/.*\.(.*)$ fetch.php?data=$1&type=$2 [L]
</IfModule> </IfModule>
########################################### ###########################################

6
data.php
View file

@ -95,10 +95,12 @@ class Data extends Base {
if ($config['cops_use_url_rewriting'] == "1") if ($config['cops_use_url_rewriting'] == "1")
{ {
$database = "";
if (!is_null (GetUrlParam (DB))) $database = GetUrlParam (DB) . "/";
if ($config['cops_provide_kepub'] == "1" && preg_match("/Kobo/", $_SERVER['HTTP_USER_AGENT'])) { if ($config['cops_provide_kepub'] == "1" && preg_match("/Kobo/", $_SERVER['HTTP_USER_AGENT'])) {
return "download/" . $this->id . "/" . urlencode ($this->getUpdatedFilenameKepub ()); return "download/" . $this->id . "/" . $database . urlencode ($this->getUpdatedFilenameKepub ());
} else { } else {
return "download/" . $this->id . "/" . urlencode ($this->getFilename ()); return "download/" . $this->id . "/" . $database . urlencode ($this->getFilename ());
} }
} }
else else