mirror of
https://github.com/wallabag/wallabag.git
synced 2025-08-26 18:21:02 +00:00
Rename wallabag_core to wallabag
This commit is contained in:
parent
0b44170e83
commit
74a98aaae2
29 changed files with 185 additions and 185 deletions
|
@ -525,7 +525,7 @@ class EntryRestController extends WallabagRestController
|
|||
|
||||
$urls = json_decode($request->query->get('urls', []));
|
||||
|
||||
$limit = $this->getParameter('wallabag_core.api_limit_mass_actions');
|
||||
$limit = $this->getParameter('wallabag.api_limit_mass_actions');
|
||||
|
||||
if (\count($urls) > $limit) {
|
||||
throw new HttpException(400, 'API limit reached');
|
||||
|
@ -1044,7 +1044,7 @@ class EntryRestController extends WallabagRestController
|
|||
}
|
||||
|
||||
// if refreshing entry failed, don't save it
|
||||
if ($this->getParameter('wallabag_core.fetching_error_message') === $entry->getContent()) {
|
||||
if ($this->getParameter('wallabag.fetching_error_message') === $entry->getContent()) {
|
||||
return new JsonResponse([], 304);
|
||||
}
|
||||
|
||||
|
|
|
@ -61,7 +61,7 @@ class WallabagRestController extends AbstractFOSRestController
|
|||
*/
|
||||
public function getVersionAction()
|
||||
{
|
||||
$version = $this->getParameter('wallabag_core.version');
|
||||
$version = $this->getParameter('wallabag.version');
|
||||
$json = $this->serializer->serialize($version, 'json');
|
||||
|
||||
return (new JsonResponse())->setJson($json);
|
||||
|
@ -85,7 +85,7 @@ class WallabagRestController extends AbstractFOSRestController
|
|||
public function getInfoAction(Config $craueConfig)
|
||||
{
|
||||
$info = new ApplicationInfo(
|
||||
$this->getParameter('wallabag_core.version'),
|
||||
$this->getParameter('wallabag.version'),
|
||||
$this->getParameter('fosuser_registration') && $craueConfig->get('api_user_registration'),
|
||||
);
|
||||
|
||||
|
|
|
@ -410,7 +410,7 @@ class EntryController extends AbstractController
|
|||
$this->updateEntry($entry, 'entry_reloaded');
|
||||
|
||||
// if refreshing entry failed, don't save it
|
||||
if ($this->getParameter('wallabag_core.fetching_error_message') === $entry->getContent()) {
|
||||
if ($this->getParameter('wallabag.fetching_error_message') === $entry->getContent()) {
|
||||
$this->addFlash('notice', 'flashes.entry.notice.entry_reloaded_failed');
|
||||
|
||||
return $this->redirect($this->generateUrl('view', ['id' => $entry->getId()]));
|
||||
|
|
|
@ -128,7 +128,7 @@ class FeedController extends AbstractController
|
|||
$user
|
||||
);
|
||||
|
||||
$perPage = $user->getConfig()->getFeedLimit() ?: $this->getParameter('wallabag_core.feed_limit');
|
||||
$perPage = $user->getConfig()->getFeedLimit() ?: $this->getParameter('wallabag.feed_limit');
|
||||
$entries->setMaxPerPage($perPage);
|
||||
|
||||
if (null === $entries) {
|
||||
|
@ -151,7 +151,7 @@ class FeedController extends AbstractController
|
|||
'entries' => $entries,
|
||||
'user' => $user->getUsername(),
|
||||
'domainName' => $this->getParameter('domain_name'),
|
||||
'version' => $this->getParameter('wallabag_core.version'),
|
||||
'version' => $this->getParameter('wallabag.version'),
|
||||
'tag' => $tag->getSlug(),
|
||||
'updated' => $this->prepareFeedUpdatedDate($entries, $sort),
|
||||
],
|
||||
|
@ -206,7 +206,7 @@ class FeedController extends AbstractController
|
|||
$pagerAdapter = new DoctrineORMAdapter($qb->getQuery(), true, false);
|
||||
$entries = new Pagerfanta($pagerAdapter);
|
||||
|
||||
$perPage = $user->getConfig()->getFeedLimit() ?: $this->getParameter('wallabag_core.feed_limit');
|
||||
$perPage = $user->getConfig()->getFeedLimit() ?: $this->getParameter('wallabag.feed_limit');
|
||||
$entries->setMaxPerPage($perPage);
|
||||
|
||||
$url = $this->generateUrl(
|
||||
|
@ -232,7 +232,7 @@ class FeedController extends AbstractController
|
|||
'entries' => $entries,
|
||||
'user' => $user->getUsername(),
|
||||
'domainName' => $this->getParameter('domain_name'),
|
||||
'version' => $this->getParameter('wallabag_core.version'),
|
||||
'version' => $this->getParameter('wallabag.version'),
|
||||
'updated' => $this->prepareFeedUpdatedDate($entries),
|
||||
], new Response('', 200, ['Content-Type' => 'application/atom+xml']));
|
||||
}
|
||||
|
|
|
@ -30,9 +30,9 @@ abstract class BrowserController extends AbstractController
|
|||
$markAsRead = $form->get('mark_as_read')->getData();
|
||||
$name = $this->getUser()->getId() . '.json';
|
||||
|
||||
if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) {
|
||||
if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag.resource_dir'), $name)) {
|
||||
$res = $wallabag
|
||||
->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name)
|
||||
->setFilepath($this->getParameter('wallabag.resource_dir') . '/' . $name)
|
||||
->setMarkAsRead($markAsRead)
|
||||
->import();
|
||||
|
||||
|
@ -51,7 +51,7 @@ abstract class BrowserController extends AbstractController
|
|||
]);
|
||||
}
|
||||
|
||||
unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name);
|
||||
unlink($this->getParameter('wallabag.resource_dir') . '/' . $name);
|
||||
}
|
||||
|
||||
$this->addFlash('notice', $message);
|
||||
|
|
|
@ -44,9 +44,9 @@ class DeliciousController extends AbstractController
|
|||
$markAsRead = $form->get('mark_as_read')->getData();
|
||||
$name = 'delicious_' . $this->getUser()->getId() . '.json';
|
||||
|
||||
if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) {
|
||||
if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag.resource_dir'), $name)) {
|
||||
$res = $delicious
|
||||
->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name)
|
||||
->setFilepath($this->getParameter('wallabag.resource_dir') . '/' . $name)
|
||||
->setMarkAsRead($markAsRead)
|
||||
->import();
|
||||
|
||||
|
@ -65,7 +65,7 @@ class DeliciousController extends AbstractController
|
|||
]);
|
||||
}
|
||||
|
||||
unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name);
|
||||
unlink($this->getParameter('wallabag.resource_dir') . '/' . $name);
|
||||
}
|
||||
|
||||
$this->addFlash('notice', $message);
|
||||
|
|
|
@ -30,9 +30,9 @@ abstract class HtmlController extends AbstractController
|
|||
$markAsRead = $form->get('mark_as_read')->getData();
|
||||
$name = $this->getUser()->getId() . '.html';
|
||||
|
||||
if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) {
|
||||
if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag.resource_dir'), $name)) {
|
||||
$res = $wallabag
|
||||
->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name)
|
||||
->setFilepath($this->getParameter('wallabag.resource_dir') . '/' . $name)
|
||||
->setMarkAsRead($markAsRead)
|
||||
->import();
|
||||
|
||||
|
@ -51,7 +51,7 @@ abstract class HtmlController extends AbstractController
|
|||
]);
|
||||
}
|
||||
|
||||
unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name);
|
||||
unlink($this->getParameter('wallabag.resource_dir') . '/' . $name);
|
||||
}
|
||||
|
||||
$this->addFlash('notice', $message);
|
||||
|
|
|
@ -44,9 +44,9 @@ class InstapaperController extends AbstractController
|
|||
$markAsRead = $form->get('mark_as_read')->getData();
|
||||
$name = 'instapaper_' . $this->getUser()->getId() . '.csv';
|
||||
|
||||
if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) {
|
||||
if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag.resource_dir'), $name)) {
|
||||
$res = $instapaper
|
||||
->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name)
|
||||
->setFilepath($this->getParameter('wallabag.resource_dir') . '/' . $name)
|
||||
->setMarkAsRead($markAsRead)
|
||||
->import();
|
||||
|
||||
|
@ -65,7 +65,7 @@ class InstapaperController extends AbstractController
|
|||
]);
|
||||
}
|
||||
|
||||
unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name);
|
||||
unlink($this->getParameter('wallabag.resource_dir') . '/' . $name);
|
||||
}
|
||||
|
||||
$this->addFlash('notice', $message);
|
||||
|
|
|
@ -44,9 +44,9 @@ class PinboardController extends AbstractController
|
|||
$markAsRead = $form->get('mark_as_read')->getData();
|
||||
$name = 'pinboard_' . $this->getUser()->getId() . '.json';
|
||||
|
||||
if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) {
|
||||
if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag.resource_dir'), $name)) {
|
||||
$res = $pinboard
|
||||
->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name)
|
||||
->setFilepath($this->getParameter('wallabag.resource_dir') . '/' . $name)
|
||||
->setMarkAsRead($markAsRead)
|
||||
->import();
|
||||
|
||||
|
@ -65,7 +65,7 @@ class PinboardController extends AbstractController
|
|||
]);
|
||||
}
|
||||
|
||||
unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name);
|
||||
unlink($this->getParameter('wallabag.resource_dir') . '/' . $name);
|
||||
}
|
||||
|
||||
$this->addFlash('notice', $message);
|
||||
|
|
|
@ -44,9 +44,9 @@ class ReadabilityController extends AbstractController
|
|||
$markAsRead = $form->get('mark_as_read')->getData();
|
||||
$name = 'readability_' . $this->getUser()->getId() . '.json';
|
||||
|
||||
if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) {
|
||||
if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag.resource_dir'), $name)) {
|
||||
$res = $readability
|
||||
->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name)
|
||||
->setFilepath($this->getParameter('wallabag.resource_dir') . '/' . $name)
|
||||
->setMarkAsRead($markAsRead)
|
||||
->import();
|
||||
|
||||
|
@ -65,7 +65,7 @@ class ReadabilityController extends AbstractController
|
|||
]);
|
||||
}
|
||||
|
||||
unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name);
|
||||
unlink($this->getParameter('wallabag.resource_dir') . '/' . $name);
|
||||
}
|
||||
|
||||
$this->addFlash('notice', $message);
|
||||
|
|
|
@ -33,9 +33,9 @@ abstract class WallabagController extends AbstractController
|
|||
$markAsRead = $form->get('mark_as_read')->getData();
|
||||
$name = $this->getUser()->getId() . '.json';
|
||||
|
||||
if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) {
|
||||
if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag.resource_dir'), $name)) {
|
||||
$res = $wallabag
|
||||
->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name)
|
||||
->setFilepath($this->getParameter('wallabag.resource_dir') . '/' . $name)
|
||||
->setMarkAsRead($markAsRead)
|
||||
->import();
|
||||
|
||||
|
@ -54,7 +54,7 @@ abstract class WallabagController extends AbstractController
|
|||
]);
|
||||
}
|
||||
|
||||
unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name);
|
||||
unlink($this->getParameter('wallabag.resource_dir') . '/' . $name);
|
||||
}
|
||||
|
||||
$this->addFlash('notice', $message);
|
||||
|
|
|
@ -29,8 +29,8 @@ class StaticController extends AbstractController
|
|||
return $this->render(
|
||||
'Static/about.html.twig',
|
||||
[
|
||||
'version' => $this->getParameter('wallabag_core.version'),
|
||||
'paypal_url' => $this->getParameter('wallabag_core.paypal_url'),
|
||||
'version' => $this->getParameter('wallabag.version'),
|
||||
'paypal_url' => $this->getParameter('wallabag.paypal_url'),
|
||||
]
|
||||
);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue