andy/neoCMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 11 Wiki Activity

Fixed issue #8 - Issue was related to being unable to support https, and also over https, the port number was being included. Added support for https and removal of the port number. Also fixed issue with calls going to legacy location instead of core.

Browse Source
This commit is contained in:
Andy Dixon
2024-08-01 21:14:51 +01:00
parent 3e09519f5f
commit 49e914bb6e
10 changed files with 4524 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cms/js/dash.js
+1 -1
View File
@@ -90,7 +90,7 @@ changePrefs = function () {
};
logout = function () {
$.ajax({
type: "POST", url: "../functions/logout.php", success: function () {
type: "POST", url: "../core/logout.php", success: function () {
window.location = '../../'
}
})
cms/js/lib/jquery.js
Vendored
+4364 -351
View File
File diff suppressed because it is too large Load Diff
cms/js/main.js
+14 -11
View File
@@ -18,14 +18,14 @@ $(function () {
fBrowseBind()
});
tempCache = function () {
$.ajax({url: "neocms-temps/editor.html", cache: true, dataType: "html"});
$.ajax({url: "neocms-temps/image-editor.html", cache: true, dataType: "html"});
$.ajax({url: "neocms-temps/video-editor.html", cache: true, dataType: "html"});
$.ajax({url: "neocms-temps/html-editor.html", cache: true, dataType: "html"});
$.ajax({url: "neocms-temps/link-editor.html", cache: true, dataType: "html"});
$.ajax({url: "neocms-temps/table-editor.html", cache: true, dataType: "html"});
$.ajax({url: "neocms-temps/prompt.html", cache: true, dataType: "html"});
$.ajax({url: "neocms-temps/upload.html", cache: true, dataType: "html"})
$.ajax({url: "templates/editor.html", cache: true, dataType: "html"});
$.ajax({url: "templates/image-editor.html", cache: true, dataType: "html"});
$.ajax({url: "templates/video-editor.html", cache: true, dataType: "html"});
$.ajax({url: "templates/html-editor.html", cache: true, dataType: "html"});
$.ajax({url: "templates/link-editor.html", cache: true, dataType: "html"});
$.ajax({url: "templates/table-editor.html", cache: true, dataType: "html"});
$.ajax({url: "templates/prompt.html", cache: true, dataType: "html"});
$.ajax({url: "templates/upload.html", cache: true, dataType: "html"})
};
fBrowseBind = function () {
$('.neoCMSFBrowse').unbind('click').bind('click', function () {
@@ -174,25 +174,28 @@ linkBind = function () {
checkURL = function (linky) {
var linkHref = (linky.match('://')) ? linky.split('://') : linky;
$('#neoCMSFilesWrap').remove();
if (linkHref[0] == 'http' && linkHref[1]) {
if ((linkHref[0] == 'http' || linkHref[0] == 'https') && linkHref[1]) {
if (linkHref[1].match('/')) linkHref = linkHref[1].split('/');
linkHref = linkHref[0].split(':');
linkHref = linkHref[0];
var neoCMSLoc = window.location.href.split('//');
neoCMSLoc = neoCMSLoc[1].split('/');
neoCMSLoc = neoCMSLoc[0];
if (linkHref == neoCMSLoc || linkHref == 'www.' + neoCMSLoc) {
if ($('#neoCMSPageEdits .edit', ifrDoc).length) {
console.log(linkHref);
navAwayPrompt(linky, 'loc')
} else {
console.log($('#neoCMSPageSrc').length);
if ($('#neoCMSPageSrc').length) {
$.ajax({
type: "POST", url: "functions/getpage.php", data: "page=" + linky, success: function () {
type: "POST", url: "core/getpage.php", data: "page=" + linky, success: function () {
if (frames['neoCMSPageSrc'].contentWindow) frames['neoCMSPageSrc'].contentWindow.location.href = linky; else frames['neoCMSPageSrc'].location.href = linky
}
})
} else {
$.ajax({
type: "POST", url: "../functions/getpage.php", data: "page=" + linky, success: function () {
type: "POST", url: "../core/getpage.php", data: "page=" + linky, success: function () {
window.location = '../'
}
})
cms/js/neocms.js
+1 -1
View File
@@ -1861,7 +1861,7 @@ logoutPrompt = function () {
};
logout = function () {
$.ajax({
type: "POST", url: "functions/logout.php", success: function () {
type: "POST", url: "core/logout.php", success: function () {
window.location = retUrl()
}
})
cms/js/ui.js
+1 -1
View File
@@ -1863,7 +1863,7 @@ logoutPrompt = function () {
};
logout = function () {
$.ajax({
type: "POST", url: "functions/logout.php", success: function () {
type: "POST", url: "core/logout.php", success: function () {
window.location = retUrl()
}
})