mirror of https://github.com/MISP/MISP
rebase continue
Vito Piserchia
parent
7318850c26
commit
316359c3ba
|
|
@ -29,7 +29,7 @@ class ObjectTemplatesController extends AppController
|
|||
$items = array();
|
||||
$items[] = array(
|
||||
'name' => __('All Objects'),
|
||||
'value' => $this->baseurl . "/ObjectTemplates/objectChoice/" . h($event_id) . "/0"
|
||||
'value' => $this->baseurl . "/ObjectTemplates/objectChoice/" . h($event_id) . "/" . "0"
|
||||
);
|
||||
foreach($metas as $meta) {
|
||||
$items[] = array(
|
||||
|
|
|
|||
|
|
@ -479,7 +479,7 @@
|
|||
$clone.find('strong').text('Synchronization result:');
|
||||
if (job_sent) {
|
||||
$clone.find('#submoduleGitResult')
|
||||
.html('> Synchronizing DB with <a href="<?php echo $baseurl . '/jobs/index/'; ?>" target="_blank">workers</a>...');
|
||||
.html('> Synchronizing DB with <a href="<?php echo $baseurl . '/jobs/index/'; ?>" target="_blank">workers</a>...');
|
||||
} else {
|
||||
$clone.find('#submoduleGitResult')
|
||||
.text(sync_result);
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
</div><br />
|
||||
<div class="input file" id="file_container_<?php echo $element_id;?>">
|
||||
</div>
|
||||
<iframe id="iframe_<?php echo $element_id; ?>" src="<?php echo $baseurl; ?>/templates/uploadFile/<?php echo $element_id; ?>/<?php echo ($element['batch'] ? 'yes' : 'no'); ?>" style="border:0px;height:30px;width:100%;overflow:hidden;" scrolling="no"></iframe>
|
||||
<iframe id="iframe_<?php echo $element_id; ?>" src="<?php echo $baseurl; ?>/templates/uploadFile/<?php echo $element_id; ?>/<?php echo ($element['batch'] ? 'yes' : 'no'); ?>" style="border:0px;height:30px;width:100%;overflow:hidden;" scrolling="no"></iframe>
|
||||
<div class="error-message populateTemplateErrorField" <?php if (!isset($errors[$element_id])) echo 'style="display:none;"';?>>
|
||||
<?php echo __('Error') . ': ' . $errors[$element_id]; ?>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -294,7 +294,7 @@
|
|||
'<a href="#" style="color:white;" onClick="genericPopup(%s);">%s</a>',
|
||||
sprintf(
|
||||
"'%s/eventDelegations/view/%s', '#confirmation_box'",
|
||||
$baseurl,
|
||||
$baseurl,
|
||||
h($delegationRequest['EventDelegation']['id'])
|
||||
),
|
||||
__('View request details')
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
function queueInterval(k, id) {
|
||||
intervalArray[k] = setInterval(function() {
|
||||
if (tabIsActive) {
|
||||
$.getJSON('<?php echo $baseurl; ?>/jobs/getGenerateCorrelationProgress/' + id, function(data) {
|
||||
$.getJSON('<?php echo $baseurl; ?>/jobs/getGenerateCorrelationProgress/' + id, function(data) {
|
||||
var x = document.getElementById("bar" + id);
|
||||
x.style.width = data+"%";
|
||||
if (data > 0 && data < 100) {
|
||||
|
|
@ -147,7 +147,7 @@
|
|||
echo h($item['Job']['job_status']);
|
||||
if ($item['Job']['failed']):
|
||||
?>
|
||||
<div class="fa fa-search useCursorPointer queryPopover" title="<?php echo __('View stacktrace');?>" role="button" tabindex="0" aria-label="<?php echo __('View stacktrace');?>" data-url="<?php echo $basurl; ?>/jobs/getError" data-id="<?php echo h($item['Job']['process_id']); ?>"></div>
|
||||
<div class="fa fa-search useCursorPointer queryPopover" title="<?php echo __('View stacktrace');?>" role="button" tabindex="0" aria-label="<?php echo __('View stacktrace');?>" data-url="<?php echo $basurl; ?>/jobs/getError" data-id="<?php echo h($item['Job']['process_id']); ?>"></div>
|
||||
<?php
|
||||
endif;
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ foreach ($list as $template):
|
|||
?>
|
||||
</td>
|
||||
<td class="short action-links">
|
||||
<a href='<?php echo $baseurl; ?>/objectTemplates/view/<?php echo $template['ObjectTemplate']['id']; ?>' class = "fa fa-eye" title = "<?php echo __('View');?>" aria-label = "<?php echo __('View');?>"></a>
|
||||
<a href='<?php echo $baseurl; ?>/objectTemplates/view/<?php echo $template['ObjectTemplate']['id']; ?>' class = "fa fa-eye" title = "<?php echo __('View');?>" aria-label = "<?php echo __('View');?>"></a>
|
||||
<?php
|
||||
if ($isSiteAdmin):
|
||||
echo $this->Form->postLink('', array('action' => 'update', $template['ObjectTemplate']['name'], 1), array('class' => 'fa fa-sync', 'title' => __('Force update')), __('Are you sure you want to force an update for template # %s?', $template['ObjectTemplate']['id']));
|
||||
|
|
|
|||
|
|
@ -104,27 +104,27 @@
|
|||
<?php
|
||||
foreach ($orgs as $org): ?>
|
||||
<tr>
|
||||
<td class="short" ondblclick="document.location.href ='<?php echo $baseurl; ?>/organisations/view/<?php echo $org['Organisation']['id'];?>'"><?php echo h($org['Organisation']['id']); ?></td>
|
||||
<td class="short" ondblclick="document.location.href ='<?php echo $baseurl; ?>/organisations/view/<?php echo $org['Organisation']['id'];?>'">
|
||||
<td class="short" ondblclick="document.location.href ='<?php echo $baseurl . "/organisations/view/" . $org['Organisation']['id'];?>'"><?php echo h($org['Organisation']['id']); ?></td>
|
||||
<td class="short" ondblclick="document.location.href ='<?php echo $baseurl . "/organisations/view/" . $org['Organisation']['id'];?>'">
|
||||
<?php
|
||||
echo $this->OrgImg->getOrgImg(array('name' => $org['Organisation']['name'], 'id' => $org['Organisation']['id'], 'size' => 24));
|
||||
?>
|
||||
</td>
|
||||
<td class="short" ondblclick="document.location.href ='<?php echo $baseurl; ?>/organisations/view/<?php echo $org['Organisation']['id'];?>'"><?php echo h($org['Organisation']['name']); ?></td>
|
||||
<td class="short" ondblclick="document.location.href ='<?php echo $baseurl . "/organisations/view/" . $org['Organisation']['id'];?>'"><?php echo h($org['Organisation']['name']); ?></td>
|
||||
<?php if ($isSiteAdmin): ?>
|
||||
<td class="short" ondblclick="document.location.href ='<?php echo $baseurl; ?>/organisations/view/<?php echo $org['Organisation']['id'];?>'"><?php echo h($org['Organisation']['uuid']); ?></td>
|
||||
<td class="short" ondblclick="document.location.href ='<?php echo $baseurl . "/organisations/view/" . $org['Organisation']['id'];?>'"><?php echo h($org['Organisation']['uuid']); ?></td>
|
||||
<?php endif; ?>
|
||||
<td ondblclick="document.location.href ='<?php echo $baseurl; ?>/organisations/view/<?php echo $org['Organisation']['id'];?>'"><?php echo h($org['Organisation']['description']); ?></td>
|
||||
<td class="short" ondblclick="document.location.href ='<?php echo $baseurl; ?>/organisations/view/<?php echo $org['Organisation']['id'];?>'"><?php echo h($org['Organisation']['nationality']); ?></td>
|
||||
<td class="short" ondblclick="document.location.href ='<?php echo $baseurl; ?>/organisations/view/<?php echo $org['Organisation']['id'];?>'"><?php echo h($org['Organisation']['sector']); ?></td>
|
||||
<td class="short" ondblclick="document.location.href ='<?php echo $baseurl; ?>/organisations/view/<?php echo $org['Organisation']['id'];?>'"><?php echo h($org['Organisation']['type']); ?></td>
|
||||
<td ondblclick="document.location.href ='<?php echo $baseurl . "/organisations/view/" . $org['Organisation']['id'];?>'"><?php echo h($org['Organisation']['description']); ?></td>
|
||||
<td class="short" ondblclick="document.location.href ='<?php echo $baseurl . "/organisations/view/" . $org['Organisation']['id'];?>'"><?php echo h($org['Organisation']['nationality']); ?></td>
|
||||
<td class="short" ondblclick="document.location.href ='<?php echo $baseurl . "/organisations/view/" . $org['Organisation']['id'];?>'"><?php echo h($org['Organisation']['sector']); ?></td>
|
||||
<td class="short" ondblclick="document.location.href ='<?php echo $baseurl . "/organisations/view/" . $org['Organisation']['id'];?>'"><?php echo h($org['Organisation']['type']); ?></td>
|
||||
<td><?php echo h($org['Organisation']['contacts']); ?></td>
|
||||
<?php if ($isSiteAdmin): ?>
|
||||
<td class="short" ondblclick="document.location.href ='<?php echo $baseurl; ?>/organisations/view/<?php echo $org['Organisation']['id'];?>'">
|
||||
<td class="short" ondblclick="document.location.href ='<?php echo $baseurl . "/organisations/view/" . $org['Organisation']['id'];?>'">
|
||||
<?php echo (isset($org['Organisation']['created_by_email'])) ? h($org['Organisation']['created_by_email']) : ' '; ?>
|
||||
</td>
|
||||
<?php endif; ?>
|
||||
<td class="short <?php echo $org['Organisation']['local'] ? 'green' : 'red';?>" ondblclick="document.location.href ='<?php echo $baseurl; ?>/organisations/view/<?php echo $org['Organisation']['id'];?>'"><?php echo $org['Organisation']['local'] ? __('Yes') : __('No');?></td>
|
||||
<td class="short <?php echo $org['Organisation']['local'] ? 'green' : 'red';?>" ondblclick="document.location.href ='<?php echo $baseurl . "/organisations/view/" . $org['Organisation']['id'];?>'"><?php echo $org['Organisation']['local'] ? __('Yes') : __('No');?></td>
|
||||
<td class="short"><?php echo isset($org['Organisation']['user_count']) ? $org['Organisation']['user_count'] : '0';?></td>
|
||||
<td class="short">
|
||||
<?php
|
||||
|
|
@ -135,12 +135,12 @@ foreach ($orgs as $org): ?>
|
|||
</td>
|
||||
<td class="short action-links">
|
||||
<?php if ($isSiteAdmin): ?>
|
||||
<a href='<?php echo $baseurl . "/admin/organisations/edit/" . $org['Organisation']['id'];?>' class = "fa fa-edit" title = "<?php echo __('Edit');?>" aria-label = "<?php echo __('Edit');?>"></a>
|
||||
<a href='<?php echo $baseurl . "/admin/organisations/edit/" . $org['Organisation']['id'];?>' class = "fa fa-edit" title = "<?php echo __('Edit');?>" aria-label = "<?php echo __('Edit');?>"></a>
|
||||
<?php
|
||||
echo $this->Form->postLink('', array('admin' => true, 'action' => 'delete', $org['Organisation']['id']), array('class' => 'fa fa-trash', 'title' => __('Delete'), 'aria-label' => __('Delete')), __('Are you sure you want to delete %s?', $org['Organisation']['name']));
|
||||
?>
|
||||
<?php endif; ?>
|
||||
<a href='<?php echo $baseurl . "/organisations/view/" . $org['Organisation']['id']; ?>' class = "fa fa-eye" title = "<?php echo __('View');?>" aria-label = "<?php echo __('View');?>"></a>
|
||||
<a href='<?php echo $baseurl . "/organisations/view/" . $org['Organisation']['id']; ?>' class = "fa fa-eye" title = "<?php echo __('View');?>" aria-label = "<?php echo __('View');?>"></a>
|
||||
</td>
|
||||
</tr>
|
||||
<?php
|
||||
|
|
|
|||
|
|
@ -158,12 +158,12 @@ foreach ($servers as $row_pos => $server):
|
|||
<td class="short"><span class="<?php echo ($server['Server']['unpublish_event'] ? 'icon-ok' : 'icon-remove'); ?>" role="img" aria-label="<?php echo ($server['Server']['unpublish_event'] ? __('Yes') : __('No')); ?>"></span></td>
|
||||
<td class="short"><span class="<?php echo ($server['Server']['publish_without_email'] ? 'icon-ok' : 'icon-remove'); ?>" role="img" aria-label="<?php echo ($server['Server']['publish_without_email'] ? __('Yes') : __('No')); ?>"></span></td>
|
||||
<td><?php echo h($server['Server']['url']); ?> </td>
|
||||
<td><a href="<?php echo $baseurl . "/organisations/view/" . h($server['RemoteOrg']['id']); ?>"><?php echo h($server['RemoteOrg']['name']); ?></a></td>
|
||||
<td><a href="<?php echo $baseurl . "/organisations/view/" . h($server['RemoteOrg']['id']); ?>"><?php echo h($server['RemoteOrg']['name']); ?></a></td>
|
||||
<td class="short"><?php echo h($server['Server']['cert_file']); ?> </td>
|
||||
<td class="short"><?php echo h($server['Server']['client_cert_file']); ?> </td>
|
||||
<td class="short"><span class="<?php echo ($server['Server']['self_signed'] ? 'icon-ok' : 'icon-remove'); ?>" role="img" aria-label="<?php echo ($server['Server']['self_signed'] ? __('Yes') : __('No')); ?>"></span></td>
|
||||
<td class="short"><span class="<?php echo ($server['Server']['skip_proxy'] ? 'icon-ok' : 'icon-remove'); ?>" role="img" aria-label="<?php echo ($server['Server']['skip_proxy'] ? __('Yes') : __('No')); ?>"></span></td>
|
||||
<td class="short"><a href="<?php echo $baseurl . "/organisations/view/" . h($server['Organisation']['id']); ?>"><?php echo h($server['Organisation']['name']); ?></a></td>
|
||||
<td class="short"><a href="<?php echo $baseurl . "/organisations/view/" . h($server['Organisation']['id']); ?>"><?php echo h($server['Organisation']['name']); ?></a></td>
|
||||
<td class="short action-links">
|
||||
<?php
|
||||
echo sprintf('<a href="%s" title="%s" aria-label="%s" class="%s"></a>', $baseurl . '/servers/previewIndex/' . h($server['Server']['id']), __('Explore'), __('Explore'), 'fa fa-search');
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
<dd class="eventTagContainer">
|
||||
<?php if (!empty($event['Tag'])) foreach ($event['Tag'] as $tag): ?>
|
||||
<span style="padding-right:0px;">
|
||||
<span role="button" tabindex="0" aria-label="<?php echo __('Filter the remote instance by tag: %s', h($tag['name']));?>" title="<?php echo __('Filter the remote instance on the tag: %s', h($tag['name'])); ?>" onclick="document.location.href='<?php echo $baseurl . "/servers/previewIndex/" . h($server['Server']['id']); ?>/searchtag:<?php echo h($tag['name']); ?>';" class="tagFirstHalf" style="background-color:<?php echo h($tag['colour']);?>;color:<?php echo $this->TextColour->getTextColour($tag['colour']);?>"><?php echo h($tag['name']); ?></span>
|
||||
<span role="button" tabindex="0" aria-label="<?php echo __('Filter the remote instance by tag: %s', h($tag['name']));?>" title="<?php echo __('Filter the remote instance on the tag: %s', h($tag['name'])); ?>" onclick="document.location.href='<?php echo $baseurl . "/servers/previewIndex/" . h($server['Server']['id']); ?>/searchtag:<?php echo h($tag['name']); ?>';" class="tagFirstHalf" style="background-color:<?php echo h($tag['colour']);?>;color:<?php echo $this->TextColour->getTextColour($tag['colour']);?>"><?php echo h($tag['name']); ?></span>
|
||||
</span>
|
||||
<?php endforeach; ?>
|
||||
</dd>
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
<?php
|
||||
foreach ($types as $key => $value):
|
||||
?>
|
||||
<span class="tabMenuFixed tabMenuFixedCenter tabMenuSides useCursorPointer <?php if ($value['selected']) echo 'tabMenuActive'; ?>" onclick="window.location='<?php echo $baseurl; ?>/users/statistics/orgs/scope:<?php echo h($key);?>'"><?php echo h($value['text']); ?></span>
|
||||
<span class="tabMenuFixed tabMenuFixedCenter tabMenuSides useCursorPointer <?php if ($value['selected']) echo 'tabMenuActive'; ?>" onclick="window.location='<?php echo $baseurl; ?>/users/statistics/orgs/scope:<?php echo h($key);?>'"><?php echo h($value['text']); ?></span>
|
||||
<?php
|
||||
endforeach;
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -359,7 +359,7 @@
|
|||
this.refreshInfoCells();
|
||||
this.redrawGraph();
|
||||
// highlight attribute types
|
||||
$.getJSON('/decayingModelMapping/viewAssociatedTypes/' + model.id, function(j) {
|
||||
$.getJSON(baseurl + '/decayingModelMapping/viewAssociatedTypes/' + model.id, function(j) {
|
||||
that.highlightAttributeType(j);
|
||||
});
|
||||
},
|
||||
|
|
@ -616,7 +616,7 @@
|
|||
},
|
||||
refreshTypeMappingTable: function(model_id) {
|
||||
var that = this;
|
||||
$.getJSON('/decayingModelMapping/viewAssociatedTypes/' + model_id, function(j) {
|
||||
$.getJSON(baseurl + '/decayingModelMapping/viewAssociatedTypes/' + model_id, function(j) {
|
||||
// ensure that the row contains the model ID
|
||||
var $tr = that.findMatchingAttributeType(j);
|
||||
that.highlightAttributeType($tr);
|
||||
|
|
@ -914,7 +914,7 @@ ModelTable.prototype = {
|
|||
if ($filter_radio) {
|
||||
filters[$filter_radio.val()] = 1;
|
||||
}
|
||||
$.getJSON('/decayingModel/getAllDecayingModels/', filters, function(json) {
|
||||
$.getJSON(baseurl + '/decayingModel/getAllDecayingModels/', filters, function(json) {
|
||||
that.update(json);
|
||||
});
|
||||
},
|
||||
|
|
|
|||
|
|
@ -595,9 +595,9 @@ function edit_item(id, callback) {
|
|||
var item = items_timeline.get(id);
|
||||
var group = item.group;
|
||||
if (group == 'attribute') {
|
||||
simplePopup('/attributes/edit/'+item.orig_id);
|
||||
simplePopup(baseurl+'/attributes/edit/'+item.orig_id);
|
||||
} else if (group == 'object') {
|
||||
window.location = '/objects/edit/'+item.orig_id;
|
||||
window.location = baseurl+'/objects/edit/'+item.orig_id;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue