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

fix: [CS] CS brought up to date

pull/3910/head
iglocska 2018-11-23 14:22:18 +01:00
parent 8f83041389
commit 65da1e8fa8
2 changed files with 5613 additions and 5100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10651
app/Controller/EventsController.php
View File

File diff suppressed because it is too large Load Diff

62
app/Controller/PagesController.php
View File

@ -21,37 +21,39 @@
App::uses('AppController', 'Controller'); App::uses('AppController', 'Controller');
class PagesController extends AppController { class PagesController extends AppController
{
public $name = 'Pages';
public $uses = array();
public $name = 'Pages'; // displays a view based on the page to display passed as parameters
public $uses = array(); public function display()
{
$path = func_get_args();
// displays a view based on the page to display passed as parameters $count = count($path);
public function display() { if (!$count) {
$this->redirect('/');
$path = func_get_args(); }
$page = $subpage = $title_for_layout = null;
$count = count($path); if (!empty($path[0])) {
if (!$count) { $page = $path[0];
$this->redirect('/'); }
} if (!empty($path[1])) {
$page = $subpage = $title_for_layout = null; $subpage = $path[1];
if ($path[1] === 'md') {
if (!empty($path[0])) { $this->layout = false;
$page = $path[0]; }
} }
if (!empty($path[1])) { if (!empty($path[$count - 1])) {
$subpage = $path[1]; $title_for_layout = Inflector::humanize($path[$count - 1]);
if ($path[1] === 'md') $this->layout = false; }
} $this->loadModel('Attribute');
if (!empty($path[$count - 1])) { $this->set('categoryDefinitions', $this->Attribute->categoryDefinitions);
$title_for_layout = Inflector::humanize($path[$count - 1]); $this->set('typeDefinitions', $this->Attribute->typeDefinitions);
} $this->set('user', $this->Auth->User());
$this->loadModel('Attribute'); $this->set(compact('page', 'subpage', 'title_for_layout'));
$this->set('categoryDefinitions', $this->Attribute->categoryDefinitions); $this->render(implode('/', $path));
$this->set('typeDefinitions', $this->Attribute->typeDefinitions); }
$this->set('user', $this->Auth->User());
$this->set(compact('page', 'subpage', 'title_for_layout'));
$this->render(implode('/', $path));
}
} }