Revize 224
Přidáno uživatelem Michal Kliment před více než 15 roky(ů)
| freenetis/trunk/kohana/application/controllers/members.php | ||
|---|---|---|
|
->where('type=','member')
|
||
|
->find_by_member_id($member_id);
|
||
|
|
||
|
if (!$this->acl_check_edit(get_class($this),'members')) Controller::error(1);
|
||
|
if (!$this->acl_check_edit(get_class($this),'members',$member_id)) Controller::error(1);
|
||
|
|
||
|
$this->user_id = $user_model->id;
|
||
|
unset($user_model);
|
||
| freenetis/trunk/kohana/application/controllers/accounts.php | ||
|---|---|---|
|
|
||
|
function main_accounts($acc_name = 'master')
|
||
|
{
|
||
|
$model_account= new Account_Model();
|
||
|
$model_account = new Account_Model();
|
||
|
$model_account->where('type=\''.$acc_name.'\'')->find();
|
||
|
url::redirect(url_lang::base().'accounts/account_transfers/'.$model_account->id);
|
||
|
}
|
||
| ... | ... | |
|
$model_account= new Account_Model();
|
||
|
$model_account->find_by_id($acc_id);
|
||
|
|
||
|
if ($model_account->owner_id == $_SESSION['member_id'])
|
||
|
/*if ($model_account->owner_id == $_SESSION['member_id'])
|
||
|
{
|
||
|
if (!$this->acl_check_3D('freenetis', 'view_all', 'view_all_transfers')) Controller::error(1);
|
||
|
}
|
||
|
else
|
||
|
{
|
||
|
if (!$this->acl_check_3D('freenetis', 'view_all', 'view_all_transfers')) Controller::error(1);
|
||
|
}
|
||
|
}*/
|
||
|
|
||
|
$acc_name = $model_account->name;
|
||
|
//$acc_id = $model_account->id;
|
||
| ... | ... | |
|
|
||
|
function unidentified_transfers($limit_results = 50, $order_by = 'timestamp', $order_by_direction = 'DESC')
|
||
|
{
|
||
|
if (!$this->gacl_class->acl_check('freenetis', 'new_own', 'all', $_SESSION['username'],get_class($this),'assign_transfers')) Controller::error(1);
|
||
|
if (!$this->acl_check_view(get_class($this), 'unidentified_transfers')) Controller::error(1);
|
||
|
// get new selector
|
||
|
if (is_numeric($this->input->get('record_per_page'))) $limit_results = (int) $this->input->get('record_per_page');
|
||
|
|
||
| freenetis/trunk/kohana/application/upgrade_sql/upgrade_sql_221.php | ||
|---|---|---|
|
<?php
|
||
|
|
||
|
$upgrade_sql[221] = array(
|
||
|
"INSERT INTO `axo` (`id`, `section_value`, `value`, `order_value`, `name`, `hidden`) VALUES (129, 'Members_Controller', 'membership_interrupts', 0, 'Preruseni clenstvi', 0);",
|
||
|
|
||
|
"INSERT INTO `axo_map` (`acl_id`, `section_value`, `value`) VALUES
|
||
|
(38, 'Members_Controller', 'membership_interrupts'),
|
||
|
(51, 'Members_Controller', 'membership_interrupts');"
|
||
|
);
|
||
|
?>
|
||
| freenetis/trunk/kohana/application/upgrade_sql/upgrade_sql.php | ||
|---|---|---|
|
}
|
||
|
|
||
|
$upgrade_sql[get_SVN_rev()] = array(
|
||
|
"INSERT INTO `axo` (`id`, `section_value`, `value`, `order_value`, `name`, `hidden`) VALUES (129, 'Members_Controller', 'membership_interrupts', 0, 'Preruseni clenstvi', 0);",
|
||
|
"INSERT INTO `acl` (`id`, `section_value`, `allow`, `enabled`, `return_value`, `note`, `updated_date`) VALUES
|
||
|
(60, 'user', 1, 1, '', 'Revizni komise muze editovat pouze informace o sobe, nikoliv vsak zarizeni.', 1245397643);",
|
||
|
|
||
|
"UPDATE `acl_seq` SET `id` = 60 WHERE `acl_seq`.`id` = 59 LIMIT 1;",
|
||
|
|
||
|
"INSERT INTO `aco_map` (`acl_id`, `section_value`, `value`) VALUES
|
||
|
(50, 'menu', 'unconfirmed_works'),
|
||
|
(50, 'menu', 'unidentified_transfers'),
|
||
|
(60, 'freenetis', 'edit_own'),
|
||
|
(60, 'freenetis', 'new_own'),
|
||
|
(60, 'freenetis', 'view_own');",
|
||
|
|
||
|
"INSERT INTO `aro_groups_map` (`acl_id`, `group_id`) VALUES (60, 24);",
|
||
|
|
||
|
"DELETE FROM `axo` WHERE `axo`.`id` = 58 LIMIT 1;",
|
||
|
|
||
|
"DELETE FROM `axo` WHERE `axo`.`id` = 59 LIMIT 1;",
|
||
|
|
||
|
"DELETE FROM `axo` WHERE `axo`.`id` = 60 LIMIT 1;",
|
||
|
|
||
|
"DELETE FROM `axo` WHERE `axo`.`id` = 61 LIMIT 1;",
|
||
|
|
||
|
"DELETE FROM `axo` WHERE `axo`.`id` = 62 LIMIT 1;",
|
||
|
|
||
|
"DELETE FROM `axo` WHERE `axo`.`id` = 63 LIMIT 1;",
|
||
|
|
||
|
"INSERT INTO `axo_map` (`acl_id`, `section_value`, `value`) VALUES
|
||
|
(38, 'Members_Controller', 'membership_interrupts'),
|
||
|
(51, 'Members_Controller', 'membership_interrupts');"
|
||
|
(51, 'Accounts_Controller', 'unidentified_transfers'),
|
||
|
(51, 'Users_Controller', 'work'),
|
||
|
(60, 'Members_Controller', 'address'),
|
||
|
(60, 'Members_Controller', 'comment'),
|
||
|
(60, 'Members_Controller', 'members'),
|
||
|
(60, 'Members_Controller', 'name'),
|
||
|
(60, 'Users_Controller', 'aditional_contacts'),
|
||
|
(60, 'Users_Controller', 'comment'),
|
||
|
(60, 'Users_Controller', 'email'),
|
||
|
(60, 'Users_Controller', 'login'),
|
||
|
(60, 'Users_Controller', 'name'),
|
||
|
(60, 'Users_Controller', 'password'),
|
||
|
(60, 'Users_Controller', 'phone'),
|
||
|
(60, 'Users_Controller', 'surname'),
|
||
|
(60, 'Users_Controller', 'users'),
|
||
|
(60, 'Users_Controller', 'work');"
|
||
|
);
|
||
|
?>
|
||
Také k dispozici: Unified diff
Dalsi uprava prav, mensi uprava struktury databaze, drobne zmeny v kontrolerech members a accounts.