From 9c16ea6e95a002e67424f2f7ce02b77678418258 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Mon, 16 Jul 2018 21:09:09 +0200
Subject: [PATCH 01/10] fixed bold-looking fonts on mac-browsers

---
 templates/default-layout.lucius | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/default-layout.lucius b/templates/default-layout.lucius
index ad9fe2301..b713ec9d9 100644
--- a/templates/default-layout.lucius
+++ b/templates/default-layout.lucius
@@ -24,6 +24,7 @@
   box-sizing: border-box;
   padding: 0;
   margin: 0;
+  -webkit-font-smoothing: antialiased;
 }
 
 body {

From 058ad077eedafd6eefaa6cb150a07de55cc663b3 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Mon, 16 Jul 2018 21:15:18 +0200
Subject: [PATCH 02/10] increased browser-compatibility for borders in navbar

---
 templates/widgets/navbar.lucius | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/templates/widgets/navbar.lucius b/templates/widgets/navbar.lucius
index 0c41669d7..90cecf1e6 100644
--- a/templates/widgets/navbar.lucius
+++ b/templates/widgets/navbar.lucius
@@ -56,7 +56,6 @@
     min-width: 70px;
     height: calc(100% - 4px);
     padding: 0 6px 4px;
-    box-shadow: 0 0 0 1px inset var(--color-lmu-box-border);
   }
 
   &::after {
@@ -70,7 +69,14 @@
     width: 100%;
     height: calc(100% - 4px);
     padding: 0 6px 4px;
-    box-shadow: 0 0 0 1px inset var(--color-lmu-box-border);
+  }
+}
+
+@media (min-width: 769px) {
+
+  .navbar__logo::before,
+  .navbar__logo::after {
+    border: 1px solid var(--color-lmu-box-border);
   }
 }
 
@@ -114,7 +120,10 @@
   min-width: 90px;
   color: var(--color-lightwhite);
   transition: height .2s cubic-bezier(0.03, 0.43, 0.58, 1);
-  box-shadow: 0 0 0 1px inset var(--color-lmu-box-border);
+
+  &:hover {
+    color: var(--color-lightwhite);
+  }
 }
 
 .navbar__link-label {
@@ -123,6 +132,13 @@
   text-transform: uppercase;
 }
 
+@media (min-width: 769px) {
+
+  .navbar__link-wrapper {
+    border: 1px solid var(--color-lmu-box-border);
+  }
+}
+
 @media (max-width: 768px) {
 
   .navbar__link-wrapper {
@@ -241,7 +257,15 @@
 
   .navbar__link-wrapper {
     color: var(--color-grey);
-    box-shadow: 0 0 0 1px inset var(--color-grey);
+  }
+}
+
+@media (min-width: 769px) {
+
+  .navbar__list-item--secondary {
+    .navbar__link-wrapper {
+      border: 1px solid var(--color-grey);
+    }
   }
 }
 

From b603c2facf7d5f14671bded1ff5000e01cee43b9 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Mon, 16 Jul 2018 22:39:52 +0200
Subject: [PATCH 03/10] fix for file_upload not getting validated in safari

---
 templates/standalone/inputs.julius | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/standalone/inputs.julius b/templates/standalone/inputs.julius
index 0c5624444..ed129274e 100644
--- a/templates/standalone/inputs.julius
+++ b/templates/standalone/inputs.julius
@@ -59,6 +59,7 @@
     resetFileLabel();
     input.classList.add('file-input__input--hidden');
     input.addEventListener('change', function() {
+      input.dispatchEvent(new Event('input'));
       if (isMulti) {
         renderFileList(input.files);
       }

From 08e93b58887b31fcf24222e88ddb1312baf23b76 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Wed, 18 Jul 2018 21:58:44 +0200
Subject: [PATCH 04/10] content centered when logged-out

---
 templates/default-layout.lucius | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/templates/default-layout.lucius b/templates/default-layout.lucius
index 9ec372125..25a12154c 100644
--- a/templates/default-layout.lucius
+++ b/templates/default-layout.lucius
@@ -171,6 +171,8 @@ h4 {
   background-color: white;
   overflow: hidden;
   transition: padding-left .2s ease-out;
+  max-width: 1200px;
+  margin: 0 auto;
 
   > .container {
     margin: 20px 0;
@@ -185,6 +187,13 @@ h4 {
   }
 }
 
+.logged-in {
+  .main__content {
+    margin: 0;
+    max-width: none;
+  }
+}
+
 @media (max-width: 768px) {
   .logged-in {
     .main__content {
@@ -210,7 +219,6 @@ h4 {
 }
 
 @media (min-width: 1200px) {
-
   .logged-in {
     .main__content {
       padding-left: 320px;

From 5beb46708f6ff3dfd9821ab1360596c0f138696c Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Fri, 20 Jul 2018 11:48:33 +0200
Subject: [PATCH 05/10] Implement submission blacklist

Fixes #130
---
 config/submission-blacklist                   | 12 +++++
 messages/de.msg                               |  2 +
 package.yaml                                  |  1 +
 src/Handler/Corrections.hs                    |  4 +-
 src/Handler/Submission.hs                     |  2 +-
 src/Handler/Utils.hs                          |  2 +-
 src/Handler/Utils/Submission.hs               | 45 ++++++++++++++++++-
 src/Handler/Utils/Submission/TH.hs            | 39 ++++++++++++++++
 .../messages/submissionFilesIgnored.hamlet    |  4 ++
 9 files changed, 105 insertions(+), 6 deletions(-)
 create mode 100644 config/submission-blacklist
 create mode 100644 src/Handler/Utils/Submission/TH.hs
 create mode 100644 templates/messages/submissionFilesIgnored.hamlet

diff --git a/config/submission-blacklist b/config/submission-blacklist
new file mode 100644
index 000000000..1027b869b
--- /dev/null
+++ b/config/submission-blacklist
@@ -0,0 +1,12 @@
+$# Syntax:
+$#   - Leere zeilen werden ignoriert
+$#   - Zeilen, die mit '$#' beginnen, werden ignoriert
+$#   - Verbleibende Zeilen werden jeweils als `Glob`-Pattern kompiliert
+
+$# Ignoriere rekursiv alle Ordner __MACOSX und ihren Inhalt
+**/__MACOSX
+**/__MACOSX/*
+**/__MACOSX/**/*
+
+$# Ignoriere rekursiv alle Dateien .DS_Store
+**/.DS_Store
\ No newline at end of file
diff --git a/messages/de.msg b/messages/de.msg
index 0c7147ecd..a5a17e6fa 100644
--- a/messages/de.msg
+++ b/messages/de.msg
@@ -221,3 +221,5 @@ AmbiguousUTCTime: Der angegebene Zeitpunkt lässt sich nicht eindeutig zu UTC ko
 LastEdits: Letzte Änderungen
 EditedBy name@Text time@Text: Durch #{name} um #{time}
 LastEdit: Letzte Änderung
+
+SubmissionFilesIgnored: Es wurden Dateien in der hochgeladenen Abgabe ignoriert:
\ No newline at end of file
diff --git a/package.yaml b/package.yaml
index 2133c682c..f6aba2b60 100644
--- a/package.yaml
+++ b/package.yaml
@@ -87,6 +87,7 @@ dependencies:
 - system-locale
 - th-lift-instances
 - gitrev
+- Glob
 
 # The library contains all of our application code. The executable
 # defined below is just a thin wrapper.
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 7379ae4c0..b861990b5 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -403,7 +403,7 @@ postCorrectionR tid csh shn cid = do
         FormSuccess fileSource -> do
           uid <- requireAuthId
           
-          runDB . runConduit $ transPipe lift fileSource .| extractRatings .| sinkSubmission uid (Right sub) True
+          runDB . runConduit $ transPipe lift fileSource .| extractRatingsMsg .| sinkSubmission uid (Right sub) True
 
           addMessageI "success" MsgRatingFilesUpdated
           redirect $ CSubmissionR tid csh shn cid CorrectionR
@@ -438,7 +438,7 @@ postCorrectionsUploadR = do
     FormFailure errs -> mapM_ (addMessage "error" . toHtml) errs
     FormSuccess files -> do
       uid <- requireAuthId
-      subs <- runDB . runConduit $ transPipe lift files .| extractRatings .| sinkMultiSubmission uid True
+      subs <- runDB . runConduit $ transPipe lift files .| extractRatingsMsg .| sinkMultiSubmission uid True
       subs' <- traverse encrypt $ Set.toList subs :: Handler [CryptoFileNameSubmission]
       mr <- (toHtml .) <$> getMessageRender
       addMessage "success" =<< withUrlRenderer ($(ihamletFile "templates/messages/correctionsUploaded.hamlet") mr)
diff --git a/src/Handler/Submission.hs b/src/Handler/Submission.hs
index 483443b75..8b71cbefb 100644
--- a/src/Handler/Submission.hs
+++ b/src/Handler/Submission.hs
@@ -220,7 +220,7 @@ submissionHelper tid csh shn (SubmissionMode mcid) = do
             (Nothing, Just smid)   -- no new files, existing submission partners updated
               -> return smid
             (Just files, _)  -- new files
-              -> runConduit $ transPipe lift files .| extractRatings .| sinkSubmission uid (maybe (Left shid) Right msmid) False
+              -> runConduit $ transPipe lift files .| extractRatingsMsg .| sinkSubmission uid (maybe (Left shid) Right msmid) False
             _ -> error "Impossible, because of definition of `makeSubmissionForm`"
           -- Determine members of pre-registered group
           groupUids <- fmap (setFromList . map E.unValue) . E.select . E.from $ \(submissionGroupUser `E.InnerJoin` submissionGroup `E.InnerJoin` submissionGroupUser') -> do
diff --git a/src/Handler/Utils.hs b/src/Handler/Utils.hs
index 72a833f48..b173b2219 100644
--- a/src/Handler/Utils.hs
+++ b/src/Handler/Utils.hs
@@ -17,7 +17,7 @@ import Handler.Utils.Table as Handler.Utils
 import Handler.Utils.Table.Pagination as Handler.Utils
 
 import Handler.Utils.Zip        as Handler.Utils
-import Handler.Utils.Rating     as Handler.Utils
+import Handler.Utils.Rating     as Handler.Utils hiding (extractRatings)
 import Handler.Utils.Submission as Handler.Utils
 import Handler.Utils.Sheet      as Handler.Utils
 import Handler.Utils.Templates  as Handler.Utils
diff --git a/src/Handler/Utils/Submission.hs b/src/Handler/Utils/Submission.hs
index 0bed9cd36..b65705bd1 100644
--- a/src/Handler/Utils/Submission.hs
+++ b/src/Handler/Utils/Submission.hs
@@ -15,6 +15,7 @@
 module Handler.Utils.Submission
   ( AssignSubmissionException(..)
   , assignSubmissions
+  , submissionBlacklist, filterSubmission, extractRatings, extractRatingsMsg
   , submissionFileSource, submissionFileQuery
   , submissionMultiArchive 
   , SubmissionSinkException(..)
@@ -29,6 +30,7 @@ import Control.Lens.Extras (is)
 import Utils.Lens
 
 import Control.Monad.State hiding (forM_, mapM_,foldM)
+import Control.Monad.Writer (MonadWriter(..))
 import qualified Control.Monad.Random as Rand
 
 import Data.Maybe
@@ -45,16 +47,22 @@ import qualified Data.CaseInsensitive as CI
 import Data.Monoid (Monoid, Any(..))
 import Generics.Deriving.Monoid (memptydefault, mappenddefault)
 
-import Handler.Utils.Rating
+import Handler.Utils.Rating hiding (extractRatings)
+import qualified Handler.Utils.Rating as Rating (extractRatings)
 import Handler.Utils.Zip
 import Handler.Utils.Sheet
+import Handler.Utils.Submission.TH
 
 import qualified Database.Esqueleto as E
 
+import Data.Conduit
 import qualified Data.Conduit.List as Conduit
 import Data.Conduit.ResumableSink
 
 import System.FilePath
+import System.FilePath.Glob
+
+import Text.Hamlet (ihamletFile)
 
 
 data AssignSubmissionException = NoCorrectorsByProportion
@@ -191,6 +199,39 @@ data SubmissionSinkException = DuplicateFileTitle FilePath
 
 instance Exception SubmissionSinkException
 
+submissionBlacklist :: [Pattern]
+submissionBlacklist = $(patternFile compDefault "config/submission-blacklist")
+
+filterSubmission :: MonadLogger m => ConduitM File File m (Set FilePath)
+-- ^ Removes all `File`s matching `submissionBlacklist`, returning their `fileTitle`s
+filterSubmission = do
+  $logDebugS "filterSubmission" $ tshow submissionBlacklist
+  execWriterLC . awaitForever $ \case
+    File{fileTitle}
+      | any (`match'` fileTitle) submissionBlacklist -> tell $ Set.singleton fileTitle
+    file -> yield file
+  where
+    match' = matchWith $ matchDefault
+      { matchDotsImplicitly = True -- Special treatment for . makes no sense since we're multiplatform
+      }
+
+extractRatings :: ( MonadHandler m
+                  , HandlerSite m ~ UniWorX
+                  , MonadCatch m
+                  , MonadLogger m
+                  ) => ConduitM File SubmissionContent m (Set FilePath)
+extractRatings = filterSubmission `fuseUpstream` Rating.extractRatings
+
+extractRatingsMsg :: ( MonadHandler m
+                     , HandlerSite m ~ UniWorX
+                     , MonadCatch m
+                     , MonadLogger m
+                     ) => Conduit File m SubmissionContent
+extractRatingsMsg = do
+  ignored <- filterSubmission `fuseUpstream` Rating.extractRatings
+  mr <- (toHtml . ) <$> getMessageRender
+  addMessage "warning" =<< withUrlRenderer ($(ihamletFile "templates/messages/submissionFilesIgnored.hamlet") mr)
+
 sinkSubmission :: UserId
                -> Either SheetId SubmissionId
                -> Bool -- ^ Is this a correction
@@ -228,7 +269,7 @@ sinkSubmission userId mExists isUpdate = do
     sinkSubmission' submissionId isUpdate = lift . finalize <=< execStateLC mempty . Conduit.mapM_ $ \case
       Left file@(File{..}) -> do
         $logDebugS "sinkSubmission" . tshow $ (submissionId, fileTitle)
-        
+
         alreadySeen <- gets (Set.member fileTitle . sinkFilenames)
         when alreadySeen . throwM $ DuplicateFileTitle fileTitle
         tell $ mempty{ sinkFilenames = Set.singleton fileTitle  }
diff --git a/src/Handler/Utils/Submission/TH.hs b/src/Handler/Utils/Submission/TH.hs
new file mode 100644
index 000000000..99de8a01f
--- /dev/null
+++ b/src/Handler/Utils/Submission/TH.hs
@@ -0,0 +1,39 @@
+{-# LANGUAGE NoImplicitPrelude
+           , TemplateHaskell
+           , ViewPatterns
+           , OverloadedStrings
+           , StandaloneDeriving
+           , DeriveLift
+  #-}
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Handler.Utils.Submission.TH
+  ( patternFile
+  ) where
+
+import ClassyPrelude.Yesod
+import Language.Haskell.TH
+import Language.Haskell.TH.Syntax (qAddDependentFile, Lift(..))
+
+import System.FilePath.Glob
+
+import Data.Text (Text)
+import qualified Data.Text as Text
+import qualified Data.Text.IO as Text
+
+deriving instance Lift CompOptions
+
+-- $(patternFile compDefault file) :: [System.FilePath.Glob.Pattern]
+patternFile :: CompOptions -> FilePath -> ExpQ
+patternFile opts file = do
+  qAddDependentFile file
+  patternStrings <- runIO $ filter (not . isComment) . Text.lines <$> Text.readFile file
+  listE $ map (\(Text.unpack -> pat) -> [|compileWith opts pat|]) patternStrings
+
+isComment :: Text -> Bool
+isComment line = or
+  [ commentSymbol `Text.isPrefixOf` Text.stripStart line
+  , Text.null $ Text.strip line
+  ]
+  where
+    commentSymbol = "$#"
diff --git a/templates/messages/submissionFilesIgnored.hamlet b/templates/messages/submissionFilesIgnored.hamlet
new file mode 100644
index 000000000..9c08b02dc
--- /dev/null
+++ b/templates/messages/submissionFilesIgnored.hamlet
@@ -0,0 +1,4 @@
+_{MsgSubmissionFilesIgnored}
+<ul style="font-family: monospace">
+  $forall fileTitle <- ignored
+    <li>#{fileTitle}

From d1b806ade278ad934c8f68092ef1578333594c5e Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Fri, 20 Jul 2018 11:49:22 +0200
Subject: [PATCH 06/10] Fix alert historical alert class

---
 src/Handler/Corrections.hs | 6 +++---
 src/Handler/Sheet.hs       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index b861990b5..87b132cd4 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -215,7 +215,7 @@ correctionsR whereClause (formColonnade -> displayColumns) psValidator actions =
         when (not $ null alreadyAssigned) $ do
           mr <- (toHtml . ) <$> getMessageRender
           alreadyAssigned' <- forM alreadyAssigned $ \Entity{..} -> (, entityVal) <$> (encrypt entityKey :: DB CryptoFileNameSubmission) 
-          addMessage "warn" =<< withUrlRenderer ($(ihamletFile "templates/messages/submissionsAlreadyAssigned.hamlet") mr)
+          addMessage "warning" =<< withUrlRenderer ($(ihamletFile "templates/messages/submissionsAlreadyAssigned.hamlet") mr)
         let unassigned = Set.fromList subs `Set.difference` Set.fromList (entityKey <$> alreadyAssigned)
         when (not $ null unassigned) $ do
           num <- updateWhereCount [SubmissionId <-. Set.toList unassigned] [SubmissionRatingBy =. Just uid]
@@ -238,7 +238,7 @@ correctionsR whereClause (formColonnade -> displayColumns) psValidator actions =
         when (not $ null alreadyAssigned) $ do
           mr <- (toHtml . ) <$> getMessageRender
           alreadyAssigned' <- forM alreadyAssigned $ \Entity{..} -> (, entityVal) <$> (encrypt entityKey :: DB CryptoFileNameSubmission) 
-          addMessage "warn" =<< withUrlRenderer ($(ihamletFile "templates/messages/submissionsAlreadyAssigned.hamlet") mr)
+          addMessage "warning" =<< withUrlRenderer ($(ihamletFile "templates/messages/submissionsAlreadyAssigned.hamlet") mr)
         let unassigned = Set.fromList subs `Set.difference` Set.fromList (entityKey <$> alreadyAssigned)
         when (not $ null unassigned) $ do
           (assigned, unassigned) <- assignSubmissions shid (Just unassigned)
@@ -247,7 +247,7 @@ correctionsR whereClause (formColonnade -> displayColumns) psValidator actions =
           when (not $ null unassigned) $ do
             mr <- (toHtml . ) <$> getMessageRender
             unassigned' <- forM (Set.toList unassigned) $ \sid -> (encrypt sid :: DB CryptoFileNameSubmission) 
-            addMessage "warn" =<< withUrlRenderer ($(ihamletFile "templates/messages/submissionsNotAssignedAuto.hamlet") mr)
+            addMessage "warning" =<< withUrlRenderer ($(ihamletFile "templates/messages/submissionsNotAssignedAuto.hamlet") mr)
       redirect currentRoute
 
   fmap toTypedContent . defaultLayout $ do
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index 8d70902bb..539ba05eb 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -495,7 +495,7 @@ correctorForm shid = do
   (defaultLoads', currentLoads') <- lift . runDB $ (,) <$> defaultLoads shid <*> currentLoads
   loads' <- fmap (Map.fromList [(uid, mempty) | uid <- formCIDs] `Map.union`) $ if
     | Map.null currentLoads'
-    , null formCIDs          -> defaultLoads' <$ when (not $ Map.null defaultLoads') (addMessageI "warn" MsgCorrectorsDefaulted)
+    , null formCIDs          -> defaultLoads' <$ when (not $ Map.null defaultLoads') (addMessageI "warning" MsgCorrectorsDefaulted)
     | otherwise              -> return $ Map.fromList (map (, mempty) formCIDs) `Map.union` currentLoads'
 
   deletions <- lift $ foldM (\dels uid -> maybe (Set.insert uid dels) (const dels) <$> guardNonDeleted uid) Set.empty (Map.keys loads')

From e7e3404de0faa5aa00577d133343a0ff828383dc Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Fri, 20 Jul 2018 12:57:27 +0200
Subject: [PATCH 07/10] Better error messages for submission uploads

---
 messages/de.msg                               |  4 +-
 src/Handler/Corrections.hs                    | 11 ++--
 src/Handler/Utils/Submission.hs               | 52 ++++++++++++++-----
 .../messages/submissionFilesIgnored.hamlet    | 11 ++--
 4 files changed, 57 insertions(+), 21 deletions(-)

diff --git a/messages/de.msg b/messages/de.msg
index a5a17e6fa..de6d18014 100644
--- a/messages/de.msg
+++ b/messages/de.msg
@@ -174,6 +174,7 @@ UpdatedAssignedCorrectorsAuto num@Int64: #{display num} Abgaben wurden unter den
 CouldNotAssignCorrectorsAuto num@Int64: #{display num} Abgaben konnten nicht automatisch zugewiesen werden:
 
 CorrectionsUploaded num@Int64: #{display num} Korrekturen wurden gespeichert:
+NoCorrectionsUploaded: In der hochgeladenen Datei wurden keine Korrekturen gefunden.
 
 RatingBy: Korrigiert von
 AchievedBonusPoints: Erreichte Bonuspunkte
@@ -222,4 +223,5 @@ LastEdits: Letzte Änderungen
 EditedBy name@Text time@Text: Durch #{name} um #{time}
 LastEdit: Letzte Änderung
 
-SubmissionFilesIgnored: Es wurden Dateien in der hochgeladenen Abgabe ignoriert:
\ No newline at end of file
+SubmissionFilesIgnored: Es wurden Dateien in der hochgeladenen Abgabe ignoriert:
+SubmissionDoesNotExist smid@CryptoFileNameSubmission: Es existiert keine Abgabe mit Nummer #{toPathPiece smid}.
\ No newline at end of file
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 87b132cd4..a3bd66f5a 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -14,6 +14,7 @@
 {-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE ViewPatterns #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE MultiWayIf #-}
 
 module Handler.Corrections where
 
@@ -439,9 +440,13 @@ postCorrectionsUploadR = do
     FormSuccess files -> do
       uid <- requireAuthId
       subs <- runDB . runConduit $ transPipe lift files .| extractRatingsMsg .| sinkMultiSubmission uid True
-      subs' <- traverse encrypt $ Set.toList subs :: Handler [CryptoFileNameSubmission]
-      mr <- (toHtml .) <$> getMessageRender
-      addMessage "success" =<< withUrlRenderer ($(ihamletFile "templates/messages/correctionsUploaded.hamlet") mr)
+      if
+        | null subs -> addMessageI "warning" MsgNoCorrectionsUploaded
+        | otherwise -> do
+            subs' <- traverse encrypt $ Set.toList subs :: Handler [CryptoFileNameSubmission]
+            mr <- (toHtml .) <$> getMessageRender
+            addMessage "success" =<< withUrlRenderer ($(ihamletFile "templates/messages/correctionsUploaded.hamlet") mr)
+        
 
   defaultLayout $ do
     $(widgetFile "corrections-upload")
diff --git a/src/Handler/Utils/Submission.hs b/src/Handler/Utils/Submission.hs
index b65705bd1..00ca2f06b 100644
--- a/src/Handler/Utils/Submission.hs
+++ b/src/Handler/Utils/Submission.hs
@@ -24,6 +24,7 @@ module Handler.Utils.Submission
   ) where
 
 import Import hiding ((.=), joinPath)
+import Yesod.Core.Types (HandlerContents(..), ErrorResponse(..))
 
 import Control.Lens
 import Control.Lens.Extras (is)
@@ -31,6 +32,7 @@ import Utils.Lens
 
 import Control.Monad.State hiding (forM_, mapM_,foldM)
 import Control.Monad.Writer (MonadWriter(..))
+import Control.Monad.RWS.Lazy (RWST)
 import qualified Control.Monad.Random as Rand
 
 import Data.Maybe
@@ -64,6 +66,8 @@ import System.FilePath.Glob
 
 import Text.Hamlet (ihamletFile)
 
+import qualified Control.Monad.Catch as E (Handler(..))
+
 
 data AssignSubmissionException = NoCorrectorsByProportion
   deriving (Typeable, Show)
@@ -228,7 +232,9 @@ extractRatingsMsg :: ( MonadHandler m
                      , MonadLogger m
                      ) => Conduit File m SubmissionContent
 extractRatingsMsg = do
-  ignored <- filterSubmission `fuseUpstream` Rating.extractRatings
+  ignored' <- filterSubmission `fuseUpstream` Rating.extractRatings
+  let ignored :: Set (Either CryptoFileNameSubmission FilePath)
+      ignored = Right `Set.map` ignored'
   mr <- (toHtml . ) <$> getMessageRender
   addMessage "warning" =<< withUrlRenderer ($(ihamletFile "templates/messages/submissionFilesIgnored.hamlet") mr)
 
@@ -439,7 +445,9 @@ sinkMultiSubmission userId isUpdate = do
   let
     feed :: SubmissionId
          -> SubmissionContent
-         -> StateT
+         -> RWST
+              ()
+              _
               (Map SubmissionId (ResumableSink SubmissionContent (YesodDB UniWorX) SubmissionId))
               (YesodDB UniWorX)
               ()
@@ -449,8 +457,9 @@ sinkMultiSubmission userId isUpdate = do
         Just sink -> return sink
         Nothing -> do
           lift $ do
-            Submission{..} <- get404 sId
             cID <- encrypt sId
+            $(logDebugS) "sinkMultiSubmission" $ "Doing auth checks for " <> toPathPiece cID 
+            Submission{..} <- get404 sId
             Sheet{..} <- get404 submissionSheet
             Course{..} <- get404 sheetCourse
             authRes <- evalAccessDB (CSubmissionR courseTerm courseShorthand sheetName cID CorrectionR) True
@@ -463,30 +472,45 @@ sinkMultiSubmission userId isUpdate = do
       case sink' of
         Left _ -> error "sinkSubmission returned prematurely"
         Right nSink -> modify $ Map.insert sId nSink
-  sinks <- execStateLC Map.empty . awaitForever $ \case
+  (sinks, ignored) <- execRWSLC () Map.empty . awaitForever $ \case
     v@(Right (sId, _)) -> do
       cID <- encrypt sId
-      handle (throwM . SubmissionSinkException cID Nothing) $
-        lift $ feed sId v
+      $logDebugS "sinkMultiSubmission" $ "Feeding rating for " <> toPathPiece cID
+      lift (feed sId v) `catches` [ E.Handler (throwM . SubmissionSinkException cID Nothing), E.Handler (void . handleHCError (Left cID)) ]
     (Left f@File{..})  -> do
       let
-        tryDecrypt :: FilePath -> _ (Either SomeException SubmissionId)
-        tryDecrypt (CI.mk -> ciphertext) = try $ decrypt (CryptoID{..} :: CryptoFileNameSubmission)
-        acc (Just cID, fp) segment = return (Just cID, fp ++ [segment])
+        acc :: (Maybe SubmissionId, [FilePath]) -> FilePath -> _ (Maybe SubmissionId, [FilePath])
+        acc (Just sId, fp) segment = return (Just sId, fp ++ [segment])
         acc (Nothing , fp) segment = do
-          msId <- tryDecrypt segment
-          return . either (const id) (set _1 . Just) msId $ (Nothing, fp)
+          let
+            tryDecrypt ciphertext = do
+              sId <- decrypt (CryptoID (CI.mk segment) :: CryptoFileNameSubmission)
+              Just sId <$ get404 sId
+          msId <- lift (lift $ tryDecrypt segment) `catches` [ E.Handler handleCryptoID, E.Handler (handleHCError $ Right fileTitle) ]
+          return (msId, fp)
       (msId, (joinPath -> fileTitle')) <- foldM acc (Nothing, []) $ splitDirectories fileTitle
-      $logDebugS "sinkMultiSubmission" $ tshow (splitDirectories fileTitle, msId, fileTitle')
       case msId of
-        Nothing -> $logDebugS "sinkMultiSubmission" "Dropped"
+        Nothing -> do
+          $logDebugS "sinkMultiSubmission" $ "Dropping " <> tshow (splitDirectories fileTitle, msId, fileTitle')
         Just sId -> do
+          $logDebugS "sinkMultiSubmission" $ "Feeding " <> tshow (splitDirectories fileTitle, msId, fileTitle')
           cID <- encrypt sId
           handle (throwM . SubmissionSinkException cID (Just fileTitle)) $
             lift . feed sId $ Left f{ fileTitle = fileTitle' }
+  when (not $ null ignored) $ do
+    mr <- (toHtml .) <$> getMessageRender
+    addMessage "warning" =<< withUrlRenderer ($(ihamletFile "templates/messages/submissionFilesIgnored.hamlet") mr)
   fmap Map.keysSet . lift . sequence $ flip Map.mapWithKey sinks $ \sId sink -> do
     cID <- encrypt sId
-    handle (throwM . SubmissionSinkException cID Nothing) . void $ closeResumableSink sink
+    handle (throwM . SubmissionSinkException cID Nothing) $
+      void $ closeResumableSink sink
+  where
+    handleHCError :: Either CryptoFileNameSubmission FilePath -> HandlerContents -> _ (Maybe a)
+    handleHCError ident (HCError NotFound) = Nothing <$ tell (Set.singleton ident)
+    handleHCError _ e = throwM e
+    handleCryptoID :: CryptoIDError -> _ (Maybe a)
+    handleCryptoID _ = return Nothing
+    
 
 submissionMatchesSheet :: TermId -> Text -> Text -> CryptoFileNameSubmission -> DB ()
 submissionMatchesSheet tid csh shn cid = do
diff --git a/templates/messages/submissionFilesIgnored.hamlet b/templates/messages/submissionFilesIgnored.hamlet
index 9c08b02dc..f02bed623 100644
--- a/templates/messages/submissionFilesIgnored.hamlet
+++ b/templates/messages/submissionFilesIgnored.hamlet
@@ -1,4 +1,9 @@
 _{MsgSubmissionFilesIgnored}
-<ul style="font-family: monospace">
-  $forall fileTitle <- ignored
-    <li>#{fileTitle}
+<ul>
+  $forall ident <- ignored
+    $case ident
+      $of Right fileTitle
+        <li style="font-family: monospace">#{fileTitle}
+      $of Left cID
+        <li>Bewertungsdatei für <span style="font-family: monospace">#{toPathPiece cID}</span>
+    

From b80f9e79e48c5d18077a9b7ec5c70055be01da34 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sun, 22 Jul 2018 17:44:52 +0200
Subject: [PATCH 08/10] Stop emitting SubmissionFilesIgnored when nothing was
 ignored

---
 src/Handler/Utils/Submission.hs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Handler/Utils/Submission.hs b/src/Handler/Utils/Submission.hs
index 00ca2f06b..b09e57868 100644
--- a/src/Handler/Utils/Submission.hs
+++ b/src/Handler/Utils/Submission.hs
@@ -235,8 +235,9 @@ extractRatingsMsg = do
   ignored' <- filterSubmission `fuseUpstream` Rating.extractRatings
   let ignored :: Set (Either CryptoFileNameSubmission FilePath)
       ignored = Right `Set.map` ignored'
-  mr <- (toHtml . ) <$> getMessageRender
-  addMessage "warning" =<< withUrlRenderer ($(ihamletFile "templates/messages/submissionFilesIgnored.hamlet") mr)
+  unless (null ignored) $ do
+    mr <- (toHtml . ) <$> getMessageRender
+    addMessage "warning" =<< withUrlRenderer ($(ihamletFile "templates/messages/submissionFilesIgnored.hamlet") mr)
 
 sinkSubmission :: UserId
                -> Either SheetId SubmissionId

From e0c8e6edf046959a7521ba57ce5bc12660029944 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sun, 22 Jul 2018 17:28:53 +0200
Subject: [PATCH 09/10] Don't hide CorrectionR-PageAction

Fixes #128
---
 src/Foundation.hs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index b76ad30f2..42fdbff39 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -872,12 +872,7 @@ pageActions (CSubmissionR tid csh shn cid SubShowR) =
       { menuItemLabel = "Korrektur"
       , menuItemIcon  = Nothing
       , menuItemRoute = CSubmissionR tid csh shn cid CorrectionR
-      , menuItemAccessCallback' = do
-          smid <- decrypt cid
-          sm <- runDB $ get smid
-          case sm of
-            (Just (Submission { submissionRatingTime=Just _})) -> return True
-            _ -> return False
+      , menuItemAccessCallback' = return True
       }
   ]
 pageActions (CSheetR tid csh shn SCorrR) =

From b539c54c127badae34e71f168f50f59d872c5891 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Mon, 23 Jul 2018 12:00:37 +0200
Subject: [PATCH 10/10] Bump cryptoids

---
 stack.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stack.yaml b/stack.yaml
index 255d30efa..5462c2462 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -38,7 +38,7 @@ extra-deps:
 
   - uuid-crypto-1.4.0.0
   - filepath-crypto-0.1.0.0
-  - cryptoids-0.5.0.0
+  - cryptoids-0.5.1.0
   - cryptoids-types-0.0.0
   - cryptoids-class-0.0.0