Revize 95
Přidáno uživatelem Tomáš Dulík před asi 16 roky(ů)
freenetis/trunk/kohana/application/i18n/cs_CZ/texts.php | ||
---|---|---|
'wrong password.'=> 'Špatné heslo',
|
||
'yes'=> 'ano',
|
||
'you have successfully logout' => 'Byl jste úspěšně odhlášen.',
|
||
'network address does not match the mask' => 'Síťová adresa neodpovídá zadané masce',
|
||
'zip code' => 'PSČ',
|
||
|
||
);
|
freenetis/trunk/kohana/application/controllers/members.php | ||
---|---|---|
$form->set_attr('class', 'form_class')->set_attr('method', 'post');
|
||
|
||
$form->group('')->label(url_lang::lang('texts.Basic informations'));
|
||
$form->input('username')->label(url_lang::lang('texts.username').':')->rules('required|length[3,50]')->callback(array($this, 'valid_username'));
|
||
$form->input('username')->label(url_lang::lang('texts.username').':')
|
||
->rules('required|length[3,50]')->callback(array($this, 'valid_username'));
|
||
|
||
$form->input('pre_title')->label(url_lang::lang('texts.pre title').':')->rules('length[3,40]');
|
||
$form->input('name')->label(url_lang::lang('texts.name').':')->rules('required|length[3,30]');
|
||
... | ... | |
$form->input('town')->label(url_lang::lang('texts.town').':')->rules('required|length[3,200]');
|
||
$form->input('zip_code')->label(url_lang::lang('texts.zip code').':')->rules('required|length[5,10]');
|
||
$form->input('phone')->label(url_lang::lang('texts.phone').':')->rules('required|length[9,40]')->callback(array($this, 'valid_phone'));
|
||
$form->input('email')->label(url_lang::lang('texts.email').':')->rules('required|length[3,50]|valid_email')->callback(array($this, 'valid_email'));
|
||
$form->input('email')->label(url_lang::lang('texts.email').':')
|
||
->rules('required|length[3,50]|valid_email')
|
||
->callback(array($this, 'valid_email'));
|
||
$form->group('')->label(url_lang::lang('texts.Account informations'));
|
||
//$form->dropdown('acctype')->label(url_lang::lang('texts.Account type').':')->options(array('analytic'=>url_lang::lang('texts.Double entry account'),'bank'=>url_lang::lang('texts.Bank account')));
|
||
if ($this->gacl_class->acl_check('freenetis', 'new_all', 'all', $_SESSION['username'],get_class($this),'add_current_credit')) $form->input('current_credit')->label(url_lang::lang('texts.Current credit').':')->rules('valid_numeric');
|
||
... | ... | |
$form->input('pre_title')->label(url_lang::lang('texts.pre title').':')->rules('length[3,40]')->value($member_data->pre_title);
|
||
if ($this->gacl_class->acl_check('freenetis', 'edit_own', 'all', $_SESSION['username'],get_class($this),'edit_name')) $form->input('name')->label(url_lang::lang('texts.name').':')->rules('required|length[3,30]')->value($member_data->name);
|
||
$form->input('middle_name')->label(url_lang::lang('texts.middle name').':')->rules('length[3,30]')->value($member_data->middle_name);
|
||
if ($this->gacl_class->acl_check('freenetis', 'edit_own', 'all', $_SESSION['username'],get_class($this),'edit_surname'))$form->input('surname')->label(url_lang::lang('texts.surname').':')->rules('required|length[3,60]')->value($member_data->surname);
|
||
if ($this->gacl_class->acl_check('freenetis', 'edit_own', 'all', $_SESSION['username'],get_class($this),'edit_surname'))
|
||
$form->input('surname')->label(url_lang::lang('texts.surname').':')->rules('required|length[3,60]')->value($member_data->surname);
|
||
$form->input('post_title')->label(url_lang::lang('texts.post title').':')->rules('length[3,30]')->value($member_data->post_title);
|
||
if ($this->gacl_class->acl_check('freenetis', 'edit_own', 'all', $_SESSION['username'],get_class($this),'edit_type'))$form->dropdown('type')->label(url_lang::lang('texts.Type').':')->options(array('regular'=>url_lang::lang('texts.Regular member'),'applicant'=>url_lang::lang('texts.applicant')))->selected($member_data->type);
|
||
if ($this->gacl_class->acl_check('freenetis', 'edit_own', 'all', $_SESSION['username'],get_class($this),'edit_membersname'))$form->input('membername')->label(url_lang::lang('texts.Members name').':')->rules('required|length[3,60]')->value($member_data->namem);
|
||
... | ... | |
$form->input('zip_code')->label(url_lang::lang('texts.zip code').':')->rules('required|length[5,10]')->value($member_data->ZIP_code);
|
||
}
|
||
if ($this->gacl_class->acl_check('freenetis', 'edit_own', 'all', $_SESSION['username'],get_class($this),'edit_phone')) $form->input('phone')->label(url_lang::lang('texts.phone').':')->rules('required|length[3,40]')->callback(array($this, 'valid_phone'))->value($member_data->phone);
|
||
if ($this->gacl_class->acl_check('freenetis', 'edit_own', 'all', $_SESSION['username'],get_class($this),'edit_email')) $form->input('email')->label(url_lang::lang('texts.email').':')->rules('length[3,50]|valid_email')->callback(array($this, 'valid_email'))->value($member_data->email);
|
||
if ($this->gacl_class->acl_check('freenetis', 'edit_own', 'all', $_SESSION['username'],get_class($this),'edit_email'))
|
||
$form->input('email')->label(url_lang::lang('texts.email').':')
|
||
->rules('length[3,50]|valid_email')
|
||
->callback(array($this, 'valid_email'))->value($member_data->email);
|
||
|
||
$form->group('')->label(url_lang::lang('texts.Account informations'));
|
||
if ($this->gacl_class->acl_check('freenetis', 'edit_own', 'all', $_SESSION['username'],get_class($this),'edit_currentcredit')) $form->input('current_credit')->label(url_lang::lang('texts.Current credit').':')->rules('valid_numeric')->value($member_data->current_credit);
|
freenetis/trunk/kohana/application/controllers/users.php | ||
---|---|---|
$form->set_attr('class', 'form_class')->set_attr('method', 'post');
|
||
|
||
$form->group('')->label(url_lang::lang('texts.Basic informations'));
|
||
if ($this->gacl_class->acl_check('freenetis', 'edit_own', 'all', $_SESSION['username'],get_class($this),'edit_username')) $form->input('username')->label(url_lang::lang('texts.username').':')->rules('required|length[3,50]')->callback(array($this, 'valid_username'))->value($user_model->login);
|
||
if ($this->gacl_class->acl_check('freenetis', 'edit_own', 'all', $_SESSION['username'],get_class($this),'edit_username'))
|
||
$form->input('username')->label(url_lang::lang('texts.username').':')
|
||
->rules('required|length[3,50]')
|
||
->callback(array($this, 'valid_username'))->value($user_model->login);
|
||
|
||
$form->input('pre_title')->label(url_lang::lang('texts.pre title').':')->rules('length[3,40]')->value($user_model->pre_title);
|
||
$form->input('name')->label(url_lang::lang('texts.name').':')->rules('required|length[3,30]')->value($user_model->name);
|
||
... | ... | |
function valid_username($input)
|
||
{
|
||
$user_model=new User_Model();
|
||
|
||
if ($user_model->username_exist($input->value,$this->user_id) || trim($input->value)=='')
|
||
{
|
||
$input->add_error('required', url_lang::lang('texts.Username already exists in database.'));
|
freenetis/trunk/kohana/application/controllers/subnets.php | ||
---|---|---|
url::redirect(url_lang::base().'subnets/show_all');
|
||
}
|
||
|
||
|
||
|
||
//=============================================================================
|
||
//----- SHOW_ALL --------------------------------------------------------------
|
||
//=============================================================================
|
||
function show_all($limit_results = 50, $order_by = 'id', $order_by_direction = 'ASC')
|
||
function show_all($limit_results = 400, $order_by = 'id', $order_by_direction = 'ASC')
|
||
{
|
||
$subnet_model = new Subnet_Model();
|
||
|
||
... | ... | |
//'use_paginator' => false,
|
||
//'use_selector' => false,
|
||
'current' => $limit_results, // current selected 'records_per_page' value
|
||
'selector_increace' => 10, // increace
|
||
'selector_min' => 10, // minimum where selector start
|
||
'selector_max_multiplier' => 5,
|
||
'selector_increace' => 200, // increace
|
||
'selector_min' => 200, // minimum where selector start
|
||
'selector_max_multiplier' => 100,
|
||
'base_url' => Config::item('locale.lang').'/devices/show_all/'.$limit_results.'/'.$order_by.'/'.$order_by_direction ,
|
||
'uri_subnet' => 'page', // pass a string as uri_subnet to trigger former 'label' functionality
|
||
'total_items' => $total_subnets, // use db count query here of course
|
||
... | ... | |
$form->group('')->label(url_lang::lang('texts.Basic data'));
|
||
|
||
$form->input('name')->label(url_lang::lang('texts.Subnet name').':')->rules('required|length[3,250]');
|
||
$form->input('network_address')->label(url_lang::lang('texts.Network address').':')->rules('required|valid_ip');
|
||
$form->input('netmask')->label(url_lang::lang('texts.Netmask').':')->rules('required|length[1,250]');
|
||
$form->input('network_address')->label(url_lang::lang('texts.Network address').':')
|
||
->rules('required')->callback(array($this, 'valid_netip'));
|
||
$form->input('netmask')->label(url_lang::lang('texts.Netmask').':')
|
||
->rules('required|length[1,250]');
|
||
$form->input('OSPF_area_id')->label(url_lang::lang('texts.OSPF area ID').':')->rules('valid_digit');
|
||
|
||
$form->submit('submit')->value(url_lang::lang('texts.Save'));
|
||
... | ... | |
//=============================================================================
|
||
//----- EDIT ------------------------------------------------------------------
|
||
//=============================================================================
|
||
protected $form;
|
||
function edit($subnet_id)
|
||
{
|
||
$subnet = new Subnet_Model($subnet_id);
|
||
... | ... | |
$form->group('')->label(url_lang::lang('texts.Basic data'));
|
||
|
||
$form->input('name')->label(url_lang::lang('texts.Subnet name').':')->rules('required|length[3,250]')->value($subnet->name);
|
||
$form->input('network_address')->label(url_lang::lang('texts.Network address').':')->rules('required|valid_ip')->value($subnet->network_address);
|
||
$form->input('netmask')->label(url_lang::lang('texts.Netmask').':')->rules('required|length[1,250]')->value($subnet->netmask);
|
||
$form->input('network_address')->label(url_lang::lang('texts.Network address').':')
|
||
->rules('required')->callback(array($this, 'valid_netip'))
|
||
->value($subnet->network_address);
|
||
$form->input('netmask')->label(url_lang::lang('texts.Netmask').':')
|
||
->rules('required|length[1,250]')->value($subnet->netmask);
|
||
$form->input('OSPF_area_id')->label(url_lang::lang('texts.OSPF area ID').':')->rules('valid_digit')->value($subnet->OSPF_area_id);
|
||
|
||
$form->submit('submit')->value(url_lang::lang('texts.update'));
|
||
... | ... | |
}
|
||
//----- end EDIT --------------------------------------------------------------
|
||
//=============================================================================
|
||
function valid_netip($input) {
|
||
$netip=ip2long($input->value);
|
||
$mask=ip2long($_POST['netmask']);
|
||
|
||
if ( ($netip & $mask) != $netip )
|
||
$input->add_error('required', url_lang::lang('texts.Network address does not match the mask.'));
|
||
|
||
}
|
||
|
||
}
|
||
?>
|
Také k dispozici: Unified diff
V subnets.php opravena chybná kontrola adresy sítě - přidána fce valid_netip.
V members.php a users.php provedeny jen estetické úpravy některých řádků (kilometrové řádky bude potřeba přeformátovat všude, běžný monitor má rozlišení jen 1024x768...