diff options
| author | Andrew Dolgov <[email protected]> | 2021-02-22 22:35:27 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2021-02-22 22:35:27 +0300 |
| commit | 211f699aa0c4211e4ee8a02446d51b9811d0c28c (patch) | |
| tree | 1335af2487e9668d24db1dace41bdf46f1c10763 /classes/pref | |
| parent | 383f4ca04af8c7a1ff4f8be5a488f6799e0e0d37 (diff) | |
migrate the rest into Config::
Diffstat (limited to 'classes/pref')
| -rwxr-xr-x | classes/pref/feeds.php | 8 | ||||
| -rw-r--r-- | classes/pref/system.php | 4 | ||||
| -rw-r--r-- | classes/pref/users.php | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 229effeb3..7c3a40647 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -441,7 +441,7 @@ class Pref_Feeds extends Handler_Protected { $sth->execute([$feed_id, $_SESSION['uid']]); if ($row = $sth->fetch()) { - @unlink(ICONS_DIR . "/$feed_id.ico"); + @unlink(Config::get(Config::ICONS_DIR) . "/$feed_id.ico"); $sth = $this->pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = NULL, favicon_last_checked = '1970-01-01' where id = ?"); @@ -479,7 +479,7 @@ class Pref_Feeds extends Handler_Protected { $sth->execute([$feed_id, $_SESSION['uid']]); if ($row = $sth->fetch()) { - $new_filename = ICONS_DIR . "/$feed_id.ico"; + $new_filename = Config::get(Config::ICONS_DIR) . "/$feed_id.ico"; if (file_exists($new_filename)) unlink($new_filename); @@ -1228,8 +1228,8 @@ class Pref_Feeds extends Handler_Protected { $pdo->commit(); - if (file_exists(ICONS_DIR . "/$id.ico")) { - unlink(ICONS_DIR . "/$id.ico"); + if (file_exists(Config::get(Config::ICONS_DIR) . "/$id.ico")) { + unlink(Config::get(Config::ICONS_DIR) . "/$id.ico"); } } else { diff --git a/classes/pref/system.php b/classes/pref/system.php index bc519a321..35c776463 100644 --- a/classes/pref/system.php +++ b/classes/pref/system.php @@ -153,10 +153,10 @@ class Pref_System extends Handler_Administrative { <div dojoType='dijit.layout.AccordionContainer' region='center'> <div dojoType='dijit.layout.AccordionPane' style='padding : 0' title='<i class="material-icons">report</i> <?= __('Event Log') ?>'> <?php - if (LOG_DESTINATION == "sql") { + if (Config::get(Config::LOG_DESTINATION) == "sql") { $this->_log_viewer($page, $severity); } else { - print_notice("Please set LOG_DESTINATION to 'sql' in config.php to enable database logging."); + print_notice("Please set Config::get(Config::LOG_DESTINATION) to 'sql' in config.php to enable database logging."); } ?> </div> diff --git a/classes/pref/users.php b/classes/pref/users.php index 5ac6a7990..f30abe001 100644 --- a/classes/pref/users.php +++ b/classes/pref/users.php @@ -86,7 +86,7 @@ class Pref_Users extends Handler_Administrative { <?php while ($row = $sth->fetch()) { ?> <li> <?php - $icon_file = ICONS_URL . "/" . $row["id"] . ".ico"; + $icon_file = Config::get(Config::ICONS_URL) . "/" . $row["id"] . ".ico"; $icon = file_exists($icon_file) ? $icon_file : "images/blank_icon.gif"; ?> |