From ff50f9c69e2a1f04a3425180d989df599f17cfd9 Mon Sep 17 00:00:00 2001 From: Knah Tsaeb Date: Fri, 26 Jun 2015 17:29:17 +0200 Subject: [PATCH] [chg] start proper fork of original Shaarli --- index.php | 45 +++++++++++++++++++++++++++++--------------- shaarli_version.txt | 1 + tpl/configure.html | 4 ++-- tpl/page.footer.html | 7 ++++--- tpl/tools.html | 1 + 5 files changed, 38 insertions(+), 20 deletions(-) create mode 100644 shaarli_version.txt diff --git a/index.php b/index.php index 27f9e694..8d3bbfce 100644 --- a/index.php +++ b/index.php @@ -28,9 +28,12 @@ $GLOBALS['config']['ENABLE_LOCALCACHE'] = true; // Enable Shaarli to store thumbnail in a local cache. Disable to reduce webspace usage. // Care if favicon is active and local cache are false serve page can be long $GLOBALS['config']['PUBSUBHUB_URL'] = ''; // PubSubHubbub support. Put an empty string to disable, or put your hub url here to enable. + // Note: You must have publisher.php in the same directory as Shaarli index.php $GLOBALS['config']['UPDATECHECK_FILENAME'] = $GLOBALS['config']['DATADIR'].'/lastupdatecheck.txt'; // For updates check of Shaarli. $GLOBALS['config']['UPDATECHECK_INTERVAL'] = 86400 ; // Updates check frequency for Shaarli. 86400 seconds=24 hours - // Note: You must have publisher.php in the same directory as Shaarli index.php +$GLOBALS['config']['UPDATECHECK_URL'] = 'http://book.knah-tsaeb.org/shaarli_version.txt'; // Define last version of myShaarli +$GLOBALS['config']['UPDATECHECK_DOWNLOAD'] = 'https://forge.leslibres.org/projects/shaarli/repository'; +$GLOBALS['config']['ENABLE_UPDATECHECK'] = TRUE; $GLOBALS['config']['externalThumbshot'] = ''; // Url for external thumbnailer // exemple : http://images.thumbshots.com/image.aspx?cid=dgdfgdfg&v=1&w=120&url= // the last param must be a url @@ -42,7 +45,7 @@ // Optionnal config file. if (is_file($GLOBALS['config']['DATADIR'].'/options.php')) require($GLOBALS['config']['DATADIR'].'/options.php'); -define('shaarli_version','0.0.41 beta'); +define('myShaarli_version','1.0.0 alpha'); define('PHPPREFIX',''); // Suffix to encapsulate data in php code. // http://server.com/x/shaarli --> /shaarli/ @@ -148,22 +151,34 @@ function checkphpversion() // other= the available version. function checkUpdate() { - if (!isLoggedIn()) return ''; // Do not check versions for visitors. - if (empty($GLOBALS['config']['ENABLE_UPDATECHECK'])) return ''; // Do not check if the user doesn't want to. - - // Get latest version number at most once a day. - if (!is_file($GLOBALS['config']['UPDATECHECK_FILENAME']) || (filemtime($GLOBALS['config']['UPDATECHECK_FILENAME']) {include="includes"} - +