mirror of
https://github.com/ngoduykhanh/wireguard-ui.git
synced 2025-06-07 00:46:58 +03:00
add: Manage template from global settings form
This commit is contained in:
parent
c9a7bdf018
commit
25de639727
4 changed files with 44 additions and 3 deletions
|
@ -254,6 +254,13 @@ func EmailClient(db store.IStore, mailer emailer.Emailer, emailSubject, emailCon
|
||||||
globalSettings, _ := db.GetGlobalSettings()
|
globalSettings, _ := db.GetGlobalSettings()
|
||||||
config := util.BuildClientConfig(*clientData.Client, server, globalSettings)
|
config := util.BuildClientConfig(*clientData.Client, server, globalSettings)
|
||||||
|
|
||||||
|
if globalSettings.EmailContent != "" {
|
||||||
|
emailContent = globalSettings.EmailContent
|
||||||
|
}
|
||||||
|
if globalSettings.EmailSubject != "" {
|
||||||
|
emailSubject = globalSettings.EmailSubject
|
||||||
|
}
|
||||||
|
|
||||||
cfg_att := emailer.Attachment{"wg0.conf", []byte(config)}
|
cfg_att := emailer.Attachment{"wg0.conf", []byte(config)}
|
||||||
var attachments []emailer.Attachment
|
var attachments []emailer.Attachment
|
||||||
if clientData.Client.PrivateKey != "" {
|
if clientData.Client.PrivateKey != "" {
|
||||||
|
@ -609,6 +616,7 @@ func GlobalSettingSubmit(db store.IStore) echo.HandlerFunc {
|
||||||
}
|
}
|
||||||
|
|
||||||
globalSettings.UpdatedAt = time.Now().UTC()
|
globalSettings.UpdatedAt = time.Now().UTC()
|
||||||
|
globalSettings.EmailContent = base64.StdEncoding.EncodeToString([]byte(globalSettings.EmailContent))
|
||||||
|
|
||||||
// write config to the database
|
// write config to the database
|
||||||
if err := db.SaveGlobalSettings(globalSettings); err != nil {
|
if err := db.SaveGlobalSettings(globalSettings); err != nil {
|
||||||
|
|
|
@ -11,5 +11,7 @@ type GlobalSetting struct {
|
||||||
MTU int `json:"mtu,string"`
|
MTU int `json:"mtu,string"`
|
||||||
PersistentKeepalive int `json:"persistent_keepalive,string"`
|
PersistentKeepalive int `json:"persistent_keepalive,string"`
|
||||||
ConfigFilePath string `json:"config_file_path"`
|
ConfigFilePath string `json:"config_file_path"`
|
||||||
|
EmailSubject string `json:"email_subject"`
|
||||||
|
EmailContent string `json:"email_content"`
|
||||||
UpdatedAt time.Time `json:"updated_at"`
|
UpdatedAt time.Time `json:"updated_at"`
|
||||||
}
|
}
|
||||||
|
|
|
@ -115,7 +115,18 @@ func (o *JsonDB) GetUser() (model.User, error) {
|
||||||
// GetGlobalSettings func to query global settings from the database
|
// GetGlobalSettings func to query global settings from the database
|
||||||
func (o *JsonDB) GetGlobalSettings() (model.GlobalSetting, error) {
|
func (o *JsonDB) GetGlobalSettings() (model.GlobalSetting, error) {
|
||||||
settings := model.GlobalSetting{}
|
settings := model.GlobalSetting{}
|
||||||
return settings, o.conn.Read("server", "global_settings", &settings)
|
err := o.conn.Read("server", "global_settings", &settings)
|
||||||
|
if err != nil {
|
||||||
|
return settings, err
|
||||||
|
}
|
||||||
|
if settings.EmailContent != "" {
|
||||||
|
str, err := base64.StdEncoding.DecodeString(settings.EmailContent)
|
||||||
|
if err != nil {
|
||||||
|
return settings, err
|
||||||
|
}
|
||||||
|
settings.EmailContent = string(str)
|
||||||
|
}
|
||||||
|
return settings, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetServer func to query Server setting from the database
|
// GetServer func to query Server setting from the database
|
||||||
|
|
|
@ -61,6 +61,16 @@ Global Settings
|
||||||
name="config_file_path" placeholder="E.g. /etc/wireguard/wg0.conf"
|
name="config_file_path" placeholder="E.g. /etc/wireguard/wg0.conf"
|
||||||
value="{{ .globalSettings.ConfigFilePath }}">
|
value="{{ .globalSettings.ConfigFilePath }}">
|
||||||
</div>
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="email_subject">Email Subject</label>
|
||||||
|
<input type="text" class="form-control" id="email_subject"
|
||||||
|
name="email_subject" placeholder="Your new wireguard configuration"
|
||||||
|
value="{{ .globalSettings.EmailSubject }}">
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="email_content">Email Content</label>
|
||||||
|
<textarea class="form-control" id="email_content" name="email_content" placeholder="<p>Html email template</p>" rows="3"> {{ .globalSettings.EmailContent }} </textarea>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- /.card-body -->
|
<!-- /.card-body -->
|
||||||
|
|
||||||
|
@ -142,7 +152,17 @@ Global Settings
|
||||||
const mtu = $("#mtu").val();
|
const mtu = $("#mtu").val();
|
||||||
const persistent_keepalive = $("#persistent_keepalive").val();
|
const persistent_keepalive = $("#persistent_keepalive").val();
|
||||||
const config_file_path = $("#config_file_path").val();
|
const config_file_path = $("#config_file_path").val();
|
||||||
const data = {"endpoint_address": endpoint_address, "dns_servers": dns_servers, "mtu": mtu, "persistent_keepalive": persistent_keepalive, "config_file_path": config_file_path};
|
const email_subject = $("#email_subject").val();
|
||||||
|
const email_content = $("#email_content").val();
|
||||||
|
const data = {
|
||||||
|
"endpoint_address": endpoint_address,
|
||||||
|
"dns_servers": dns_servers,
|
||||||
|
"mtu": mtu,
|
||||||
|
"persistent_keepalive": persistent_keepalive,
|
||||||
|
"config_file_path": config_file_path,
|
||||||
|
"email_subject": email_subject,
|
||||||
|
"email_content": email_content
|
||||||
|
};
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
cache: false,
|
cache: false,
|
||||||
|
@ -255,4 +275,4 @@ Global Settings
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue