diff --git a/html/css/styles.css b/html/css/styles.css
index 80d53766ec..d68b1fa1fe 100644
--- a/html/css/styles.css
+++ b/html/css/styles.css
@@ -63,7 +63,7 @@ ul ul ul { list-style: square outside; }
}
.submit {
- background-image: url('/images/submitbg.png');
+ background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAATCAIAAAA4QDsKAAAABGdBTUEAALGPC/xhBQAAAEZJREFUeJyVjMEJACEQA2dlSxD7r2/xcdhAfNwJig/PfJIhISaJocQk/9ccwTDAEYAQ4K99sylfXm+gtbFl1p4WNUouUaMDPUI2q6SigUIAAAAASUVORK5CYII=');
background-position: 0 100%;
border-color: #B2B2B2 #525252 #525252 #B2B2B2;
}
diff --git a/html/includes/authenticate.inc.php b/html/includes/authenticate.inc.php
index 316fcde5c5..f1f5087d2e 100644
--- a/html/includes/authenticate.inc.php
+++ b/html/includes/authenticate.inc.php
@@ -33,7 +33,7 @@ if ($vars['page'] == 'logout' && $_SESSION['authenticated']) {
setcookie('auth', '', (time() - 60 * 60 * 24 * $config['auth_remember']), '/');
session_destroy();
$auth_message = 'Logged Out';
- header('Location: /');
+ header('Location: ' . $config['base_url']);
exit;
}
diff --git a/html/includes/common/alerts.inc.php b/html/includes/common/alerts.inc.php
index 0dabec69df..b135ee48ff 100644
--- a/html/includes/common/alerts.inc.php
+++ b/html/includes/common/alerts.inc.php
@@ -31,7 +31,7 @@ var alerts_grid = $("#alerts").bootgrid({
device_id: \'' . $device['device_id'] .'\'
};
},
- url: "/ajax_table.php",
+ url: "ajax_table.php",
formatters: {
"status": function(column,row) {
return "
" + row.msg + "
";
@@ -70,7 +70,7 @@ var alerts_grid = $("#alerts").bootgrid({
var state = $(this).data("state");
$.ajax({
type: "POST",
- url: "/ajax_form.php",
+ url: "ajax_form.php",
data: { type: "ack-alert", alert_id: alert_id, state: state },
success: function(msg){
$("#message").html(\'\'+msg+\'
\');
diff --git a/html/includes/common/eventlog.inc.php b/html/includes/common/eventlog.inc.php
index 8640559e8b..7ce1590c01 100644
--- a/html/includes/common/eventlog.inc.php
+++ b/html/includes/common/eventlog.inc.php
@@ -24,7 +24,7 @@ var eventlog_grid = $("#eventlog").bootgrid({
type: "' .mres($vars['type']) .'",
};
},
- url: "/ajax_table.php"
+ url: "ajax_table.php"
});
diff --git a/html/includes/modal/alert_schedule.inc.php b/html/includes/modal/alert_schedule.inc.php
index b726a219f6..01474b7c9d 100644
--- a/html/includes/modal/alert_schedule.inc.php
+++ b/html/includes/modal/alert_schedule.inc.php
@@ -102,7 +102,7 @@ $('#schedule-maintenance').on('show.bs.modal', function (event) {
if (schedule_id > 0) {
$.ajax({
type: "POST",
- url: "/ajax_form.php",
+ url: "ajax_form.php",
data: { type: "schedule-maintenance", sub_type: "parse-maintenance", schedule_id: schedule_id },
dataType: "json",
success: function(output) {
@@ -124,7 +124,7 @@ $('#sched-submit').click('', function(e) {
e.preventDefault();
$.ajax({
type: "POST",
- url: "/ajax_form.php",
+ url: "ajax_form.php",
data: $('form.schedule-maintenance-form').serialize(),
dataType: "json",
success: function(data){
diff --git a/html/includes/modal/alert_template.inc.php b/html/includes/modal/alert_template.inc.php
index bd034952e6..71574ba6f7 100644
--- a/html/includes/modal/alert_template.inc.php
+++ b/html/includes/modal/alert_template.inc.php
@@ -107,7 +107,7 @@ $('#alert-template').on('show.bs.modal', function (event) {
$('#template_id').val(template_id);
$.ajax({
type: "POST",
- url: "/ajax_form.php",
+ url: "ajax_form.php",
data: { type: "parse-alert-template", template_id: template_id },
dataType: "json",
success: function(output) {
@@ -125,7 +125,7 @@ $('#create-template').click('', function(e) {
var name = $("#name").val();
$.ajax({
type: "POST",
- url: "/ajax_form.php",
+ url: "ajax_form.php",
data: { type: "alert-templates", template: template , name: name, template_id: template_id},
dataType: "html",
success: function(msg){
diff --git a/html/includes/modal/attach_alert_template.inc.php b/html/includes/modal/attach_alert_template.inc.php
index 3e16014cc7..409c6405c7 100644
--- a/html/includes/modal/attach_alert_template.inc.php
+++ b/html/includes/modal/attach_alert_template.inc.php
@@ -60,7 +60,7 @@ $('#attach-alert-template').on('show.bs.modal', function(e) {
$("#template_id").val(template_id);
$.ajax({
type: "POST",
- url: "/ajax_form.php",
+ url: "ajax_form.php",
data: { type: "parse-template-rules", template_id: template_id },
dataType: "json",
success: function(output) {
@@ -88,7 +88,7 @@ $('#alert-template-attach').click('', function(event) {
var rules = items.join(',');
$.ajax({
type: 'POST',
- url: '/ajax_form.php',
+ url: 'ajax_form.php',
data: { type: "attach-alert-template", template_id: template_id, rule_id: rules },
dataType: "html",
success: function(msg) {
diff --git a/html/includes/modal/delete_alert_map.inc.php b/html/includes/modal/delete_alert_map.inc.php
index 930e1b7f85..ee0d0fd130 100644
--- a/html/includes/modal/delete_alert_map.inc.php
+++ b/html/includes/modal/delete_alert_map.inc.php
@@ -50,7 +50,7 @@ $('#alert-map-removal').click('', function(event) {
var map_id = $("#map_id").val();
$.ajax({
type: 'POST',
- url: '/ajax_form.php',
+ url: 'ajax_form.php',
data: { type: "delete-alert-map", map_id: map_id },
dataType: "html",
success: function(msg) {
diff --git a/html/includes/modal/delete_alert_rule.inc.php b/html/includes/modal/delete_alert_rule.inc.php
index fdbe700777..fa5951b5b8 100644
--- a/html/includes/modal/delete_alert_rule.inc.php
+++ b/html/includes/modal/delete_alert_rule.inc.php
@@ -50,7 +50,7 @@ $('#alert-rule-removal').click('', function(event) {
var alert_id = $("#alert_id").val();
$.ajax({
type: 'POST',
- url: '/ajax_form.php',
+ url: 'ajax_form.php',
data: { type: "delete-alert-rule", alert_id: alert_id },
dataType: "html",
success: function(msg) {
diff --git a/html/includes/modal/delete_alert_template.inc.php b/html/includes/modal/delete_alert_template.inc.php
index 5161ea5bef..41413a1b91 100644
--- a/html/includes/modal/delete_alert_template.inc.php
+++ b/html/includes/modal/delete_alert_template.inc.php
@@ -50,7 +50,7 @@ $('#alert-template-removal').click('', function(event) {
var template_id = $("#template_id").val();
$.ajax({
type: 'POST',
- url: '/ajax_form.php',
+ url: 'ajax_form.php',
data: { type: "delete-alert-template", template_id: template_id },
dataType: "html",
success: function(msg) {
diff --git a/html/includes/modal/delete_device_group.inc.php b/html/includes/modal/delete_device_group.inc.php
index 42e504cd97..77c0e70e8b 100644
--- a/html/includes/modal/delete_device_group.inc.php
+++ b/html/includes/modal/delete_device_group.inc.php
@@ -50,7 +50,7 @@ $('#device-group-removal').click('', function(event) {
var group_id = $("#group_id").val();
$.ajax({
type: 'POST',
- url: '/ajax_form.php',
+ url: 'ajax_form.php',
data: { type: "delete-device-group", group_id: group_id },
dataType: "html",
success: function(msg) {
diff --git a/html/includes/modal/new_alert_map.inc.php b/html/includes/modal/new_alert_map.inc.php
index b414d730db..c9ec494d4a 100644
--- a/html/includes/modal/new_alert_map.inc.php
+++ b/html/includes/modal/new_alert_map.inc.php
@@ -57,7 +57,7 @@ $('#create-map').on('show.bs.modal', function (event) {
$('#map_id').val(map_id);
$.ajax({
type: "POST",
- url: "/ajax_form.php",
+ url: "ajax_form.php",
data: { type: "parse-alert-map", map_id: map_id },
dataType: "json",
success: function(output) {
@@ -166,7 +166,7 @@ $('#map-submit').click('', function(e) {
e.preventDefault();
$.ajax({
type: "POST",
- url: "/ajax_form.php",
+ url: "ajax_form.php",
data: $('form.maps-form').serialize(),
success: function(msg){
$("#message").html(''+msg+'
');
diff --git a/html/includes/modal/new_alert_rule.inc.php b/html/includes/modal/new_alert_rule.inc.php
index 5d4ff60765..7868a0b00c 100644
--- a/html/includes/modal/new_alert_rule.inc.php
+++ b/html/includes/modal/new_alert_rule.inc.php
@@ -184,7 +184,7 @@ $('#create-alert').on('show.bs.modal', function (event) {
}
$.ajax({
type: "POST",
- url: "/ajax_form.php",
+ url: "ajax_form.php",
data: { type: "parse-alert-rule", alert_id: alert_id },
dataType: "json",
success: function(output) {
@@ -347,7 +347,7 @@ $('#rule-submit').click('', function(e) {
e.preventDefault();
$.ajax({
type: "POST",
- url: "/ajax_form.php",
+ url: "ajax_form.php",
data: $('form.alerts-form').serialize(),
success: function(msg){
if(msg.indexOf("ERROR:") <= -1) {
diff --git a/html/includes/modal/new_device_group.inc.php b/html/includes/modal/new_device_group.inc.php
index d1dc5d6f4d..79fee676df 100644
--- a/html/includes/modal/new_device_group.inc.php
+++ b/html/includes/modal/new_device_group.inc.php
@@ -119,7 +119,7 @@ $('#create-group').on('show.bs.modal', function (event) {
});
$.ajax({
type: "POST",
- url: "/ajax_form.php",
+ url: "ajax_form.php",
data: { type: "parse-device-group", group_id: group_id },
dataType: "json",
success: function(output) {
@@ -192,7 +192,7 @@ $('#group-submit').click('', function(e) {
e.preventDefault();
$.ajax({
type: "POST",
- url: "/ajax_form.php",
+ url: "ajax_form.php",
data: $('form.group-form').serialize(),
success: function(msg){
if(msg.indexOf("ERROR:") <= -1) {
diff --git a/html/includes/modal/poller_groups.inc.php b/html/includes/modal/poller_groups.inc.php
index ccbfe22458..9482c99940 100644
--- a/html/includes/modal/poller_groups.inc.php
+++ b/html/includes/modal/poller_groups.inc.php
@@ -93,7 +93,7 @@ $('#group-removal').click('', function(e) {
group_id = $("#group_id").val();
$.ajax({
type: "POST",
- url: "/ajax_form.php",
+ url: "ajax_form.php",
data: $('form.remove_group_form').serialize() ,
success: function(msg) {
$("#thanks").html(''+msg+'
');
@@ -115,7 +115,7 @@ $('#poller-groups').on('show.bs.modal', function (event) {
$('#group_id').val(group_id);
$.ajax({
type: "POST",
- url: "/ajax_form.php",
+ url: "ajax_form.php",
data: { type: "parse-poller-groups", group_id: group_id },
dataType: "json",
success: function(output) {
@@ -133,7 +133,7 @@ $('#create-group').click('', function(e) {
var group_id = $('#group_id').val();
$.ajax({
type: "POST",
- url: "/ajax_form.php",
+ url: "ajax_form.php",
data: { type: "poller-groups", group_name: group_name, descr: descr, group_id: group_id },
dataType: "html",
success: function(msg){
diff --git a/html/includes/modal/remove_alert_schedule.inc.php b/html/includes/modal/remove_alert_schedule.inc.php
index 0e168ae77a..f95464db9a 100644
--- a/html/includes/modal/remove_alert_schedule.inc.php
+++ b/html/includes/modal/remove_alert_schedule.inc.php
@@ -52,7 +52,7 @@ $('#sched-maintenance-removal').click('', function(e) {
e.preventDefault();
$.ajax({
type: "POST",
- url: "/ajax_form.php",
+ url: "ajax_form.php",
data: $('form.schedule-maintenance-del').serialize(),
dataType: "json",
success: function(data){
diff --git a/html/includes/print-alert-rules.php b/html/includes/print-alert-rules.php
index f6296b3ebb..670a578150 100644
--- a/html/includes/print-alert-rules.php
+++ b/html/includes/print-alert-rules.php
@@ -268,7 +268,7 @@ $('#ack-alert').click('', function(e) {
var alert_id = $(this).data("alert_id");
$.ajax({
type: "POST",
- url: "/ajax_form.php",
+ url: "ajax_form.php",
data: { type: "ack-alert", alert_id: alert_id },
success: function(msg){
$("#message").html(''+msg+'
');
@@ -294,7 +294,7 @@ $('input[name="alert-rule"]').on('switchChange.bootstrapSwitch', function(event
var orig_class = $(this).data("orig_class");
$.ajax({
type: 'POST',
- url: '/ajax_form.php',
+ url: 'ajax_form.php',
data: { type: "update-alert-rule", alert_id: alert_id, state: state },
dataType: "html",
success: function(msg) {
diff --git a/html/includes/print-interface.inc.php b/html/includes/print-interface.inc.php
index 26f33fb509..bfb5d1bd73 100644
--- a/html/includes/print-interface.inc.php
+++ b/html/includes/print-interface.inc.php
@@ -30,7 +30,7 @@ else {
}
if (dbFetchCell('SELECT COUNT(*) FROM `mac_accounting` WHERE `port_id` = ?', array($port['port_id']))) {
- $mac = " 'macaccounting'))."'>
";
+ $mac = " 'macaccounting'))."'>
";
}
else {
$mac = '';
diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 54b51213f8..c436d5b7d0 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -489,12 +489,12 @@ if ($_SESSION['userlevel'] >= '10') {