Revize 1908
Přidáno uživatelem Michal Kliment před více než 11 roky(ů)
freenetis/branches/1.1/db_upgrades/upgrade_1.1.0~alpha24.php | ||
---|---|---|
<?php defined('SYSPATH') or die('No direct script access.');
|
||
/*
|
||
* This file is part of open source system FreenetIS
|
||
* and it is released under GPLv3 licence.
|
||
*
|
||
* More info about licence can be found:
|
||
* http://www.gnu.org/licenses/gpl-3.0.html
|
||
*
|
||
* More info about project can be found:
|
||
* http://www.freenetis.org/
|
||
*
|
||
*/
|
||
|
||
/**
|
||
* This upgrade is not equal to any of previos upgrades
|
||
*
|
||
* @author Ondřej Fibich <ondrej.fibich@gmail.com>
|
||
*/
|
||
$upgrade_equal_to['1.1.0~alpha24'] = array();
|
||
|
||
$upgrade_sql['1.1.0~alpha24'] = array
|
||
(
|
||
"INSERT INTO `axo` (`id`, `section_value`, `value`, `name`) VALUES ('188', 'Log_queues_Controller', 'log_queue', 'Log queues');",
|
||
|
||
"INSERT INTO `axo_map` (`acl_id`, `section_value`, `value`) VALUES ('38', 'Log_queues_Controller', 'log_queue');",
|
||
|
||
"INSERT INTO `axo` (`id`, `section_value`, `value`, `name`) VALUES ('189', 'Log_queues_Controller', 'comments', 'Comments for log queue');",
|
||
|
||
"INSERT INTO `axo_map` (`acl_id`, `section_value`, `value`) VALUES ('38', 'Log_queues_Controller', 'comments');"
|
||
);
|
freenetis/branches/1.1/application/controllers/log_queues.php | ||
---|---|---|
$limit_results = 50, $order_by = 'created_at',
|
||
$order_by_direction = 'desc', $page_word = null, $page = 1)
|
||
{
|
||
if (!$this->acl_check_view('Settings_Controller', 'system'))
|
||
if (!$this->acl_check_view('Log_queues_Controller', 'log_queue'))
|
||
{
|
||
Controller::error(ACCESS);
|
||
}
|
||
... | ... | |
Controller::error(RECORD);
|
||
}
|
||
|
||
if (!$this->acl_check_view('Settings_Controller', 'system'))
|
||
if (!$this->acl_check_view('Log_queues_Controller', 'log_queue'))
|
||
{
|
||
Controller::error(ACCESS);
|
||
}
|
||
... | ... | |
'use_selector' => FALSE,
|
||
));
|
||
|
||
if ($this->acl_check_edit('Settings_Controller', 'system'))
|
||
if ($this->acl_check_new('Log_queues_Controller', 'comments'))
|
||
{
|
||
$url = ($lq_model->comments_thread_id) ?
|
||
'comments/add/'.$lq_model->comments_thread_id :
|
||
... | ... | |
|
||
$actions = $comments_grid->grouped_action_field();
|
||
|
||
if ($this->acl_check_edit('Settings_Controller', 'system'))
|
||
if ($this->acl_check_edit('Log_queues_Controller', 'comments'))
|
||
{
|
||
$actions->add_conditional_action()
|
||
->icon_action('edit')
|
||
... | ... | |
->class('popup_link');
|
||
}
|
||
|
||
if ($this->acl_check_delete('Settings_Controller', 'system'))
|
||
if ($this->acl_check_delete('Log_queues_Controller', 'comments'))
|
||
{
|
||
$actions->add_conditional_action()
|
||
->icon_action('delete')
|
||
... | ... | |
Controller::error(RECORD);
|
||
}
|
||
|
||
if (!$this->acl_check_edit('Settings_Controller', 'system'))
|
||
if (!$this->acl_check_edit('Log_queues_Controller', 'log_queue'))
|
||
{
|
||
Controller::error(ACCESS);
|
||
}
|
freenetis/branches/1.1/application/controllers/comments.php | ||
---|---|---|
// thread belongs to log queues
|
||
case 'log_queue':
|
||
// access control
|
||
if (!$this->acl_check_new('Settings_Controller', 'system'))
|
||
if (!$this->acl_check_new('Log_queues_Controller', 'comments'))
|
||
Controller::error(ACCESS);
|
||
|
||
$link_back_url = Path::instance()->previous();
|
||
... | ... | |
// thread belongs to log queues
|
||
case 'log_queue':
|
||
// access control
|
||
if (!$this->acl_check_edit('Settings_Controller', 'system'))
|
||
if (!$this->acl_check_edit('Log_queues_Controller', 'comments'))
|
||
Controller::error(ACCESS);
|
||
|
||
$link_back_url = Path::instance()->previous();
|
||
... | ... | |
// thread belongs to log queues
|
||
case 'log_queue':
|
||
// access control
|
||
if (!$this->acl_check_delete('Settings_Controller', 'system'))
|
||
if (!$this->acl_check_delete('Log_queues_Controller', 'comments'))
|
||
Controller::error(ACCESS);
|
||
|
||
$link_back_url = Path::instance()->previous();
|
freenetis/branches/1.1/application/libraries/MY_Controller.php | ||
---|---|---|
|
||
$menu->addGroup('administration', __('Administration'));
|
||
|
||
/**
|
||
* @todo Add own AXO
|
||
*/
|
||
|
||
// list of errors and logs
|
||
if ($this->acl_check_view('Settings_Controller', 'system'))
|
||
if ($this->acl_check_view('Log_queues_Controller', 'log_queue'))
|
||
{
|
||
$menu->addItem(
|
||
'log_queues/show_all', __('Errors and logs'),
|
freenetis/branches/1.1/version.php | ||
---|---|---|
* The current version of FreenetIS.
|
||
* This value must be changed by developers in a new release of FreenetIS.
|
||
*/
|
||
define('FREENETIS_VERSION', '1.1.0~alpha23');
|
||
define('FREENETIS_VERSION', '1.1.0~alpha24');
|
Také k dispozici: Unified diff
freenetis-1.1.0~alpha24
Opravy:
- fixes #510: Vyclenit samostatne pristup k logum systemu a udalostem