From 7d17202f392e6d634dd1cef5e8553277872443a7 Mon Sep 17 00:00:00 2001
From: Kyle Drake <kyle@kyledrake.net>
Date: Sun, 21 May 2017 15:37:50 -0500
Subject: [PATCH] add WebDAV windows alt; restrict zipball downloads44444444
 for large sites

---
 models/site.rb                  |  5 +++++
 views/dashboard.erb             |  6 ++++--
 views/site_files/mount_info.erb | 24 ++++++++++++++----------
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/models/site.rb b/models/site.rb
index d59b5b9e..cf3ce200 100644
--- a/models/site.rb
+++ b/models/site.rb
@@ -70,6 +70,7 @@ class Site < Sequel::Model
   THUMBNAIL_RESOLUTIONS  = ['210x158']
 
   MAX_FILE_SIZE = 10**8 # 100 MB
+  MAX_SITE_DOWNLOAD_SIZE = 2_000_000_000 # 2GB
 
   CLAMAV_THREAT_MATCHES = [
     /^VBS/,
@@ -1135,6 +1136,10 @@ class Site < Sequel::Model
     ((total_space_used.to_f / maximum_space) * 100).round(1)
   end
 
+  def too_big_to_download?
+    space_used > MAX_SITE_DOWNLOAD_SIZE
+  end
+
   # Note: Change Stat#prune! and the nginx map compiler if you change this business logic.
   def supporter?
     owner.plan_type != 'free'
diff --git a/views/dashboard.erb b/views/dashboard.erb
index 0a9685d8..b2c6fdbf 100644
--- a/views/dashboard.erb
+++ b/views/dashboard.erb
@@ -190,9 +190,11 @@
   <% if !current_site.plan_feature(:no_file_restrictions) %>
     <a href="/site_files/allowed_types">Allowed file types</a> |
   <% end %>
-  <a href="/site_files/<%= current_site.username %>.zip">Download entire site</a>
+    <% unless current_site.too_big_to_download? %>
+      <a href="/site_files/<%= current_site.username %>.zip">Download entire site</a> |
+    <% end %>
   <% unless is_education? %>
-   | <a href="/site_files/mount_info">Mount your site as a drive on your computer!</a>
+    <a href="/site_files/mount_info">Mount your site as a drive on your computer</a>
   <% end %>
 </div>
 
diff --git a/views/site_files/mount_info.erb b/views/site_files/mount_info.erb
index c3015a9e..4b9e6f20 100644
--- a/views/site_files/mount_info.erb
+++ b/views/site_files/mount_info.erb
@@ -1,7 +1,7 @@
 <div class="header-Outro">
   <div class="row content single-Col">
   <h1>Mount your site</h1>
-  <h3 class="subtitle">Now you can access your Neocities site as a drive on your computer!</h3>
+  <h3 class="subtitle">Access your Neocities site as a drive on your computer</h3>
   </div>
 </div>
 
@@ -10,7 +10,7 @@
     <h1>About</h1>
 
     <p>
-      Neocities now supports <strong>WebDAV</strong>, which allows you to mount your Neocities share on your computer. Now you can access and change your files on your own computer's file manager!
+      Neocities supports <strong>WebDAV</strong>, which allows you to mount your Neocities share on your computer.
     </p>
 
     <% if current_site.nil? %>
@@ -22,20 +22,24 @@
         This feature requires a supporter account. <a href="/supporter">Click here</a> to become a supporter.
       </p>
     <% else %>
-      <h2>Instructions for Windows 7</h2>
+      <h2>Instructions for Windows</h2>
 
       <p>
-        <a href="http://www.onemetric.com.au/Documentation/Mounting-A-WebDAV-Share-Windows-7">Use these instructions</a>, except use this URL to connect: <strong>https://neocities.org/webdav</strong>
-        <br>
-        Enter your login info when requested.
-      </p>
+        Unfortunately, the WebDAV that comes with Windows file manager has issues with SSL,
+        and the problem has not yet been fixed. We recommend using a client like <a href="https://cyberduck.io">Cyberduck</a> with Windows, which is free and has
+        WebDAV support. You can also try <a href="https://mountainduck.io/">Mountain Duck</a>
+        which will allow you to mount your Neocities site as a hard drive on your computer.
 
       <h2>Instructions for OSX</h2>
 
       <p>
-      <a href="http://support.apple.com/kb/ph3857">Use these instructions</a>, and use this URL to connect: <strong>https://neocities.org/webdav</strong>
-      <br>
-      Enter login info when requested.
+        <a href="http://support.apple.com/kb/ph3857">Use these instructions</a>, and use this URL to connect: <strong>https://neocities.org/webdav</strong>
+        <br>
+        Enter login info when requested.
+      </p>
+
+      <p>
+        You can also try out <a href="https://cyberduck.io">Cyberduck</a> or <a href="https://mountainduck.io/">Mountain Duck</a> if you run into any issues.
       </p>
 
       <h2>Instructions for Linux (Ubuntu)</h2>