{
return [
'auto' => t('Automatic'),
+ 'de' => t('German'),
'en' => t('English'),
'fr' => t('French'),
- 'de' => t('German'),
+ 'jp' => t('Japanese'),
];
}
}
*
* Also update the urls and ids mapping arrays.
*
- * @param string $order ASC|DESC
+ * @param string $order ASC|DESC
+ * @param bool $ignoreSticky If set to true, sticky bookmarks won't be first
*/
- public function reorder($order = 'DESC')
+ public function reorder(string $order = 'DESC', bool $ignoreSticky = false): void
{
$order = $order === 'ASC' ? -1 : 1;
// Reorder array by dates.
- usort($this->bookmarks, function ($a, $b) use ($order) {
+ usort($this->bookmarks, function ($a, $b) use ($order, $ignoreSticky) {
/** @var $a Bookmark */
/** @var $b Bookmark */
- if ($a->isSticky() !== $b->isSticky()) {
+ if (false === $ignoreSticky && $a->isSticky() !== $b->isSticky()) {
return $a->isSticky() ? -1 : 1;
}
return $a->getCreated() < $b->getCreated() ? 1 * $order : -1 * $order;
/**
* @inheritDoc
*/
- public function search($request = [], $visibility = null, $caseSensitive = false, $untaggedOnly = false)
- {
+ public function search(
+ $request = [],
+ $visibility = null,
+ $caseSensitive = false,
+ $untaggedOnly = false,
+ bool $ignoreSticky = false
+ ) {
if ($visibility === null) {
$visibility = $this->isLoggedIn ? BookmarkFilter::$ALL : BookmarkFilter::$PUBLIC;
}
$searchtags = isset($request['searchtags']) ? $request['searchtags'] : '';
$searchterm = isset($request['searchterm']) ? $request['searchterm'] : '';
+ if ($ignoreSticky) {
+ $this->bookmarks->reorder('DESC', true);
+ }
+
return $this->bookmarkFilter->filter(
BookmarkFilter::$FILTER_TAG | BookmarkFilter::$FILTER_TEXT,
[$searchtags, $searchterm],
* @param string $visibility
* @param bool $caseSensitive
* @param bool $untaggedOnly
+ * @param bool $ignoreSticky
*
* @return Bookmark[]
*/
- public function search($request = [], $visibility = null, $caseSensitive = false, $untaggedOnly = false);
+ public function search(
+ $request = [],
+ $visibility = null,
+ $caseSensitive = false,
+ $untaggedOnly = false,
+ bool $ignoreSticky = false
+ );
/**
* Get a single bookmark by its ID.
}
// Optionally filter the results:
- $linksToDisplay = $this->linkDB->search($userInput);
+ $linksToDisplay = $this->linkDB->search($userInput, null, false, false, true);
$nblinksToDisplay = $this->getNbLinks(count($linksToDisplay), $userInput);
&& $this->container->conf->get('privacy.force_login')
// and the current page isn't already the login page
// and the user is not requesting a feed (which would lead to a different content-type as expected)
- && !in_array($next->getName(), ['login', 'atom', 'rss'], true)
+ && !in_array($next->getName(), ['login', 'processLogin', 'atom', 'rss'], true)
) {
throw new UnauthorizedException();
}
$data = $this->container->feedBuilder->buildData($feedType, $request->getParams());
- $this->executePageHooks('render_feed', $data, $feedType);
+ $this->executePageHooks('render_feed', $data, 'feed.' . $feedType);
$this->assignAllView($data);
- $content = $this->render('feed.'. $feedType);
+ $content = $this->render('feed.' . $feedType);
$cache->cache($content);
/** Legacy route: ?post= */
public function post(Request $request, Response $response): Response
{
- $parameters = count($request->getQueryParams()) > 0 ? '?' . http_build_query($request->getQueryParams()) : '';
+ $route = '/admin/shaare';
+ $buildParameters = function (?array $parameters, bool $encode) {
+ if ($encode) {
+ $parameters = array_map('urlencode', $parameters);
+ }
+
+ return count($parameters) > 0 ? '?' . http_build_query($parameters) : '';
+ };
+
if (!$this->container->loginManager->isLoggedIn()) {
- return $this->redirect($response, '/login' . $parameters);
+ $parameters = $buildParameters($request->getQueryParams(), true);
+ return $this->redirect($response, '/login?returnurl='. $this->getBasePath() . $route . $parameters);
}
- return $this->redirect($response, '/admin/shaare' . $parameters);
+ $parameters = $buildParameters($request->getQueryParams(), false);
+
+ return $this->redirect($response, $route . $parameters);
}
/** Legacy route: ?addlink= */
protected function addlink(Request $request, Response $response): Response
{
+ $route = '/admin/add-shaare';
+
if (!$this->container->loginManager->isLoggedIn()) {
- return $this->redirect($response, '/login');
+ return $this->redirect($response, '/login?returnurl=' . $this->getBasePath() . $route);
}
- return $this->redirect($response, '/admin/add-shaare');
+ return $this->redirect($response, $route);
}
/** Legacy route: ?do=login */
protected function login(Request $request, Response $response): Response
{
- return $this->redirect($response, '/login');
+ $returnUrl = $request->getQueryParam('returnurl');
+
+ return $this->redirect($response, '/login' . ($returnUrl ? '?returnurl=' . $returnUrl : ''));
}
/** Legacy route: ?do=logout */
return $this->redirect($response, '/feed/' . $feedType . $parameters);
}
+
+ /** Legacy route: ?do=configure */
+ protected function configure(Request $request, Response $response): Response
+ {
+ $route = '/admin/configure';
+
+ if (!$this->container->loginManager->isLoggedIn()) {
+ return $this->redirect($response, '/login?returnurl=' . $this->getBasePath() . $route);
+ }
+
+ return $this->redirect($response, $route);
+ }
+
+ protected function getBasePath(): string
+ {
+ return $this->container->basePath ?: '';
+ }
}
public static $PAGE_PICWALL = 'picwall';
- public static $PAGE_TAGCLOUD = 'tagcloud';
+ public static $PAGE_TAGCLOUD = 'tag.cloud';
- public static $PAGE_TAGLIST = 'taglist';
+ public static $PAGE_TAGLIST = 'tag.list';
public static $PAGE_DAILY = 'daily';
- public static $PAGE_FEED_ATOM = 'atom';
+ public static $PAGE_FEED_ATOM = 'feed.atom';
- public static $PAGE_FEED_RSS = 'rss';
+ public static $PAGE_FEED_RSS = 'feed.rss';
public static $PAGE_TOOLS = 'tools';
public static $PAGE_ADDLINK = 'addlink';
- public static $PAGE_EDITLINK = 'edit_link';
+ public static $PAGE_EDITLINK = 'editlink';
public static $PAGE_DELETELINK = 'delete_link';
public static $PAGE_THUMBS_UPDATE = 'thumbs_update';
public static $GET_TOKEN = 'token';
-
- /**
- * Reproducing renderPage() if hell, to avoid regression.
- *
- * This highlights how bad this needs to be rewrite,
- * but let's focus on plugins for now.
- *
- * @param string $query $_SERVER['QUERY_STRING'].
- * @param array $get $_SERVER['GET'].
- * @param bool $loggedIn true if authenticated user.
- *
- * @return string page found.
- */
- public static function findPage($query, $get, $loggedIn)
- {
- $loggedIn = ($loggedIn === true) ? true : false;
-
- if (empty($query) && !isset($get['edit_link']) && !isset($get['post'])) {
- return self::$PAGE_LINKLIST;
- }
-
- if (startsWith($query, 'do=' . self::$PAGE_LOGIN) && $loggedIn === false) {
- return self::$PAGE_LOGIN;
- }
-
- if (startsWith($query, 'do=' . self::$PAGE_PICWALL)) {
- return self::$PAGE_PICWALL;
- }
-
- if (startsWith($query, 'do=' . self::$PAGE_TAGCLOUD)) {
- return self::$PAGE_TAGCLOUD;
- }
-
- if (startsWith($query, 'do=' . self::$PAGE_TAGLIST)) {
- return self::$PAGE_TAGLIST;
- }
-
- if (startsWith($query, 'do=' . self::$PAGE_OPENSEARCH)) {
- return self::$PAGE_OPENSEARCH;
- }
-
- if (startsWith($query, 'do=' . self::$PAGE_DAILY)) {
- return self::$PAGE_DAILY;
- }
-
- if (startsWith($query, 'do=' . self::$PAGE_FEED_ATOM)) {
- return self::$PAGE_FEED_ATOM;
- }
-
- if (startsWith($query, 'do=' . self::$PAGE_FEED_RSS)) {
- return self::$PAGE_FEED_RSS;
- }
-
- if (startsWith($query, 'do=' . self::$PAGE_THUMBS_UPDATE)) {
- return self::$PAGE_THUMBS_UPDATE;
- }
-
- if (startsWith($query, 'do=' . self::$AJAX_THUMB_UPDATE)) {
- return self::$AJAX_THUMB_UPDATE;
- }
-
- // At this point, only loggedin pages.
- if (!$loggedIn) {
- return self::$PAGE_LINKLIST;
- }
-
- if (startsWith($query, 'do=' . self::$PAGE_TOOLS)) {
- return self::$PAGE_TOOLS;
- }
-
- if (startsWith($query, 'do=' . self::$PAGE_CHANGEPASSWORD)) {
- return self::$PAGE_CHANGEPASSWORD;
- }
-
- if (startsWith($query, 'do=' . self::$PAGE_CONFIGURE)) {
- return self::$PAGE_CONFIGURE;
- }
-
- if (startsWith($query, 'do=' . self::$PAGE_CHANGETAG)) {
- return self::$PAGE_CHANGETAG;
- }
-
- if (startsWith($query, 'do=' . self::$PAGE_ADDLINK)) {
- return self::$PAGE_ADDLINK;
- }
-
- if (isset($get['edit_link']) || isset($get['post'])) {
- return self::$PAGE_EDITLINK;
- }
-
- if (isset($get['delete_link'])) {
- return self::$PAGE_DELETELINK;
- }
-
- if (isset($get[self::$PAGE_CHANGE_VISIBILITY])) {
- return self::$PAGE_CHANGE_VISIBILITY;
- }
-
- if (startsWith($query, 'do=' . self::$PAGE_PINLINK)) {
- return self::$PAGE_PINLINK;
- }
-
- if (startsWith($query, 'do=' . self::$PAGE_EXPORT)) {
- return self::$PAGE_EXPORT;
- }
-
- if (startsWith($query, 'do=' . self::$PAGE_IMPORT)) {
- return self::$PAGE_IMPORT;
- }
-
- if (startsWith($query, 'do=' . self::$PAGE_PLUGINSADMIN)) {
- return self::$PAGE_PLUGINSADMIN;
- }
-
- if (startsWith($query, 'do=' . self::$PAGE_SAVE_PLUGINSADMIN)) {
- return self::$PAGE_SAVE_PLUGINSADMIN;
- }
-
- if (startsWith($query, 'do=' . self::$GET_TOKEN)) {
- return self::$GET_TOKEN;
- }
-
- return self::$PAGE_LINKLIST;
- }
}
$this->tpl->assign('formatter', $this->conf->get('formatter', 'default'));
+ $this->tpl->assign('links_per_page', $this->session['LINKS_PER_PAGE']);
+
// To be removed with a proper theme configuration.
$this->tpl->assign('conf', $this->conf);
}
/**
* Ajax request to refresh the CSRF token.
*/
-function refreshToken(basePath) {
- console.log('refresh');
+function refreshToken(basePath, callback) {
const xhr = new XMLHttpRequest();
xhr.open('GET', `${basePath}/admin/token`);
xhr.onload = () => {
const elements = document.querySelectorAll('input[name="token"]');
[...elements].forEach((element) => {
- console.log(element);
element.setAttribute('value', xhr.responseText);
});
+
+ if (callback) {
+ callback(xhr.response);
+ }
};
xhr.send();
}
[...autocompleteFields].forEach((autocompleteField) => {
awesomepletes.push(createAwesompleteInstance(autocompleteField));
});
+
+ const exportForm = document.querySelector('#exportform');
+ if (exportForm != null) {
+ exportForm.addEventListener('submit', (event) => {
+ event.preventDefault();
+
+ refreshToken(basePath, () => {
+ event.target.submit();
+ });
+ });
+ }
})();
padding: 5px;
text-decoration: none;
color: $dark-grey;
+
+ &.selected {
+ background: var(--main-color);
+ color: $white;
+ }
}
input {
"eslint-plugin-import": "^2.8.0",
"extract-text-webpack-plugin": "^3.0.2",
"file-loader": "^1.1.6",
- "node-sass": "^4.12.0",
+ "node-sass": "^4.13.1",
"sass-lint": "^1.12.1",
"sass-loader": "^6.0.6",
"style-loader": "^0.19.1",
'DEFAULT_COLORS_DARK_MAIN',
];
+const DEFAULT_COLORS_CSS_FILE = '/default_colors/default_colors.css';
+
/**
* Display an error if the plugin is active a no color is configured.
*
*/
function default_colors_init($conf)
{
- $params = '';
+ $params = [];
foreach (DEFAULT_COLORS_PLACEHOLDERS as $placeholder) {
- $params .= trim($conf->get('plugins.'. $placeholder, ''));
+ $value = trim($conf->get('plugins.'. $placeholder, ''));
+ if (strlen($value) > 0) {
+ $params[$placeholder] = $value;
+ }
}
if (empty($params)) {
$error = t('Default colors plugin error: '.
'This plugin is active and no custom color is configured.');
- return array($error);
+ return [$error];
+ }
+
+ // Colors are defined but the custom CSS file does not exist -> generate it
+ if (!file_exists(PluginManager::$PLUGINS_PATH . DEFAULT_COLORS_CSS_FILE)) {
+ default_colors_generate_css_file($params);
}
}
/**
- * When plugin parameters are saved, we regenerate the custom CSS file with provided settings.
+ * When linklist is displayed, include default_colors CSS file.
*
- * @param array $data $_POST array
+ * @param array $data - header data.
*
- * @return array Updated $_POST array
+ * @return mixed - header data with default_colors CSS file added.
*/
-function hook_default_colors_save_plugin_parameters($data)
+function hook_default_colors_render_includes($data)
{
$file = PluginManager::$PLUGINS_PATH . '/default_colors/default_colors.css';
- $template = file_get_contents(PluginManager::$PLUGINS_PATH . '/default_colors/default_colors.css.template');
- $content = '';
- foreach (DEFAULT_COLORS_PLACEHOLDERS as $rule) {
- $content .= ! empty($data[$rule])
- ? default_colors_format_css_rule($data, $rule) .';'. PHP_EOL
- : '';
- }
-
- if (! empty($content)) {
- file_put_contents($file, sprintf($template, $content));
+ if (file_exists($file )) {
+ $data['css_files'][] = $file ;
}
return $data;
}
/**
- * When linklist is displayed, include default_colors CSS file.
- *
- * @param array $data - header data.
+ * Regenerate the custom CSS file with provided settings.
*
- * @return mixed - header data with default_colors CSS file added.
+ * @param array $params Plugin configuration (CSS rules)
*/
-function hook_default_colors_render_includes($data)
+function default_colors_generate_css_file($params): void
{
$file = PluginManager::$PLUGINS_PATH . '/default_colors/default_colors.css';
- if (file_exists($file )) {
- $data['css_files'][] = $file ;
+ $template = file_get_contents(PluginManager::$PLUGINS_PATH . '/default_colors/default_colors.css.template');
+ $content = '';
+ foreach (DEFAULT_COLORS_PLACEHOLDERS as $rule) {
+ $content .= !empty($params[$rule])
+ ? default_colors_format_css_rule($params, $rule) .';'. PHP_EOL
+ : '';
}
- return $data;
+ if (! empty($content)) {
+ file_put_contents($file, sprintf($template, $content));
+ }
}
/**
function hook_qrcode_render_footer($data)
{
if ($data['_PAGE_'] == TemplatePage::LINKLIST) {
- $data['js_files'][] = PluginManager::$PLUGINS_PATH . '/qrcode/shaarli-qrcode.js';
+ $data['js_files'][] = ($data['_BASE_PATH_'] ?? '') . '/' . PluginManager::$PLUGINS_PATH . '/qrcode/shaarli-qrcode.js';
}
return $data;
function hook_qrcode_render_includes($data)
{
if ($data['_PAGE_'] == TemplatePage::LINKLIST) {
- $data['css_files'][] = PluginManager::$PLUGINS_PATH . '/qrcode/qrcode.css';
+ $data['css_files'][] = ($data['_BASE_PATH_'] ?? '') . '/' . PluginManager::$PLUGINS_PATH . '/qrcode/qrcode.css';
}
return $data;
$this->assertEquals(ReferenceLinkDB::$NB_LINKS_TOTAL, count($data['links']));
// Test first not pinned link (note link)
- $link = $data['links'][array_keys($data['links'])[2]];
+ $link = $data['links'][array_keys($data['links'])[0]];
$this->assertEquals(41, $link['id']);
$this->assertEquals(DateTime::createFromFormat(Bookmark::LINK_DATE_FORMAT, '20150310_114651'), $link['created']);
$this->assertEquals('http://host.tld/shaare/WDWyig', $link['guid']);
$data = $feedBuilder->buildData(FeedBuilder::$FEED_ATOM, null);
$this->assertEquals(ReferenceLinkDB::$NB_LINKS_TOTAL, count($data['links']));
$this->assertRegExp('/2016-08-03T09:30:33\+\d{2}:\d{2}/', $data['last_update']);
- $link = $data['links'][array_keys($data['links'])[2]];
+ $link = $data['links'][array_keys($data['links'])[0]];
$this->assertRegExp('/2015-03-10T11:46:51\+\d{2}:\d{2}/', $link['pub_iso_date']);
$this->assertRegExp('/2016-08-03T09:30:33\+\d{2}:\d{2}/', $data['links'][8]['up_iso_date']);
}
$feedBuilder->setLocale(self::$LOCALE);
$data = $feedBuilder->buildData(FeedBuilder::$FEED_ATOM, $criteria);
$this->assertEquals(3, count($data['links']));
- $link = $data['links'][array_keys($data['links'])[2]];
+ $link = $data['links'][array_keys($data['links'])[0]];
$this->assertEquals(41, $link['id']);
$this->assertEquals(DateTime::createFromFormat(Bookmark::LINK_DATE_FORMAT, '20150310_114651'), $link['created']);
}
$this->assertEquals(ReferenceLinkDB::$NB_LINKS_TOTAL, count($data['links']));
$this->assertTrue($data['usepermalinks']);
// First link is a permalink
- $link = $data['links'][array_keys($data['links'])[2]];
+ $link = $data['links'][array_keys($data['links'])[0]];
$this->assertEquals(41, $link['id']);
$this->assertEquals(DateTime::createFromFormat(Bookmark::LINK_DATE_FORMAT, '20150310_114651'), $link['created']);
$this->assertEquals('http://host.tld/shaare/WDWyig', $link['guid']);
$this->assertContains('Direct link', $link['description']);
$this->assertContains('http://host.tld/shaare/WDWyig', $link['description']);
// Second link is a direct link
- $link = $data['links'][array_keys($data['links'])[3]];
+ $link = $data['links'][array_keys($data['links'])[1]];
$this->assertEquals(8, $link['id']);
$this->assertEquals(DateTime::createFromFormat(Bookmark::LINK_DATE_FORMAT, '20150310_114633'), $link['created']);
$this->assertEquals('http://host.tld/shaare/RttfEw', $link['guid']);
);
// Test first link (note link)
- $link = $data['links'][array_keys($data['links'])[2]];
+ $link = $data['links'][array_keys($data['links'])[0]];
$this->assertEquals('http://host.tld:8080/~user/shaarli/shaare/WDWyig', $link['guid']);
$this->assertEquals('http://host.tld:8080/~user/shaarli/shaare/WDWyig', $link['url']);
$this->assertContains('http://host.tld:8080/~user/shaarli/./add-tag/hashtag', $link['description']);
static::assertSame('privacy.hide_public_links', $assignedVariables['hide_public_links']);
static::assertSame('api.enabled', $assignedVariables['api_enabled']);
static::assertSame('api.secret', $assignedVariables['api_secret']);
- static::assertCount(4, $assignedVariables['languages']);
+ static::assertCount(5, $assignedVariables['languages']);
static::assertArrayHasKey('gd_enabled', $assignedVariables);
static::assertSame('thumbnails.mode', $assignedVariables['thumbnails_mode']);
}
static::assertSame('data', $data['content']);
static::assertArrayHasKey('loggedin', $param);
- static::assertSame('rss', $param['target']);
+ static::assertSame('feed.rss', $param['target']);
})
;
static::assertSame('data', $data['content']);
static::assertArrayHasKey('loggedin', $param);
- static::assertSame('atom', $param['target']);
+ static::assertSame('feed.atom', $param['target']);
})
;
static::assertSame('data', $data['content']);
static::assertArrayHasKey('loggedin', $param);
- static::assertSame('atom', $param['target']);
+ static::assertSame('feed.atom', $param['target']);
})
;
{
return [
['post', [], '/admin/shaare', true],
- ['post', [], '/login', false],
+ ['post', [], '/login?returnurl=/subfolder/admin/shaare', false],
['post', ['title' => 'test'], '/admin/shaare?title=test', true],
- ['post', ['title' => 'test'], '/login?title=test', false],
+ ['post', ['title' => 'test'], '/login?returnurl=/subfolder/admin/shaare?title=test', false],
['addlink', [], '/admin/add-shaare', true],
- ['addlink', [], '/login', false],
+ ['addlink', [], '/login?returnurl=/subfolder/admin/add-shaare', false],
['login', [], '/login', true],
['login', [], '/login', false],
['logout', [], '/admin/logout', true],
['opensearch', [], '/open-search', true],
['dailyrss', [], '/daily-rss', false],
['dailyrss', [], '/daily-rss', true],
+ ['configure', [], '/login?returnurl=/subfolder/admin/configure', false],
+ ['configure', [], '/admin/configure', true],
];
}
}
+++ /dev/null
-<?php
-
-namespace Shaarli\Legacy;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * Unit tests for Router
- */
-class LegacyRouterTest extends TestCase
-{
- /**
- * Test findPage: login page output.
- * Valid: page should be return.
- *
- * @return void
- */
- public function testFindPageLoginValid()
- {
- $this->assertEquals(
- LegacyRouter::$PAGE_LOGIN,
- LegacyRouter::findPage('do=login', array(), false)
- );
-
- $this->assertEquals(
- LegacyRouter::$PAGE_LOGIN,
- LegacyRouter::findPage('do=login', array(), 1)
- );
-
- $this->assertEquals(
- LegacyRouter::$PAGE_LOGIN,
- LegacyRouter::findPage('do=login&stuff', array(), false)
- );
- }
-
- /**
- * Test findPage: login page output.
- * Invalid: page shouldn't be return.
- *
- * @return void
- */
- public function testFindPageLoginInvalid()
- {
- $this->assertNotEquals(
- LegacyRouter::$PAGE_LOGIN,
- LegacyRouter::findPage('do=login', array(), true)
- );
-
- $this->assertNotEquals(
- LegacyRouter::$PAGE_LOGIN,
- LegacyRouter::findPage('do=other', array(), false)
- );
- }
-
- /**
- * Test findPage: picwall page output.
- * Valid: page should be return.
- *
- * @return void
- */
- public function testFindPagePicwallValid()
- {
- $this->assertEquals(
- LegacyRouter::$PAGE_PICWALL,
- LegacyRouter::findPage('do=picwall', array(), false)
- );
-
- $this->assertEquals(
- LegacyRouter::$PAGE_PICWALL,
- LegacyRouter::findPage('do=picwall', array(), true)
- );
- }
-
- /**
- * Test findPage: picwall page output.
- * Invalid: page shouldn't be return.
- *
- * @return void
- */
- public function testFindPagePicwallInvalid()
- {
- $this->assertEquals(
- LegacyRouter::$PAGE_PICWALL,
- LegacyRouter::findPage('do=picwall&stuff', array(), false)
- );
-
- $this->assertNotEquals(
- LegacyRouter::$PAGE_PICWALL,
- LegacyRouter::findPage('do=other', array(), false)
- );
- }
-
- /**
- * Test findPage: tagcloud page output.
- * Valid: page should be return.
- *
- * @return void
- */
- public function testFindPageTagcloudValid()
- {
- $this->assertEquals(
- LegacyRouter::$PAGE_TAGCLOUD,
- LegacyRouter::findPage('do=tagcloud', array(), false)
- );
-
- $this->assertEquals(
- LegacyRouter::$PAGE_TAGCLOUD,
- LegacyRouter::findPage('do=tagcloud', array(), true)
- );
-
- $this->assertEquals(
- LegacyRouter::$PAGE_TAGCLOUD,
- LegacyRouter::findPage('do=tagcloud&stuff', array(), false)
- );
- }
-
- /**
- * Test findPage: tagcloud page output.
- * Invalid: page shouldn't be return.
- *
- * @return void
- */
- public function testFindPageTagcloudInvalid()
- {
- $this->assertNotEquals(
- LegacyRouter::$PAGE_TAGCLOUD,
- LegacyRouter::findPage('do=other', array(), false)
- );
- }
-
- /**
- * Test findPage: linklist page output.
- * Valid: page should be return.
- *
- * @return void
- */
- public function testFindPageLinklistValid()
- {
- $this->assertEquals(
- LegacyRouter::$PAGE_LINKLIST,
- LegacyRouter::findPage('', array(), true)
- );
-
- $this->assertEquals(
- LegacyRouter::$PAGE_LINKLIST,
- LegacyRouter::findPage('whatever', array(), true)
- );
-
- $this->assertEquals(
- LegacyRouter::$PAGE_LINKLIST,
- LegacyRouter::findPage('whatever', array(), false)
- );
-
- $this->assertEquals(
- LegacyRouter::$PAGE_LINKLIST,
- LegacyRouter::findPage('do=tools', array(), false)
- );
- }
-
- /**
- * Test findPage: tools page output.
- * Valid: page should be return.
- *
- * @return void
- */
- public function testFindPageToolsValid()
- {
- $this->assertEquals(
- LegacyRouter::$PAGE_TOOLS,
- LegacyRouter::findPage('do=tools', array(), true)
- );
-
- $this->assertEquals(
- LegacyRouter::$PAGE_TOOLS,
- LegacyRouter::findPage('do=tools&stuff', array(), true)
- );
- }
-
- /**
- * Test findPage: tools page output.
- * Invalid: page shouldn't be return.
- *
- * @return void
- */
- public function testFindPageToolsInvalid()
- {
- $this->assertNotEquals(
- LegacyRouter::$PAGE_TOOLS,
- LegacyRouter::findPage('do=tools', array(), 1)
- );
-
- $this->assertNotEquals(
- LegacyRouter::$PAGE_TOOLS,
- LegacyRouter::findPage('do=tools', array(), false)
- );
-
- $this->assertNotEquals(
- LegacyRouter::$PAGE_TOOLS,
- LegacyRouter::findPage('do=other', array(), true)
- );
- }
-
- /**
- * Test findPage: changepasswd page output.
- * Valid: page should be return.
- *
- * @return void
- */
- public function testFindPageChangepasswdValid()
- {
- $this->assertEquals(
- LegacyRouter::$PAGE_CHANGEPASSWORD,
- LegacyRouter::findPage('do=changepasswd', array(), true)
- );
- $this->assertEquals(
- LegacyRouter::$PAGE_CHANGEPASSWORD,
- LegacyRouter::findPage('do=changepasswd&stuff', array(), true)
- );
- }
-
- /**
- * Test findPage: changepasswd page output.
- * Invalid: page shouldn't be return.
- *
- * @return void
- */
- public function testFindPageChangepasswdInvalid()
- {
- $this->assertNotEquals(
- LegacyRouter::$PAGE_CHANGEPASSWORD,
- LegacyRouter::findPage('do=changepasswd', array(), 1)
- );
-
- $this->assertNotEquals(
- LegacyRouter::$PAGE_CHANGEPASSWORD,
- LegacyRouter::findPage('do=changepasswd', array(), false)
- );
-
- $this->assertNotEquals(
- LegacyRouter::$PAGE_CHANGEPASSWORD,
- LegacyRouter::findPage('do=other', array(), true)
- );
- }
- /**
- * Test findPage: configure page output.
- * Valid: page should be return.
- *
- * @return void
- */
- public function testFindPageConfigureValid()
- {
- $this->assertEquals(
- LegacyRouter::$PAGE_CONFIGURE,
- LegacyRouter::findPage('do=configure', array(), true)
- );
-
- $this->assertEquals(
- LegacyRouter::$PAGE_CONFIGURE,
- LegacyRouter::findPage('do=configure&stuff', array(), true)
- );
- }
-
- /**
- * Test findPage: configure page output.
- * Invalid: page shouldn't be return.
- *
- * @return void
- */
- public function testFindPageConfigureInvalid()
- {
- $this->assertNotEquals(
- LegacyRouter::$PAGE_CONFIGURE,
- LegacyRouter::findPage('do=configure', array(), 1)
- );
-
- $this->assertNotEquals(
- LegacyRouter::$PAGE_CONFIGURE,
- LegacyRouter::findPage('do=configure', array(), false)
- );
-
- $this->assertNotEquals(
- LegacyRouter::$PAGE_CONFIGURE,
- LegacyRouter::findPage('do=other', array(), true)
- );
- }
-
- /**
- * Test findPage: changetag page output.
- * Valid: page should be return.
- *
- * @return void
- */
- public function testFindPageChangetagValid()
- {
- $this->assertEquals(
- LegacyRouter::$PAGE_CHANGETAG,
- LegacyRouter::findPage('do=changetag', array(), true)
- );
-
- $this->assertEquals(
- LegacyRouter::$PAGE_CHANGETAG,
- LegacyRouter::findPage('do=changetag&stuff', array(), true)
- );
- }
-
- /**
- * Test findPage: changetag page output.
- * Invalid: page shouldn't be return.
- *
- * @return void
- */
- public function testFindPageChangetagInvalid()
- {
- $this->assertNotEquals(
- LegacyRouter::$PAGE_CHANGETAG,
- LegacyRouter::findPage('do=changetag', array(), 1)
- );
-
- $this->assertNotEquals(
- LegacyRouter::$PAGE_CHANGETAG,
- LegacyRouter::findPage('do=changetag', array(), false)
- );
-
- $this->assertNotEquals(
- LegacyRouter::$PAGE_CHANGETAG,
- LegacyRouter::findPage('do=other', array(), true)
- );
- }
-
- /**
- * Test findPage: addlink page output.
- * Valid: page should be return.
- *
- * @return void
- */
- public function testFindPageAddlinkValid()
- {
- $this->assertEquals(
- LegacyRouter::$PAGE_ADDLINK,
- LegacyRouter::findPage('do=addlink', array(), true)
- );
-
- $this->assertEquals(
- LegacyRouter::$PAGE_ADDLINK,
- LegacyRouter::findPage('do=addlink&stuff', array(), true)
- );
- }
-
- /**
- * Test findPage: addlink page output.
- * Invalid: page shouldn't be return.
- *
- * @return void
- */
- public function testFindPageAddlinkInvalid()
- {
- $this->assertNotEquals(
- LegacyRouter::$PAGE_ADDLINK,
- LegacyRouter::findPage('do=addlink', array(), 1)
- );
-
- $this->assertNotEquals(
- LegacyRouter::$PAGE_ADDLINK,
- LegacyRouter::findPage('do=addlink', array(), false)
- );
-
- $this->assertNotEquals(
- LegacyRouter::$PAGE_ADDLINK,
- LegacyRouter::findPage('do=other', array(), true)
- );
- }
-
- /**
- * Test findPage: export page output.
- * Valid: page should be return.
- *
- * @return void
- */
- public function testFindPageExportValid()
- {
- $this->assertEquals(
- LegacyRouter::$PAGE_EXPORT,
- LegacyRouter::findPage('do=export', array(), true)
- );
-
- $this->assertEquals(
- LegacyRouter::$PAGE_EXPORT,
- LegacyRouter::findPage('do=export&stuff', array(), true)
- );
- }
-
- /**
- * Test findPage: export page output.
- * Invalid: page shouldn't be return.
- *
- * @return void
- */
- public function testFindPageExportInvalid()
- {
- $this->assertNotEquals(
- LegacyRouter::$PAGE_EXPORT,
- LegacyRouter::findPage('do=export', array(), 1)
- );
-
- $this->assertNotEquals(
- LegacyRouter::$PAGE_EXPORT,
- LegacyRouter::findPage('do=export', array(), false)
- );
-
- $this->assertNotEquals(
- LegacyRouter::$PAGE_EXPORT,
- LegacyRouter::findPage('do=other', array(), true)
- );
- }
-
- /**
- * Test findPage: import page output.
- * Valid: page should be return.
- *
- * @return void
- */
- public function testFindPageImportValid()
- {
- $this->assertEquals(
- LegacyRouter::$PAGE_IMPORT,
- LegacyRouter::findPage('do=import', array(), true)
- );
-
- $this->assertEquals(
- LegacyRouter::$PAGE_IMPORT,
- LegacyRouter::findPage('do=import&stuff', array(), true)
- );
- }
-
- /**
- * Test findPage: import page output.
- * Invalid: page shouldn't be return.
- *
- * @return void
- */
- public function testFindPageImportInvalid()
- {
- $this->assertNotEquals(
- LegacyRouter::$PAGE_IMPORT,
- LegacyRouter::findPage('do=import', array(), 1)
- );
-
- $this->assertNotEquals(
- LegacyRouter::$PAGE_IMPORT,
- LegacyRouter::findPage('do=import', array(), false)
- );
-
- $this->assertNotEquals(
- LegacyRouter::$PAGE_IMPORT,
- LegacyRouter::findPage('do=other', array(), true)
- );
- }
-
- /**
- * Test findPage: editlink page output.
- * Valid: page should be return.
- *
- * @return void
- */
- public function testFindPageEditlinkValid()
- {
- $this->assertEquals(
- LegacyRouter::$PAGE_EDITLINK,
- LegacyRouter::findPage('whatever', array('edit_link' => 1), true)
- );
-
- $this->assertEquals(
- LegacyRouter::$PAGE_EDITLINK,
- LegacyRouter::findPage('', array('edit_link' => 1), true)
- );
-
-
- $this->assertEquals(
- LegacyRouter::$PAGE_EDITLINK,
- LegacyRouter::findPage('whatever', array('post' => 1), true)
- );
-
- $this->assertEquals(
- LegacyRouter::$PAGE_EDITLINK,
- LegacyRouter::findPage('whatever', array('post' => 1, 'edit_link' => 1), true)
- );
- }
-
- /**
- * Test findPage: editlink page output.
- * Invalid: page shouldn't be return.
- *
- * @return void
- */
- public function testFindPageEditlinkInvalid()
- {
- $this->assertNotEquals(
- LegacyRouter::$PAGE_EDITLINK,
- LegacyRouter::findPage('whatever', array('edit_link' => 1), false)
- );
-
- $this->assertNotEquals(
- LegacyRouter::$PAGE_EDITLINK,
- LegacyRouter::findPage('whatever', array('edit_link' => 1), 1)
- );
-
- $this->assertNotEquals(
- LegacyRouter::$PAGE_EDITLINK,
- LegacyRouter::findPage('whatever', array(), true)
- );
- }
-}
namespace Shaarli\Plugin\DefaultColors;
-use DateTime;
use PHPUnit\Framework\TestCase;
use Shaarli\Bookmark\LinkDB;
use Shaarli\Config\ConfigManager;
$conf->set('plugins.DEFAULT_COLORS_BACKGROUND', 'value');
$errors = default_colors_init($conf);
$this->assertEmpty($errors);
+
+ $this->assertFileExists($file = 'sandbox/default_colors/default_colors.css');
}
/**
/**
* Test the save plugin parameters hook with all colors specified.
*/
- public function testSavePluginParametersAll()
+ public function testGenerateCssFile()
{
- $post = [
+ $params = [
'other1' => true,
'DEFAULT_COLORS_MAIN' => 'blue',
'DEFAULT_COLORS_BACKGROUND' => 'pink',
'DEFAULT_COLORS_DARK_MAIN' => 'green',
];
- hook_default_colors_save_plugin_parameters($post);
+ default_colors_generate_css_file($params);
$this->assertFileExists($file = 'sandbox/default_colors/default_colors.css');
$content = file_get_contents($file);
$expected = ':root {
/**
* Test the save plugin parameters hook with only one color specified.
*/
- public function testSavePluginParametersSingle()
+ public function testGenerateCssFileSingle()
{
- $post = [
+ $params = [
'other1' => true,
'DEFAULT_COLORS_BACKGROUND' => 'pink',
'other2' => ['yep'],
'DEFAULT_COLORS_DARK_MAIN' => '',
];
- hook_default_colors_save_plugin_parameters($post);
+ default_colors_generate_css_file($params);
$this->assertFileExists($file = 'sandbox/default_colors/default_colors.css');
$content = file_get_contents($file);
$expected = ':root {
/**
* Test the save plugin parameters hook with no color specified.
*/
- public function testSavePluginParametersNone()
+ public function testGenerateCssFileNone()
{
- hook_default_colors_save_plugin_parameters([]);
+ default_colors_generate_css_file([]);
$this->assertFileNotExists($file = 'sandbox/default_colors/default_colors.css');
}
<i class="fa fa-trash" aria-hidden="true"></i>
</a>
·
- <a href="{$base_path}/admin/shaare/{$value.id}" aria-label="{$strEdit}" title="{$strEdit}"><i class="fa fa-pencil-square-o edit-link" aria-hidden="true"></i></a>
+ <a href="{$base_path}/admin/shaare/{$value.id}" aria-label="{$strEdit}" title="{$strEdit}">
+ <i class="fa fa-pencil-square-o edit-link" aria-hidden="true"></i>
+ </a>
+ ·
+ <a href="{$base_path}/admin/shaare/{$value.id}/pin?token={$token}"
+ aria-label="{$strToggleSticky}"
+ title="{$strToggleSticky}"
+ class="pin-link {if="$value.sticky"}pinned-link{/if}"
+ >
+ <i class="fa fa-thumb-tack" aria-hidden="true"></i>
+ </a>
{/if}
</div>
</div>
<div class="linksperpage pure-u-1-3">
<div class="pure-u-0 pure-u-lg-visible">{'Links per page'|t}</div>
- <a href="{$base_path}/links-per-page?nb=20">20</a>
- <a href="{$base_path}/links-per-page?nb=50">50</a>
- <a href="{$base_path}/links-per-page?nb=100">100</a>
+ <a href="{$base_path}/links-per-page?nb=20"
+ {if="$links_per_page == 20"}class="selected"{/if}>20</a>
+ <a href="{$base_path}/links-per-page?nb=50"
+ {if="$links_per_page == 50"}class="selected"{/if}>50</a>
+ <a href="{$base_path}/links-per-page?nb=100"
+ {if="$links_per_page == 100"}class="selected"{/if}>100</a>
<form method="GET" class="pure-u-0 pure-u-lg-visible" action="{$base_path}/links-per-page">
- <input type="text" name="nb" placeholder="133">
+ <input type="text" name="nb" placeholder="133"
+ {if="$links_per_page != 20 && $links_per_page != 50 && $links_per_page != 100"}
+ value="{$links_per_page}"{/if}>
</form>
<a href="#" class="filter-off fold-all pure-u-0 pure-u-lg-visible" aria-label="{'Fold all'|t}" title="{'Fold all'|t}">
<i class="fa fa-chevron-up" aria-hidden="true"></i>
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
-lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.3.0, lodash@~4.17.10:
- version "4.17.19"
- resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
- integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
+lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.3.0, lodash@~4.17.10:
+ version "4.17.20"
+ resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
+ integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
longest@^1.0.1:
version "1.0.1"
semver "^5.3.0"
tar "^4"
-node-sass@^4.12.0:
- version "4.12.0"
- resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.12.0.tgz#0914f531932380114a30cc5fa4fa63233a25f017"
- integrity sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==
+node-sass@^4.13.1:
+ version "4.13.1"
+ resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.13.1.tgz#9db5689696bb2eec2c32b98bfea4c7a2e992d0a3"
+ integrity sha512-TTWFx+ZhyDx1Biiez2nB0L3YrCZ/8oHagaDalbuBSlqXgUPsdkUSzJsVxeDO9LtPB49+Fh3WQl3slABo6AotNw==
dependencies:
async-foreach "^0.1.3"
chalk "^1.1.1"
get-stdin "^4.0.1"
glob "^7.0.3"
in-publish "^2.0.0"
- lodash "^4.17.11"
+ lodash "^4.17.15"
meow "^3.7.0"
mkdirp "^0.5.1"
nan "^2.13.2"
projects / github / shaarli / Shaarli.git / commitdiff
