Revize 2028
Přidáno uživatelem David Raška před asi 11 roky(ů)
freenetis/branches/1.1/application/controllers/stats.php | ||
---|---|---|
public function members_increase_decrease()
|
||
{
|
||
// access control
|
||
if (!$this->acl_check_view('Settings_Controller', 'system'))
|
||
if (!$this->acl_check_view('Stats_Controller', 'members_increase_decrease'))
|
||
Controller::error(ACCESS);
|
||
|
||
// creates instance of member ID=1 (Association)
|
||
... | ... | |
public function members_growth()
|
||
{
|
||
// access control
|
||
if (!$this->acl_check_view('Settings_Controller', 'system'))
|
||
if (!$this->acl_check_view('Stats_Controller', 'members_growth'))
|
||
Controller::error(ACCESS);
|
||
|
||
// creates new member model
|
||
... | ... | |
{
|
||
// access control
|
||
if (!Settings::get('finance_enabled') ||
|
||
!$this->acl_check_view('Settings_Controller', 'system'))
|
||
!$this->acl_check_view('Stats_Controller', 'incoming_member_payment'))
|
||
{
|
||
Controller::error(ACCESS);
|
||
}
|
||
... | ... | |
$x++;
|
||
}
|
||
}
|
||
|
||
|
||
// round max
|
||
$max = ceil($max);
|
||
$max = (substr($max, 0, 2) + 1) . num::null_fill(0, strlen($max) - 2);
|
||
|
||
|
||
// calculation of correct rates of axes
|
||
$y_count = substr($max, 0, 2);
|
||
|
||
... | ... | |
{
|
||
// access control
|
||
if (!Settings::get('finance_enabled') ||
|
||
!$this->acl_check_view('Settings_Controller', 'system'))
|
||
!$this->acl_check_view('Stats_Controller', 'members_fees'))
|
||
{
|
||
Controller::error(ACCESS);
|
||
}
|
freenetis/branches/1.1/db_upgrades/upgrade_1.1.0~alpha40.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 David Raska <jeffraska@gmail.com>
|
||
*/
|
||
$upgrade_equal_to['1.1.0~alpha40'] = array();
|
||
|
||
/**
|
||
* Adds settings column to users table
|
||
* Adds AXO for Stats controller
|
||
*
|
||
* @author David Raska <jeffraska@gmail.com>
|
||
*/
|
||
$upgrade_sql['1.1.0~alpha40'] = array
|
||
(
|
||
"ALTER TABLE `users` ADD `settings` TEXT NOT NULL ",
|
||
|
||
"INSERT INTO `axo` (`id`, `section_value`, `value`, `name`) VALUES ('199', 'Stats_Controller', 'members_increase_decrease', 'Members increase decrease');",
|
||
|
||
"INSERT INTO `axo_map` (`acl_id`, `section_value`, `value`) VALUES ('38', 'Stats_Controller', 'members_increase_decrease');",
|
||
|
||
"INSERT INTO `axo` (`id`, `section_value`, `value`, `name`) VALUES ('200', 'Stats_Controller', 'members_growth', 'Members growth');",
|
||
|
||
"INSERT INTO `axo_map` (`acl_id`, `section_value`, `value`) VALUES ('38', 'Stats_Controller', 'members_growth');",
|
||
|
||
"INSERT INTO `axo` (`id`, `section_value`, `value`, `name`) VALUES ('201', 'Stats_Controller', 'incoming_member_payment', 'Incoming member payment');",
|
||
|
||
"INSERT INTO `axo_map` (`acl_id`, `section_value`, `value`) VALUES ('38', 'Stats_Controller', 'incoming_member_payment');",
|
||
|
||
"INSERT INTO `axo` (`id`, `section_value`, `value`, `name`) VALUES ('202', 'Stats_Controller', 'members_fees', 'Members fees');",
|
||
|
||
"INSERT INTO `axo_map` (`acl_id`, `section_value`, `value`) VALUES ('38', 'Stats_Controller', 'members_fees');",
|
||
|
||
);
|
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~alpha39');
|
||
define('FREENETIS_VERSION', '1.1.0~alpha40');
|
Také k dispozici: Unified diff
Opravy:
- closes #652 - Oprava zobrazeni statistik prichozich clenskzch prispevku
Upravy:
- closes #658 - Pridani AXO pro Stats controller
- pridani sloupce settings do tabulky users