$GLOBALS['config']['UPDATECHECK_BRANCH'] = 'stable';
$GLOBALS['config']['UPDATECHECK_INTERVAL'] = 86400;
+$GLOBALS['config']['REDIRECTOR_URLENCODE'] = true;
/*
* Plugin configuration
$GLOBALS['config']['DATASTORE'],
isLoggedIn(),
$GLOBALS['config']['HIDE_PUBLIC_LINKS'],
- $GLOBALS['redirector']
+ $GLOBALS['redirector'],
+ $GLOBALS['config']['REDIRECTOR_URLENCODE']
);
/* Some Shaarlies may have very few links, so we need to look
* Show the 'Daily' page.
*
* @param PageBuilder $pageBuilder Template engine wrapper.
+ * @param LinkDB $LINKSDB LinkDB instance.
*/
-function showDaily($pageBuilder)
+function showDaily($pageBuilder, $LINKSDB)
{
- $LINKSDB = new LinkDB(
- $GLOBALS['config']['DATASTORE'],
- isLoggedIn(),
- $GLOBALS['config']['HIDE_PUBLIC_LINKS'],
- $GLOBALS['redirector']
- );
-
$day=Date('Ymd',strtotime('-1 day')); // Yesterday, in format YYYYMMDD.
if (isset($_GET['day'])) $day=$_GET['day'];
$GLOBALS['config']['DATASTORE'],
isLoggedIn(),
$GLOBALS['config']['HIDE_PUBLIC_LINKS'],
- $GLOBALS['redirector']
+ $GLOBALS['redirector'],
+ $GLOBALS['config']['REDIRECTOR_URLENCODE']
);
$updater = new Updater(
return strcasecmp($a, $b);
});
- $tagList=array();
- foreach($tags as $key=>$value)
- // Tag font size scaling: default 15 and 30 logarithm bases affect scaling, 22 and 6 are arbitrary font sizes for max and min sizes.
- {
- $tagList[$key] = array('count'=>$value,'size'=>log($value, 15) / log($maxcount, 30) * (22-6) + 6);
+ $tagList = array();
+ foreach($tags as $key => $value) {
+ // Tag font size scaling:
+ // default 15 and 30 logarithm bases affect scaling,
+ // 22 and 6 are arbitrary font sizes for max and min sizes.
+ $size = log($value, 15) / log($maxcount, 30) * 2.2 + 0.8;
+ $tagList[$key] = array(
+ 'count' => $value,
+ 'size' => number_format($size, 2, '.', ''),
+ );
}
$data = array(
// Daily page.
if ($targetPage == Router::$PAGE_DAILY) {
- showDaily($PAGE);
+ showDaily($PAGE, $LINKSDB);
}
// ATOM and RSS feed.
startsWith($query,'do='. $targetPage) && !isLoggedIn()
);
$cached = $cache->cachedVersion();
- if (false && !empty($cached)) {
+ if (!empty($cached)) {
echo $cached;
exit;
}
{
if (!empty($_POST['title']) )
{
- if (!tokenOk($_POST['token'])) die('Wrong token.'); // Go away!
+ if (!tokenOk($_POST['token'])) {
+ die('Wrong token.'); // Go away!
+ }
$tz = 'UTC';
- if (!empty($_POST['continent']) && !empty($_POST['city']))
- if (isTimeZoneValid($_POST['continent'],$_POST['city']))
- $tz = $_POST['continent'].'/'.$_POST['city'];
+ if (!empty($_POST['continent']) && !empty($_POST['city'])
+ && isTimeZoneValid($_POST['continent'], $_POST['city'])
+ ) {
+ $tz = $_POST['continent'] . '/' . $_POST['city'];
+ }
$GLOBALS['timezone'] = $tz;
$GLOBALS['title']=$_POST['title'];
$GLOBALS['titleLink']=$_POST['titleLink'];
exit;
}
if (!tokenOk($_POST['token'])) die('Wrong token.');
- importFile();
+ importFile($LINKSDB);
exit;
}
// -----------------------------------------------------------------------------------------------
// Process the import file form.
-function importFile()
+function importFile($LINKSDB)
{
if (!isLoggedIn()) { die('Not allowed.'); }
- $LINKSDB = new LinkDB(
- $GLOBALS['config']['DATASTORE'],
- isLoggedIn(),
- $GLOBALS['config']['HIDE_PUBLIC_LINKS'],
- $GLOBALS['redirector']
- );
+
$filename=$_FILES['filetoupload']['name'];
$filesize=$_FILES['filetoupload']['size'];
$data=file_get_contents($_FILES['filetoupload']['tmp_name']);
if (!empty($_POST['setlogin']) && !empty($_POST['setpassword']))
{
$tz = 'UTC';
- if (!empty($_POST['continent']) && !empty($_POST['city'])) {
- if (isTimeZoneValid($_POST['continent'], $_POST['city'])) {
- $tz = $_POST['continent'].'/'.$_POST['city'];
- }
+ if (!empty($_POST['continent']) && !empty($_POST['city'])
+ && isTimeZoneValid($_POST['continent'], $_POST['city'])
+ ) {
+ $tz = $_POST['continent'].'/'.$_POST['city'];
}
$GLOBALS['timezone'] = $tz;
// Everything is ok, let's create config file.