MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

rebase continue

pull/5974/head
Vito Piserchia 2020-08-17 15:57:21 +02:00
parent f1c4ab081b
commit c1e13c034d
9 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/View/Attributes/index.ctp
View File

@ -168,7 +168,7 @@ $(document).ready(function () {
});
object_id = selected.join('|');
}
url = "/sightings/advanced/" + object_id + "/" + object_context;
url = "<?php echo $baseurl; ?>" + "/sightings/advanced/" + object_id + "/" + object_context;
genericPopup(url, '#popover_box');
});
$('.correlation-toggle').click(function() {

2
app/View/Elements/Events/View/row_object_reference.ctp
View File

@ -25,7 +25,7 @@
<?php
if ($mayModify):
?>
<span class="fa fa-plus-square useCursorPointer" title="<?php echo __('Add reference');?>" role="button" tabindex="0" aria-label="<?php echo __('Add reference');?>" onClick="genericPopup(<?php echo '/objectReferences/add/' . h($object['id']);?>', '#popover_form');"></span>
<span class="fa fa-plus-square useCursorPointer" title="<?php echo __('Add reference');?>" role="button" tabindex="0" aria-label="<?php echo __('Add reference');?>" onClick="genericPopup('<?php echo $baseurl . '/objectReferences/add/' . h($object['id']);?>', '#popover_form');"></span>
<?php
endif;
?>

2
app/View/Elements/eventattribute.ctp
View File

@ -331,7 +331,7 @@ attributes or the appropriate distribution level. If you think there is a mistak
});
object_id = selected.join('|');
}
url = "/sightings/advanced/" + object_id + "/" + object_context;
url = "<?php echo $baseurl; ?>" + "/sightings/advanced/" + object_id + "/" + object_context;
genericPopup(url, '#popover_box');
});
$(".eventViewAttributeHover").mouseenter(function() {

4
app/View/Elements/genericElements/SideMenu/side_menu.ctp
View File

@ -215,7 +215,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
'onClick' => array(
'function' => 'genericPopup',
'params' => array('/event_delegations/acceptDelegation/' . $delegationRequest['EventDelegation']['id'], '#confirmation_box')
'params' => array($baseurl . '/event_delegations/acceptDelegation/' . $delegationRequest['EventDelegation']['id'], '#confirmation_box')
),
'text' => __('Accept Delegation Request')
));
@ -223,7 +223,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
'onClick' => array(
'function' => 'genericPopup',
'params' => array('/event_delegations/deleteDelegation/' . $delegationRequest['EventDelegation']['id'], '#confirmation_box')
'params' => array($baseurl . '/event_delegations/deleteDelegation/' . $delegationRequest['EventDelegation']['id'], '#confirmation_box')
),
'text' => __('Discard Delegation Request')
));

4
app/View/EventDelegations/ajax/view.ctp
View File

@ -18,9 +18,9 @@ $requester = $me['org_id'] == $delegation['RequesterOrg']['id'] ? __('Your organ
<p><b><?php echo __('Message from requester');?></b><br /><?php echo h($delegation['EventDelegation']['message']); ?></p>
<div class="row-fluid">
<?php if ($isSiteAdmin || $me['org_id'] == $delegation['Org']['id']):?>
<span role="button" tabindex="0" aria-label="<?php echo __('Accept delegation request');?>" title="<?php echo __('Accept delegation request');?>" class="btn btn-primary" onClick="genericPopup('/event_delegations/acceptDelegation/<?php echo h($delegation['EventDelegation']['id']); ?>', '#confirmation_box');"><?php echo __('Accept');?></span>
<span role="button" tabindex="0" aria-label="<?php echo __('Accept delegation request');?>" title="<?php echo __('Accept delegation request');?>" class="btn btn-primary" onClick="genericPopup('<?php echo $baseurl?>/event_delegations/acceptDelegation/<?php echo h($delegation['EventDelegation']['id']); ?>', '#confirmation_box');"><?php echo __('Accept');?></span>
<?php endif;?>
<span role="button" tabindex="0" aria-label="<?php echo __('Decline and remove delegation request');?>" title="<?php echo __('Decline and remove delegation request');?>" class="btn btn-inverse" onClick="genericPopup('/event_delegations/deleteDelegation/<?php echo h($delegation['EventDelegation']['id']); ?>', '#confirmation_box');"><?php echo __('Discard');?></span>
<span role="button" tabindex="0" aria-label="<?php echo __('Decline and remove delegation request');?>" title="<?php echo __('Decline and remove delegation request');?>" class="btn btn-inverse" onClick="genericPopup('<?php echo $baseurl?>/event_delegations/deleteDelegation/<?php echo h($delegation['EventDelegation']['id']); ?>', '#confirmation_box');"><?php echo __('Discard');?></span>
<span role="button" tabindex="0" aria-label="<?php echo __('Cancel');?>" title="<?php echo __('Cancel');?>" class="btn btn-inverse" style="float:right;" id="PromptNoButton" onClick="cancelPrompt();"><?php echo __('Cancel');?></span>
</div>
</div>

3
app/View/Events/view.ctp
View File

@ -293,7 +293,8 @@
sprintf (
'<a href="#" style="color:white;" onClick="genericPopup(%s);">%s</a>',
sprintf(
"'/eventDelegations/view/%s', '#confirmation_box'",
"'%s/eventDelegations/view/%s', '#confirmation_box'",
$baseurl,
h($delegationRequest['EventDelegation']['id'])
),
__('View request details')

4
app/webroot/js/event-graph.js
View File

@ -1582,7 +1582,7 @@ class MispInteraction {
return;
}
var edgeFromId = edgeData.from.startsWith('o-') ? edgeData.from.substr(2) : edgeData.from;
genericPopup('/objectReferences/add/'+edgeFromId, '#popover_form', function() {
genericPopup(baseurl + '/objectReferences/add/'+edgeFromId, '#popover_form', function() {
$('#ObjectReferenceReferencedUuid').val(uuid);
objectReferenceInput();
});
@ -1604,7 +1604,7 @@ class MispInteraction {
dataHandler.fetch_reference_data(rel_uuid, function(data) {
data = data[0].ObjectReference;
var uuid = data.referenced_uuid;
genericPopup('/objectReferences/add/'+data.object_id, '#popover_form', function() {
genericPopup(baseurl + '/objectReferences/add/'+data.object_id, '#popover_form', function() {
$('#targetSelect').val(uuid);
$('#ObjectReferenceComment').val(data.comment);
$('#ObjectReferenceRelationshipTypeSelect').val(data.relationship_type);

8
app/webroot/js/event-timeline.js
View File

@ -248,7 +248,7 @@ function reflect_change(onIndex, itemType, itemId, item) {
}
function quick_fetch_seens(itemType, itemId, callback) {
var url = "/" + itemType + "/" + "fetchViewValue" + "/" + itemId + "/";
var url = baseurl + "/" + itemType + "/" + "fetchViewValue" + "/" + itemId + "/";
var dfs = $.ajax({
dataType: "html",
cache: false,
@ -282,7 +282,7 @@ function update_seen(item, seenType, value, reflect, callback) {
}
function fetch_form_and_submit(itemType, item, seenType, value, reflect, callback) {
var url = "/" + itemType + "/fetchEditForm/" + item.orig_id + "/" + seenType+"_seen";
var url = baseurl + "/" + itemType + "/fetchEditForm/" + item.orig_id + "/" + seenType+"_seen";
$.ajax({
beforeSend: function (XMLHttpRequest) {
$(".loadingTimeline").show();
@ -418,7 +418,7 @@ function reload_timeline() {
var selectedScope = map_scope($('#select_timeline_scope').val());
var payload = {scope: selectedScope};
$.ajax({
url: "/events/"+"getEventTimeline"+"/"+scope_id+"/"+extended_text+"event.json",
url: baseurl + "/events/"+"getEventTimeline"+"/"+scope_id+"/"+extended_text+"event.json",
dataType: 'json',
type: 'post',
contentType: 'application/json',
@ -500,7 +500,7 @@ function enable_timeline() {
};
var payload = {scope: map_scope($('#select_timeline_scope').val())};
$.ajax({
url: "/events/"+"getEventTimeline"+"/"+scope_id+"/"+extended_text+"event.json",
url: baseurl + "/events/"+"getEventTimeline"+"/"+scope_id+"/"+extended_text+"event.json",
dataType: 'json',
type: 'post',
contentType: 'application/json',

4
app/webroot/js/misp.js
View File

@ -3249,7 +3249,7 @@ function runOnDemandAction(element, url, target, postFormField) {
function getRemoteSyncUser(id) {
var resultContainer = $("#sync_user_test_" + id);
$.ajax({
url: '/servers/getRemoteUser/' + id,
url: baseurl + '/servers/getRemoteUser/' + id,
type:'GET',
beforeSend: function (XMLHttpRequest) {
resultContainer.html('Running test...');
@ -3401,7 +3401,7 @@ function gpgSelect(fingerprint) {
$("#gray_out").fadeOut();
$.ajax({
type: "get",
url: "/users/fetchGpgKey/" + fingerprint,
url: baseurl + "/users/fetchGpgKey/" + fingerprint,
beforeSend: function () {
$(".loading").show();
},