core: Replace CACHE_DIR by PATH_CACHE
Move CACHE_DIR from index.php to /lib/RssBridge.php and change name to PATH_CACHE. PATH_CACHE is one of the core paths of RSS-Bridge and should therefore be defined in the core file RssBridge.php.
This commit is contained in:
parent
4bf45df18e
commit
2126db84ac
7 changed files with 8 additions and 10 deletions
|
@ -121,7 +121,7 @@ class ElloBridge extends BridgeAbstract {
|
|||
|
||||
private function getAPIKey() {
|
||||
$cache = Cache::create('FileCache');
|
||||
$cache->setPath(CACHE_DIR);
|
||||
$cache->setPath(PATH_CACHE);
|
||||
$cache->setParameters(['key']);
|
||||
$key = $cache->loadData();
|
||||
|
||||
|
|
|
@ -53,7 +53,7 @@ class PixivBridge extends BridgeAbstract {
|
|||
|
||||
$url = str_replace('_master1200', '', $url);
|
||||
$url = str_replace('c/240x240/img-master/', 'img-original/', $url);
|
||||
$path = CACHE_DIR . '/pixiv_img';
|
||||
$path = PATH_CACHE . '/pixiv_img';
|
||||
|
||||
if(!is_dir($path))
|
||||
mkdir($path, 0755, true);
|
||||
|
|
|
@ -77,7 +77,7 @@ class WordPressPluginUpdateBridge extends BridgeAbstract {
|
|||
debugMessage('getting pubdate from url ' . $url . '');
|
||||
// Initialize cache
|
||||
$cache = Cache::create('FileCache');
|
||||
$cache->setPath(CACHE_DIR . '/pages');
|
||||
$cache->setPath(PATH_CACHE . '/pages');
|
||||
$params = [$url];
|
||||
$cache->setParameters($params);
|
||||
// Get cachefile timestamp
|
||||
|
|
|
@ -28,9 +28,6 @@ if(file_exists('DEBUG')) {
|
|||
|
||||
require_once __DIR__ . '/lib/RssBridge.php';
|
||||
|
||||
// Specify directory for cached files (using FileCache)
|
||||
define('CACHE_DIR', __DIR__ . '/cache');
|
||||
|
||||
// Specify path for whitelist file
|
||||
define('WHITELIST_FILE', __DIR__ . '/whitelist.txt');
|
||||
|
||||
|
@ -222,7 +219,7 @@ try {
|
|||
|
||||
// Initialize cache
|
||||
$cache = Cache::create('FileCache');
|
||||
$cache->setPath(CACHE_DIR);
|
||||
$cache->setPath(PATH_CACHE);
|
||||
$cache->purgeCache(86400); // 24 hours
|
||||
$cache->setParameters($cache_params);
|
||||
|
||||
|
|
|
@ -31,8 +31,8 @@ class Configuration {
|
|||
die('"json" extension not loaded. Please check "php.ini"');
|
||||
|
||||
// Check cache folder permissions (write permissions required)
|
||||
if(!is_writable(CACHE_DIR))
|
||||
die('RSS-Bridge does not have write permissions for ' . CACHE_DIR . '!');
|
||||
if(!is_writable(PATH_CACHE))
|
||||
die('RSS-Bridge does not have write permissions for ' . PATH_CACHE . '!');
|
||||
|
||||
// Check whitelist file permissions (only in DEBUG mode)
|
||||
if(!file_exists(WHITELIST_FILE) && !is_writable(dirname(WHITELIST_FILE)))
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
define('PATH_VENDOR', __DIR__ . '/../vendor'); // Path for vendor library
|
||||
define('PATH_LIB', __DIR__ . '/../lib'); // Path for core library
|
||||
define('PATH_CACHE', __DIR__ . '/../cache'); // Path to cache folder
|
||||
|
||||
// Classes
|
||||
require_once PATH_LIB . '/Exceptions.php';
|
||||
|
|
|
@ -113,7 +113,7 @@ $defaultSpanText = DEFAULT_SPAN_TEXT){
|
|||
|
||||
// Initialize cache
|
||||
$cache = Cache::create('FileCache');
|
||||
$cache->setPath(CACHE_DIR . '/pages');
|
||||
$cache->setPath(PATH_CACHE . '/pages');
|
||||
$cache->purgeCache(86400); // 24 hours (forced)
|
||||
|
||||
$params = [$url];
|
||||
|
|
Loading…
Reference in a new issue