summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael <[email protected]>2017-03-26 18:38:44 -0400
committerMichael <[email protected]>2017-03-26 18:38:44 -0400
commitf2ab2e93fb90ed74a68075970227f8531435a3de (patch)
tree5add6486e19bbbed98c4d587144dfddc0ad181d8
parent579355e512bd99032b2ab080ebf3890d715da88f (diff)
downloadproject-unite-f2ab2e93fb90ed74a68075970227f8531435a3de.tar.gz
project-unite-f2ab2e93fb90ed74a68075970227f8531435a3de.tar.bz2
project-unite-f2ab2e93fb90ed74a68075970227f8531435a3de.zip
space is a wonderful place, time is a wonderful time
-rw-r--r--Project-Unite/Controllers/AdminController.cs10
1 files changed, 9 insertions, 1 deletions
diff --git a/Project-Unite/Controllers/AdminController.cs b/Project-Unite/Controllers/AdminController.cs
index d863010..f753fb9 100644
--- a/Project-Unite/Controllers/AdminController.cs
+++ b/Project-Unite/Controllers/AdminController.cs
@@ -121,7 +121,15 @@ Unlike previous ShiftOS site revamps, your account got migrated over. However, t
string backupUrl = backupDir.Remove(0, 1) + "/ShiftOS-" + DateTime.Now.ToString().Replace("/", "-") + ".zip";
string backupname = Path.Combine(backupServerDir, "ShiftOS-" + DateTime.Now.ToString().Replace("/", "-") + ".zip");
- System.IO.Compression.ZipFile.CreateFromDirectory(Server.MapPath("~/Uploads"), backupname);
+
+ try
+ {
+ System.IO.Compression.ZipFile.CreateFromDirectory(Server.MapPath("~/Uploads"), backupname);
+ }
+ catch
+ {
+ return Content(backupname + "<br/><br/>" + Server.MapPath("~/Uploads"));
+ }
var backupData = new AssetBackup();
backupData.Id = Guid.NewGuid().ToString();
backupData.UserId = User.Identity.GetUserId();