Should fix url rewriting with multi database. re #40
This commit is contained in:
parent
d01b23b615
commit
ad115f08c3
|
@ -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
6
data.php
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue