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

Simplify a little getLink

Browse source
This commit is contained in:
Sébastien Lucas 2014-03-10 21:14:54 +01:00
parent 133b6dc9d6
commit e67e620ba3
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
base.php
View file

@ -1072,6 +1072,13 @@ abstract class Base
return is_array ($config['calibre_directory']); return is_array ($config['calibre_directory']);
} }
public static function useAbsolutePath () {
global $config;
$path = self::getDbDirectory();
return preg_match ('/^\//', Base::getDbDirectory ()) || // Linux /
preg_match ('/^\w\:/', Base::getDbDirectory ()); // Windows X:
}
public static function noDatabaseSelected () { public static function noDatabaseSelected () {
return self::isMultipleDatabaseEnabled () && is_null (GetUrlParam (DB)); return self::isMultipleDatabaseEnabled () && is_null (GetUrlParam (DB));
} }

3
data.php
View file

@ -150,8 +150,7 @@ class Data extends Base {
$urlParam = addURLParameter("", "data", $idData); $urlParam = addURLParameter("", "data", $idData);
if (preg_match ('/^\//', Base::getDbDirectory ()) || // Linux / if (Base::useAbsolutePath () ||
preg_match ('/^\w\:/', Base::getDbDirectory ()) || // Windows X:
$rel == Link::OPDS_THUMBNAIL_TYPE || $rel == Link::OPDS_THUMBNAIL_TYPE ||
($type == "epub" && $config['cops_update_epub-metadata'])) ($type == "epub" && $config['cops_update_epub-metadata']))
{ {