From 84a1edf67c7e99789f67e682b22340f23cc49f43 Mon Sep 17 00:00:00 2001 From: usmannasir Date: Tue, 8 Apr 2025 00:45:58 +0500 Subject: [PATCH] maintenanceMod fix --- .../websiteFunctions/websiteFunctions.js | 25 +++++++++++++------ .../websiteFunctions/listWebsites.html | 2 +- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/websiteFunctions/static/websiteFunctions/websiteFunctions.js b/websiteFunctions/static/websiteFunctions/websiteFunctions.js index 798225883..0eb875bb2 100755 --- a/websiteFunctions/static/websiteFunctions/websiteFunctions.js +++ b/websiteFunctions/static/websiteFunctions/websiteFunctions.js @@ -2676,11 +2676,11 @@ app.controller('listWebsites', function ($scope, $http, $window) { $scope.visitSite = function(wp) { var url = wp.url || wp.domain; - if (!url) return ''; - if (url.startsWith('http://') || url.startsWith('https://')) { - return url; + if (!url) return; + if (!url.startsWith('http://') && !url.startsWith('https://')) { + url = 'https://' + url; } - return 'https://' + url; + window.open(url, '_blank'); }; $scope.wpLogin = function(wpId) { @@ -5826,7 +5826,12 @@ app.controller('listWebsites', function ($scope, $http, $window) { }); }; - $scope.visitSite = function(url) { + $scope.visitSite = function(wp) { + var url = wp.url || wp.domain; + if (!url) return; + if (!url.startsWith('http://') && !url.startsWith('https://')) { + url = 'https://' + url; + } window.open(url, '_blank'); }; @@ -9421,7 +9426,12 @@ app.controller('listWebsites', function ($scope, $http, $window) { }); }; - $scope.visitSite = function(url) { + $scope.visitSite = function(wp) { + var url = wp.url || wp.domain; + if (!url) return; + if (!url.startsWith('http://') && !url.startsWith('https://')) { + url = 'https://' + url; + } window.open(url, '_blank'); }; @@ -13414,7 +13424,8 @@ app.controller('manageAliasController', function ($scope, $http, $timeout, $wind $scope.visitSite = function(wp) { var url = wp.url || wp.domain; - if (!/^https?:\/\//i.test(url)) { + if (!url) return; + if (!url.startsWith('http://') && !url.startsWith('https://')) { url = 'https://' + url; } window.open(url, '_blank'); diff --git a/websiteFunctions/templates/websiteFunctions/listWebsites.html b/websiteFunctions/templates/websiteFunctions/listWebsites.html index 44b662e87..5b7e7e05a 100755 --- a/websiteFunctions/templates/websiteFunctions/listWebsites.html +++ b/websiteFunctions/templates/websiteFunctions/listWebsites.html @@ -173,7 +173,7 @@ style="max-width: 100%; margin-bottom: 10px; min-height: 150px; background: #f5f5f5;" onerror="this.onerror=null; this.src='https://s.wordpress.org/style/images/about/WordPress-logotype-standard.png';">
- + Visit Site