X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FController%2FConfigController.php;h=0e61c642039a98c4ced84493130a6ab4e61c4148;hb=7ab5eb9508921d84b4b4ec84a59135d536da748e;hp=68f30f6e65e07dd6cc040136b72e0bb32a303e9a;hpb=9abac9651fd0af4586245364657dc9455ba5c73c;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index 68f30f6e..0e61c642 100644
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -35,7 +35,7 @@ class ConfigController extends Controller
         $configForm = $this->createForm(ConfigType::class, $config, ['action' => $this->generateUrl('config')]);
         $configForm->handleRequest($request);
 
-        if ($configForm->isValid()) {
+        if ($configForm->isSubmitted() && $configForm->isValid()) {
             $em->persist($config);
             $em->flush();
 
@@ -57,7 +57,7 @@ class ConfigController extends Controller
         $pwdForm = $this->createForm(ChangePasswordType::class, null, ['action' => $this->generateUrl('config').'#set4']);
         $pwdForm->handleRequest($request);
 
-        if ($pwdForm->isValid()) {
+        if ($pwdForm->isSubmitted() && $pwdForm->isValid()) {
             if ($this->get('craue_config')->get('demo_mode_enabled') && $this->get('craue_config')->get('demo_mode_username') === $user->getUsername()) {
                 $message = 'flashes.config.notice.password_not_updated_demo';
             } else {
@@ -79,7 +79,7 @@ class ConfigController extends Controller
         ]);
         $userForm->handleRequest($request);
 
-        if ($userForm->isValid()) {
+        if ($userForm->isSubmitted() && $userForm->isValid()) {
             $userManager->updateUser($user, true);
 
             $this->get('session')->getFlashBag()->add(
@@ -94,7 +94,7 @@ class ConfigController extends Controller
         $rssForm = $this->createForm(RssType::class, $config, ['action' => $this->generateUrl('config').'#set2']);
         $rssForm->handleRequest($request);
 
-        if ($rssForm->isValid()) {
+        if ($rssForm->isSubmitted() && $rssForm->isValid()) {
             $em->persist($config);
             $em->flush();
 
@@ -125,7 +125,7 @@ class ConfigController extends Controller
         $newTaggingRule = $this->createForm(TaggingRuleType::class, $taggingRule, ['action' => $action]);
         $newTaggingRule->handleRequest($request);
 
-        if ($newTaggingRule->isValid()) {
+        if ($newTaggingRule->isSubmitted() && $newTaggingRule->isValid()) {
             $taggingRule->setConfig($config);
             $em->persist($taggingRule);
             $em->flush();
@@ -248,9 +248,9 @@ class ConfigController extends Controller
                 break;
 
             case 'entries':
-                // SQLite doesn't care about cascading remove, so we need to manually remove associated stuf
+                // SQLite doesn't care about cascading remove, so we need to manually remove associated stuff
                 // otherwise they won't be removed ...
-                if ($this->get('doctrine')->getConnection()->getDriver() instanceof \Doctrine\DBAL\Driver\PDOSqlite\Driver) {
+                if ($this->get('doctrine')->getConnection()->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\SqlitePlatform) {
                     $this->getDoctrine()->getRepository('WallabagAnnotationBundle:Annotation')->removeAllByUserId($this->getUser()->getId());
                 }
 
@@ -260,6 +260,19 @@ class ConfigController extends Controller
                 $this->getDoctrine()
                     ->getRepository('WallabagCoreBundle:Entry')
                     ->removeAllByUserId($this->getUser()->getId());
+                break;
+            case 'archived':
+                if ($this->get('doctrine')->getConnection()->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\SqlitePlatform) {
+                    $this->removeAnnotationsForArchivedByUserId($this->getUser()->getId());
+                }
+
+                // manually remove tags to avoid orphan tag
+                $this->removeTagsForArchivedByUserId($this->getUser()->getId());
+
+                $this->getDoctrine()
+                    ->getRepository('WallabagCoreBundle:Entry')
+                    ->removeArchivedByUserId($this->getUser()->getId());
+                break;
         }
 
         $this->get('session')->getFlashBag()->add(
@@ -271,14 +284,13 @@ class ConfigController extends Controller
     }
 
     /**
-     * Remove all tags for a given user and cleanup orphan tags.
+     * Remove all tags for given tags and a given user and cleanup orphan tags.
      *
-     * @param int $userId
+     * @param array $tags
+     * @param int   $userId
      */
-    private function removeAllTagsByUserId($userId)
+    private function removeAllTagsByStatusAndUserId($tags, $userId)
     {
-        $tags = $this->getDoctrine()->getRepository('WallabagCoreBundle:Tag')->findAllTags($userId);
-
         if (empty($tags)) {
             return;
         }
@@ -299,6 +311,43 @@ class ConfigController extends Controller
         $em->flush();
     }
 
+    /**
+     * Remove all tags for a given user and cleanup orphan tags.
+     *
+     * @param int $userId
+     */
+    private function removeAllTagsByUserId($userId)
+    {
+        $tags = $this->getDoctrine()->getRepository('WallabagCoreBundle:Tag')->findAllTags($userId);
+        $this->removeAllTagsByStatusAndUserId($tags, $userId);
+    }
+
+    /**
+     * Remove all tags for a given user and cleanup orphan tags.
+     *
+     * @param int $userId
+     */
+    private function removeTagsForArchivedByUserId($userId)
+    {
+        $tags = $this->getDoctrine()->getRepository('WallabagCoreBundle:Tag')->findForArchivedArticlesByUser($userId);
+        $this->removeAllTagsByStatusAndUserId($tags, $userId);
+    }
+
+    private function removeAnnotationsForArchivedByUserId($userId)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $archivedEntriesAnnotations = $this->getDoctrine()
+            ->getRepository('WallabagAnnotationBundle:Annotation')
+            ->findAllArchivedEntriesByUser($userId);
+
+        foreach ($archivedEntriesAnnotations as $archivedEntriesAnnotation) {
+            $em->remove($archivedEntriesAnnotation);
+        }
+
+        $em->flush();
+    }
+
     /**
      * Validate that a rule can be edited/deleted by the current user.
      *