ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use instead of session streamPermission

This commit is contained in:
Isaac Connor 2018-07-24 16:43:07 -04:00
parent 3a676cd569
commit c6aae346b9
1 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
web/api/app/Controller/ServersController.php
View File

@ -8,7 +8,6 @@ App::uses('AppController', 'Controller');
*/ */
class ServersController extends AppController { class ServersController extends AppController {
/** /**
* Components * Components
* *
@ -16,18 +15,15 @@ class ServersController extends AppController {
*/ */
public $components = array('Paginator', 'RequestHandler'); public $components = array('Paginator', 'RequestHandler');
public function beforeFilter() {
public function beforeFilter() { parent::beforeFilter();
parent::beforeFilter(); $canView = (!$user) || ($user['system'] != 'None');
$canView = $this->Session->Read('streamPermission'); if ( !$canView ) {
if ($canView =='None') { throw new UnauthorizedException(__('Insufficient Privileges'));
throw new UnauthorizedException(__('Insufficient Privileges')); return;
return; }
} }
}
/** /**
* index method * index method
* *
@ -36,7 +32,7 @@ public function beforeFilter() {
public function index() { public function index() {
$this->Server->recursive = 0; $this->Server->recursive = 0;
$options=''; $options = '';
$servers = $this->Server->find('all',$options); $servers = $this->Server->find('all',$options);
$this->set(array( $this->set(array(
'servers' => $servers, 'servers' => $servers,
@ -76,16 +72,17 @@ public function beforeFilter() {
* @return void * @return void
*/ */
public function add() { public function add() {
if ($this->request->is('post')) { if ( $this->request->is('post') ) {
if ($this->Session->Read('systemPermission') != 'Edit') global $user;
{ $canEdit = (!$user) || ($user['System'] == 'Edit');
throw new UnauthorizedException(__('Insufficient privileges')); if ( !$canEdit ) {
throw new UnauthorizedException(__('Insufficient privileges'));
return; return;
} }
$this->Server->create(); $this->Server->create();
if ($this->Server->save($this->request->data)) { if ( $this->Server->save($this->request->data) ) {
# Might be nice to send it a start request # Might be nice to send it a start request
#$this->daemonControl($this->Server->id, 'start', $this->request->data); #$this->daemonControl($this->Server->id, 'start', $this->request->data);
return $this->flash(__('The server has been saved.'), array('action' => 'index')); return $this->flash(__('The server has been saved.'), array('action' => 'index'));
@ -103,15 +100,17 @@ public function beforeFilter() {
public function edit($id = null) { public function edit($id = null) {
$this->Server->id = $id; $this->Server->id = $id;
if (!$this->Server->exists($id)) { global $user;
throw new NotFoundException(__('Invalid server')); $canEdit = (!$user) || ($user['System'] == 'Edit');
} if ( !$canEdit ) {
if ($this->Session->Read('systemPermission') != 'Edit') throw new UnauthorizedException(__('Insufficient privileges'));
{
throw new UnauthorizedException(__('Insufficient privileges'));
return; return;
} }
if ($this->Server->save($this->request->data)) {
if ( !$this->Server->exists($id) ) {
throw new NotFoundException(__('Invalid server'));
}
if ( $this->Server->save($this->request->data) ) {
$message = 'Saved'; $message = 'Saved';
} else { } else {
$message = 'Error'; $message = 'Error';
@ -133,20 +132,22 @@ public function beforeFilter() {
* @return void * @return void
*/ */
public function delete($id = null) { public function delete($id = null) {
$this->Server->id = $id; global $user;
if (!$this->Server->exists()) { $canEdit = (!$user) || ($user['System'] == 'Edit');
throw new NotFoundException(__('Invalid server')); if ( !$canEdit ) {
} throw new UnauthorizedException(__('Insufficient privileges'));
if ($this->Session->Read('systemPermission') != 'Edit')
{
throw new UnauthorizedException(__('Insufficient privileges'));
return; return;
} }
$this->Server->id = $id;
if ( !$this->Server->exists() ) {
throw new NotFoundException(__('Invalid server'));
}
$this->request->allowMethod('post', 'delete'); $this->request->allowMethod('post', 'delete');
#$this->daemonControl($this->Server->id, 'stop'); #$this->daemonControl($this->Server->id, 'stop');
if ($this->Server->delete()) { if ( $this->Server->delete() ) {
return $this->flash(__('The server has been deleted.'), array('action' => 'index')); return $this->flash(__('The server has been deleted.'), array('action' => 'index'));
} else { } else {
return $this->flash(__('The server could not be deleted. Please, try again.'), array('action' => 'index')); return $this->flash(__('The server could not be deleted. Please, try again.'), array('action' => 'index'));