mirror of
https://github.com/Cacti/cacti.git
synced 2026-11-21 20:23:18 +09:00
Re-resolving Issue #1239
This commit is contained in:
1 parent
d3e8bf8da0
commit
e0b68a64cd
2 files changed
+41
-38
No files matched your search
@@ -4,6 +4,7 @@ Cacti CHANGELOG
|
||||
-issue#1222: Fix RRDTool error in generate_graph_def_name()
|
||||
-issue#1230: Fix undefined function in tree.php
|
||||
-issue#1238: Cacti not handing git pull 'Invalid Object identifier' correctly
|
||||
-issue#1239: New Cacti browser error handler mishandling certain conditions
|
||||
-issue: Critial issue created when theme files are missing corrupting user settings
|
||||
|
||||
1.1.31
|
||||
|
||||
+40
-38
@@ -1295,47 +1295,49 @@ function loadPageNoHeader(href, scroll) {
|
||||
}
|
||||
|
||||
function getPresentHTTPError(data) {
|
||||
var title_match = data.match(/<title>(.*?)<\/title>/);
|
||||
var head_match = data.match(/<h1>(.*?)<\/h1>/);
|
||||
var para_match = data.match(/<p>(.*?)<\/p>/);
|
||||
if (typeof data != 'undefined') {
|
||||
var title_match = data.match(/<title>(.*?)<\/title>/);
|
||||
var head_match = data.match(/<h1>(.*?)<\/h1>/);
|
||||
var para_match = data.match(/<p>(.*?)<\/p>/);
|
||||
|
||||
errorStr = '';
|
||||
errorSub = '';
|
||||
errorText = '';
|
||||
errorStr = '';
|
||||
errorSub = '';
|
||||
errorText = '';
|
||||
|
||||
if (title_match != null) {
|
||||
var errorStr = title_match[1];
|
||||
}
|
||||
|
||||
if (head_match != null) {
|
||||
var errorSub = head_match[1];
|
||||
}
|
||||
|
||||
if (para_match != null) {
|
||||
var errorText = para_match[1];
|
||||
}
|
||||
|
||||
returnStr = '<div id="httperror" style="display:none">' +
|
||||
'<h4>' + errorOnPage + '</h4><hr>' +
|
||||
'<div style="padding-bottom: 5px;"><div style="display:table-cell;width:75px"><b>' + errorNumberPrefix + '</b></div> ' +
|
||||
'<div style="display:table-cell"> ' + errorStr + '</div></div>' +
|
||||
'<div><div style="display:table-cell;width:75px"><b>' + errorReasonPrefix + '</b></div> ' +
|
||||
'<div style="display:table-cell"> ' + errorText + '</div></div>' +
|
||||
'</div></div>';
|
||||
|
||||
$('#httperror').remove();
|
||||
$('body').append(returnStr);
|
||||
$('#httperror').dialog({
|
||||
resizable: false,
|
||||
height: 'auto',
|
||||
width: 400,
|
||||
title: errorStr,
|
||||
buttons: {
|
||||
Ok: function() {
|
||||
$(this).dialog('close');
|
||||
}
|
||||
if (title_match != null) {
|
||||
var errorStr = title_match[1];
|
||||
}
|
||||
});
|
||||
|
||||
if (head_match != null) {
|
||||
var errorSub = head_match[1];
|
||||
}
|
||||
|
||||
if (para_match != null) {
|
||||
var errorText = para_match[1];
|
||||
}
|
||||
|
||||
returnStr = '<div id="httperror" style="display:none">' +
|
||||
'<h4>' + errorOnPage + '</h4><hr>' +
|
||||
'<div style="padding-bottom: 5px;"><div style="display:table-cell;width:75px"><b>' + errorNumberPrefix + '</b></div> ' +
|
||||
'<div style="display:table-cell"> ' + errorStr + '</div></div>' +
|
||||
'<div><div style="display:table-cell;width:75px"><b>' + errorReasonPrefix + '</b></div> ' +
|
||||
'<div style="display:table-cell"> ' + errorText + '</div></div>' +
|
||||
'</div></div>';
|
||||
|
||||
$('#httperror').remove();
|
||||
$('body').append(returnStr);
|
||||
$('#httperror').dialog({
|
||||
resizable: false,
|
||||
height: 'auto',
|
||||
width: 400,
|
||||
title: errorStr,
|
||||
buttons: {
|
||||
Ok: function() {
|
||||
$(this).dialog('close');
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function ajaxAnchors() {
|
||||
|
||||
Reference in new issue
Block a user