Revize 1924
Přidáno uživatelem Ondřej Fibich před více než 11 roky(ů)
| freenetis/branches/1.1/application/i18n/cs_CZ/texts.php | ||
|---|---|---|
|
'allow additional payment' => 'Povolit doplatek',
|
||
|
'allowed subnet' => 'Povolená podsíť',
|
||
|
'allowed subnets' => 'Povolené podsítě',
|
||
|
'allowed subnets update' => 'Povolené podsítě',
|
||
|
'allowed subnet state' => 'Stav povolených podsítí',
|
||
|
'allowed subnets of member' => 'Povolené podsítě člena',
|
||
|
'already filled in' => 'Vyplněno',
|
||
|
'amount' => 'Částka',
|
||
| ... | ... | |
|
'e-mails' => 'E-maily',
|
||
|
'encoding' => 'Kódování',
|
||
|
'enable action logs' => 'Zapnout logy akcí',
|
||
|
'enable allowed subnets' => 'Zapnout povolené podsítě',
|
||
|
'enable automatic fio import' => 'Povolit automatický import Fio',
|
||
|
'enable integrity test (all numbers in invoice has to be in extended statement)' => 'Povolit test na celistvost (každé číslo ve faktuře musí být v podrobném výpisu)',
|
||
|
'enable mysql event scheduler' => 'Povolit MySQL plánovač akcí',
|
||
| ... | ... | |
|
'interface that you choosed is connected to another interface' => 'Rozhraní, které jste vybrali je připojeno k jinému rozhraní',
|
||
|
'interval of whitelist collides with another whitelist of this member' => 'Interval bílé listiny koliduje s jinou bílou listinou člena.',
|
||
|
'interval of update' => 'Interval aktualizace',
|
||
|
'interval of update in seconds' => 'Interval aktualizace v sekundách',
|
||
|
'invalid connect to interface - already has different link' => 'Nelze se připojit k rozhraní - již má jinou linku',
|
||
|
'invalid date' => 'Neplatné datum!',
|
||
|
'invalid input data' => 'Neplatná vstupní data',
|
||
| freenetis/branches/1.1/application/helpers/module_state.php | ||
|---|---|---|
|
}
|
||
|
|
||
|
if ($add_text)
|
||
|
{
|
||
|
{
|
||
|
$hours = $diff_text['hours'];
|
||
|
$minutes = $diff_text['minutes'];
|
||
|
$seconds = $diff_text['seconds'];
|
||
| ... | ... | |
|
|
||
|
$text_diff = $diff_text['days'].'d - '.$hours.'h '.$minutes.'m '.$seconds.'s';
|
||
|
|
||
|
$result .= __($module).' '.$text.' '.$last_time_text.' ('.$text_diff.')';
|
||
|
$result .= __(str_replace('_', ' ', $module)).' '.$text.' '
|
||
|
.$last_time_text.' ('.$text_diff.')';
|
||
|
}
|
||
|
|
||
|
return $result;
|
||
| freenetis/branches/1.1/application/controllers/scheduler.php | ||
|---|---|---|
|
// it's time to update
|
||
|
if (Settings::get('allowed_subnets_enabled') &&
|
||
|
(
|
||
|
Settings::get('allowed_subnets_update_last') +
|
||
|
Settings::get('allowed_subnets_update_interval')
|
||
|
strtotime(Settings::get('allowed_subnets_update_state')) +
|
||
|
intval(Settings::get('allowed_subnets_update_interval'))
|
||
|
) < time())
|
||
|
{
|
||
|
ORM::factory('message')
|
||
|
->activate_unallowed_connecting_place_message(User_Model::ASSOCIATION);
|
||
|
// activate
|
||
|
ORM::factory('message')->activate_unallowed_connecting_place_message(
|
||
|
User_Model::ASSOCIATION
|
||
|
);
|
||
|
// set last update info
|
||
|
Settings::set('allowed_subnets_update_state', date('Y-m-d H:i:s'));
|
||
|
}
|
||
|
}
|
||
|
|
||
| freenetis/branches/1.1/application/controllers/settings.php | ||
|---|---|---|
|
if (Settings::get('redirection_enabled'))
|
||
|
$data[__('Redirection state')] = module_state::get_state('redirection');
|
||
|
|
||
|
$data[__('QoS state')] = module_state::get_state('qos');
|
||
|
$data[__('Monitoring state')] = module_state::get_state('monitoring');
|
||
|
$data[__('Logging state')] = module_state::get_state('logging');
|
||
|
if (Settings::get('qos_enabled'))
|
||
|
$data[__('QoS state')] = module_state::get_state('qos');
|
||
|
|
||
|
if (Settings::get('monitoring_enabled'))
|
||
|
$data[__('Monitoring state')] = module_state::get_state('monitoring');
|
||
|
|
||
|
if (Settings::get('logging_enabled'))
|
||
|
$data[__('Logging state')] = module_state::get_state('logging');
|
||
|
|
||
|
if (Settings::get('allowed_subnets_enabled'))
|
||
|
$data[__('Allowed subnet state')] = module_state::get_state('allowed_subnets_update');
|
||
|
|
||
|
ob_start();
|
||
|
|
||
|
$html = '';
|
||
| ... | ... | |
|
help::hint('self_cancel_text'))
|
||
|
->value(Settings::get('self_cancel_text'));
|
||
|
|
||
|
// allowed subnets
|
||
|
$this->form->group(__('Allowed subnets') . ' ' . help::hint('allowed_subnets'));
|
||
|
|
||
|
$this->form->checkbox('allowed_subnets_enabled')
|
||
|
->value('1')
|
||
|
->checked(Settings::get('allowed_subnets_enabled'))
|
||
|
->label('Enable allowed subnets');
|
||
|
|
||
|
if (Settings::get('allowed_subnets_enabled'))
|
||
|
{
|
||
|
$this->form->input('allowed_subnets_update_interval')
|
||
|
->label('Interval of update')
|
||
|
->help(help::hint('allowed_subnets_update_interval'))
|
||
|
->rules('required|valid_numeric')
|
||
|
->value(Settings::get('allowed_subnets_update_interval'));
|
||
|
}
|
||
|
}
|
||
|
|
||
|
$this->form->group('E-mail');
|
||
| ... | ... | |
|
|
||
|
url::redirect('settings/notifications');
|
||
|
}
|
||
|
|
||
|
|
||
|
// states of modules
|
||
|
$states = array();
|
||
|
|
||
|
if (Settings::get('redirection_enabled'))
|
||
|
$states[] = module_state::get_state('redirection', TRUE);
|
||
|
|
||
|
if (Settings::get('allowed_subnets_enabled'))
|
||
|
$states[] = module_state::get_state('allowed_subnets_update', TRUE);
|
||
|
|
||
|
// create view for this template
|
||
|
$view = new View('main');
|
||
|
$view->title = __('System') . ' - ' . __('Notification settings');
|
||
| ... | ... | |
|
$view->content->current = 'notifications';
|
||
|
$view->content->content = $this->form->html();
|
||
|
$view->content->headline = __('Notification settings');
|
||
|
$view->content->description = Settings::get('redirection_enabled') ? module_state::get_state('redirection', TRUE) : '';
|
||
|
$view->content->description = implode('<br />', $states);
|
||
|
|
||
|
$view->render(TRUE);
|
||
|
}
|
||
Také k dispozici: Unified diff
Upravy:
- nastaveni povolenych subnetu
Opravy:
- fixes #368: Povolene subnety - Scheduler#update_allowed_subnets - kontrola intervalu