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

Merge branch 'hotfix-2.3.131'

pull/672/head v2.3.131
iglocska 2015-09-21 09:22:24 +02:00
parent 8d824ddf1a 6fa13b4ad0
commit b449dcdac2
6 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.json
View File

@ -1 +1 @@
{"major":2, "minor":3, "hotfix":130}
{"major":2, "minor":3, "hotfix":131}

3
app/Controller/UsersController.php
View File

@ -156,6 +156,7 @@ class UsersController extends AppController {
* @return void
*/
public function admin_index() {
$this->User->virtualFields['org_ci'] = 'UPPER(User.org)';
$urlparams = "";
$passedArgsArray = array();
$booleanFields = array('autoalert', 'contactalert', 'termsaccepted');
@ -191,8 +192,8 @@ class UsersController extends AppController {
if (!empty($test)) $this->paginate['conditions']['AND'][] = $test;
}
}
$passedArgsArray[$searchTerm] = $v;
}
$passedArgsArray[$searchTerm] = $v;
}
$this->set('urlparams', $urlparams);
$this->set('passedArgsArray', $passedArgsArray);

2
app/Model/Attribute.php
View File

@ -1302,7 +1302,7 @@ class Attribute extends AppModel {
public function text($org, $isSiteAdmin, $type, $tags = false, $eventId = false, $allowNonIDS = false, $from = false, $to = false, $last = false) {
//restricting to non-private or same org if the user is not a site-admin.
$conditions['AND'] = array();
if (defined($allowNonIDS) && $allowNonIDS === false) $conditions['AND'] = array('Attribute.to_ids =' => 1, 'Event.published =' => 1);
if ($allowNonIDS === false) $conditions['AND'] = array('Attribute.to_ids =' => 1, 'Event.published =' => 1);
if ($type !== 'all') $conditions['AND']['Attribute.type'] = $type;
if ($from) $conditions['AND']['Event.date >='] = $from;
if ($to) $conditions['AND']['Event.date <='] = $to;

2
app/View/Events/automation.ctp
View File

@ -172,7 +172,7 @@ Use semicolons instead (the search will automatically search for colons instead)
<p>The same search could be accomplished using the following POSTed XML object (note that ampersands need to be escaped, or alternatively separate id and tag elements can be used): </p>
<code>&lt;request&gt;&lt;id&gt;!51&lt;/id&gt;&lt;id&gt;!62&lt;/id&gt;&lt;tags&gt;APT1&lt;/tags&gt;&lt;tags&gt;!OSINT&lt;/tags&gt;&lt;from&gt;2015-02-15&lt;/from&gt;&lt;/request&gt;</code>
<h3>Text export</h3>
<p>An export of all attributes of a specific type to a plain text file. By default non IDS flagged attributes are also exported.</p>
<p>An export of all attributes of a specific type to a plain text file. By default only published and IDS flagged attributes are exported.</p>
<p>You can configure your tools to automatically download the following files:</p>
<pre>
<?php

7
app/View/Pages/doc/administration.ctp
View File

@ -16,6 +16,7 @@
<li><a href="#logs">Logging</a></li>
<li><a href="#admin_tools">Administrative Tools</a></li>
<li><a href="#background">Background Processing</a></li>
<li><a href="#faq">FAQ</a></li>
</ul>
</li>
<li><?php echo $this->Html->link('Categories and Types', array('controller' => 'pages', 'action' => 'display', 'doc', 'categories_and_types')); ?></li>
@ -241,4 +242,10 @@
<li><b>Message</b>: This field shows when the job was queued by the scheduler for execution. </li>
</ul>
<br /><img src="/img/doc/schedule.png" alt = "" title = "Site administrators can schedule reccuring tasks on this page."/><br />
<h2 ><a id="diagnostics"></a>Frequently asked questions</h2>
<b>Losing access to the platform and resetting the password</b><br /><br />
If you ever lock yourself out of MISP as a site admin, there is a command line tool to reset your password. This can also be handy if you have changed the salt key and invalidated all of the passwords.<br />
Simply run the command:<br />
<code>/var/www/MISP/app/Console/cake Password my.email@address.com my_new_password</code><br />
This will create a new password hash using the currently set salt.
</div>

2
app/View/Users/admin_index.ctp
View File

@ -41,7 +41,7 @@
<table class="table table-striped table-hover table-condensed">
<tr>
<th><?php echo $this->Paginator->sort('id');?></th>
<th><?php echo $this->Paginator->sort('org');?></th>
<th><?php echo $this->Paginator->sort('org_ci', 'Org');?></th>
<th><?php echo $this->Paginator->sort('role_id', 'Role');?></th>
<th><?php echo $this->Paginator->sort('email');?></th>
<th><?php echo $this->Paginator->sort('autoalert');?></th>