diff options
Diffstat (limited to 'application/front/controller/admin')
13 files changed, 27 insertions, 25 deletions
diff --git a/application/front/controller/admin/ConfigureController.php b/application/front/controller/admin/ConfigureController.php index 0ed7ad81..eb26ef21 100644 --- a/application/front/controller/admin/ConfigureController.php +++ b/application/front/controller/admin/ConfigureController.php | |||
@@ -51,7 +51,7 @@ class ConfigureController extends ShaarliAdminController | |||
51 | $this->assignView('languages', Languages::getAvailableLanguages()); | 51 | $this->assignView('languages', Languages::getAvailableLanguages()); |
52 | $this->assignView('gd_enabled', extension_loaded('gd')); | 52 | $this->assignView('gd_enabled', extension_loaded('gd')); |
53 | $this->assignView('thumbnails_mode', $this->container->conf->get('thumbnails.mode', Thumbnailer::MODE_NONE)); | 53 | $this->assignView('thumbnails_mode', $this->container->conf->get('thumbnails.mode', Thumbnailer::MODE_NONE)); |
54 | $this->assignView('pagetitle', t('Configure') .' - '. $this->container->conf->get('general.title', 'Shaarli')); | 54 | $this->assignView('pagetitle', t('Configure') . ' - ' . $this->container->conf->get('general.title', 'Shaarli')); |
55 | 55 | ||
56 | return $response->write($this->render(TemplatePage::CONFIGURE)); | 56 | return $response->write($this->render(TemplatePage::CONFIGURE)); |
57 | } | 57 | } |
@@ -95,12 +95,13 @@ class ConfigureController extends ShaarliAdminController | |||
95 | } | 95 | } |
96 | 96 | ||
97 | $thumbnailsMode = extension_loaded('gd') ? $request->getParam('enableThumbnails') : Thumbnailer::MODE_NONE; | 97 | $thumbnailsMode = extension_loaded('gd') ? $request->getParam('enableThumbnails') : Thumbnailer::MODE_NONE; |
98 | if ($thumbnailsMode !== Thumbnailer::MODE_NONE | 98 | if ( |
99 | $thumbnailsMode !== Thumbnailer::MODE_NONE | ||
99 | && $thumbnailsMode !== $this->container->conf->get('thumbnails.mode', Thumbnailer::MODE_NONE) | 100 | && $thumbnailsMode !== $this->container->conf->get('thumbnails.mode', Thumbnailer::MODE_NONE) |
100 | ) { | 101 | ) { |
101 | $this->saveWarningMessage( | 102 | $this->saveWarningMessage( |
102 | t('You have enabled or changed thumbnails mode.') . | 103 | t('You have enabled or changed thumbnails mode.') . |
103 | '<a href="'. $this->container->basePath .'/admin/thumbnails">' . t('Please synchronize them.') .'</a>' | 104 | '<a href="' . $this->container->basePath . '/admin/thumbnails">' . t('Please synchronize them.') . '</a>' |
104 | ); | 105 | ); |
105 | } | 106 | } |
106 | $this->container->conf->set('thumbnails.mode', $thumbnailsMode); | 107 | $this->container->conf->set('thumbnails.mode', $thumbnailsMode); |
diff --git a/application/front/controller/admin/ExportController.php b/application/front/controller/admin/ExportController.php index 2be957fa..f01d7e9b 100644 --- a/application/front/controller/admin/ExportController.php +++ b/application/front/controller/admin/ExportController.php | |||
@@ -23,7 +23,7 @@ class ExportController extends ShaarliAdminController | |||
23 | */ | 23 | */ |
24 | public function index(Request $request, Response $response): Response | 24 | public function index(Request $request, Response $response): Response |
25 | { | 25 | { |
26 | $this->assignView('pagetitle', t('Export') .' - '. $this->container->conf->get('general.title', 'Shaarli')); | 26 | $this->assignView('pagetitle', t('Export') . ' - ' . $this->container->conf->get('general.title', 'Shaarli')); |
27 | 27 | ||
28 | return $response->write($this->render(TemplatePage::EXPORT)); | 28 | return $response->write($this->render(TemplatePage::EXPORT)); |
29 | } | 29 | } |
@@ -68,7 +68,7 @@ class ExportController extends ShaarliAdminController | |||
68 | $response = $response->withHeader('Content-Type', 'text/html; charset=utf-8'); | 68 | $response = $response->withHeader('Content-Type', 'text/html; charset=utf-8'); |
69 | $response = $response->withHeader( | 69 | $response = $response->withHeader( |
70 | 'Content-disposition', | 70 | 'Content-disposition', |
71 | 'attachment; filename=bookmarks_'.$selection.'_'.$now->format(Bookmark::LINK_DATE_FORMAT).'.html' | 71 | 'attachment; filename=bookmarks_' . $selection . '_' . $now->format(Bookmark::LINK_DATE_FORMAT) . '.html' |
72 | ); | 72 | ); |
73 | 73 | ||
74 | $this->assignView('date', $now->format(DateTime::RFC822)); | 74 | $this->assignView('date', $now->format(DateTime::RFC822)); |
diff --git a/application/front/controller/admin/ImportController.php b/application/front/controller/admin/ImportController.php index 758d5ef9..c2ad6a09 100644 --- a/application/front/controller/admin/ImportController.php +++ b/application/front/controller/admin/ImportController.php | |||
@@ -38,7 +38,7 @@ class ImportController extends ShaarliAdminController | |||
38 | true | 38 | true |
39 | ) | 39 | ) |
40 | ); | 40 | ); |
41 | $this->assignView('pagetitle', t('Import') .' - '. $this->container->conf->get('general.title', 'Shaarli')); | 41 | $this->assignView('pagetitle', t('Import') . ' - ' . $this->container->conf->get('general.title', 'Shaarli')); |
42 | 42 | ||
43 | return $response->write($this->render(TemplatePage::IMPORT)); | 43 | return $response->write($this->render(TemplatePage::IMPORT)); |
44 | } | 44 | } |
@@ -64,7 +64,7 @@ class ImportController extends ShaarliAdminController | |||
64 | $msg = sprintf( | 64 | $msg = sprintf( |
65 | t( | 65 | t( |
66 | 'The file you are trying to upload is probably bigger than what this webserver can accept' | 66 | 'The file you are trying to upload is probably bigger than what this webserver can accept' |
67 | .' (%s). Please upload in smaller chunks.' | 67 | . ' (%s). Please upload in smaller chunks.' |
68 | ), | 68 | ), |
69 | get_max_upload_size(ini_get('post_max_size'), ini_get('upload_max_filesize')) | 69 | get_max_upload_size(ini_get('post_max_size'), ini_get('upload_max_filesize')) |
70 | ); | 70 | ); |
diff --git a/application/front/controller/admin/ManageTagController.php b/application/front/controller/admin/ManageTagController.php index 22fb461c..8675a0c5 100644 --- a/application/front/controller/admin/ManageTagController.php +++ b/application/front/controller/admin/ManageTagController.php | |||
@@ -32,7 +32,7 @@ class ManageTagController extends ShaarliAdminController | |||
32 | $this->assignView('tags_separator', $separator); | 32 | $this->assignView('tags_separator', $separator); |
33 | $this->assignView( | 33 | $this->assignView( |
34 | 'pagetitle', | 34 | 'pagetitle', |
35 | t('Manage tags') .' - '. $this->container->conf->get('general.title', 'Shaarli') | 35 | t('Manage tags') . ' - ' . $this->container->conf->get('general.title', 'Shaarli') |
36 | ); | 36 | ); |
37 | 37 | ||
38 | return $response->write($this->render(TemplatePage::CHANGE_TAG)); | 38 | return $response->write($this->render(TemplatePage::CHANGE_TAG)); |
@@ -87,7 +87,7 @@ class ManageTagController extends ShaarliAdminController | |||
87 | 87 | ||
88 | $this->saveSuccessMessage($alert); | 88 | $this->saveSuccessMessage($alert); |
89 | 89 | ||
90 | $redirect = true === $isDelete ? '/admin/tags' : '/?searchtags='. urlencode($toTag); | 90 | $redirect = true === $isDelete ? '/admin/tags' : '/?searchtags=' . urlencode($toTag); |
91 | 91 | ||
92 | return $this->redirect($response, $redirect); | 92 | return $this->redirect($response, $redirect); |
93 | } | 93 | } |
diff --git a/application/front/controller/admin/PasswordController.php b/application/front/controller/admin/PasswordController.php index 5ec0d24b..4aaf1f82 100644 --- a/application/front/controller/admin/PasswordController.php +++ b/application/front/controller/admin/PasswordController.php | |||
@@ -25,7 +25,7 @@ class PasswordController extends ShaarliAdminController | |||
25 | 25 | ||
26 | $this->assignView( | 26 | $this->assignView( |
27 | 'pagetitle', | 27 | 'pagetitle', |
28 | t('Change password') .' - '. $this->container->conf->get('general.title', 'Shaarli') | 28 | t('Change password') . ' - ' . $this->container->conf->get('general.title', 'Shaarli') |
29 | ); | 29 | ); |
30 | } | 30 | } |
31 | 31 | ||
@@ -78,7 +78,7 @@ class PasswordController extends ShaarliAdminController | |||
78 | 78 | ||
79 | // Save new password | 79 | // Save new password |
80 | // Salt renders rainbow-tables attacks useless. | 80 | // Salt renders rainbow-tables attacks useless. |
81 | $this->container->conf->set('credentials.salt', sha1(uniqid('', true) .'_'. mt_rand())); | 81 | $this->container->conf->set('credentials.salt', sha1(uniqid('', true) . '_' . mt_rand())); |
82 | $this->container->conf->set( | 82 | $this->container->conf->set( |
83 | 'credentials.hash', | 83 | 'credentials.hash', |
84 | sha1( | 84 | sha1( |
diff --git a/application/front/controller/admin/PluginsController.php b/application/front/controller/admin/PluginsController.php index 8e059681..ae47c1af 100644 --- a/application/front/controller/admin/PluginsController.php +++ b/application/front/controller/admin/PluginsController.php | |||
@@ -42,7 +42,7 @@ class PluginsController extends ShaarliAdminController | |||
42 | $this->assignView('disabledPlugins', $disabledPlugins); | 42 | $this->assignView('disabledPlugins', $disabledPlugins); |
43 | $this->assignView( | 43 | $this->assignView( |
44 | 'pagetitle', | 44 | 'pagetitle', |
45 | t('Plugin Administration') .' - '. $this->container->conf->get('general.title', 'Shaarli') | 45 | t('Plugin Administration') . ' - ' . $this->container->conf->get('general.title', 'Shaarli') |
46 | ); | 46 | ); |
47 | 47 | ||
48 | return $response->write($this->render(TemplatePage::PLUGINS_ADMIN)); | 48 | return $response->write($this->render(TemplatePage::PLUGINS_ADMIN)); |
@@ -64,7 +64,7 @@ class PluginsController extends ShaarliAdminController | |||
64 | unset($parameters['parameters_form']); | 64 | unset($parameters['parameters_form']); |
65 | unset($parameters['token']); | 65 | unset($parameters['token']); |
66 | foreach ($parameters as $param => $value) { | 66 | foreach ($parameters as $param => $value) { |
67 | $this->container->conf->set('plugins.'. $param, escape($value)); | 67 | $this->container->conf->set('plugins.' . $param, escape($value)); |
68 | } | 68 | } |
69 | } else { | 69 | } else { |
70 | $this->container->conf->set('general.enabled_plugins', save_plugin_config($parameters)); | 70 | $this->container->conf->set('general.enabled_plugins', save_plugin_config($parameters)); |
diff --git a/application/front/controller/admin/ServerController.php b/application/front/controller/admin/ServerController.php index bfc99422..80997940 100644 --- a/application/front/controller/admin/ServerController.php +++ b/application/front/controller/admin/ServerController.php | |||
@@ -65,7 +65,7 @@ class ServerController extends ShaarliAdminController | |||
65 | 65 | ||
66 | $this->saveWarningMessage( | 66 | $this->saveWarningMessage( |
67 | t('Thumbnails cache has been cleared.') . ' ' . | 67 | t('Thumbnails cache has been cleared.') . ' ' . |
68 | '<a href="'. $this->container->basePath .'/admin/thumbnails">' . t('Please synchronize them.') .'</a>' | 68 | '<a href="' . $this->container->basePath . '/admin/thumbnails">' . t('Please synchronize them.') . '</a>' |
69 | ); | 69 | ); |
70 | } else { | 70 | } else { |
71 | $folders = [ | 71 | $folders = [ |
diff --git a/application/front/controller/admin/SessionFilterController.php b/application/front/controller/admin/SessionFilterController.php index d9a7a2e0..0917b6d2 100644 --- a/application/front/controller/admin/SessionFilterController.php +++ b/application/front/controller/admin/SessionFilterController.php | |||
@@ -45,6 +45,4 @@ class SessionFilterController extends ShaarliAdminController | |||
45 | 45 | ||
46 | return $this->redirectFromReferer($request, $response, ['visibility']); | 46 | return $this->redirectFromReferer($request, $response, ['visibility']); |
47 | } | 47 | } |
48 | |||
49 | |||
50 | } | 48 | } |
diff --git a/application/front/controller/admin/ShaareAddController.php b/application/front/controller/admin/ShaareAddController.php index 8dc386b2..ab8e7f40 100644 --- a/application/front/controller/admin/ShaareAddController.php +++ b/application/front/controller/admin/ShaareAddController.php | |||
@@ -23,7 +23,7 @@ class ShaareAddController extends ShaarliAdminController | |||
23 | 23 | ||
24 | $this->assignView( | 24 | $this->assignView( |
25 | 'pagetitle', | 25 | 'pagetitle', |
26 | t('Shaare a new link') .' - '. $this->container->conf->get('general.title', 'Shaarli') | 26 | t('Shaare a new link') . ' - ' . $this->container->conf->get('general.title', 'Shaarli') |
27 | ); | 27 | ); |
28 | $this->assignView('tags', $tags); | 28 | $this->assignView('tags', $tags); |
29 | $this->assignView('default_private_links', $this->container->conf->get('privacy.default_private_links', false)); | 29 | $this->assignView('default_private_links', $this->container->conf->get('privacy.default_private_links', false)); |
diff --git a/application/front/controller/admin/ShaareManageController.php b/application/front/controller/admin/ShaareManageController.php index 0b143172..35837baa 100644 --- a/application/front/controller/admin/ShaareManageController.php +++ b/application/front/controller/admin/ShaareManageController.php | |||
@@ -54,7 +54,7 @@ class ShaareManageController extends ShaarliAdminController | |||
54 | $data = $formatter->format($bookmark); | 54 | $data = $formatter->format($bookmark); |
55 | $this->executePageHooks('delete_link', $data); | 55 | $this->executePageHooks('delete_link', $data); |
56 | $this->container->bookmarkService->remove($bookmark, false); | 56 | $this->container->bookmarkService->remove($bookmark, false); |
57 | ++ $count; | 57 | ++$count; |
58 | } | 58 | } |
59 | 59 | ||
60 | if ($count > 0) { | 60 | if ($count > 0) { |
diff --git a/application/front/controller/admin/ShaarePublishController.php b/application/front/controller/admin/ShaarePublishController.php index 625a5680..4cbfcdc5 100644 --- a/application/front/controller/admin/ShaarePublishController.php +++ b/application/front/controller/admin/ShaarePublishController.php | |||
@@ -118,7 +118,8 @@ class ShaarePublishController extends ShaarliAdminController | |||
118 | $this->container->conf->get('general.tags_separator', ' ') | 118 | $this->container->conf->get('general.tags_separator', ' ') |
119 | ); | 119 | ); |
120 | 120 | ||
121 | if ($this->container->conf->get('thumbnails.mode', Thumbnailer::MODE_NONE) !== Thumbnailer::MODE_NONE | 121 | if ( |
122 | $this->container->conf->get('thumbnails.mode', Thumbnailer::MODE_NONE) !== Thumbnailer::MODE_NONE | ||
122 | && true !== $this->container->conf->get('general.enable_async_metadata', true) | 123 | && true !== $this->container->conf->get('general.enable_async_metadata', true) |
123 | && $bookmark->shouldUpdateThumbnail() | 124 | && $bookmark->shouldUpdateThumbnail() |
124 | ) { | 125 | ) { |
@@ -148,7 +149,8 @@ class ShaarePublishController extends ShaarliAdminController | |||
148 | return $this->redirectFromReferer( | 149 | return $this->redirectFromReferer( |
149 | $request, | 150 | $request, |
150 | $response, | 151 | $response, |
151 | ['/admin/add-shaare', '/admin/shaare'], ['addlink', 'post', 'edit_link'], | 152 | ['/admin/add-shaare', '/admin/shaare'], |
153 | ['addlink', 'post', 'edit_link'], | ||
152 | $bookmark->getShortUrl() | 154 | $bookmark->getShortUrl() |
153 | ); | 155 | ); |
154 | } | 156 | } |
@@ -168,10 +170,10 @@ class ShaarePublishController extends ShaarliAdminController | |||
168 | $this->assignView($key, $value); | 170 | $this->assignView($key, $value); |
169 | } | 171 | } |
170 | 172 | ||
171 | $editLabel = false === $isNew ? t('Edit') .' ' : ''; | 173 | $editLabel = false === $isNew ? t('Edit') . ' ' : ''; |
172 | $this->assignView( | 174 | $this->assignView( |
173 | 'pagetitle', | 175 | 'pagetitle', |
174 | $editLabel . t('Shaare') .' - '. $this->container->conf->get('general.title', 'Shaarli') | 176 | $editLabel . t('Shaare') . ' - ' . $this->container->conf->get('general.title', 'Shaarli') |
175 | ); | 177 | ); |
176 | 178 | ||
177 | return $response->write($this->render(TemplatePage::EDIT_LINK)); | 179 | return $response->write($this->render(TemplatePage::EDIT_LINK)); |
@@ -194,7 +196,8 @@ class ShaarePublishController extends ShaarliAdminController | |||
194 | 196 | ||
195 | // If this is an HTTP(S) link, we try go get the page to extract | 197 | // If this is an HTTP(S) link, we try go get the page to extract |
196 | // the title (otherwise we will to straight to the edit form.) | 198 | // the title (otherwise we will to straight to the edit form.) |
197 | if (true !== $this->container->conf->get('general.enable_async_metadata', true) | 199 | if ( |
200 | true !== $this->container->conf->get('general.enable_async_metadata', true) | ||
198 | && empty($title) | 201 | && empty($title) |
199 | && strpos(get_url_scheme($url) ?: '', 'http') !== false | 202 | && strpos(get_url_scheme($url) ?: '', 'http') !== false |
200 | ) { | 203 | ) { |
diff --git a/application/front/controller/admin/ThumbnailsController.php b/application/front/controller/admin/ThumbnailsController.php index 4dc09d38..94d97d4b 100644 --- a/application/front/controller/admin/ThumbnailsController.php +++ b/application/front/controller/admin/ThumbnailsController.php | |||
@@ -34,7 +34,7 @@ class ThumbnailsController extends ShaarliAdminController | |||
34 | $this->assignView('ids', $ids); | 34 | $this->assignView('ids', $ids); |
35 | $this->assignView( | 35 | $this->assignView( |
36 | 'pagetitle', | 36 | 'pagetitle', |
37 | t('Thumbnails update') .' - '. $this->container->conf->get('general.title', 'Shaarli') | 37 | t('Thumbnails update') . ' - ' . $this->container->conf->get('general.title', 'Shaarli') |
38 | ); | 38 | ); |
39 | 39 | ||
40 | return $response->write($this->render(TemplatePage::THUMBNAILS)); | 40 | return $response->write($this->render(TemplatePage::THUMBNAILS)); |
diff --git a/application/front/controller/admin/ToolsController.php b/application/front/controller/admin/ToolsController.php index a87f20d2..560e5e3e 100644 --- a/application/front/controller/admin/ToolsController.php +++ b/application/front/controller/admin/ToolsController.php | |||
@@ -28,7 +28,7 @@ class ToolsController extends ShaarliAdminController | |||
28 | $this->assignView($key, $value); | 28 | $this->assignView($key, $value); |
29 | } | 29 | } |
30 | 30 | ||
31 | $this->assignView('pagetitle', t('Tools') .' - '. $this->container->conf->get('general.title', 'Shaarli')); | 31 | $this->assignView('pagetitle', t('Tools') . ' - ' . $this->container->conf->get('general.title', 'Shaarli')); |
32 | 32 | ||
33 | return $response->write($this->render(TemplatePage::TOOLS)); | 33 | return $response->write($this->render(TemplatePage::TOOLS)); |
34 | } | 34 | } |