*/
class ApplicationUtils
{
+ /**
+ * @var string File containing the current version
+ */
+ public static $VERSION_FILE = 'shaarli_version.php';
+
private static $GIT_URL = 'https://raw.githubusercontent.com/shaarli/Shaarli';
- private static $GIT_BRANCHES = array('master', 'stable');
- private static $VERSION_FILE = 'shaarli_version.php';
+ private static $GIT_BRANCHES = array('latest', 'stable');
private static $VERSION_START_TAG = '<?php /* ';
private static $VERSION_END_TAG = ' */ ?>';
return false;
}
+ return $data;
+ }
+
+ /**
+ * Retrieve the version from a remote URL or a file.
+ *
+ * @param string $remote URL or file to fetch.
+ * @param int $timeout For URLs fetching.
+ *
+ * @return bool|string The version or false if it couldn't be retrieved.
+ */
+ public static function getVersion($remote, $timeout = 2)
+ {
+ if (startsWith($remote, 'http')) {
+ if (($data = static::getLatestGitVersionCode($remote, $timeout)) === false) {
+ return false;
+ }
+ } else {
+ if (! is_file($remote)) {
+ return false;
+ }
+ $data = file_get_contents($remote);
+ }
+
return str_replace(
array(self::$VERSION_START_TAG, self::$VERSION_END_TAG, PHP_EOL),
array('', '', ''),
$isLoggedIn,
$branch='stable')
{
- if (! $isLoggedIn) {
- // Do not check versions for visitors
- return false;
- }
-
- if (empty($enableCheck)) {
- // Do not check if the user doesn't want to
+ // Do not check versions for visitors
+ // Do not check if the user doesn't want to
+ // Do not check with dev version
+ if (! $isLoggedIn || empty($enableCheck) || $currentVersion === 'dev') {
return false;
}
// Late Static Binding allows overriding within tests
// See http://php.net/manual/en/language.oop5.late-static-bindings.php
- $latestVersion = static::getLatestGitVersionCode(
+ $latestVersion = static::getVersion(
self::$GIT_URL . '/' . $branch . '/' . self::$VERSION_FILE
);
public static function checkResourcePermissions($conf)
{
$errors = array();
+ $rainTplDir = rtrim($conf->get('resource.raintpl_tpl'), '/');
// Check script and template directories are readable
foreach (array(
'application',
'inc',
'plugins',
- $conf->get('resource.raintpl_tpl'),
- $conf->get('resource.raintpl_tpl').'/'.$conf->get('resource.theme'),
+ $rainTplDir,
+ $rainTplDir.'/'.$conf->get('resource.theme'),
) as $path) {
if (! is_readable(realpath($path))) {
$errors[] = '"'.$path.'" directory is not readable';
}
/**
- * Get a list of available themes.
+ * Returns a salted hash representing the current Shaarli version.
*
- * It will return the name of any directory present in the template folder.
+ * Useful for assets browser cache.
*
- * @param string $tplDir Templates main directory.
+ * @param string $currentVersion of Shaarli
+ * @param string $salt User personal salt, also used for the authentication
*
- * @return array List of theme names.
+ * @return string version hash
*/
- public static function getThemes($tplDir)
+ public static function getVersionHash($currentVersion, $salt)
{
- $allTheme = glob($tplDir.'/*', GLOB_ONLYDIR);
- $themes = [];
- foreach ($allTheme as $value) {
- $themes[] = str_replace($tplDir.'/', '', $value);
- }
-
- return $themes;
+ return hash_hmac('sha256', $currentVersion, $salt);
}
}