diff --git a/.env b/.env
index 28edf71..6737c6d 100644
--- a/.env
+++ b/.env
@@ -63,8 +63,4 @@ APP_YGGDRASIL=1
APP_TRACKERS=http://[201:23b4:991a:634d:8359:4521:5576:15b7]:2023/announce|http://[200:1e2f:e608:eb3a:2bf:1e62:87ba:e2f7]/announce|http://[316:c51a:62a3:8b9::5]/announce
-APP_ARTICLE_TITLE_LENGTH_MIN=10
-APP_ARTICLE_TITLE_LENGTH_MAX=255
-APP_ARTICLE_DESCRIPTION_LENGTH_MIN=0
-APP_ARTICLE_DESCRIPTION_LENGTH_MAX=10000
APP_TORRENT_FILE_SIZE_MAX=1024000
\ No newline at end of file
diff --git a/config/services.yaml b/config/services.yaml
index 45ceb5b..4831621 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -15,10 +15,6 @@ parameters:
app.sensitive: '%env(APP_SENSITIVE)%'
app.approved: '%env(APP_APPROVED)%'
app.yggdrasil: '%env(APP_YGGDRASIL)%'
- app.article.title.length.min: '%env(APP_ARTICLE_TITLE_LENGTH_MIN)%'
- app.article.title.length.max: '%env(APP_ARTICLE_TITLE_LENGTH_MAX)%'
- app.article.description.length.min: '%env(APP_ARTICLE_DESCRIPTION_LENGTH_MIN)%'
- app.article.description.length.max: '%env(APP_ARTICLE_DESCRIPTION_LENGTH_MAX)%'
app.torrent.size.max: '%env(APP_TORRENT_FILE_SIZE_MAX)%'
services:
diff --git a/src/Controller/ActivityController.php b/src/Controller/ActivityController.php
index 7664ea2..7a65eea 100644
--- a/src/Controller/ActivityController.php
+++ b/src/Controller/ActivityController.php
@@ -10,7 +10,6 @@ use Symfony\Component\HttpFoundation\Request;
use App\Service\ActivityService;
use App\Service\UserService;
-use App\Service\ArticleService;
use App\Service\TorrentService;
class ActivityController extends AbstractController
@@ -63,7 +62,6 @@ class ActivityController extends AbstractController
$activity,
ActivityService $activityService,
UserService $userService,
- ArticleService $articleService,
TorrentService $torrentService,
): Response
{
diff --git a/src/Controller/ArticleController.php b/src/Controller/ArticleController.php
deleted file mode 100644
index cac30ae..0000000
--- a/src/Controller/ArticleController.php
+++ /dev/null
@@ -1,281 +0,0 @@
- '\d+'
- ],
- methods:
- [
- 'GET'
- ]
- )]
- public function info(
- Request $request,
- UserService $userService,
- ActivityService $activityService
- ): Response
- {
- // Init user
- $user = $this->initUser(
- $request,
- $userService,
- $activityService
- );
-
- return $this->render('default/article/info.html.twig', [
- 'title' => 'test'
- ]);
- }
-
- #[Route(
- '/{_locale}/submit/article',
- name: 'article_submit',
- methods:
- [
- 'GET',
- 'POST'
- ]
- )]
- public function submit(
- Request $request,
- TranslatorInterface $translator,
- UserService $userService,
- ArticleService $articleService,
- ArticleService $torrentService,
- ActivityService $activityService
- ): Response
- {
- // Init user
- $user = $this->initUser(
- $request,
- $userService,
- $activityService
- );
-
- if (!$user->isStatus())
- {
- // @TODO
- throw new \Exception(
- $translator->trans('Access denied')
- );
- }
-
- // Init form
- $form =
- [
- 'locale' =>
- [
- 'error' => [],
- 'attribute' =>
- [
- 'value' => $request->get('_locale'),
- 'placeholder' => $translator->trans('Content language')
- ]
- ],
- 'title' =>
- [
- 'error' => [],
- 'attribute' =>
- [
- 'value' => $request->get('title'),
- 'minlength' => $this->getParameter('app.article.title.length.min'),
- 'maxlength' => $this->getParameter('app.article.title.length.max'),
- 'placeholder' => sprintf(
- $translator->trans('Article title (%s-%s chars)'),
- number_format($this->getParameter('app.article.title.length.min')),
- number_format($this->getParameter('app.article.title.length.max'))
- ),
- ]
- ],
- 'description' =>
- [
- 'error' => [],
- 'attribute' =>
- [
- 'value' => $request->get('description'),
- 'minlength' => $this->getParameter('app.article.description.length.min'),
- 'maxlength' => $this->getParameter('app.article.description.length.max'),
- 'placeholder' => sprintf(
- $translator->trans('Article description (%s-%s chars)'),
- number_format($this->getParameter('app.article.description.length.min')),
- number_format($this->getParameter('app.article.description.length.max'))
- ),
- ]
- ],
- 'torrents' =>
- [
- 'error' => [],
- 'attribute' =>
- [
- 'placeholder' => $translator->trans('Select torrent file')
- ]
- ],
- 'sensitive' =>
- [
- 'error' => [],
- 'attribute' =>
- [
- 'value' => $request->get('sensitive'),
- 'placeholder' => $translator->trans('Apply sensitive filters to publication'),
- ]
- ]
- ];
-
- // Process request
- if ($request->isMethod('post'))
- {
- /// Locale
- if (!in_array($request->get('locale'), explode('|', $this->getParameter('app.locales'))))
- {
- $form['locale']['error'][] = $translator->trans('Requested locale not supported');
- }
-
- /// Title
- if (mb_strlen($request->get('title')) < $this->getParameter('app.article.title.length.min') ||
- mb_strlen($request->get('title')) > $this->getParameter('app.article.title.length.max'))
- {
- $form['title']['error'][] = sprintf(
- $translator->trans('Article title out of %s-%s chars'),
- number_format($this->getParameter('app.article.title.length.min')),
- number_format($this->getParameter('app.article.title.length.max'))
- );
- }
-
- /// Description
- if (mb_strlen($request->get('description')) < $this->getParameter('app.article.description.length.min') ||
- mb_strlen($request->get('description')) > $this->getParameter('app.article.description.length.max'))
- {
- $form['description']['error'][] = sprintf(
- $translator->trans('Article description out of %s-%s chars'),
- number_format($this->getParameter('app.article.description.length.min')),
- number_format($this->getParameter('app.article.description.length.max'))
- );
- }
-
- /// Torrents
- $torrents = [];
-
- if ($files = $request->files->get('torrents'))
- {
- foreach ($files as $file)
- {
- /// Torrent
- if ($file = $request->files->get('torrent'))
- {
- //// Validate torrent file
- if (filesize($file->getPathName()) > $this->getParameter('app.torrent.size.max'))
- {
- $form['torrents']['error'][] = $translator->trans('Torrent file out of size limit');
-
- continue;
- }
-
- //// Validate torrent format
- if (!$torrentService->readTorrentFileByFilepath($file->getPathName()))
- {
- $form['torrents']['error'][] = $translator->trans('Could not parse torrent file');
-
- continue;
- }
- }
-
- //// Content
- $torrent = $torrentService->add(
- $file->getPathName(),
- $user->getId(),
- time(),
- [$request->get('locale')],
- (bool) $request->get('sensitive'),
- $user->isApproved()
- );
-
- $torrents[] = $torrent->getId();
- }
- }
-
- if (empty($form['locale']['error']) &&
- empty($form['title']['error']) &&
- empty($form['description']['error']) &&
- empty($form['torrents']['error'])
- )
- {
- $article = $articleService->submit(
- $user->getId(),
- time(),
- (string) $request->get('locale'),
- (string) $request->get('title'),
- (string) $request->get('description'),
- (array) $torrents,
- (bool) $request->get('sensitive'),
- $user->isApproved()
- );
-
- // Redirect
- return $this->redirectToRoute(
- 'article_info',
- [
- '_locale' => $request->get('_locale'),
- 'id' => $article->getId()
- ]
- );
- }
- }
-
- return $this->render(
- 'default/article/submit.html.twig',
- [
- 'locales' => explode('|', $this->getParameter('app.locales')),
- 'form' => $form,
- ]
- );
- }
-
- private function initUser(
- Request $request,
- UserService $userService,
- ActivityService $activityService
- ): ?\App\Entity\User
- {
- // Init user
- if (!$user = $userService->findUserByAddress($request->getClientIp()))
- {
- $user = $userService->addUser(
- $request->getClientIp(),
- time(),
- $this->getParameter('app.locale'),
- explode('|', $this->getParameter('app.locales')),
- $activityService->getEventCodes(),
- $this->getParameter('app.theme'),
- $this->getParameter('app.sensitive'),
- $this->getParameter('app.yggdrasil'),
- $this->getParameter('app.approved')
- );
-
- // Add user join event
- $activityService->addEventUserAdd(
- $user->getId(),
- time()
- );
- }
-
- return $user;
- }
-}
\ No newline at end of file
diff --git a/src/Controller/TorrentController.php b/src/Controller/TorrentController.php
index 465a672..0a143fd 100644
--- a/src/Controller/TorrentController.php
+++ b/src/Controller/TorrentController.php
@@ -123,7 +123,6 @@ class TorrentController extends AbstractController
$torrent->getId()
)
],
- 'articles' => [],
'contributors' => $contributors
],
'file' =>
@@ -1070,7 +1069,7 @@ class TorrentController extends AbstractController
$torrentSensitive->getId()
);
- // Redirect to info article created
+ // Redirect to info page created
return $this->redirectToRoute(
'torrent_info',
[
@@ -1171,7 +1170,7 @@ class TorrentController extends AbstractController
$torrentSensitive->getId()
);
- // Redirect to info article created
+ // Redirect
return $this->redirectToRoute(
'torrent_sensitive_edit',
[
@@ -1244,7 +1243,7 @@ class TorrentController extends AbstractController
$torrentSensitive->getId()
);
- // Redirect to info article created
+ // Redirect
return $this->redirectToRoute(
'torrent_sensitive_edit',
[
@@ -1323,7 +1322,7 @@ class TorrentController extends AbstractController
);
}
- // Redirect to info article created
+ // Redirect
return $this->redirectToRoute(
'torrent_info',
[
diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php
index 8b7a9f0..97fde33 100644
--- a/src/Controller/UserController.php
+++ b/src/Controller/UserController.php
@@ -11,7 +11,6 @@ use Symfony\Component\HttpFoundation\Request;
use App\Service\ActivityService;
use App\Service\UserService;
-use App\Service\ArticleService;
use App\Service\TorrentService;
class UserController extends AbstractController
@@ -325,7 +324,7 @@ class UserController extends AbstractController
);
}
- // Redirect to info article created
+ // Redirect
return $this->redirectToRoute(
'user_info',
[
@@ -399,7 +398,7 @@ class UserController extends AbstractController
);
}
- // Redirect to info article created
+ // Redirect
return $this->redirectToRoute(
'user_info',
[
@@ -473,7 +472,7 @@ class UserController extends AbstractController
);
}
- // Redirect to info article created
+ // Redirect
return $this->redirectToRoute(
'user_info',
[
@@ -499,7 +498,6 @@ class UserController extends AbstractController
Request $request,
TranslatorInterface $translator,
UserService $userService,
- ArticleService $articleService,
TorrentService $torrentService,
ActivityService $activityService
): Response
@@ -570,7 +568,7 @@ class UserController extends AbstractController
);
}
- // Redirect to info article created
+ // Redirect
return $this->redirectToRoute(
'user_info',
[
diff --git a/src/Entity/Activity.php b/src/Entity/Activity.php
index 2ba0783..27e1440 100644
--- a/src/Entity/Activity.php
+++ b/src/Entity/Activity.php
@@ -54,16 +54,11 @@ class Activity
public const EVENT_TORRENT_DOWNLOAD_MAGNET_ADD = 2500;
- /// Article
- public const EVENT_ARTICLE_ADD = 3000;
// ...
#[ORM\Column]
private ?int $userId = null;
- #[ORM\Column(nullable: true)]
- private ?int $articleId = null;
-
#[ORM\Column(nullable: true)]
private ?int $torrentId = null;
@@ -109,18 +104,6 @@ class Activity
return $this;
}
- public function getArticleId(): ?int
- {
- return $this->articleId;
- }
-
- public function setArticleId(int $articleId): static
- {
- $this->articleId = $articleId;
-
- return $this;
- }
-
public function getTorrentId(): ?int
{
return $this->torrentId;
diff --git a/src/Entity/Article.php b/src/Entity/Article.php
deleted file mode 100644
index 5f21569..0000000
--- a/src/Entity/Article.php
+++ /dev/null
@@ -1,72 +0,0 @@
-id;
- }
-
- public function setId(string $id): static
- {
- $this->id = $id;
-
- return $this;
- }
-
- public function getUserId(): ?int
- {
- return $this->userId;
- }
-
- public function setUserId(int $userId): static
- {
- $this->userId = $userId;
-
- return $this;
- }
-
- public function getAdded(): ?int
- {
- return $this->added;
- }
-
- public function setAdded(int $added): static
- {
- $this->added = $added;
-
- return $this;
- }
-
- public function isApproved(): ?bool
- {
- return $this->approved;
- }
-
- public function setApproved(bool $approved): static
- {
- $this->approved = $approved;
-
- return $this;
- }
-}
diff --git a/src/Entity/ArticleDescription.php b/src/Entity/ArticleDescription.php
deleted file mode 100644
index 003441f..0000000
--- a/src/Entity/ArticleDescription.php
+++ /dev/null
@@ -1,118 +0,0 @@
-id;
- }
-
- public function setId(string $id): static
- {
- $this->id = $id;
-
- return $this;
- }
-
- public function getArticleId(): ?int
- {
- return $this->articleId;
- }
-
- public function setArticleId(int $articleId): static
- {
- $this->articleId = $articleId;
-
- return $this;
- }
-
- public function getUserId(): ?int
- {
- return $this->userId;
- }
-
- public function setUserId(int $userId): static
- {
- $this->userId = $userId;
-
- return $this;
- }
-
- public function getAdded(): ?int
- {
- return $this->added;
- }
-
- public function setAdded(int $added): static
- {
- $this->added = $added;
-
- return $this;
- }
-
- public function getLocale(): ?string
- {
- return $this->locale;
- }
-
- public function setLocale(string $locale): static
- {
- $this->locale = $locale;
-
- return $this;
- }
-
- public function getValue(): ?string
- {
- return $this->value;
- }
-
- public function setValue(string $value): static
- {
- $this->value = $value;
-
- return $this;
- }
-
- public function isApproved(): ?bool
- {
- return $this->approved;
- }
-
- public function setApproved(bool $approved): static
- {
- $this->approved = $approved;
-
- return $this;
- }
-}
diff --git a/src/Entity/ArticleSensitive.php b/src/Entity/ArticleSensitive.php
deleted file mode 100644
index b9b14f7..0000000
--- a/src/Entity/ArticleSensitive.php
+++ /dev/null
@@ -1,118 +0,0 @@
-id;
- }
-
- public function setId(string $id): static
- {
- $this->id = $id;
-
- return $this;
- }
-
- public function getArticleId(): ?int
- {
- return $this->articleId;
- }
-
- public function setArticleId(int $articleId): static
- {
- $this->articleId = $articleId;
-
- return $this;
- }
-
- public function getUserId(): ?int
- {
- return $this->userId;
- }
-
- public function setUserId(int $userId): static
- {
- $this->userId = $userId;
-
- return $this;
- }
-
- public function getAdded(): ?int
- {
- return $this->added;
- }
-
- public function setAdded(int $added): static
- {
- $this->added = $added;
-
- return $this;
- }
-
- public function getLocale(): ?string
- {
- return $this->locale;
- }
-
- public function setLocale(string $locale): static
- {
- $this->locale = $locale;
-
- return $this;
- }
-
- public function isValue(): ?bool
- {
- return $this->value;
- }
-
- public function setValue(bool $value): static
- {
- $this->value = $value;
-
- return $this;
- }
-
- public function isApproved(): ?bool
- {
- return $this->approved;
- }
-
- public function setApproved(bool $approved): static
- {
- $this->approved = $approved;
-
- return $this;
- }
-}
diff --git a/src/Entity/ArticleTitle.php b/src/Entity/ArticleTitle.php
deleted file mode 100644
index 2a1c00a..0000000
--- a/src/Entity/ArticleTitle.php
+++ /dev/null
@@ -1,118 +0,0 @@
-id;
- }
-
- public function setId(string $id): static
- {
- $this->id = $id;
-
- return $this;
- }
-
- public function getArticleId(): ?int
- {
- return $this->articleId;
- }
-
- public function setArticleId(int $articleId): static
- {
- $this->articleId = $articleId;
-
- return $this;
- }
-
- public function getUserId(): ?int
- {
- return $this->userId;
- }
-
- public function setUserId(int $userId): static
- {
- $this->userId = $userId;
-
- return $this;
- }
-
- public function getAdded(): ?int
- {
- return $this->added;
- }
-
- public function setAdded(int $added): static
- {
- $this->added = $added;
-
- return $this;
- }
-
- public function getLocale(): ?string
- {
- return $this->locale;
- }
-
- public function setLocale(string $locale): static
- {
- $this->locale = $locale;
-
- return $this;
- }
-
- public function getValue(): ?string
- {
- return $this->value;
- }
-
- public function setValue(string $value): static
- {
- $this->value = $value;
-
- return $this;
- }
-
- public function isApproved(): ?bool
- {
- return $this->approved;
- }
-
- public function setApproved(bool $approved): static
- {
- $this->approved = $approved;
-
- return $this;
- }
-}
diff --git a/src/Repository/ActivityRepository.php b/src/Repository/ActivityRepository.php
index f87aa83..89a3331 100644
--- a/src/Repository/ActivityRepository.php
+++ b/src/Repository/ActivityRepository.php
@@ -65,20 +65,4 @@ class ActivityRepository extends ServiceEntityRepository
->getSingleScalarResult()
;
}
-
- public function findActivitiesTotalByArticleId(
- int $articleId,
- array $whitelist
- ): int
- {
- return $this->createQueryBuilder('a')
- ->select('count(a.id)')
- ->where('a.articleId = :articleId')
- ->andWhere('a.event IN (:event)')
- ->setParameter(':articleId', $articleId)
- ->setParameter(':event', $whitelist)
- ->getQuery()
- ->getSingleScalarResult()
- ;
- }
}
diff --git a/src/Repository/ArticleDescriptionRepository.php b/src/Repository/ArticleDescriptionRepository.php
deleted file mode 100644
index 46cbf7e..0000000
--- a/src/Repository/ArticleDescriptionRepository.php
+++ /dev/null
@@ -1,23 +0,0 @@
-
- *
- * @method ArticleDescription|null find($id, $lockMode = null, $lockVersion = null)
- * @method ArticleDescription|null findOneBy(array $criteria, array $orderBy = null)
- * @method ArticleDescription[] findAll()
- * @method ArticleDescription[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
- */
-class ArticleDescriptionRepository extends ServiceEntityRepository
-{
- public function __construct(ManagerRegistry $registry)
- {
- parent::__construct($registry, ArticleDescription::class);
- }
-}
diff --git a/src/Repository/ArticleRepository.php b/src/Repository/ArticleRepository.php
deleted file mode 100644
index 31ce461..0000000
--- a/src/Repository/ArticleRepository.php
+++ /dev/null
@@ -1,23 +0,0 @@
-
- *
- * @method Article|null find($id, $lockMode = null, $lockVersion = null)
- * @method Article|null findOneBy(array $criteria, array $orderBy = null)
- * @method Article[] findAll()
- * @method Article[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
- */
-class ArticleRepository extends ServiceEntityRepository
-{
- public function __construct(ManagerRegistry $registry)
- {
- parent::__construct($registry, Article::class);
- }
-}
diff --git a/src/Repository/ArticleSensitiveRepository.php b/src/Repository/ArticleSensitiveRepository.php
deleted file mode 100644
index 5c09ca3..0000000
--- a/src/Repository/ArticleSensitiveRepository.php
+++ /dev/null
@@ -1,23 +0,0 @@
-
- *
- * @method ArticleSensitive|null find($id, $lockMode = null, $lockVersion = null)
- * @method ArticleSensitive|null findOneBy(array $criteria, array $orderBy = null)
- * @method ArticleSensitive[] findAll()
- * @method ArticleSensitive[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
- */
-class ArticleSensitiveRepository extends ServiceEntityRepository
-{
- public function __construct(ManagerRegistry $registry)
- {
- parent::__construct($registry, ArticleSensitive::class);
- }
-}
diff --git a/src/Repository/ArticleTitleRepository.php b/src/Repository/ArticleTitleRepository.php
deleted file mode 100644
index c83d3d1..0000000
--- a/src/Repository/ArticleTitleRepository.php
+++ /dev/null
@@ -1,23 +0,0 @@
-
- *
- * @method ArticleTitle|null find($id, $lockMode = null, $lockVersion = null)
- * @method ArticleTitle|null findOneBy(array $criteria, array $orderBy = null)
- * @method ArticleTitle[] findAll()
- * @method ArticleTitle[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
- */
-class ArticleTitleRepository extends ServiceEntityRepository
-{
- public function __construct(ManagerRegistry $registry)
- {
- parent::__construct($registry, ArticleTitle::class);
- }
-}
diff --git a/src/Service/ActivityService.php b/src/Service/ActivityService.php
index 5ce2897..6b84ea8 100644
--- a/src/Service/ActivityService.php
+++ b/src/Service/ActivityService.php
@@ -58,9 +58,6 @@ class ActivityService
Activity::EVENT_TORRENT_DOWNLOAD_FILE_ADD,
Activity::EVENT_TORRENT_DOWNLOAD_MAGNET_ADD,
-
- // Articles
- Activity::EVENT_ARTICLE_ADD,
];
}
@@ -341,19 +338,6 @@ class ActivityService
] = $code;
break;
-
- // Article
- case Activity::EVENT_TORRENT_ADD:
-
- $events
- [
- $this->translatorInterface->trans('Articles')
- ]
- [
- $this->translatorInterface->trans('Added')
- ] = $code;
-
- break;
}
}
@@ -424,28 +408,6 @@ class ActivityService
);
}
- public function findLastActivitiesByArticleId(
- int $articleId,
- array $whitelist,
- int $limit = 10,
- int $offset = 0
- ): array
- {
- return $this->entityManagerInterface
- ->getRepository(Activity::class)
- ->findBy(
- [
- 'articleId' => $articleId,
- 'event' => $whitelist,
- ],
- [
- 'id' => 'DESC'
- ],
- $limit,
- $offset
- );
- }
-
public function findActivitiesTotal(
array $whitelist
): int
@@ -481,19 +443,6 @@ class ActivityService
);
}
- public function findActivitiesTotalByArticleId(
- int $articleId,
- array $whitelist
- ): int
- {
- return $this->entityManagerInterface
- ->getRepository(Activity::class)
- ->findActivitiesTotalByArticleId(
- $articleId,
- $whitelist
- );
- }
-
// User
public function addEventUserAdd(
int $userId,
diff --git a/src/Service/ArticleService.php b/src/Service/ArticleService.php
deleted file mode 100644
index cdfaaa7..0000000
--- a/src/Service/ArticleService.php
+++ /dev/null
@@ -1,196 +0,0 @@
-entityManager = $entityManager;
- }
-
- public function submit(
- int $added,
- int $userId,
- string $locale,
- string $title,
- string $description,
- array $torrents,
- bool $sensitive,
- bool $approved
- ): ?Article
- {
- $article = $this->addArticle();
-
- if (!empty($title))
- {
- $articleTitle = $this->addArticleTitle(
- $article->getId(),
- $userId,
- $added,
- $locale,
- $title,
- $approved
- );
- }
-
- if (!empty($description))
- {
- $articleDescription = $this->addArticleDescription(
- $article->getId(),
- $userId,
- $added,
- $locale,
- $description,
- $approved
- );
- }
-
- if (!empty($torrents))
- {
- $articleTorrents = $this->addArticleTorrents(
- $article->getId(),
- $userId,
- $added,
- $locale,
- $torrents,
- $approved
- );
- }
-
- // @TODO
- $articleSensitive = $this->addArticleSensitive(
- $article->getId(),
- $userId,
- $added,
- $locale,
- $description,
- $approved
- );
-
- return $article;
- }
-
- public function addArticle(): ?Article
- {
- $article = new Article();
-
- $this->entityManager->persist($article);
- $this->entityManager->flush();
-
- return $article;
- }
-
- public function addArticleTitle(
- int $articleId,
- int $userId,
- int $added,
- string $locale,
- string $value,
- bool $approved
- ): ?ArticleTitle
- {
- $articleTitle = new ArticleTitle();
-
- $articleTitle->setArticleId($articleId);
- $articleTitle->setUserId($userId);
- $articleTitle->setLocale($locale);
- $articleTitle->setValue($value);
- $articleTitle->setAdded($added);
- $articleTitle->setApproved($approved);
-
- $this->entityManager->persist($articleTitle);
- $this->entityManager->flush();
-
- return $articleTitle;
- }
-
- public function addArticleDescription(
- int $articleId,
- int $userId,
- int $added,
- string $locale,
- string $value,
- bool $approved
- ): ?ArticleDescription
- {
- $articleDescription = new ArticleDescription();
-
- $articleDescription->setArticleId($articleId);
- $articleDescription->setUserId($userId);
- $articleDescription->setAdded($added);
- $articleDescription->setLocale($locale);
- $articleDescription->setValue($value);
- $articleDescription->setApproved($approved);
-
- $this->entityManager->persist($articleDescription);
- $this->entityManager->flush();
-
- return $articleDescription;
- }
-
- public function addArticleTorrents(
- int $articleId,
- int $userId,
- int $added,
- array $torrentsId,
- bool $approved
- ): ?ArticleTorrents
- {
- $articleTorrents = new ArticleTorrents();
-
- $articleTorrents->setArticleId($articleId);
- $articleTorrents->setUserId($userId);
- $articleTorrents->setAdded($added);
- $articleTorrents->setTorrentsId($torrentsId);
- $articleTorrents->setApproved($approved);
-
- $this->entityManager->persist($articleTorrents);
- $this->entityManager->flush();
-
- return $articleTorrents;
- }
-
- public function addArticleSensitive(
- int $articleId,
- int $userId,
- int $added,
- string $locale,
- string $value,
- bool $approved
- ): ?ArticleSensitive
- {
- $articleSensitive = new ArticleSensitive();
-
- $articleSensitive->setArticleId($articleId);
- $articleSensitive->setUserId($userId);
- $articleSensitive->setAdded($added);
- $articleSensitive->setLocale($locale);
- $articleSensitive->setValue($value);
- $articleSensitive->setApproved($approved);
-
- $this->entityManager->persist($articleSensitive);
- $this->entityManager->flush();
-
- return $articleSensitive;
- }
-}
\ No newline at end of file
diff --git a/templates/default/article/info.html.twig b/templates/default/article/info.html.twig
deleted file mode 100644
index 3389f18..0000000
--- a/templates/default/article/info.html.twig
+++ /dev/null
@@ -1,2 +0,0 @@
-{% extends 'default/layout.html.twig' %}
-{% block title %}{{ title }} - {{ name }}{% endblock %}
\ No newline at end of file
diff --git a/templates/default/article/submit.html.twig b/templates/default/article/submit.html.twig
deleted file mode 100644
index 5b579fe..0000000
--- a/templates/default/article/submit.html.twig
+++ /dev/null
@@ -1,115 +0,0 @@
-{% extends 'default/layout.html.twig' %}
-{% block title %}{{'Submit article'|trans }} - {{ name }}{% endblock %}
-{% block main_content %}
-
-
-
{{'Submit article'|trans }}
-
-
-
-{% endblock %}
diff --git a/templates/default/user/module.html.twig b/templates/default/user/module.html.twig
index e47fe07..0b77420 100644
--- a/templates/default/user/module.html.twig
+++ b/templates/default/user/module.html.twig
@@ -53,7 +53,7 @@
{% endif %}
- {% if route == 'article_submit' or route == 'torrent_submit' %}
+ {% if route == 'torrent_submit' or route == 'torrent_submit' %}