From 894a3c4bf38d8dcadb6941049b9167e5101805bd Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 11 Jun 2016 09:08:02 +0200 Subject: Rename configuration key for better sections --- application/ApplicationUtils.php | 18 +++++------ application/PageBuilder.php | 16 +++++----- application/Updater.php | 10 +++---- application/config/ConfigManager.php | 58 +++++++++++++++++++----------------- application/config/ConfigPhp.php | 48 ++++++++++++++--------------- 5 files changed, 77 insertions(+), 73 deletions(-) (limited to 'application') diff --git a/application/ApplicationUtils.php b/application/ApplicationUtils.php index c5a157b9..e67b2902 100644 --- a/application/ApplicationUtils.php +++ b/application/ApplicationUtils.php @@ -145,7 +145,7 @@ class ApplicationUtils 'application', 'inc', 'plugins', - $conf->get('path.raintpl_tpl'), + $conf->get('resource.raintpl_tpl'), ) as $path) { if (! is_readable(realpath($path))) { $errors[] = '"'.$path.'" directory is not readable'; @@ -154,10 +154,10 @@ class ApplicationUtils // Check cache and data directories are readable and writeable foreach (array( - $conf->get('path.thumbnails_cache'), - $conf->get('path.data_dir'), - $conf->get('path.page_cache'), - $conf->get('path.raintpl_tmp'), + $conf->get('resource.thumbnails_cache'), + $conf->get('resource.data_dir'), + $conf->get('resource.page_cache'), + $conf->get('resource.raintpl_tmp'), ) as $path) { if (! is_readable(realpath($path))) { $errors[] = '"'.$path.'" directory is not readable'; @@ -170,10 +170,10 @@ class ApplicationUtils // Check configuration files are readable and writeable foreach (array( $conf->getConfigFileExt(), - $conf->get('path.datastore'), - $conf->get('path.ban_file'), - $conf->get('path.log'), - $conf->get('path.update_check'), + $conf->get('resource.datastore'), + $conf->get('resource.ban_file'), + $conf->get('resource.log'), + $conf->get('resource.update_check'), ) as $path) { if (! is_file(realpath($path))) { # the file may not exist yet diff --git a/application/PageBuilder.php b/application/PageBuilder.php index 843cc0dc..88dbfa8a 100644 --- a/application/PageBuilder.php +++ b/application/PageBuilder.php @@ -41,17 +41,17 @@ class PageBuilder try { $version = ApplicationUtils::checkUpdate( shaarli_version, - $this->conf->get('path.update_check'), - $this->conf->get('general.check_updates_interval'), - $this->conf->get('general.check_updates'), + $this->conf->get('resource.update_check'), + $this->conf->get('updates.check_updates_interval'), + $this->conf->get('updates.check_updates'), isLoggedIn(), - $this->conf->get('general.check_updates_branch') + $this->conf->get('updates.check_updates_branch') ); $this->tpl->assign('newVersion', escape($version)); $this->tpl->assign('versionError', ''); } catch (Exception $exc) { - logm($this->conf->get('path.log'), $_SERVER['REMOTE_ADDR'], $exc->getMessage()); + logm($this->conf->get('resource.log'), $_SERVER['REMOTE_ADDR'], $exc->getMessage()); $this->tpl->assign('newVersion', ''); $this->tpl->assign('versionError', escape($exc->getMessage())); } @@ -80,9 +80,9 @@ class PageBuilder $this->tpl->assign('pagetitle', $this->conf->get('pagetitle')); } $this->tpl->assign('shaarlititle', $this->conf->get('title', 'Shaarli')); - $this->tpl->assign('openshaarli', $this->conf->get('extras.open_shaarli', false)); - $this->tpl->assign('showatom', $this->conf->get('extras.show_atom', false)); - $this->tpl->assign('hide_timestamps', $this->conf->get('extras.hide_timestamps', false)); + $this->tpl->assign('openshaarli', $this->conf->get('security.open_shaarli', false)); + $this->tpl->assign('showatom', $this->conf->get('feed.show_atom', false)); + $this->tpl->assign('hide_timestamps', $this->conf->get('privacy.hide_timestamps', false)); if (!empty($GLOBALS['plugin_errors'])) { $this->tpl->assign('plugin_errors', $GLOBALS['plugin_errors']); } diff --git a/application/Updater.php b/application/Updater.php index b8940e41..fd45d17f 100644 --- a/application/Updater.php +++ b/application/Updater.php @@ -114,8 +114,8 @@ class Updater */ public function updateMethodMergeDeprecatedConfigFile() { - if (is_file($this->conf->get('path.data_dir') . '/options.php')) { - include $this->conf->get('path.data_dir') . '/options.php'; + if (is_file($this->conf->get('resource.data_dir') . '/options.php')) { + include $this->conf->get('resource.data_dir') . '/options.php'; // Load GLOBALS into config $allowedKeys = array_merge(ConfigPhp::$ROOT_KEYS); @@ -126,7 +126,7 @@ class Updater } } $this->conf->write($this->isLoggedIn); - unlink($this->conf->get('path.data_dir').'/options.php'); + unlink($this->conf->get('resource.data_dir').'/options.php'); } return true; @@ -143,7 +143,7 @@ class Updater $link['tags'] = implode(' ', array_unique(LinkFilter::tagsStrToArray($link['tags'], true))); $this->linkDB[$link['linkdate']] = $link; } - $this->linkDB->savedb($this->conf->get('path.page_cache')); + $this->linkDB->savedb($this->conf->get('resource.page_cache')); return true; } @@ -207,7 +207,7 @@ class Updater try { $this->conf->set('general.title', escape($this->conf->get('general.title'))); $this->conf->set('general.header_link', escape($this->conf->get('general.header_link'))); - $this->conf->set('extras.redirector', escape($this->conf->get('extras.redirector'))); + $this->conf->set('redirector.url', escape($this->conf->get('redirector.url'))); $this->conf->write($this->isLoggedIn); } catch (Exception $e) { error_log($e->getMessage()); diff --git a/application/config/ConfigManager.php b/application/config/ConfigManager.php index 5aafc89d..ff41772a 100644 --- a/application/config/ConfigManager.php +++ b/application/config/ConfigManager.php @@ -186,8 +186,8 @@ class ConfigManager 'general.timezone', 'general.title', 'general.header_link', - 'general.default_private_links', - 'extras.redirector', + 'privacy.default_private_links', + 'redirector.url', ); // Only logged in user can alter config. @@ -287,39 +287,43 @@ class ConfigManager */ protected function setDefaultValues() { - $this->setEmpty('path.data_dir', 'data'); - $this->setEmpty('path.config', 'data/config.php'); - $this->setEmpty('path.datastore', 'data/datastore.php'); - $this->setEmpty('path.ban_file', 'data/ipbans.php'); - $this->setEmpty('path.updates', 'data/updates.txt'); - $this->setEmpty('path.log', 'data/log.txt'); - $this->setEmpty('path.update_check', 'data/lastupdatecheck.txt'); - $this->setEmpty('path.raintpl_tpl', 'tpl/'); - $this->setEmpty('path.raintpl_tmp', 'tmp/'); - $this->setEmpty('path.thumbnails_cache', 'cache'); - $this->setEmpty('path.page_cache', 'pagecache'); + $this->setEmpty('resource.data_dir', 'data'); + $this->setEmpty('resource.config', 'data/config.php'); + $this->setEmpty('resource.datastore', 'data/datastore.php'); + $this->setEmpty('resource.ban_file', 'data/ipbans.php'); + $this->setEmpty('resource.updates', 'data/updates.txt'); + $this->setEmpty('resource.log', 'data/log.txt'); + $this->setEmpty('resource.update_check', 'data/lastupdatecheck.txt'); + $this->setEmpty('resource.raintpl_tpl', 'tpl/'); + $this->setEmpty('resource.raintpl_tmp', 'tmp/'); + $this->setEmpty('resource.thumbnails_cache', 'cache'); + $this->setEmpty('resource.page_cache', 'pagecache'); $this->setEmpty('security.ban_after', 4); $this->setEmpty('security.ban_duration', 1800); $this->setEmpty('security.session_protection_disabled', false); + $this->setEmpty('security.open_shaarli', false); - $this->setEmpty('general.check_updates', false); - $this->setEmpty('general.rss_permalinks', true); - $this->setEmpty('general.links_per_page', 20); - $this->setEmpty('general.default_private_links', false); - $this->setEmpty('general.enable_thumbnails', true); - $this->setEmpty('general.enable_localcache', true); - $this->setEmpty('general.check_updates_branch', 'stable'); - $this->setEmpty('general.check_updates_interval', 86400); $this->setEmpty('general.header_link', '?'); + $this->setEmpty('general.links_per_page', 20); $this->setEmpty('general.enabled_plugins', array('qrcode')); - $this->setEmpty('extras.show_atom', false); - $this->setEmpty('extras.hide_public_links', false); - $this->setEmpty('extras.hide_timestamps', false); - $this->setEmpty('extras.open_shaarli', false); - $this->setEmpty('extras.redirector', ''); - $this->setEmpty('extras.redirector_encode_url', true); + $this->setEmpty('updates.check_updates', false); + $this->setEmpty('updates.check_updates_branch', 'stable'); + $this->setEmpty('updates.check_updates_interval', 86400); + + $this->setEmpty('feed.rss_permalinks', true); + $this->setEmpty('feed.show_atom', false); + + $this->setEmpty('privacy.default_private_links', false); + $this->setEmpty('privacy.hide_public_links', false); + $this->setEmpty('privacy.hide_timestamps', false); + + $this->setEmpty('thumbnail.enable_thumbnails', true); + $this->setEmpty('thumbnail.enable_localcache', true); + + $this->setEmpty('redirector.url', ''); + $this->setEmpty('redirector.encode_url', true); $this->setEmpty('plugins', array()); } diff --git a/application/config/ConfigPhp.php b/application/config/ConfigPhp.php index b122f4f1..27187b66 100644 --- a/application/config/ConfigPhp.php +++ b/application/config/ConfigPhp.php @@ -34,38 +34,38 @@ class ConfigPhp implements ConfigIO 'credentials.login' => 'login', 'credentials.hash' => 'hash', 'credentials.salt' => 'salt', - 'path.data_dir' => 'config.DATADIR', - 'path.config' => 'config.CONFIG_FILE', - 'path.datastore' => 'config.DATASTORE', - 'path.updates' => 'config.UPDATES_FILE', - 'path.log' => 'config.LOG_FILE', - 'path.update_check' => 'config.UPDATECHECK_FILENAME', - 'path.raintpl_tpl' => 'config.RAINTPL_TPL', - 'path.raintpl_tmp' => 'config.RAINTPL_TMP', - 'path.thumbnails_cache' => 'config.CACHEDIR', - 'path.page_cache' => 'config.PAGECACHE', - 'path.ban_file' => 'config.IPBANS_FILENAME', + 'resource.data_dir' => 'config.DATADIR', + 'resource.config' => 'config.CONFIG_FILE', + 'resource.datastore' => 'config.DATASTORE', + 'resource.updates' => 'config.UPDATES_FILE', + 'resource.log' => 'config.LOG_FILE', + 'resource.update_check' => 'config.UPDATECHECK_FILENAME', + 'resource.raintpl_tpl' => 'config.RAINTPL_TPL', + 'resource.raintpl_tmp' => 'config.RAINTPL_TMP', + 'resource.thumbnails_cache' => 'config.CACHEDIR', + 'resource.page_cache' => 'config.PAGECACHE', + 'resource.ban_file' => 'config.IPBANS_FILENAME', 'security.session_protection_disabled' => 'disablesessionprotection', 'security.ban_after' => 'config.BAN_AFTER', 'security.ban_duration' => 'config.BAN_DURATION', 'general.title' => 'title', 'general.timezone' => 'timezone', 'general.header_link' => 'titleLink', - 'general.check_updates' => 'config.ENABLE_UPDATECHECK', - 'general.check_updates_branch' => 'config.UPDATECHECK_BRANCH', - 'general.check_updates_interval' => 'config.UPDATECHECK_INTERVAL', - 'general.default_private_links' => 'privateLinkByDefault', - 'general.rss_permalinks' => 'config.ENABLE_RSS_PERMALINKS', + 'updates.check_updates' => 'config.ENABLE_UPDATECHECK', + 'updates.check_updates_branch' => 'config.UPDATECHECK_BRANCH', + 'updates.check_updates_interval' => 'config.UPDATECHECK_INTERVAL', + 'privacy.default_private_links' => 'privateLinkByDefault', + 'feed.rss_permalinks' => 'config.ENABLE_RSS_PERMALINKS', 'general.links_per_page' => 'config.LINKS_PER_PAGE', - 'general.enable_thumbnails' => 'config.ENABLE_THUMBNAILS', - 'general.enable_localcache' => 'config.ENABLE_LOCALCACHE', + 'thumbnail.enable_thumbnails' => 'config.ENABLE_THUMBNAILS', + 'thumbnail.enable_localcache' => 'config.ENABLE_LOCALCACHE', 'general.enabled_plugins' => 'config.ENABLED_PLUGINS', - 'extras.redirector' => 'redirector', - 'extras.redirector_encode_url' => 'config.REDIRECTOR_URLENCODE', - 'extras.show_atom' => 'config.SHOW_ATOM', - 'extras.hide_public_links' => 'config.HIDE_PUBLIC_LINKS', - 'extras.hide_timestamps' => 'config.HIDE_TIMESTAMPS', - 'extras.open_shaarli' => 'config.OPEN_SHAARLI', + 'redirector.url' => 'redirector', + 'redirector.encode_url' => 'config.REDIRECTOR_URLENCODE', + 'feed.show_atom' => 'config.SHOW_ATOM', + 'privacy.hide_public_links' => 'config.HIDE_PUBLIC_LINKS', + 'privacy.hide_timestamps' => 'config.HIDE_TIMESTAMPS', + 'security.open_shaarli' => 'config.OPEN_SHAARLI', ); /** -- cgit v1.2.3