From 4eb68ee900ce304af0e811e3be3e69fa067d4423 Mon Sep 17 00:00:00 2001
From: Moe <github@m03.ca>
Date: Thu, 7 Mar 2019 15:26:56 -0800
Subject: [PATCH] Remove hardcoded "uploader" fields and place in dynamically
 loaded files

---
 libs/uploaders.js              |  11 +-
 libs/uploaders/amazonS3.ejs    |  84 +++++++++
 libs/uploaders/backblazeB2.ejs |  60 ++++++
 libs/uploaders/sftp.ejs        |  45 +++++
 libs/uploaders/wasabi.ejs      |  68 +++++++
 libs/uploaders/webdav.ejs      |  60 ++++++
 web/pages/blocks/settings.ejs  | 324 +--------------------------------
 7 files changed, 334 insertions(+), 318 deletions(-)
 create mode 100644 libs/uploaders/amazonS3.ejs
 create mode 100644 libs/uploaders/backblazeB2.ejs
 create mode 100644 libs/uploaders/sftp.ejs
 create mode 100644 libs/uploaders/wasabi.ejs
 create mode 100644 libs/uploaders/webdav.ejs

diff --git a/libs/uploaders.js b/libs/uploaders.js
index 7b67957c..f4f2051e 100644
--- a/libs/uploaders.js
+++ b/libs/uploaders.js
@@ -1,11 +1,20 @@
 module.exports = function(s,config,lang){
+    config.uploaderEjsBlocks = []
     var loadLib = function(lib){
-        return require('./uploaders/' + lib + '.js')
+        var uploadersFolder = __dirname + '/uploaders/'
+        var libraryPath = uploadersFolder + lib + '.js'
+        if(lib !== 'loader'){
+            var libraryEjsFile = uploadersFolder + lib + '.ejs'
+            config.uploaderEjsBlocks.push(libraryEjsFile)
+        }
+        return require(libraryPath)
     }
     loadLib('loader')(s,config,lang)
+    //cloud storage
     loadLib('backblazeB2')(s,config,lang)
     loadLib('amazonS3')(s,config,lang)
     loadLib('webdav')(s,config,lang)
     loadLib('wasabi')(s,config,lang)
+    //simple storage
     loadLib('sftp')(s,config,lang)
 }
diff --git a/libs/uploaders/amazonS3.ejs b/libs/uploaders/amazonS3.ejs
new file mode 100644
index 00000000..8dbe995d
--- /dev/null
+++ b/libs/uploaders/amazonS3.ejs
@@ -0,0 +1,84 @@
+<% if(details.use_aws_s3!=='0'){ %>
+<div class="form-group-group forestgreen">
+    <h4><%-lang['Amazon S3']%></h4>
+    <div class="form-group">
+        <label><div><span><%-lang.Autosave%></span></div>
+                <div><select class="form-control" detail="aws_s3_save" selector="autosave_aws_s3">
+                    <option value="0" selected><%-lang.No%></option>
+                    <option value="1"><%-lang.Yes%></option>
+                </select></div>
+        </label>
+    </div>
+    <div class="autosave_aws_s3_input autosave_aws_s3_1">
+        <div class="form-group">
+            <label><div><span><%-lang.Bucket%></span></div>
+                <div><input class="form-control" detail="aws_s3_bucket" placeholder="Example : slippery-seal"></div>
+            </label>
+        </div>
+        <div class="row">
+            <div class="form-group col-md-12">
+                <label><div><span><%-lang.aws_accessKeyId%></span></div>
+                    <div><input class="form-control" detail="aws_accessKeyId"></div>
+                </label>
+            </div>
+            <div class="form-group col-md-12">
+                <label><div><span><%-lang.aws_secretAccessKey%></span></div>
+                    <div><input class="form-control" type="password" detail="aws_secretAccessKey"></div>
+                </label>
+            </div>
+        </div>
+        <div class="form-group">
+            <label><div><span><%-lang.Region%></span></div>
+                <div><select class="form-control" detail="aws_region">
+                    <option value="us-west-1" selected>US West (N. California)</option>
+                    <option value="us-west-2">US West (Oregon)</option>
+                    <option value="us-east-2">US East (Ohio)</option>
+                    <option value="us-east-1">US East (N. Virginia)</option>
+                    <option value="ap-south-1">Asia Pacific (Mumbai)</option>
+                    <option value="ap-northeast-2">Asia Pacific (Seoul)</option>
+                    <option value="ap-northeast-3">Asia Pacific (Osaka-Local)**</option>
+                    <option value="ap-southeast-1">Asia Pacific (Singapore)</option>
+                    <option value="ap-southeast-2">Asia Pacific (Sydney)</option>
+                    <option value="ap-northeast-1">Asia Pacific (Tokyo)</option>
+                    <option value="ca-central-1">Canada (Central)</option>
+                    <option value="cn-north-1">China (Beijing)</option>
+                    <option value="cn-northwest-1">China (Ningxia)</option>
+                    <option value="eu-central-1">EU (Frankfurt)</option>
+                    <option value="eu-west-1">EU (Ireland)</option>
+                    <option value="eu-west-2">EU (London)</option>
+                    <option value="eu-west-3">EU (Paris)</option>
+                    <option value="sa-east-1">South America (São Paulo)</option>
+                </select></div>
+            </label>
+        </div>
+        <div class="form-group">
+            <label><div><span><%-lang['Save Links to Database']%></span></div>
+                    <div><select class="form-control" detail="aws_s3_log" selector="h_s3sld">
+                        <option value="0"><%-lang.No%></option>
+                        <option value="1" selected><%-lang.Yes%></option>
+                    </select></div>
+            </label>
+        </div>
+        <div class="h_s3sld_input h_s3sld_1">
+            <div class="form-group">
+                <label><div><span><%-lang['Use Max Storage Amount']%></span></div>
+                        <div><select class="form-control" detail="use_aws_s3_size_limit" selector="h_s3zl">
+                            <option value="0" selected><%-lang.No%></option>
+                            <option value="1"><%-lang.Yes%></option>
+                        </select></div>
+                </label>
+            </div>
+            <div class="form-group h_s3zl_input h_s3zl_1">
+                <label><div><span><%-lang['Max Storage Amount']%></span></div>
+                    <div><input class="form-control" placeholder="10000" detail="aws_s3_size_limit"></div>
+                </label>
+            </div>
+        </div>
+        <div class="form-group">
+            <label><div><span><%-lang['Save Directory']%></span></div>
+                <div><input class="form-control" placeholder="" detail="aws_s3_dir"></div>
+            </label>
+        </div>
+    </div>
+</div>
+<% } %>
diff --git a/libs/uploaders/backblazeB2.ejs b/libs/uploaders/backblazeB2.ejs
new file mode 100644
index 00000000..c3db16a0
--- /dev/null
+++ b/libs/uploaders/backblazeB2.ejs
@@ -0,0 +1,60 @@
+<% if(details.use_bb_b2!=='0'){ %>
+<div class="form-group-group forestgreen">
+    <h4><%-lang['Backblaze B2']%></h4>
+    <div class="form-group">
+        <label><div><span><%-lang.Autosave%></span></div>
+                <div><select class="form-control" detail="bb_b2_save" selector="autosave_bb_b2">
+                    <option value="0" selected><%-lang.No%></option>
+                    <option value="1"><%-lang.Yes%></option>
+                </select></div>
+        </label>
+    </div>
+    <div class="autosave_bb_b2_input autosave_bb_b2_1">
+        <div class="form-group">
+            <label><div><span><%-lang.Bucket%></span></div>
+                <div><input class="form-control" detail="bb_b2_bucket" placeholder="Example : slippery-seal"></div>
+            </label>
+        </div>
+        <div class="row">
+            <div class="form-group col-md-12">
+                <label><div><span><%-lang.accountId%></span></div>
+                    <div><input class="form-control" detail="bb_b2_accountId"></div>
+                </label>
+            </div>
+            <div class="form-group col-md-12">
+                <label><div><span><%-lang.applicationKey%></span></div>
+                    <div><input class="form-control" type="password" detail="bb_b2_applicationKey"></div>
+                </label>
+            </div>
+        </div>
+        <div class="form-group">
+            <label><div><span><%-lang['Save Links to Database']%></span></div>
+                    <div><select class="form-control" detail="bb_b2_log" selector="h_b2sld">
+                        <option value="0"><%-lang.No%></option>
+                        <option value="1" selected><%-lang.Yes%></option>
+                    </select></div>
+            </label>
+        </div>
+        <div class="h_b2sld_input h_b2sld_1">
+            <div class="form-group">
+                <label><div><span><%-lang['Use Max Storage Amount']%></span></div>
+                        <div><select class="form-control" detail="use_bb_b2_size_limit" selector="h_b2zl">
+                            <option value="0" selected><%-lang.No%></option>
+                            <option value="1"><%-lang.Yes%></option>
+                        </select></div>
+                </label>
+            </div>
+            <div class="form-group h_b2zl_input h_b2zl_1">
+                <label><div><span><%-lang['Max Storage Amount']%></span></div>
+                    <div><input class="form-control" placeholder="10000" detail="bb_b2_size_limit"></div>
+                </label>
+            </div>
+        </div>
+        <div class="form-group">
+            <label><div><span><%-lang['Save Directory']%></span></div>
+                <div><input class="form-control" placeholder="" detail="bb_b2_dir"></div>
+            </label>
+        </div>
+    </div>
+</div>
+<% } %>
diff --git a/libs/uploaders/sftp.ejs b/libs/uploaders/sftp.ejs
new file mode 100644
index 00000000..a33df180
--- /dev/null
+++ b/libs/uploaders/sftp.ejs
@@ -0,0 +1,45 @@
+<% if(details.use_sftp!=='0'){ %>
+<div class="form-group-group forestgreen">
+    <h4><%-lang['SFTP (SSH File Transfer)']%></h4>
+    <div class="form-group">
+        <label><div><span><%-lang.Autosave%></span></div>
+                <div><select class="form-control" detail="sftp_save" selector="autosave_sftp">
+                    <option value="0" selected><%-lang.No%></option>
+                    <option value="1"><%-lang.Yes%></option>
+                </select></div>
+        </label>
+    </div>
+    <div class="autosave_sftp_input autosave_sftp_1">
+        <div class="form-group">
+            <label><div><span><%-lang.Host%></span></div>
+                <div><input class="form-control" detail="sftp_host"></div>
+            </label>
+        </div>
+        <div class="form-group">
+            <label><div><span><%-lang.Port%></span></div>
+                <div><input class="form-control" type="text" detail="sftp_port"></div>
+            </label>
+        </div>
+        <div class="form-group">
+            <label><div><span><%-lang.Username%></span></div>
+                <div><input class="form-control" type="text" detail="sftp_username"></div>
+            </label>
+        </div>
+        <div class="form-group">
+            <label><div><span><%-lang.Password%></span></div>
+                <div><input class="form-control" type="password" detail="sftp_password"></div>
+            </label>
+        </div>
+        <div class="form-group">
+            <label><div><span><%-lang.privateKey%></span></div>
+                <div><textarea class="form-control" type="password" detail="sftp_privateKey"></textarea></div>
+            </label>
+        </div>
+        <div class="form-group">
+            <label><div><span><%-lang['Save Directory']%></span></div>
+                <div><input class="form-control" placeholder="" detail="sftp_dir"></div>
+            </label>
+        </div>
+    </div>
+</div>
+<% } %>
diff --git a/libs/uploaders/wasabi.ejs b/libs/uploaders/wasabi.ejs
new file mode 100644
index 00000000..1ee5fde7
--- /dev/null
+++ b/libs/uploaders/wasabi.ejs
@@ -0,0 +1,68 @@
+<% if(details.use_whcs!=='0'){ %>
+<div class="form-group-group forestgreen">
+    <h4><%-lang['Wasabi Hot Cloud Storage']%></h4>
+    <div class="form-group">
+        <label><div><span><%-lang.Autosave%></span></div>
+                <div><select class="form-control" detail="whcs_save" selector="autosave_whcs">
+                    <option value="0" selected><%-lang.No%></option>
+                    <option value="1"><%-lang.Yes%></option>
+                </select></div>
+        </label>
+    </div>
+    <div class="autosave_whcs_input autosave_whcs_1">
+        <div class="form-group">
+            <label><div><span><%-lang.Bucket%></span></div>
+                <div><input class="form-control" detail="whcs_bucket" placeholder="Example : slippery-seal"></div>
+            </label>
+        </div>
+        <div class="row">
+            <div class="form-group col-md-12">
+                <label><div><span><%-lang.aws_accessKeyId%></span></div>
+                    <div><input class="form-control" detail="whcs_accessKeyId"></div>
+                </label>
+            </div>
+            <div class="form-group col-md-12">
+                <label><div><span><%-lang.aws_secretAccessKey%></span></div>
+                    <div><input class="form-control" type="password" detail="whcs_secretAccessKey"></div>
+                </label>
+            </div>
+        </div>
+        <div class="form-group">
+            <label><div><span><%-lang.Region%></span></div>
+                <div><select class="form-control" detail="whcs_region">
+                    <option value="us-west-1" selected>US West</option>
+                    <option value="us-east-1">US East</option>
+                </select></div>
+            </label>
+        </div>
+        <div class="form-group">
+            <label><div><span><%-lang['Save Links to Database']%></span></div>
+                    <div><select class="form-control" detail="whcs_log" selector="h_whcssld">
+                        <option value="0"><%-lang.No%></option>
+                        <option value="1" selected><%-lang.Yes%></option>
+                    </select></div>
+            </label>
+        </div>
+        <div class="h_whcssld_input h_whcssld_1">
+            <div class="form-group">
+                <label><div><span><%-lang['Use Max Storage Amount']%></span></div>
+                        <div><select class="form-control" detail="use_whcs_size_limit" selector="h_whcszl">
+                            <option value="0" selected><%-lang.No%></option>
+                            <option value="1"><%-lang.Yes%></option>
+                        </select></div>
+                </label>
+            </div>
+            <div class="form-group h_whcszl_input h_whcszl_1">
+                <label><div><span><%-lang['Max Storage Amount']%></span></div>
+                    <div><input class="form-control" placeholder="10000" detail="whcs_size_limit"></div>
+                </label>
+            </div>
+        </div>
+        <div class="form-group">
+            <label><div><span><%-lang['Save Directory']%></span></div>
+                <div><input class="form-control" placeholder="" detail="whcs_dir"></div>
+            </label>
+        </div>
+    </div>
+</div>
+<% } %>
diff --git a/libs/uploaders/webdav.ejs b/libs/uploaders/webdav.ejs
new file mode 100644
index 00000000..d5a66371
--- /dev/null
+++ b/libs/uploaders/webdav.ejs
@@ -0,0 +1,60 @@
+<% if(details.use_webdav!=='0'){ %>
+<div class="form-group-group forestgreen">
+    <h4><%-lang.WebDAV%></h4>
+    <div class="form-group">
+        <label><div><span><%-lang.Autosave%></span></div>
+                <div><select class="form-control" detail="webdav_save" selector="autosave_webdav">
+                    <option value="0"><%-lang.No%></option>
+                    <option value="1"><%-lang.Yes%></option>
+                </select></div>
+        </label>
+    </div>
+    <div class="autosave_webdav_input autosave_webdav_1">
+        <div class="form-group">
+            <label><div><span><%-lang.URL%></span></div>
+                <div><input class="form-control" detail="webdav_url"></div>
+            </label>
+        </div>
+        <div class="row">
+            <div class="form-group col-md-12">
+                <label><div><span><%-lang.Username%></span></div>
+                    <div><input class="form-control" detail="webdav_user"></div>
+                </label>
+            </div>
+            <div class="form-group col-md-12">
+                <label><div><span><%-lang.Password%></span></div>
+                    <div><input class="form-control" type="password" detail="webdav_pass"></div>
+                </label>
+            </div>
+        </div>
+        <div class="form-group">
+            <label><div><span><%-lang['Save Links to Database']%></span></div>
+                    <div><select class="form-control" detail="webdav_log" selector="h_webdavsld">
+                        <option value="0"><%-lang.No%></option>
+                        <option value="1" selected><%-lang.Yes%></option>
+                    </select></div>
+            </label>
+        </div>
+        <div class="h_webdavsld_input h_webdavsld_1">
+            <div class="form-group">
+                <label><div><span><%-lang['Use Max Storage Amount']%></span></div>
+                        <div><select class="form-control" detail="use_webdav_size_limit" selector="h_webdavzl">
+                            <option value="0" selected><%-lang.No%></option>
+                            <option value="1"><%-lang.Yes%></option>
+                        </select></div>
+                </label>
+            </div>
+            <div class="form-group h_webdavzl_input h_webdavzl_1">
+                <label><div><span><%-lang['Max Storage Amount']%></span></div>
+                    <div><input class="form-control" placeholder="10000" detail="webdav_size_limit"></div>
+                </label>
+            </div>
+        </div>
+        <div class="form-group">
+            <label><div><span><%-lang['Save Directory']%></span></div>
+                <div><input class="form-control" placeholder="/" detail="webdav_dir"></div>
+            </label>
+        </div>
+    </div>
+</div>
+<% } %>
diff --git a/web/pages/blocks/settings.ejs b/web/pages/blocks/settings.ejs
index 8afca758..8b92722e 100644
--- a/web/pages/blocks/settings.ejs
+++ b/web/pages/blocks/settings.ejs
@@ -171,323 +171,13 @@
                 </div>
               <input type="hidden" detail="mon_groups">
           </div>
-            <% if(details.use_webdav!=='0'){ %>
-          <div class="form-group-group forestgreen">
-                <h4><%-lang.WebDAV%></h4>
-                <div class="form-group">
-                    <label><div><span><%-lang.Autosave%></span></div>
-                            <div><select class="form-control" detail="webdav_save" selector="autosave_webdav">
-                                <option value="0"><%-lang.No%></option>
-                                <option value="1"><%-lang.Yes%></option>
-                            </select></div>
-                    </label>
-                </div>
-                <div class="autosave_webdav_input autosave_webdav_1">
-                    <div class="form-group">
-                        <label><div><span><%-lang.URL%></span></div>
-                            <div><input class="form-control" detail="webdav_url"></div>
-                        </label>
-                    </div>
-                    <div class="row">
-                        <div class="form-group col-md-12">
-                            <label><div><span><%-lang.Username%></span></div>
-                                <div><input class="form-control" detail="webdav_user"></div>
-                            </label>
-                        </div>
-                        <div class="form-group col-md-12">
-                            <label><div><span><%-lang.Password%></span></div>
-                                <div><input class="form-control" type="password" detail="webdav_pass"></div>
-                            </label>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label><div><span><%-lang['Save Links to Database']%></span></div>
-                                <div><select class="form-control" detail="webdav_log" selector="h_webdavsld">
-                                    <option value="0"><%-lang.No%></option>
-                                    <option value="1" selected><%-lang.Yes%></option>
-                                </select></div>
-                        </label>
-                    </div>
-                    <div class="h_webdavsld_input h_webdavsld_1">
-                        <div class="form-group">
-                            <label><div><span><%-lang['Use Max Storage Amount']%></span></div>
-                                    <div><select class="form-control" detail="use_webdav_size_limit" selector="h_webdavzl">
-                                        <option value="0" selected><%-lang.No%></option>
-                                        <option value="1"><%-lang.Yes%></option>
-                                    </select></div>
-                            </label>
-                        </div>
-                        <div class="form-group h_webdavzl_input h_webdavzl_1">
-                            <label><div><span><%-lang['Max Storage Amount']%></span></div>
-                                <div><input class="form-control" placeholder="10000" detail="webdav_size_limit"></div>
-                            </label>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label><div><span><%-lang['Save Directory']%></span></div>
-                            <div><input class="form-control" placeholder="/" detail="webdav_dir"></div>
-                        </label>
-                    </div>
-                </div>
-            </div>
-            <% } %>
-            <% if(details.use_aws_s3!=='0'){ %>
-          <div class="form-group-group forestgreen">
-                <h4><%-lang['Amazon S3']%></h4>
-                <div class="form-group">
-                    <label><div><span><%-lang.Autosave%></span></div>
-                            <div><select class="form-control" detail="aws_s3_save" selector="autosave_aws_s3">
-                                <option value="0" selected><%-lang.No%></option>
-                                <option value="1"><%-lang.Yes%></option>
-                            </select></div>
-                    </label>
-                </div>
-                <div class="autosave_aws_s3_input autosave_aws_s3_1">
-                    <div class="form-group">
-                        <label><div><span><%-lang.Bucket%></span></div>
-                            <div><input class="form-control" detail="aws_s3_bucket" placeholder="Example : slippery-seal"></div>
-                        </label>
-                    </div>
-                    <div class="row">
-                        <div class="form-group col-md-12">
-                            <label><div><span><%-lang.aws_accessKeyId%></span></div>
-                                <div><input class="form-control" detail="aws_accessKeyId"></div>
-                            </label>
-                        </div>
-                        <div class="form-group col-md-12">
-                            <label><div><span><%-lang.aws_secretAccessKey%></span></div>
-                                <div><input class="form-control" type="password" detail="aws_secretAccessKey"></div>
-                            </label>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label><div><span><%-lang.Region%></span></div>
-                            <div><select class="form-control" detail="aws_region">
-                                <option value="us-west-1" selected>US West (N. California)</option>
-                                <option value="us-west-2">US West (Oregon)</option>
-                                <option value="us-east-2">US East (Ohio)</option>
-                                <option value="us-east-1">US East (N. Virginia)</option>
-                                <option value="ap-south-1">Asia Pacific (Mumbai)</option>
-                                <option value="ap-northeast-2">Asia Pacific (Seoul)</option>
-                                <option value="ap-northeast-3">Asia Pacific (Osaka-Local)**</option>
-                                <option value="ap-southeast-1">Asia Pacific (Singapore)</option>
-                                <option value="ap-southeast-2">Asia Pacific (Sydney)</option>
-                                <option value="ap-northeast-1">Asia Pacific (Tokyo)</option>
-                                <option value="ca-central-1">Canada (Central)</option>
-                                <option value="cn-north-1">China (Beijing)</option>
-                                <option value="cn-northwest-1">China (Ningxia)</option>
-                                <option value="eu-central-1">EU (Frankfurt)</option>
-                                <option value="eu-west-1">EU (Ireland)</option>
-                                <option value="eu-west-2">EU (London)</option>
-                                <option value="eu-west-3">EU (Paris)</option>
-                                <option value="sa-east-1">South America (São Paulo)</option>
-                            </select></div>
-                        </label>
-                    </div>
-                    <div class="form-group">
-                        <label><div><span><%-lang['Save Links to Database']%></span></div>
-                                <div><select class="form-control" detail="aws_s3_log" selector="h_s3sld">
-                                    <option value="0"><%-lang.No%></option>
-                                    <option value="1" selected><%-lang.Yes%></option>
-                                </select></div>
-                        </label>
-                    </div>
-                    <div class="h_s3sld_input h_s3sld_1">
-                        <div class="form-group">
-                            <label><div><span><%-lang['Use Max Storage Amount']%></span></div>
-                                    <div><select class="form-control" detail="use_aws_s3_size_limit" selector="h_s3zl">
-                                        <option value="0" selected><%-lang.No%></option>
-                                        <option value="1"><%-lang.Yes%></option>
-                                    </select></div>
-                            </label>
-                        </div>
-                        <div class="form-group h_s3zl_input h_s3zl_1">
-                            <label><div><span><%-lang['Max Storage Amount']%></span></div>
-                                <div><input class="form-control" placeholder="10000" detail="aws_s3_size_limit"></div>
-                            </label>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label><div><span><%-lang['Save Directory']%></span></div>
-                            <div><input class="form-control" placeholder="" detail="aws_s3_dir"></div>
-                        </label>
-                    </div>
-                </div>
-            </div>
-            <% } %>
-            <% if(details.use_bb_b2!=='0'){ %>
-          <div class="form-group-group forestgreen">
-                <h4><%-lang['Backblaze B2']%></h4>
-                <div class="form-group">
-                    <label><div><span><%-lang.Autosave%></span></div>
-                            <div><select class="form-control" detail="bb_b2_save" selector="autosave_bb_b2">
-                                <option value="0" selected><%-lang.No%></option>
-                                <option value="1"><%-lang.Yes%></option>
-                            </select></div>
-                    </label>
-                </div>
-                <div class="autosave_bb_b2_input autosave_bb_b2_1">
-                    <div class="form-group">
-                        <label><div><span><%-lang.Bucket%></span></div>
-                            <div><input class="form-control" detail="bb_b2_bucket" placeholder="Example : slippery-seal"></div>
-                        </label>
-                    </div>
-                    <div class="row">
-                        <div class="form-group col-md-12">
-                            <label><div><span><%-lang.accountId%></span></div>
-                                <div><input class="form-control" detail="bb_b2_accountId"></div>
-                            </label>
-                        </div>
-                        <div class="form-group col-md-12">
-                            <label><div><span><%-lang.applicationKey%></span></div>
-                                <div><input class="form-control" type="password" detail="bb_b2_applicationKey"></div>
-                            </label>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label><div><span><%-lang['Save Links to Database']%></span></div>
-                                <div><select class="form-control" detail="bb_b2_log" selector="h_b2sld">
-                                    <option value="0"><%-lang.No%></option>
-                                    <option value="1" selected><%-lang.Yes%></option>
-                                </select></div>
-                        </label>
-                    </div>
-                    <div class="h_b2sld_input h_b2sld_1">
-                        <div class="form-group">
-                            <label><div><span><%-lang['Use Max Storage Amount']%></span></div>
-                                    <div><select class="form-control" detail="use_bb_b2_size_limit" selector="h_b2zl">
-                                        <option value="0" selected><%-lang.No%></option>
-                                        <option value="1"><%-lang.Yes%></option>
-                                    </select></div>
-                            </label>
-                        </div>
-                        <div class="form-group h_b2zl_input h_b2zl_1">
-                            <label><div><span><%-lang['Max Storage Amount']%></span></div>
-                                <div><input class="form-control" placeholder="10000" detail="bb_b2_size_limit"></div>
-                            </label>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label><div><span><%-lang['Save Directory']%></span></div>
-                            <div><input class="form-control" placeholder="" detail="bb_b2_dir"></div>
-                        </label>
-                    </div>
-                </div>
-            </div>
-            <% } %>
-            <% if(details.use_whcs!=='0'){ %>
-          <div class="form-group-group forestgreen">
-                <h4><%-lang['Wasabi Hot Cloud Storage']%></h4>
-                <div class="form-group">
-                    <label><div><span><%-lang.Autosave%></span></div>
-                            <div><select class="form-control" detail="whcs_save" selector="autosave_whcs">
-                                <option value="0" selected><%-lang.No%></option>
-                                <option value="1"><%-lang.Yes%></option>
-                            </select></div>
-                    </label>
-                </div>
-                <div class="autosave_whcs_input autosave_whcs_1">
-                    <div class="form-group">
-                        <label><div><span><%-lang.Bucket%></span></div>
-                            <div><input class="form-control" detail="whcs_bucket" placeholder="Example : slippery-seal"></div>
-                        </label>
-                    </div>
-                    <div class="row">
-                        <div class="form-group col-md-12">
-                            <label><div><span><%-lang.aws_accessKeyId%></span></div>
-                                <div><input class="form-control" detail="whcs_accessKeyId"></div>
-                            </label>
-                        </div>
-                        <div class="form-group col-md-12">
-                            <label><div><span><%-lang.aws_secretAccessKey%></span></div>
-                                <div><input class="form-control" type="password" detail="whcs_secretAccessKey"></div>
-                            </label>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label><div><span><%-lang.Region%></span></div>
-                            <div><select class="form-control" detail="whcs_region">
-                                <option value="us-west-1" selected>US West</option>
-                                <option value="us-east-1">US East</option>
-                            </select></div>
-                        </label>
-                    </div>
-                    <div class="form-group">
-                        <label><div><span><%-lang['Save Links to Database']%></span></div>
-                                <div><select class="form-control" detail="whcs_log" selector="h_whcssld">
-                                    <option value="0"><%-lang.No%></option>
-                                    <option value="1" selected><%-lang.Yes%></option>
-                                </select></div>
-                        </label>
-                    </div>
-                    <div class="h_whcssld_input h_whcssld_1">
-                        <div class="form-group">
-                            <label><div><span><%-lang['Use Max Storage Amount']%></span></div>
-                                    <div><select class="form-control" detail="use_whcs_size_limit" selector="h_whcszl">
-                                        <option value="0" selected><%-lang.No%></option>
-                                        <option value="1"><%-lang.Yes%></option>
-                                    </select></div>
-                            </label>
-                        </div>
-                        <div class="form-group h_whcszl_input h_whcszl_1">
-                            <label><div><span><%-lang['Max Storage Amount']%></span></div>
-                                <div><input class="form-control" placeholder="10000" detail="whcs_size_limit"></div>
-                            </label>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label><div><span><%-lang['Save Directory']%></span></div>
-                            <div><input class="form-control" placeholder="" detail="whcs_dir"></div>
-                        </label>
-                    </div>
-                </div>
-            </div>
-            <% } %>
-            <% if(details.use_sftp!=='0'){ %>
-          <div class="form-group-group forestgreen">
-                <h4><%-lang['SFTP (SSH File Transfer)']%></h4>
-                <div class="form-group">
-                    <label><div><span><%-lang.Autosave%></span></div>
-                            <div><select class="form-control" detail="sftp_save" selector="autosave_sftp">
-                                <option value="0" selected><%-lang.No%></option>
-                                <option value="1"><%-lang.Yes%></option>
-                            </select></div>
-                    </label>
-                </div>
-                <div class="autosave_sftp_input autosave_sftp_1">
-                    <div class="form-group">
-                        <label><div><span><%-lang.Host%></span></div>
-                            <div><input class="form-control" detail="sftp_host"></div>
-                        </label>
-                    </div>
-                    <div class="form-group">
-                        <label><div><span><%-lang.Port%></span></div>
-                            <div><input class="form-control" type="text" detail="sftp_port"></div>
-                        </label>
-                    </div>
-                    <div class="form-group">
-                        <label><div><span><%-lang.Username%></span></div>
-                            <div><input class="form-control" type="text" detail="sftp_username"></div>
-                        </label>
-                    </div>
-                    <div class="form-group">
-                        <label><div><span><%-lang.Password%></span></div>
-                            <div><input class="form-control" type="password" detail="sftp_password"></div>
-                        </label>
-                    </div>
-                    <div class="form-group">
-                        <label><div><span><%-lang.privateKey%></span></div>
-                            <div><textarea class="form-control" type="password" detail="sftp_privateKey"></textarea></div>
-                        </label>
-                    </div>
-                    <div class="form-group">
-                        <label><div><span><%-lang['Save Directory']%></span></div>
-                            <div><input class="form-control" placeholder="" detail="sftp_dir"></div>
-                        </label>
-                    </div>
-                </div>
-            </div>
-            <% } %>
+          <% if(config.uploaderEjsBlocks)config.uploaderEjsBlocks.forEach(function(blockPath){ %>
+              <%- include(blockPath,{
+                  lang: lang,
+                  config: config,
+                  details: details
+              }) %>
+          <% }) %>
             <% if(details.use_discordbot!=='0'){ %>
           <div class="form-group-group forestgreen">
                 <h4><%-lang['Discord Bot']%></h4>