*
* The code is read from the raw content of the version file on the Git server.
*
+ * @param string $url URL to reach to get the latest version.
+ * @param int $timeout Timeout to check the URL (in seconds).
+ *
* @return mixed the version code from the repository if available, else 'false'
*/
public static function getLatestGitVersionCode($url, $timeout=2)
* @param int $checkInterval the minimum interval between update checks (in seconds
* @param bool $enableCheck whether to check for new versions
* @param bool $isLoggedIn whether the user is logged in
+ * @param string $branch check update for the given branch
*
* @throws Exception an invalid branch has been set for update checks
*
/**
* Checks Shaarli has the proper access permissions to its resources
*
+ * @param ConfigManager $conf Configuration Manager instance.
+ *
* @return array A list of the detected configuration issues
*/
- public static function checkResourcePermissions()
+ public static function checkResourcePermissions($conf)
{
$errors = array();
- $conf = ConfigManager::getInstance();
// Check script and template directories are readable
foreach (array(
'application',
'inc',
'plugins',
- $conf->get('config.RAINTPL_TPL'),
+ $conf->get('resource.raintpl_tpl'),
) as $path) {
if (! is_readable(realpath($path))) {
$errors[] = '"'.$path.'" directory is not readable';
}
}
- $datadir = $conf->get('config.DATADIR');
- // Check cache and data directories are readable and writeable
+ // Check cache and data directories are readable and writable
foreach (array(
- $conf->get('config.CACHEDIR'),
- $datadir,
- $conf->get('config.PAGECACHE'),
- $conf->get('config.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';
}
}
- // Check configuration files are readable and writeable
+ // Check configuration files are readable and writable
foreach (array(
- $conf->getConfigFile(),
- $conf->get('config.DATASTORE'),
- $conf->get('config.IPBANS_FILENAME'),
- $conf->get('config.LOG_FILE'),
- $conf->get('config.UPDATECHECK_FILENAME'),
+ $conf->getConfigFileExt(),
+ $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