Revize 2129
Přidáno uživatelem David Raška před asi 11 roky(ů)
| freenetis/branches/1.1/application/libraries/MY_Controller.php | ||
|---|---|---|
|
}
|
||
|
|
||
|
/**
|
||
|
* Fuction checks access rights
|
||
|
* Return true if currently logged user (stored in $_SESSION['user_id'])
|
||
|
* may view own $axo_value object in $axo_section
|
||
|
* (and in variable $member_id is his own id of member) or if currently logged user
|
||
|
* may confirm all $axo_value object in $axo_section else return false
|
||
|
*
|
||
|
* @param $axo_section Group of objects to confirm
|
||
|
* @param $axo_value Object to confirm
|
||
|
* @param $member_id Optional variable, id of other member
|
||
|
* who is being showed by logged member
|
||
|
* @param boolean $force_own Force to use own rules for not logged user
|
||
|
* Used at: Phone_invoices_Controller#user_field()
|
||
|
* @return boolean Returns true if member has enough access rights
|
||
|
*/
|
||
|
public function acl_check_confirm(
|
||
|
$axo_section, $axo_value, $member_id = NULL, $force_own = FALSE)
|
||
|
{
|
||
|
return $this->acl_check(
|
||
|
$axo_section, $axo_value, 'confirm', $member_id, $force_own
|
||
|
);
|
||
|
}
|
||
|
|
||
|
/**
|
||
|
* This methods defines whether the preprocessor of MY_Controller is loaded
|
||
|
* or not. By default preprocessor is loaded, for changing of this state
|
||
|
* this method should be overriden in child class. (#328)
|
||
| freenetis/branches/1.1/db_upgrades/upgrade_1.1.0~alpha50.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 previous upgrades
|
||
|
*
|
||
|
* @author David Raška
|
||
|
*/
|
||
|
$upgrade_equal_to['1.1.0~alpha50'] = array();
|
||
|
|
||
|
/**
|
||
|
* Removes unused AXO, adds missing AXO
|
||
|
*
|
||
|
* @author David Raška
|
||
|
*/
|
||
|
$upgrade_sql['1.1.0~alpha50'] = array
|
||
|
(
|
||
|
// ACO
|
||
|
"DELETE FROM aco WHERE value = 'confirm_all'",
|
||
|
|
||
|
"DELETE FROM aco WHERE value = 'confirm_own'",
|
||
|
|
||
|
"DELETE FROM aco WHERE value = 'write_email'",
|
||
|
|
||
|
// ACO_MAP
|
||
|
"DELETE FROM aco_map WHERE value = 'write_email'",
|
||
|
|
||
|
"DELETE FROM aco_map WHERE value = 'confirm_own'",
|
||
|
|
||
|
// AXO_SECTIONS
|
||
|
"DELETE FROM axo_sections WHERE value = 'Registration_Controller'",
|
||
|
|
||
|
"DELETE FROM axo_sections WHERE value = 'Votes_Controller'",
|
||
|
|
||
|
// AXO
|
||
|
"DELETE FROM axo WHERE section_value = 'Registration_Controller ' AND value = 'name'",
|
||
|
|
||
|
"DELETE FROM axo WHERE section_value = 'Registration_Controller ' AND value = 'surname'",
|
||
|
|
||
|
"DELETE FROM axo WHERE section_value = 'Registration_Controller ' AND value = 'street'",
|
||
|
|
||
|
"DELETE FROM axo WHERE section_value = 'Users_Controller ' AND value = 'name'",
|
||
|
|
||
|
"DELETE FROM axo WHERE section_value = 'Users_Controller ' AND value = 'surname'",
|
||
|
|
||
|
"DELETE FROM axo WHERE section_value = 'Users_Controller ' AND value = 'phone'",
|
||
|
|
||
|
"DELETE FROM axo WHERE section_value = 'Users_Controller ' AND value = 'email'",
|
||
|
|
||
|
"DELETE FROM axo WHERE section_value = 'Members_Controller ' AND value = 'en_fee_left'",
|
||
|
|
||
|
"DELETE FROM axo WHERE section_value = 'Settings_Controller ' AND value = 'system'",
|
||
|
|
||
|
"DELETE FROM axo WHERE section_value = 'Settings_Controller ' AND value = 'fees'",
|
||
|
|
||
|
"DELETE FROM axo WHERE section_value = 'Settings_Controller ' AND value = 'enum_types'",
|
||
|
|
||
|
"DELETE FROM axo WHERE section_value = 'Members_Controller ' AND value = 'var_sym'",
|
||
|
|
||
|
"DELETE FROM axo WHERE section_value = 'Members_Controller ' AND value = 'redirect'",
|
||
|
|
||
|
"DELETE FROM axo WHERE section_value = 'Redirection_Controller ' AND value = 'redirection'",
|
||
|
|
||
|
"DELETE FROM axo WHERE section_value = 'Backup_Controller ' AND value = 'backup'",
|
||
|
|
||
|
"DELETE FROM axo WHERE section_value = 'Messages_Controller ' AND value = 'ip_address'",
|
||
|
|
||
|
"DELETE FROM axo WHERE section_value = 'Messages_Controller ' AND value = 'subnet'",
|
||
|
|
||
|
"DELETE FROM axo WHERE section_value = 'Messages_Controller ' AND value = 'subnet_enabled'",
|
||
|
|
||
|
"DELETE FROM axo WHERE section_value = 'Votes_Controller ' AND value = 'work'",
|
||
|
|
||
|
"DELETE FROM axo WHERE section_value = 'Settings_Controller ' AND value = 'access_rights'",
|
||
|
|
||
|
// AXO_MAP
|
||
|
"DELETE FROM axo_map WHERE section_value = 'Accounts_Controller' AND value = 'unidentifed_transfers'",
|
||
|
|
||
|
"DELETE FROM axo_map WHERE section_value = 'Backup_Controller' AND value = 'backup'",
|
||
|
|
||
|
"DELETE FROM axo_map WHERE section_value = 'Members_Controller' AND value = 'en_fee_left'",
|
||
|
|
||
|
"DELETE FROM axo_map WHERE section_value = 'Members_Controller' AND value = 'redirect'",
|
||
|
|
||
|
"DELETE FROM axo_map WHERE section_value = 'Members_Controller' AND value = 'var_sym'",
|
||
|
|
||
|
"DELETE FROM axo_map WHERE section_value = 'Messages_Controller' AND value = 'ip_address'",
|
||
|
|
||
|
"DELETE FROM axo_map WHERE section_value = 'Messages_Controller' AND value = 'subnet'",
|
||
|
|
||
|
"DELETE FROM axo_map WHERE section_value = 'Messages_Controller' AND value = 'subnet_enabled'",
|
||
|
|
||
|
"DELETE FROM axo_map WHERE section_value = 'Redirection_Controller' AND value = 'redirection'",
|
||
|
|
||
|
"DELETE FROM axo_map WHERE section_value = 'Settings_Controller' AND value = 'access_rights'",
|
||
|
|
||
|
"DELETE FROM axo_map WHERE section_value = 'Settings_Controller' AND value = 'economy'",
|
||
|
|
||
|
"DELETE FROM axo_map WHERE section_value = 'Settings_Controller' AND value = 'enum_types'",
|
||
|
|
||
|
"DELETE FROM axo_map WHERE section_value = 'Settings_Controller' AND value = 'fees'",
|
||
|
|
||
|
"DELETE FROM axo_map WHERE section_value = 'Settings_Controller' AND value = 'system'",
|
||
|
|
||
|
"DELETE FROM axo_map WHERE section_value = 'Users_Controller' AND value = 'email'",
|
||
|
|
||
|
"DELETE FROM axo_map WHERE section_value = 'Users_Controller' AND value = 'name'",
|
||
|
|
||
|
"DELETE FROM axo_map WHERE section_value = 'Users_Controller' AND value = 'phone'",
|
||
|
|
||
|
"DELETE FROM axo_map WHERE section_value = 'Users_Controller' AND value = 'surname'",
|
||
|
|
||
|
"DELETE FROM axo_map WHERE section_value = 'Votes_Controller' AND value = 'work'",
|
||
|
|
||
|
// ADD missing AXO
|
||
|
"INSERT INTO axo SELECT MAX(id)+1, 'Devices_Controller', 'login', 'Device login name' FROM axo",
|
||
|
|
||
|
"INSERT INTO axo_map (acl_id, section_value, value) VALUES ('38', 'Devices_Controller', 'login');",
|
||
|
|
||
|
"INSERT INTO axo SELECT MAX(id)+1, 'Devices_Controller', 'password', 'Device password' FROM axo",
|
||
|
|
||
|
"INSERT INTO axo SELECT MAX(id)+1, 'Phone_invoices_Controller', 'user_invoices', 'User phone invoices' FROM axo",
|
||
|
|
||
|
"INSERT INTO axo SELECT MAX(id)+1, 'Devices_Controller', 'main_engineer', 'Main engineer' FROM axo",
|
||
|
|
||
|
"INSERT INTO axo_map (acl_id, section_value, value) VALUES ('38', 'Devices_Controller', 'main_engineer');",
|
||
|
);
|
||
| 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~alpha49');
|
||
|
define('FREENETIS_VERSION', '1.1.0~alpha50');
|
||
Také k dispozici: Unified diff
Nove:
- closes #716: Dokonceni predchoziho commitu - Odstraneni nepouzivanych prav