Skip to content

Tracking User ID, Delete Similar Logs, Save Session Data #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
backstageel wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Tracking User ID, Delete Similar Logs, Save Session Data #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ffa836f
Pagination Was not working on Cake 2.7.8
backstageel Jan 25, 2016
2fb1157
Introducing two more columns: user_id to save ID of the user that tri…
backstageel Jan 25, 2016
214fb74
Saving user_id and session_data(json_encoded) on database
backstageel Jan 25, 2016
cd15a73
Updating views and Adding Delete Similar action
backstageel Jan 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions Config/Schema/schema.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,21 @@ public function after($event = array()) {
}

public $logs = array(
'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'key' => 'primary'),
'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'primary'),
'type' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 50, 'key' => 'index', 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
'message' => array('type' => 'text', 'null' => false, 'default' => null, 'key' => 'index', 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
'message' => array('type' => 'text', 'null' => false, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
'ip' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 50, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
'hostname' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 50, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
'uri' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
'refer' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
'user_agent' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
'number' => array('type' => 'integer', 'null' => false, 'default' => '0', 'unsigned' => false),
'session_data' => array('type' => 'text', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
'user_id' => array('type' => 'integer', 'null' => true, 'default' => '0', 'unsigned' => false),
'indexes' => array(
'PRIMARY' => array('column' => 'id', 'unique' => 1),
'type' => array('column' => 'type', 'unique' => 0),
'message' => array('column' => 'message', 'type' => 'fulltext')
'type' => array('column' => 'type', 'unique' => 0)
),
'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_general_ci', 'engine' => 'MyISAM')
);
Expand Down
1 change: 1 addition & 0 deletions Controller/DatabaseLoggerAppController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php
App::uses('AppController','Controller');
class DatabaseLoggerAppController extends AppController {
protected function dataToNamed($key = 'Search'){
$params = is_array($this->request->params['named']) ? $this->request->params['named'] : array();
Expand Down
28 changes: 25 additions & 3 deletions Controller/LogsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,20 @@ class LogsController extends DatabaseLoggerAppController {

var $name = 'Logs';
var $helpers = array('Time','Icing.Csv');
var $paginate = array(
'order' => 'Log.id DESC',
public $paginate = array(
'order' => 'Log.created DESC',
'fields' => array(
'Log.created',
'Log.type',
'Log.message',
'Log.id'
'Log.id',
'Log.user_id'

)
);

function admin_index($filter = null) {
$this->Paginator->settings = $this->paginate;
if(!empty($this->data)){
$filter = $this->data['Log']['filter'];
}
Expand All @@ -22,6 +25,8 @@ function admin_index($filter = null) {
$this->Log->search($this->request->params['named']),
$this->Log->textSearch($filter)
);


$this->set('logs',$this->paginate($conditions));
$this->set('types', $this->Log->getTypes());
$this->set('filter', $filter);
Expand Down Expand Up @@ -65,4 +70,21 @@ function admin_delete($id = null) {
$this->Session->setFlash(__('Log was not deleted'));
$this->redirect(array('action' => 'index'));
}

public function admin_delete_similar($id = null) {
if (!$id) {
$this->Session->setFlash(__('Invalid id for log'));
$this->redirect(array('action'=>'index'));
}
$log = $this->Log->findById($id);
if ($this->Log->deleteAll(['Log.message LIKE'=>'%'.$log['Log']['message'].'%'])) {
$this->Session->setFlash(__('Log deleted'));
$this->redirect(array('action'=>'index'));
}
$this->Session->setFlash(__('Log was not deleted'));
$this->redirect(array('action' => 'index'));
}
public function teste(){

}
}
2 changes: 2 additions & 0 deletions Model/Log.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ function beforeSave($options = array()){
$this->data[$this->alias]['hostname'] = env('HTTP_HOST');
$this->data[$this->alias]['uri'] = env('REQUEST_URI');
$this->data[$this->alias]['refer'] = env('HTTP_REFERER');
$this->data[$this->alias]['user_id'] = CakeSession::read('Auth.User.id');
$this->data[$this->alias]['session_data'] = json_encode(CakeSession::read());
return true;
}

Expand Down
71 changes: 40 additions & 31 deletions View/Logs/admin_index.ctp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,43 @@
<?php echo $this->Html->css('/database_logger/css/style'); ?>
<div class="database_logger_plugin">
<?php echo $this->element('admin_filter', array('plugin' => 'database_logger', 'model' => 'Log')); ?>
<div class="logs index">
<h2><?php echo __('Logs');?></h2>
<table cellpadding="0" cellspacing="0">
<tr>
<th><?php echo $this->Paginator->sort('created');?></th>
<th><?php echo $this->Paginator->sort('type');?></th>
<th><?php echo $this->Paginator->sort('message');?></th>
<th class="actions"><?php echo __('Actions');?></th>
</tr>
<?php
$i = 0;
foreach ($logs as $log):
$class = null;
if ($i++ % 2 == 0) {
$class = ' class="altrow"';
}
?>
<tr<?php echo $class;?>>
<td><?php echo $this->Time->niceShort($log['Log']['created']); ?>&nbsp;</td>
<td><?php echo $log['Log']['type']; ?>&nbsp;</td>
<td><?php echo $log['Log']['message']; ?>&nbsp;</td>
<td class="actions">
<?php echo $this->Html->link(__('View Details'), array('action' => 'view', $log['Log']['id'])); ?>
<?php echo $this->Html->link(__('Delete'), array('action' => 'delete', $log['Log']['id']), null, sprintf(__('Are you sure you want to delete this log # %s?'), $log['Log']['id'])); ?>
</td>
</tr>
<?php endforeach; ?>
</table>
<?php echo $this->element('paging', array('plugin' => 'database_logger')); ?>
</div>
<?php echo $this->element('admin_filter', ['plugin' => 'database_logger', 'model' => 'Log']); ?>
<div class="logs index">
<h2><?php echo __('Logs'); ?></h2>
<table cellpadding="0" cellspacing="0">
<tr>
<th><?php echo $this->Paginator->sort('created'); ?></th>
<th><?php echo $this->Paginator->sort('type'); ?></th>
<th><?php echo $this->Paginator->sort('message'); ?></th>
<th><?php echo $this->Paginator->sort('user_id'); ?></th>
<th class="actions"><?php echo __('Actions'); ?></th>
</tr>
<?php
$i = 0;
foreach ($logs as $log):
$class = null;
if ($i++ % 2 == 0) {
$class = ' class="altrow"';
}
?>
<tr<?php echo $class; ?>>
<td><?php echo $this->Time->niceShort($log['Log']['created']); ?>&nbsp;</td>
<td><?php echo $log['Log']['type']; ?>&nbsp;</td>
<td><?php echo $log['Log']['message']; ?>&nbsp;</td>
<td><?php echo $log['Log']['user_id']; ?>&nbsp;</td>
<td class="actions">
<?php echo $this->Html->link(__('View Details'),
['action' => 'view', $log['Log']['id']]); ?>
<?php echo $this->Html->link(__('Delete'), ['action' => 'delete', $log['Log']['id']], null,
sprintf(__('Are you sure you want to delete this log # %s?'),
$log['Log']['id'])); ?>
<?php echo $this->Html->link(__('Delete Similar'),
['action' => 'delete_similar', $log['Log']['id']],
null,
sprintf(__('Are you sure you want to delete ALL logs similar to this?'))); ?>
</td>
</tr>
<?php endforeach; ?>
</table>
<?php echo $this->element('paging', ['plugin' => 'database_logger']); ?>
</div>
</div>
10 changes: 10 additions & 0 deletions View/Logs/admin_view.ctp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,16 @@
<?php echo $log['Log']['created']; ?>
&nbsp;
</dd>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php echo __('UserID'); ?></dt>
<dd<?php if ($i++ % 2 == 0) echo $class;?>>
<?php echo $log['Log']['user_id']; ?>
&nbsp;
</dd>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php echo __('Session Data'); ?></dt>
<dd<?php if ($i++ % 2 == 0) echo $class;?>>
<?php echo print_r(json_decode($log['Log']['session_data'])); ?>
&nbsp;
</dd>
</dl>
</div>
</div>