Fixed problem with file extensions when exporting solutions from contest

Author: NikolayIT

Open Judge System/Web/OJS.Web/App_GlobalResources/Global.Designer.cs

@@ -121,6 +121,6 @@
     <value>Open Judge System (OJS)</value>
   </data>
   <data name="SystemVersion" xml:space="preserve">
-    <value>1.3.3533.20140419</value>
+    <value>1.3.3534.20140419</value>
   </data>
 </root>

Open Judge System/Web/OJS.Web/App_GlobalResources/Global.resx

@@ -186,7 +186,7 @@ public ZipFileResult Solutions(int id, bool compete)
                 var directoryName =
                     string.Format("{0} ({1} {2})", participant.UserName, participant.FirstName, participant.LastName)
                         .ToValidFilePath();
-                var directory = file.AddDirectoryByName(directoryName);
+                file.AddDirectoryByName(directoryName);
 
                 foreach (var problem in problems)
                 {
@@ -204,18 +204,10 @@ public ZipFileResult Solutions(int id, bool compete)
                     if (bestSubmission != null)
                     {
                         var fileName =
-                            string.Format("{0}.{1}", problem.Name, bestSubmission.SubmissionType.FileNameExtension)
+                            string.Format("{0}.{1}", problem.Name, bestSubmission.FileExtension ?? bestSubmission.SubmissionType.FileNameExtension)
                                 .ToValidFileName();
 
-                        byte[] content;
-                        if (bestSubmission.IsBinaryFile)
-                        {
-                            content = bestSubmission.Content;
-                        }
-                        else
-                        {
-                            content = bestSubmission.ContentAsString.ToByteArray();
-                        }
+                        var content = bestSubmission.IsBinaryFile ? bestSubmission.Content : bestSubmission.ContentAsString.ToByteArray();
 
                         var entry = file.AddEntry(string.Format("{0}\\{1}", directoryName, fileName), content);
                         entry.CreationTime = bestSubmission.CreatedOn;