From 03cabc0bc22b18f8ac68beb2cb6b529c15e56653 Mon Sep 17 00:00:00 2001 From: George Shaw Date: Mon, 11 Dec 2017 14:50:38 -0600 Subject: [PATCH] nameserver config and domain cleanup --- .../domains_subdomains/domain_management.js | 36 ++++++++++++++ account/gPanel.html | 7 +++ pkg/api/bundle/create.go | 37 +++++++++++--- pkg/api/bundle/delete.go | 16 +++++++ pkg/api/settings/add_nameserver.go | 44 +++++++++++++++++ pkg/api/settings/get_admin.go | 4 +- pkg/api/settings/get_nameservers.go | 48 +++++++++++++++++++ pkg/api/settings/get_smtp.go | 4 +- pkg/api/settings/remove_nameserver.go | 44 +++++++++++++++++ pkg/api/settings/set_admin.go | 4 +- pkg/api/settings/set_smtp.go | 4 +- pkg/database/database.go | 6 +++ pkg/database/domains.go | 48 +++++++++++++++++++ pkg/gpaccount/apihandler.go | 2 + pkg/gpserver/apihandler.go | 14 ++++-- .../panelHandlers/settings/add_nameserver.js | 31 ++++++++++++ .../settings/nameserver_config.js | 43 +++++++++++++++++ .../settings/remove_nameserver.js | 30 ++++++++++++ .../assets/js/panelHandlers/users/open.js | 13 ++--- server/document_root/gPanel.html | 38 +++++++++++++++ 20 files changed, 445 insertions(+), 28 deletions(-) create mode 100644 pkg/api/settings/add_nameserver.go create mode 100644 pkg/api/settings/get_nameservers.go create mode 100644 pkg/api/settings/remove_nameserver.go create mode 100644 server/document_root/assets/js/panelHandlers/settings/add_nameserver.js create mode 100644 server/document_root/assets/js/panelHandlers/settings/nameserver_config.js create mode 100644 server/document_root/assets/js/panelHandlers/settings/remove_nameserver.js diff --git a/account/assets/js/panelHandlers/domains_subdomains/domain_management.js b/account/assets/js/panelHandlers/domains_subdomains/domain_management.js index 91d5c80..469ad47 100644 --- a/account/assets/js/panelHandlers/domains_subdomains/domain_management.js +++ b/account/assets/js/panelHandlers/domains_subdomains/domain_management.js @@ -4,9 +4,45 @@ jQuery('._js_domain-management').on('click', function(e){ e.preventDefault(); ListDomains(BUNDLE_NAME); + ListServerNameservers(); domainManagementModal.modal('show'); }); +function ListServerNameservers() { + var display = jQuery('._js_server-nameservers'); + + var xhr = new XMLHttpRequest(); + xhr.open('GET', 'api/settings/get_nameservers', true); + xhr.send(); + + xhr.onloadend = function() { + display.html(''); + + if(xhr.status == 200) { + if(xhr.response != undefined && xhr.response.length != 0) { + jsonResponse = JSON.parse(xhr.response) + jQuery.each(jsonResponse, function(k, v) { + display.append('

'+v+'

'); + }); + } + else { + display.html('

An error has occurred, please refresh. If problem persists please contact your administrator.

'); + } + } + else if(xhr.status == 204) { + display.html('

There are no nameservers stored in the server.

'); + } + else { + if(xhr.response != undefined && xhr.response.length != 0) { + alert('Error: ' + xhr.response); + } + else { + alert('An error has occurred, refresh and try again. If problem persists please contact your administrator.'); + } + } + } +} + function ListDomains(bundle_name) { var list = jQuery('._js_registered-domains'); diff --git a/account/gPanel.html b/account/gPanel.html index 3b512a1..7f47857 100644 --- a/account/gPanel.html +++ b/account/gPanel.html @@ -208,9 +208,16 @@

Registered Domains

+ Please allow up to 15 minutes for the server to track your domain.
+ +

Server Nameservers

+ Point your domains to one of these nameservers. +
+ +
diff --git a/pkg/api/bundle/create.go b/pkg/api/bundle/create.go index e22df98..258af71 100644 --- a/pkg/api/bundle/create.go +++ b/pkg/api/bundle/create.go @@ -164,13 +164,36 @@ func Create(res http.ResponseWriter, req *http.Request, logger *log.Logger, bund return false } - msg := string("Your new gPanel Bundle has been successfully registered.\r\n\n" + - "Account Port: " + strconv.Itoa(createBundleRequestData.AccPort) + "\r\n" + - "Public Port: " + strconv.Itoa(createBundleRequestData.PubPort) + "\r\n\n" + - "Default account username: root\r\n" + - "Default account password: " + tempPass + "\r\n\n" + - "Any questions, comments, or concerns can be directed toward your server administrator " + adminSettings.Name + - " at " + adminSettings.Email) + nameservers, err := ds.ListNameservers() + if err != nil { + logger.Println(req.URL.Path + "::" + err.Error()) + http.Error(res, err.Error(), http.StatusInternalServerError) + return false + } + + var msg string + if len(nameservers) > 0 { + var nameserversString string + for _, v := range nameservers { + nameserversString += "- " + v + "\r\n" + } + + msg = string("Your new gPanel Bundle has been successfully registered.\r\n\n" + + "Account Port: " + strconv.Itoa(createBundleRequestData.AccPort) + "\r\n" + + "Public Port: " + strconv.Itoa(createBundleRequestData.PubPort) + "\r\n\n" + + "Default account username: root\r\n" + + "Default account password: " + tempPass + "\r\n\n" + + "Any questions, comments, or concerns can be directed toward your server administrator " + adminSettings.Name + + " at " + adminSettings.Email + "\r\n\n" + "This server impliments the following nameservers:\r\n" + nameserversString) + } else { + msg = string("Your new gPanel Bundle has been successfully registered.\r\n\n" + + "Account Port: " + strconv.Itoa(createBundleRequestData.AccPort) + "\r\n" + + "Public Port: " + strconv.Itoa(createBundleRequestData.PubPort) + "\r\n\n" + + "Default account username: root\r\n" + + "Default account password: " + tempPass + "\r\n\n" + + "Any questions, comments, or concerns can be directed toward your server administrator " + adminSettings.Name + + " at " + adminSettings.Email) + } err = mail.SendSimple(createBundleRequestData.Email, "New gPanel Bundle - "+createBundleRequestData.Name, msg) if err != nil { diff --git a/pkg/api/bundle/delete.go b/pkg/api/bundle/delete.go index c53be47..9254f51 100644 --- a/pkg/api/bundle/delete.go +++ b/pkg/api/bundle/delete.go @@ -8,6 +8,7 @@ import ( "strconv" "github.com/Ennovar/gPanel/pkg/gpaccount" + "github.com/Ennovar/gPanel/pkg/database" ) func Delete(res http.ResponseWriter, req *http.Request, logger *log.Logger, bundles map[string]*gpaccount.Controller, dir string) bool { @@ -34,6 +35,21 @@ func Delete(res http.ResponseWriter, req *http.Request, logger *log.Logger, bund return false } + ds, err := database.Open("server/" + database.DB_DOMAINS) + if err != nil { + logger.Println(req.URL.Path + "::" + err.Error()) + http.Error(res, err.Error(), http.StatusInternalServerError) + return false + } + defer ds.Close() + + err = ds.RemoveInstances(rqData.Name) + if err != nil { + logger.Println(req.URL.Path + "::" + err.Error()) + http.Error(res, err.Error(), http.StatusInternalServerError) + return false + } + _ = bundles[rqData.Name].Public.Stop(false) _ = bundles[rqData.Name].Stop(false) diff --git a/pkg/api/settings/add_nameserver.go b/pkg/api/settings/add_nameserver.go new file mode 100644 index 0000000..402449e --- /dev/null +++ b/pkg/api/settings/add_nameserver.go @@ -0,0 +1,44 @@ +package settings + +import ( + "net/http" + "log" + "strconv" + "encoding/json" + "github.com/Ennovar/gPanel/pkg/database" +) + +func AddNameserver(res http.ResponseWriter, req *http.Request, logger *log.Logger) bool { + if req.Method != "POST" { + logger.Println(req.URL.Path + "::" + req.Method + "::" + strconv.Itoa(http.StatusMethodNotAllowed) + "::" + http.StatusText(http.StatusMethodNotAllowed)) + http.Error(res, http.StatusText(http.StatusMethodNotAllowed), http.StatusMethodNotAllowed) + return false + } + + var nameserverRequestData database.Struct_Nameserver + + err := json.NewDecoder(req.Body).Decode(&nameserverRequestData) + if err != nil { + logger.Println(req.URL.Path + "::" + err.Error()) + http.Error(res, err.Error(), http.StatusBadRequest) + return false + } + + ds, err := database.Open("server/" + database.DB_SETTINGS) + if err != nil || ds == nil { + logger.Println(req.URL.Path + "::" + err.Error()) + http.Error(res, err.Error(), http.StatusInternalServerError) + return false + } + defer ds.Close() + + err = ds.Put(database.BUCKET_NAMESERVERS, []byte(nameserverRequestData.Nameserver), nameserverRequestData) + if err != nil { + logger.Println(req.URL.Path + "::" + err.Error()) + http.Error(res, err.Error(), http.StatusInternalServerError) + return false + } + + res.WriteHeader(http.StatusNoContent) + return true +} \ No newline at end of file diff --git a/pkg/api/settings/get_admin.go b/pkg/api/settings/get_admin.go index 5d78ff1..c61de0d 100644 --- a/pkg/api/settings/get_admin.go +++ b/pkg/api/settings/get_admin.go @@ -8,14 +8,14 @@ import ( "encoding/json" ) -func GetAdmin(res http.ResponseWriter, req *http.Request, logger *log.Logger, dir string) bool { +func GetAdmin(res http.ResponseWriter, req *http.Request, logger *log.Logger) bool { if req.Method != "GET" { logger.Println(req.URL.Path + "::" + req.Method + "::" + strconv.Itoa(http.StatusMethodNotAllowed) + "::" + http.StatusText(http.StatusMethodNotAllowed)) http.Error(res, http.StatusText(http.StatusMethodNotAllowed), http.StatusMethodNotAllowed) return false } - ds, err := database.Open(dir + database.DB_SETTINGS) + ds, err := database.Open("server/" + database.DB_SETTINGS) if err != nil || ds == nil { logger.Println(req.URL.Path + "::" + err.Error()) http.Error(res, err.Error(), http.StatusInternalServerError) diff --git a/pkg/api/settings/get_nameservers.go b/pkg/api/settings/get_nameservers.go new file mode 100644 index 0000000..ba59b2d --- /dev/null +++ b/pkg/api/settings/get_nameservers.go @@ -0,0 +1,48 @@ +package settings + +import ( + "net/http" + "log" + "strconv" + "github.com/Ennovar/gPanel/pkg/database" + "encoding/json" +) + +func GetNameservers(res http.ResponseWriter, req *http.Request, logger *log.Logger) bool { + if req.Method != "GET" { + logger.Println(req.URL.Path + "::" + req.Method + "::" + strconv.Itoa(http.StatusMethodNotAllowed) + "::" + http.StatusText(http.StatusMethodNotAllowed)) + http.Error(res, http.StatusText(http.StatusMethodNotAllowed), http.StatusMethodNotAllowed) + return false + } + + ds, err := database.Open("server/" + database.DB_SETTINGS) + if err != nil || ds == nil { + logger.Println(req.URL.Path + "::" + err.Error()) + http.Error(res, err.Error(), http.StatusInternalServerError) + return false + } + defer ds.Close() + + nameservers, err := ds.ListNameservers() + if err != nil { + logger.Println(req.URL.Path + "::" + err.Error()) + http.Error(res, err.Error(), http.StatusInternalServerError) + return false + } + + if len(nameservers) > 0 { + b, err := json.Marshal(nameservers) + if err != nil { + logger.Println(req.URL.Path + "::" + err.Error()) + http.Error(res, err.Error(), http.StatusInternalServerError) + return false + } + + res.WriteHeader(http.StatusOK) + res.Write(b) + return true + } + + res.WriteHeader(http.StatusNoContent) + return true +} diff --git a/pkg/api/settings/get_smtp.go b/pkg/api/settings/get_smtp.go index 6748498..8f2860a 100644 --- a/pkg/api/settings/get_smtp.go +++ b/pkg/api/settings/get_smtp.go @@ -8,14 +8,14 @@ import ( "github.com/Ennovar/gPanel/pkg/database" ) -func GetSMTP(res http.ResponseWriter, req *http.Request, logger *log.Logger, dir string) bool { +func GetSMTP(res http.ResponseWriter, req *http.Request, logger *log.Logger) bool { if req.Method != "GET" { logger.Println(req.URL.Path + "::" + req.Method + "::" + strconv.Itoa(http.StatusMethodNotAllowed) + "::" + http.StatusText(http.StatusMethodNotAllowed)) http.Error(res, http.StatusText(http.StatusMethodNotAllowed), http.StatusMethodNotAllowed) return false } - ds, err := database.Open(dir + database.DB_SETTINGS) + ds, err := database.Open("server/" + database.DB_SETTINGS) if err != nil || ds == nil { logger.Println(req.URL.Path + "::" + err.Error()) http.Error(res, err.Error(), http.StatusInternalServerError) diff --git a/pkg/api/settings/remove_nameserver.go b/pkg/api/settings/remove_nameserver.go new file mode 100644 index 0000000..788fb4d --- /dev/null +++ b/pkg/api/settings/remove_nameserver.go @@ -0,0 +1,44 @@ +package settings + +import ( + "net/http" + "log" + "strconv" + "github.com/Ennovar/gPanel/pkg/database" + "encoding/json" +) + +func RemoveNameserver(res http.ResponseWriter, req *http.Request, logger *log.Logger) bool { + if req.Method != "DELETE" { + logger.Println(req.URL.Path + "::" + req.Method + "::" + strconv.Itoa(http.StatusMethodNotAllowed) + "::" + http.StatusText(http.StatusMethodNotAllowed)) + http.Error(res, http.StatusText(http.StatusMethodNotAllowed), http.StatusMethodNotAllowed) + return false + } + + var nameserverRequestData database.Struct_Nameserver + + err := json.NewDecoder(req.Body).Decode(&nameserverRequestData) + if err != nil { + logger.Println(req.URL.Path + "::" + err.Error()) + http.Error(res, err.Error(), http.StatusBadRequest) + return false + } + + ds, err := database.Open("server/" + database.DB_SETTINGS) + if err != nil || ds == nil { + logger.Println(req.URL.Path + "::" + err.Error()) + http.Error(res, err.Error(), http.StatusInternalServerError) + return false + } + defer ds.Close() + + err = ds.Delete(database.BUCKET_NAMESERVERS, []byte(nameserverRequestData.Nameserver)) + if err != nil { + logger.Println(req.URL.Path + "::" + err.Error()) + http.Error(res, err.Error(), http.StatusInternalServerError) + return false + } + + res.WriteHeader(http.StatusNoContent) + return true +} diff --git a/pkg/api/settings/set_admin.go b/pkg/api/settings/set_admin.go index 4afbc5c..c7e8719 100644 --- a/pkg/api/settings/set_admin.go +++ b/pkg/api/settings/set_admin.go @@ -8,7 +8,7 @@ import ( "encoding/json" ) -func SetAdmin(res http.ResponseWriter, req *http.Request, logger *log.Logger, dir string) bool { +func SetAdmin(res http.ResponseWriter, req *http.Request, logger *log.Logger) bool { if req.Method != "POST" { logger.Println(req.URL.Path + "::" + req.Method + "::" + strconv.Itoa(http.StatusMethodNotAllowed) + "::" + http.StatusText(http.StatusMethodNotAllowed)) http.Error(res, http.StatusText(http.StatusMethodNotAllowed), http.StatusMethodNotAllowed) @@ -24,7 +24,7 @@ func SetAdmin(res http.ResponseWriter, req *http.Request, logger *log.Logger, di return false } - ds, err := database.Open(dir + database.DB_SETTINGS) + ds, err := database.Open("server/" + database.DB_SETTINGS) if err != nil || ds == nil { logger.Println(req.URL.Path + "::" + err.Error()) http.Error(res, err.Error(), http.StatusInternalServerError) diff --git a/pkg/api/settings/set_smtp.go b/pkg/api/settings/set_smtp.go index 2456af0..b6862ac 100644 --- a/pkg/api/settings/set_smtp.go +++ b/pkg/api/settings/set_smtp.go @@ -9,7 +9,7 @@ import ( "github.com/Ennovar/gPanel/pkg/database" ) -func SetSMTP(res http.ResponseWriter, req *http.Request, logger *log.Logger, dir string) bool { +func SetSMTP(res http.ResponseWriter, req *http.Request, logger *log.Logger) bool { if req.Method != "POST" && req.Method != "UPDATE" { logger.Println(req.URL.Path + "::" + req.Method + "::" + strconv.Itoa(http.StatusMethodNotAllowed) + "::" + http.StatusText(http.StatusMethodNotAllowed)) http.Error(res, http.StatusText(http.StatusMethodNotAllowed), http.StatusMethodNotAllowed) @@ -39,7 +39,7 @@ func SetSMTP(res http.ResponseWriter, req *http.Request, logger *log.Logger, dir return false } - ds, err := database.Open(dir + database.DB_SETTINGS) + ds, err := database.Open("server/" + database.DB_SETTINGS) if err != nil || ds == nil { logger.Println(req.URL.Path + "::" + err.Error()) http.Error(res, err.Error(), http.StatusInternalServerError) diff --git a/pkg/database/database.go b/pkg/database/database.go index 054dc6b..434f16b 100644 --- a/pkg/database/database.go +++ b/pkg/database/database.go @@ -26,6 +26,7 @@ const ( // DB_SETTINGS BUCKETS BUCKET_GENERAL = "general" + BUCKET_NAMESERVERS = "nameservers" // DB_DOMAINS BUCKETS BUCKET_DOMAINS = "domains" @@ -77,6 +78,11 @@ func Open(filepath string) (*Datastore, error) { if err != nil { return err } + + _, err = tx.CreateBucketIfNotExists([]byte(BUCKET_NAMESERVERS)) + if err != nil { + return err + } } if strings.HasSuffix(filepath, DB_DOMAINS) { diff --git a/pkg/database/domains.go b/pkg/database/domains.go index eeb0965..72c0b43 100644 --- a/pkg/database/domains.go +++ b/pkg/database/domains.go @@ -10,6 +10,10 @@ type Struct_Domain struct { PublicPort int `json:"port"` } +type Struct_Nameserver struct { + Nameserver string `json:"nameserver"` +} + func (ds *Datastore) ListDomains(bundle string) (map[string]Struct_Domain, error) { filtered := make(map[string]Struct_Domain) var holder Struct_Domain @@ -29,5 +33,49 @@ func (ds *Datastore) ListDomains(bundle string) (map[string]Struct_Domain, error return nil }) + return filtered, nil +} + +func (ds *Datastore) RemoveInstances(bundle string) error { + var holder Struct_Domain + + ds.handle.View(func(tx *bolt.Tx) error { + b := tx.Bucket([]byte(BUCKET_DOMAINS)) + c := b.Cursor() + + for k, v := c.First(); k != nil; k, v = c.Next() { + json.Unmarshal(v, &holder) + + if holder.BundleName == bundle { + err := ds.Delete(BUCKET_DOMAINS, k) + if err != nil { + return err + } + } + } + + return nil + }) + + return nil +} + +func (ds *Datastore) ListNameservers() ([]string, error) { + filtered := make([]string, 0) + var holder Struct_Nameserver + + ds.handle.View(func(tx *bolt.Tx) error { + b := tx.Bucket([]byte(BUCKET_NAMESERVERS)) + c := b.Cursor() + + for k, v := c.First(); k != nil; k, v = c.Next() { + json.Unmarshal(v, &holder) + + filtered = append(filtered, holder.Nameserver) + } + + return nil + }) + return filtered, nil } \ No newline at end of file diff --git a/pkg/gpaccount/apihandler.go b/pkg/gpaccount/apihandler.go index 55484cb..e59fe46 100644 --- a/pkg/gpaccount/apihandler.go +++ b/pkg/gpaccount/apihandler.go @@ -65,6 +65,8 @@ func (con *Controller) apiHandler(res http.ResponseWriter, req *http.Request) (b return true, domain.Link(res, req, con.APILogger, con.Public.Port) case "/domain/unlink": return true, domain.Unlink(res, req, con.APILogger) + case "/settings/get_nameservers": + return true, settings.GetNameservers(res, req, con.APILogger) default: return false, false } diff --git a/pkg/gpserver/apihandler.go b/pkg/gpserver/apihandler.go index 78cd8b6..c1d8a50 100644 --- a/pkg/gpserver/apihandler.go +++ b/pkg/gpserver/apihandler.go @@ -90,13 +90,19 @@ func (con *Controller) apiHandler(res http.ResponseWriter, req *http.Request) (b case "/log/delete": return true, logapi.Truncate(res, req, con.APILogger, con.Directory) case "/settings/set_smtp": - return true, settings.SetSMTP(res, req, con.APILogger, con.Directory) + return true, settings.SetSMTP(res, req, con.APILogger) case "/settings/get_smtp": - return true, settings.GetSMTP(res, req, con.APILogger, con.Directory) + return true, settings.GetSMTP(res, req, con.APILogger) case "/settings/set_admin": - return true, settings.SetAdmin(res, req, con.APILogger, con.Directory) + return true, settings.SetAdmin(res, req, con.APILogger) case "/settings/get_admin": - return true, settings.GetAdmin(res, req, con.APILogger, con.Directory) + return true, settings.GetAdmin(res, req, con.APILogger) + case "/settings/add_nameserver": + return true, settings.AddNameserver(res, req, con.APILogger) + case "/settings/get_nameservers": + return true, settings.GetNameservers(res, req, con.APILogger) + case "/settings/remove_nameserver": + return true, settings.RemoveNameserver(res, req, con.APILogger) default: return false, false } diff --git a/server/document_root/assets/js/panelHandlers/settings/add_nameserver.js b/server/document_root/assets/js/panelHandlers/settings/add_nameserver.js new file mode 100644 index 0000000..7bb3784 --- /dev/null +++ b/server/document_root/assets/js/panelHandlers/settings/add_nameserver.js @@ -0,0 +1,31 @@ +jQuery('._js_add-nameserver-form').on('submit', function(e){ + e.preventDefault(); + + var nameserver = jQuery(this).find('#addNameserver'); + if(nameserver && nameserver.val()) { + var requestData = {}; + requestData["nameserver"] = nameserver.val(); + + var xhr = new XMLHttpRequest(); + xhr.open(jQuery(this).attr('method'), jQuery(this).attr('action'), true); + xhr.setRequestHeader('Content-Type', 'application/json; charset=UTF-8'); + xhr.send(JSON.stringify(requestData)); + + xhr.onloadend = function() { + if (xhr.status == 204) { + ListNameservers(); + } + else { + if(xhr.response != undefined && xhr.response.length != 0) { + alert('Error: ' + xhr.response); + } + else { + alert('An error has occurred, refresh and try again. If problem persists please contact your administrator.'); + } + } + } + } + else { + alert('The nameserver field has to be filled out.'); + } +}); \ No newline at end of file diff --git a/server/document_root/assets/js/panelHandlers/settings/nameserver_config.js b/server/document_root/assets/js/panelHandlers/settings/nameserver_config.js new file mode 100644 index 0000000..73e23b2 --- /dev/null +++ b/server/document_root/assets/js/panelHandlers/settings/nameserver_config.js @@ -0,0 +1,43 @@ +var nameserverModal = jQuery('.nameserver-config-modal'); + +jQuery('._js_nameserver-config').on('click', function(e){ + e.preventDefault(); + + ListNameservers(); + nameserverModal.modal('show'); +}); + +function ListNameservers(){ + var display = jQuery('._js_current-nameservers'); + + var xhr = new XMLHttpRequest(); + xhr.open('GET', 'api/settings/get_nameservers', true); + xhr.send(); + + xhr.onloadend = function() { + display.html(''); + + if(xhr.status == 200) { + if(xhr.response != undefined && xhr.response.length != 0) { + jsonResponse = JSON.parse(xhr.response) + jQuery.each(jsonResponse, function(k, v) { + display.append('

'+v+'

'); + }); + } + else { + display.html('

An error has occurred, please refresh. If problem persists please contact your administrator.

'); + } + } + else if(xhr.status == 204) { + display.html('

There are no nameservers stored in the server.

'); + } + else { + if(xhr.response != undefined && xhr.response.length != 0) { + alert('Error: ' + xhr.response); + } + else { + alert('An error has occurred, refresh and try again. If problem persists please contact your administrator.'); + } + } + } +} \ No newline at end of file diff --git a/server/document_root/assets/js/panelHandlers/settings/remove_nameserver.js b/server/document_root/assets/js/panelHandlers/settings/remove_nameserver.js new file mode 100644 index 0000000..a41e04c --- /dev/null +++ b/server/document_root/assets/js/panelHandlers/settings/remove_nameserver.js @@ -0,0 +1,30 @@ +jQuery(document).on('click', '._js_remove-nameserver', function(e){ + e.preventDefault(); + + var nameserver = jQuery(this).attr('data'); + var requestData = {}; + requestData["nameserver"] = nameserver; + + var ensure = confirm("Are you sure you want to delete this nameserver?"); + + if(ensure) { + var xhr = new XMLHttpRequest(); + xhr.open('DELETE', 'api/settings/remove_nameserver', true); + xhr.setRequestHeader('Content-Type', 'application/json; charset=UTF-8'); + xhr.send(JSON.stringify(requestData)); + + xhr.onloadend = function () { + if (xhr.status == 204) { + ListNameservers(); + } + else { + if (xhr.response != undefined && xhr.response.length != 0) { + alert('Error: ' + xhr.response); + } + else { + alert('An error has occurred, refresh and try again. If problem persists please contact your administrator.'); + } + } + } + } +}); \ No newline at end of file diff --git a/server/document_root/assets/js/panelHandlers/users/open.js b/server/document_root/assets/js/panelHandlers/users/open.js index df75bc4..ee9c718 100644 --- a/server/document_root/assets/js/panelHandlers/users/open.js +++ b/server/document_root/assets/js/panelHandlers/users/open.js @@ -27,23 +27,18 @@ function listCurrentUsers() { }); } else { - display.html('

An error has occurred, please refresh. If problem persists please contact your administrator.

'); + display.html('

An error has occurred, please refresh. If problem persists please contact your administrator.

'); } } else if(xhr.status == 204) { - if(xhr.response != undefined && xhr.response.length != 0) { - display.html('

There are no users in the server. This is a problem, this shouldn\'t be like this.

'); - } - else { - display.html('

An error has occurred, please refresh. If problem persists please contact your administrator.

'); - } + display.html('

There are no users in the server. This is a problem, this shouldn\'t be like this.

'); } else { if(xhr.response != undefined && xhr.response.length != 0) { - display.html('

Error: ' + xhr.response + '

'); + display.html('

Error: ' + xhr.response + '

'); } else { - display.html('

An error has occurred, please refresh. If problem persists please contact your administrator.

'); + display.html('

An error has occurred, please refresh. If problem persists please contact your administrator.

'); } } } diff --git a/server/document_root/gPanel.html b/server/document_root/gPanel.html index 1ac812d..8446396 100644 --- a/server/document_root/gPanel.html +++ b/server/document_root/gPanel.html @@ -365,6 +365,40 @@
+ + +
@@ -418,6 +452,7 @@
+
@@ -472,6 +507,9 @@ + + +