Index: /branches/rel_avx_2_7_6/src/webui/webui/htdocs/new/src/client/app/modules/system/submenu/sys_mgmt/email/email.controller.js
===================================================================
--- /branches/rel_avx_2_7_6/src/webui/webui/htdocs/new/src/client/app/modules/system/submenu/sys_mgmt/email/email.controller.js (revision 9233)
+++ /branches/rel_avx_2_7_6/src/webui/webui/htdocs/new/src/client/app/modules/system/submenu/sys_mgmt/email/email.controller.js (working copy)
@@ -33,11 +33,63 @@
email: '',
password: ''
};
+ avxViewModel.showPassword = false;
avxViewModel.relay = {
enable: false
};
avxViewModel.relay_data = [];
+ // Form validation function
+ avxViewModel.isFormInvalid = function(form, fromString) {
+ return form.$invalid ||
+ form.from_string.$error.email ||
+ form.from_string.$error.maxlength ||
+ (fromString && fromString.length > 64);
+ };
+
+ // External sender form validation function
+ avxViewModel.isExternalSenderFormInvalid = function(form, email) {
+ var password = avxViewModel.externalSender.password;
+ return form.$invalid ||
+ form.external_sender_email.$error.email ||
+ form.external_sender_email.$error.maxlength ||
+ (email && email.length > 32) ||
+ !password || // Password required
+ password.length === 0 ||
+ (password && password.length > 64); // Password length check
+ };
+
+ // Hostname validation function
+ avxViewModel.isValidHostname = function(hostname) {
+ if (!hostname) return true; // Empty is valid
+
+ // IP address regex (IPv4)
+ var ipRegex = /^(((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))$/;
+
+ // FQDN regex
+ var fqdnRegex = /^([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)*[a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?$/;
+
+ return ipRegex.test(hostname) || fqdnRegex.test(hostname);
+ };
+
+ // Alert form validation function
+ avxViewModel.isAlertFormInvalid = function(form, hostname) {
+ return (hostname && hostname.length > 128) ||
+ (hostname && !avxViewModel.isValidHostname(hostname));
+ };
+
+ // External server form validation function
+ avxViewModel.isExternalServerFormInvalid = function(form, emailServer) {
+ var port = avxViewModel.externalServer.server_port;
+ var isPortValid = (port === null || port === undefined || port === '' || (port >= 0 && port <= 65535));
+
+ return !emailServer || // Required field check
+ emailServer.length === 0 ||
+ (emailServer && emailServer.length > 64) ||
+ (emailServer && !avxViewModel.isValidHostname(emailServer)) ||
+ !isPortValid; // Port validation - allow empty
+ };
+
// Define showProgressBar function early so it can be used by all functions
var showProgressBar = function() {
var modalInstance = $uibModal.open({
@@ -329,22 +381,11 @@
avxViewModel.refreshRelayList();
avxViewModel.saveEmail = function(from) {
- var reminder = $filter('T')('Warning: This operation will take approximately 1–2 minutes. Please do not refresh the page or perform other actions until it is completed.');
- var action_reminder = confirm(reminder);
-
- if (!action_reminder) {
- avxViewModel.email.from_string = avxViewModel.originalFromString;
- from.$dirty = true;
- return;
- }
-
showProgressBar();
sysResourceService
.update_email(avxViewModel.email.from_string || "")
.then(function(res) {
- setTimeout(function() {
- $rootScope.$broadcast('endLoading', true);
- }, 60000);
+ $rootScope.$broadcast('endLoading', true);
if (res&&res.status === 200) {
if (!res.data[0]) {
@@ -352,23 +393,20 @@
from.$dirty=true;
} else {
from.$dirty=false;
-
avxViewModel.originalFromString = avxViewModel.email.from_string;
}
} else {
alert("Internal error.");
from.$dirty=true;
}
- });
+ })
+ .catch(function(error) {
+ $rootScope.$broadcast('endLoading', true);
+ alert("Internal error.");
+ from.$dirty=true;
+ });
};
avxViewModel.saveAlert = function(form) {
- var reminder = $filter('T')('Warning: This operation will take approximately 1–2 minutes. Please do not refresh the page or perform other actions until it is completed.');
- var action_reminder = confirm(reminder);
-
- if (!action_reminder) {
- return;
- }
-
showProgressBar();
var post_data = {
host_string: avxViewModel.alert.hostname || "",
@@ -409,6 +447,8 @@
form.$dirty=true;
} else {
form.$dirty=false;
+ // Refresh external mail server data after successful save
+ get_external_mail_info();
}
} else {
alert("Internal error.");
@@ -507,6 +547,31 @@
};
avxViewModel.loading = false;
+ // Hostname validation function (same as main email controller)
+ avxViewModel.isValidHostname = function(hostname) {
+ if (!hostname) return true; // Empty is valid
+
+ // IP address regex (IPv4)
+ var ipRegex = /^(((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))$/;
+
+ // FQDN regex
+ var fqdnRegex = /^([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)*[a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?$/;
+
+ return ipRegex.test(hostname) || fqdnRegex.test(hostname);
+ };
+
+ // Form validation function
+ avxViewModel.isFormInvalid = function(form, hostname, relayServer) {
+ return !hostname || // Required field check
+ !relayServer || // Required field check
+ hostname.length === 0 ||
+ relayServer.length === 0 ||
+ (hostname && hostname.length > 50) ||
+ (relayServer && relayServer.length > 30) ||
+ (hostname && !avxViewModel.isValidHostname(hostname)) ||
+ (relayServer && !avxViewModel.isValidHostname(relayServer));
+ };
+
var showProgressBar = function() {
var modalInstance = $uibModal.open({
templateUrl: 'app/modules/common/templates/progress.html',
@@ -537,6 +602,16 @@
if (!res.data[0]) {
alert(res.data[1]);
} else {
+ // Check for warnings even when API call succeeds
+ if (res.data[2] && Array.isArray(res.data[2])) {
+ var warnings = res.data[2];
+ for (var i = 0; i < warnings.length; i++) {
+ if (warnings[i][0] === "warning") {
+ alert(warnings[i][1]);
+ return; // Don't close modal if there's a warning
+ }
+ }
+ }
$uibModalInstance.close();
}
} else {
Index: /branches/rel_avx_2_7_6/src/webui/webui/htdocs/new/src/client/app/modules/system/submenu/sys_mgmt/email/email.html
===================================================================
--- /branches/rel_avx_2_7_6/src/webui/webui/htdocs/new/src/client/app/modules/system/submenu/sys_mgmt/email/email.html (revision 9233)
+++ /branches/rel_avx_2_7_6/src/webui/webui/htdocs/new/src/client/app/modules/system/submenu/sys_mgmt/email/email.html (working copy)
@@ -8,12 +8,14 @@
@@ -33,7 +35,9 @@
@@ -44,7 +48,7 @@
@@ -72,12 +76,15 @@
{{'External Email Server'|T}}
+
{{'Please do not exceed 64 characters'|T}}
+
{{'Please enter a valid IP address or hostname'|T}}
@@ -93,7 +100,7 @@
@@ -114,17 +121,28 @@
{{'Email'|T}}
+
{{'Please enter a valid email address'|T}}
+
{{'Please do not exceed 32 characters'|T}}
@@ -152,10 +170,9 @@
-