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

chg: [internal] Simplify code in ObjectTemplate

pull/8327/head
Jakub Onderka 2022-05-05 14:13:12 +02:00
parent 1c5917a356
commit d87c2f43d7
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/Model/ObjectTemplate.php
View File

@ -1,7 +1,6 @@
<?php
App::uses('AppModel', 'Model');
App::uses('FileAccessTool', 'Tools');
App::uses('JsonTool', 'Tools');
/**
* @property ObjectTemplateElement $ObjectTemplateElement
@ -23,8 +22,8 @@ class ObjectTemplate extends AppModel
'foreignKey' => 'user_id'
),
'Organisation' => array(
'className' => 'Organisation',
'foreignKey' => 'org_id'
'className' => 'Organisation',
'foreignKey' => 'org_id'
)
);
public $hasMany = array(
@ -34,7 +33,7 @@ class ObjectTemplate extends AppModel
)
);
public $objectsDir = APP . 'files/misp-objects/objects';
const OBJECTS_DIR = APP . 'files/misp-objects/objects';
public function afterFind($results, $primary = false)
{
@ -56,7 +55,7 @@ class ObjectTemplate extends AppModel
{
$directories = $this->getTemplateDirectoryPaths();
foreach ($directories as $k => $dir) {
$dir = str_replace($this->objectsDir, '', $dir);
$dir = str_replace(self::OBJECTS_DIR, '', $dir);
$directories[$k] = $dir;
}
$updated = array();
@ -64,11 +63,10 @@ class ObjectTemplate extends AppModel
if ($type && '/' . $type != $dir) {
continue;
}
if (!file_exists($this->objectsDir . DS . $dir . DS . 'definition.json')) {
if (!file_exists(self::OBJECTS_DIR . DS . $dir . DS . 'definition.json')) {
continue;
}
$file = FileAccessTool::readFromFile($this->objectsDir . DS . $dir . DS . 'definition.json');
$template = JsonTool::decode($file);
$template = FileAccessTool::readJsonFromFile(self::OBJECTS_DIR . DS . $dir . DS . 'definition.json');
if (!isset($template['version'])) {
$template['version'] = 1;
}
@ -277,12 +275,11 @@ class ObjectTemplate extends AppModel
}
// simple test to see if there are any object templates - if not trigger update
public function populateIfEmpty($user)
public function populateIfEmpty(array $user)
{
if (!$this->hasAny()) {
$this->update($user);
}
return true;
}
public function setActive($id)
@ -344,8 +341,7 @@ class ObjectTemplate extends AppModel
if (!file_exists($path)) {
return false;
}
$content = FileAccessTool::readFromFile($path);
return JsonTool::decode($content);
return FileAccessTool::readJsonFromFile($path);
}
private function readTemplatesFromDisk()
@ -361,12 +357,12 @@ class ObjectTemplate extends AppModel
private function getTemplateDirectoryPaths($fullPath=true)
{
$dir = new Folder($this->objectsDir, false);
$dir = new Folder(self::OBJECTS_DIR, false);
return $dir->read(true, false, $fullPath)[0];
}
private function getFullPathFromTemplateName($templateName)
{
return $this->objectsDir . DS . $templateName . DS . 'definition.json';
return self::OBJECTS_DIR . DS . $templateName . DS . 'definition.json';
}
}