mirror of https://github.com/MISP/MISP
chg: Bump PyMISP
parent
ba63fc217f
commit
68c130a099
2
PyMISP
2
PyMISP
|
@ -1 +1 @@
|
|||
Subproject commit 590dc768cf01fef998d485f007fc7baceb7a5fe2
|
||||
Subproject commit be755277b85cd6b06a1c2d6bb793f47ac891cc66
|
|
@ -34,7 +34,7 @@ class AppController extends Controller
|
|||
public $helpers = array('OrgImg', 'FontAwesome', 'UserName');
|
||||
|
||||
private $__queryVersion = '147';
|
||||
public $pyMispVersion = '2.4.168';
|
||||
public $pyMispVersion = '2.4.169';
|
||||
public $phpmin = '7.2';
|
||||
public $phprec = '7.4';
|
||||
public $phptoonew = '8.0';
|
||||
|
@ -170,7 +170,7 @@ class AppController extends Controller
|
|||
throw new MethodNotAllowedException('You are using an unsecure and outdated version of IE, please download Google Chrome, Mozilla Firefox or update to a newer version of IE. If you are running IE9 or newer and still receive this error message, please make sure that you are not running your browser in compatibility mode. If you still have issues accessing the site, get in touch with your administration team at ' . Configure::read('MISP.contact'));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// For fresh installation (salt empty) generate a new salt
|
||||
if (!Configure::read('Security.salt')) {
|
||||
$this->User->Server->serverSettingsSaveValue('Security.salt', $this->User->generateRandomPassword(32));
|
||||
|
@ -200,7 +200,7 @@ class AppController extends Controller
|
|||
} else {
|
||||
$this->Auth->authenticate[AuthComponent::ALL]['userFields'] = $authUserFields;
|
||||
}
|
||||
|
||||
|
||||
$userLoggedIn = false;
|
||||
if (Configure::read('Plugin.CustomAuth_enable')) {
|
||||
$userLoggedIn = $this->__customAuthentication($_SERVER);
|
||||
|
|
Loading…
Reference in New Issue