summaryrefslogtreecommitdiff
path: root/Project-Unite/Controllers
diff options
context:
space:
mode:
authorMichael <[email protected]>2017-03-26 18:23:12 -0400
committerMichael <[email protected]>2017-03-26 18:23:12 -0400
commit2380f6faa48dffadbe6754c227e64eaab616cda3 (patch)
tree81d848a79e0194582ee9a11ed85fc6bae75ec31d /Project-Unite/Controllers
parente1bf66459e9e384e0e1ed09264df65550fb57dfe (diff)
downloadproject-unite-2380f6faa48dffadbe6754c227e64eaab616cda3.tar.gz
project-unite-2380f6faa48dffadbe6754c227e64eaab616cda3.tar.bz2
project-unite-2380f6faa48dffadbe6754c227e64eaab616cda3.zip
kittycat kittycat kittycat kittycat, I'm 100% kittycat
Diffstat (limited to 'Project-Unite/Controllers')
-rw-r--r--Project-Unite/Controllers/AdminController.cs10
1 files changed, 8 insertions, 2 deletions
diff --git a/Project-Unite/Controllers/AdminController.cs b/Project-Unite/Controllers/AdminController.cs
index a8cd5b5..88fb8a7 100644
--- a/Project-Unite/Controllers/AdminController.cs
+++ b/Project-Unite/Controllers/AdminController.cs
@@ -122,8 +122,14 @@ Unlike previous ShiftOS site revamps, your account got migrated over. However, t
string backupUrl = backupDir.Remove(0, 1) + "/ShiftOS-" + DateTime.Now.ToString() + ".zip";
string backupname = Path.Combine(backupServerDir, "ShiftOS-" + DateTime.Now.ToString() + ".zip");
- System.IO.Compression.ZipFile.CreateFromDirectory(Server.MapPath("~/Uploads"), backupname);
-
+ try
+ {
+ System.IO.Compression.ZipFile.CreateFromDirectory(Server.MapPath("~/Uploads"), backupname);
+ }
+ catch
+ {
+ return Content(backupname);
+ }
var backupData = new AssetBackup();
backupData.Id = Guid.NewGuid().ToString();
backupData.UserId = User.Identity.GetUserId();