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

chg: remove usage of App::import in favor of ::uses

pull/1459/head
Andreas Ziegler 2016-08-21 23:09:21 +02:00
parent 3d8cd2fb61
commit c47e99d38a
7 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Command/Task/RoleIdTask.php
View File

@ -1,5 +1,5 @@
<?php
App::import('Controller', 'Users');
App::uses('UsersController', 'Controller');
class RoleIdTask extends Shell {

2
app/Console/Command/Task/RoleToAroAcoTask.php
View File

@ -1,5 +1,5 @@
<?php
App::import('Controller', 'Roles');
App::uses('RolesController', 'Controller');
class RoleToAroAcoTask extends Shell {

2
app/Console/Command/Task/RolesTask.php
View File

@ -1,5 +1,5 @@
<?php
App::import('Controller', 'Roles');
App::uses('RolesController', 'Controller');
class RolesTask extends Shell {

2
app/Console/Command/Task/UsersTask.php
View File

@ -1,5 +1,5 @@
<?php
App::import('Controller', 'Users');
App::uses('UsersController', 'Controller');
class UsersTask extends Shell {

3
app/Model/Event.php
View File

@ -1,7 +1,6 @@
<?php
App::uses('AppModel', 'Model');
App::uses('CakeEmail', 'Network/Email');
App::import('Controller', 'Attributes');
Configure::load('config'); // This is needed to load GnuPG.bodyonlyencrypted
/**
* Event Model
@ -1797,7 +1796,7 @@ class Event extends AppModel {
*/
public function _add(&$data, $fromXml, $user, $org_id = 0, $passAlong = null, $fromPull = false, $jobId = null, &$created_id = 0, &$validationErrors = array()) {
if ($jobId) {
App::import('Component','Auth');
App::uses('AuthComponent', 'Controller/Component');
}
if (Configure::read('MISP.enableEventBlacklisting') && isset($data['Event']['uuid'])) {
$event = $this->find('first', array(

2
app/Plugin/Assets/models/behaviors/LogableBehavior.php
View File

@ -111,7 +111,7 @@ class LogableBehavior extends ModelBehavior {
$this->UserModel = $Model;
}
$this->schema = $this->Log->schema();
App::import('Component', 'Auth');
App::uses('AuthComponent', 'Controller/Component');
$this->user[$this->settings[$Model->alias]['userModel']] = AuthComponent::user();
}

2
app/Plugin/SysLogLogable/Model/Behavior/SysLogLogableBehavior.php
View File

@ -273,7 +273,7 @@ class SysLogLogableBehavior extends LogableBehavior {
$this->UserModel = $Model;
}
$this->schema = $this->Log->schema();
App::import('Component', 'Auth');
App::uses('AuthComponent', 'Controller/Component');
$user = AuthComponent::user();
if (!empty($user)) $this->user[$this->settings[$Model->alias]['userModel']] = AuthComponent::user();
else $this->user['User'] = array('email' => 'SYSTEM', 'Organisation' => array('name' => 'SYSTEM'), 'id' => 0);