*/
public static function getLatestGitVersionCode($url, $timeout=2)
{
- list($headers, $data) = get_http_url($url, $timeout);
+ list($headers, $data) = get_http_response($url, $timeout);
if (strpos($headers[0], '200 OK') === false) {
error_log('Failed to retrieve ' . $url);
* @param bool $enableCheck whether to check for new versions
* @param bool $isLoggedIn whether the user is logged in
*
+ * @throws Exception an invalid branch has been set for update checks
+ *
* @return mixed the new version code if available and greater, else 'false'
*/
public static function checkUpdate($currentVersion,
/**
* Checks Shaarli has the proper access permissions to its resources
*
- * @param array $globalConfig The $GLOBALS['config'] array
- *
* @return array A list of the detected configuration issues
*/
- public static function checkResourcePermissions($globalConfig)
+ public static function checkResourcePermissions()
{
$errors = array();
+ $conf = ConfigManager::getInstance();
// Check script and template directories are readable
foreach (array(
'application',
'inc',
'plugins',
- $globalConfig['RAINTPL_TPL']
+ $conf->get('config.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
foreach (array(
- $globalConfig['CACHEDIR'],
- $globalConfig['DATADIR'],
- $globalConfig['PAGECACHE'],
- $globalConfig['RAINTPL_TMP']
+ $conf->get('config.CACHEDIR'),
+ $datadir,
+ $conf->get('config.PAGECACHE'),
+ $conf->get('config.RAINTPL_TMP'),
) as $path) {
if (! is_readable(realpath($path))) {
$errors[] = '"'.$path.'" directory is not readable';
// Check configuration files are readable and writeable
foreach (array(
- $globalConfig['CONFIG_FILE'],
- $globalConfig['DATASTORE'],
- $globalConfig['IPBANS_FILENAME'],
- $globalConfig['LOG_FILE'],
- $globalConfig['UPDATECHECK_FILENAME']
+ $conf->getConfigFile(),
+ $conf->get('config.DATASTORE'),
+ $conf->get('config.IPBANS_FILENAME'),
+ $conf->get('config.LOG_FILE'),
+ $conf->get('config.UPDATECHECK_FILENAME'),
) as $path) {
if (! is_file(realpath($path))) {
# the file may not exist yet