Revize 2173
Přidáno uživatelem Ondřej Fibich před asi 11 roky(ů)
| freenetis/branches/1.1/application/controllers/login.php | ||
|---|---|---|
|
{
|
||
|
if ($member->type == Member_Model::TYPE_APPLICANT)
|
||
|
{
|
||
|
url::redirect('connection_requests/show_by_member/'.$member_id);
|
||
|
if (module::e('connection_request'))
|
||
|
{
|
||
|
url::redirect('connection_requests/show_by_member/'.$member_id);
|
||
|
}
|
||
|
else
|
||
|
{
|
||
|
url::redirect('mail/inbox');
|
||
|
}
|
||
|
}
|
||
|
else if ($user_type != User_Model::USER)
|
||
|
{
|
||
| ... | ... | |
|
}
|
||
|
else
|
||
|
{
|
||
|
if ($_SESSION['username'] == $_SESSION['member_login'])
|
||
|
if (ORM::factory('member', $_SESSION['member_id'])->type == Member_Model::TYPE_APPLICANT)
|
||
|
{
|
||
|
if (module::e('connection_request'))
|
||
|
{
|
||
|
url::redirect('connection_requests/show_by_member/'.$_SESSION['member_id']);
|
||
|
}
|
||
|
else
|
||
|
{
|
||
|
url::redirect('mail/inbox');
|
||
|
}
|
||
|
}
|
||
|
else if ($_SESSION['username'] == $_SESSION['member_login'])
|
||
|
{
|
||
|
url::redirect('members/show/'.$_SESSION['member_id']);
|
||
|
}
|
||
|
else
|
||
| freenetis/branches/1.1/application/controllers/registration.php | ||
|---|---|---|
|
) + ORM::factory('town')->select_list_with_quater();
|
||
|
|
||
|
// list for phone prefixes
|
||
|
$phone_prefixes = $country_model->select_country_list();
|
||
|
$phone_prefixes = $country_model->select_country_code_list();
|
||
|
|
||
|
// registration form
|
||
|
$form = new Forge(url_lang::base() . 'registration');
|
||
|
$form = new Forge('registration');
|
||
|
|
||
|
$form->group('Login data');
|
||
|
|
||
|
$form->input('login')
|
||
|
->label(__('Username') . ': '.help::hint('login_name'))
|
||
|
->label('Username')
|
||
|
->help(help::hint('login_name'))
|
||
|
->rules('required|length[5,20]')
|
||
|
->callback(array($this, 'valid_username'));
|
||
|
|
||
|
$pass_min_len = Settings::get('security_password_length');
|
||
|
|
||
|
$form->password('password')
|
||
|
->label(__('Password') . ': '.help::hint('password'))
|
||
|
->help(help::hint('password'))
|
||
|
->rules('required|length['.$pass_min_len.',50]')
|
||
|
->class('main_password');
|
||
|
|
||
|
$form->password('confirm_password')
|
||
|
->label(__('Confirm password') . ':')
|
||
|
->rules('required|length['.$pass_min_len.',50]')
|
||
|
->matches($form->password);
|
||
|
|
||
| ... | ... | |
|
->label('Post title')
|
||
|
->rules('length[3,30]');
|
||
|
|
||
|
$form->input('membername')
|
||
|
$form->date('birthday')
|
||
|
->label('Birthday')
|
||
|
->years(date('Y') - 100, date('Y'))
|
||
|
->rules('required');
|
||
|
|
||
|
$legalp_group = $form->group('Legal person innformation')->visible(FALSE);
|
||
|
|
||
|
$legalp_group->input('membername')
|
||
|
->label('Name of organization')
|
||
|
->rules('length[1,60]');
|
||
|
|
||
|
$form->input('organization_identifier')
|
||
|
$legalp_group->input('organization_identifier')
|
||
|
->label('Organization identifier')
|
||
|
->rules('length[3,20]');
|
||
|
|
||
|
$form->date('birthday')
|
||
|
->label('Birthday')
|
||
|
->years(date('Y') - 100, date('Y'))
|
||
|
->rules('required');
|
||
|
|
||
|
$form->group('Address');
|
||
|
|
||
| ... | ... | |
|
$form->input('town')
|
||
|
->label(__('Town').' - '.__('District'))
|
||
|
->rules('required')
|
||
|
->style('width:200px')
|
||
|
->class('join1');
|
||
|
|
||
|
$form->input('district')
|
||
|
->style('width:200px')
|
||
|
->class('join2');
|
||
|
|
||
|
$form->input('street')
|
||
|
->label('Street')
|
||
|
->rules('required')
|
||
|
->style('width:200px');
|
||
|
->rules('required');
|
||
|
|
||
|
$form->input('zip')
|
||
|
->label('Zip code')
|
||
|
->rules('required')
|
||
|
->style('width:200px');
|
||
|
->rules('required');
|
||
|
}
|
||
|
else
|
||
|
{
|
||
| ... | ... | |
|
}
|
||
|
|
||
|
$form->input('gpsx')
|
||
|
->label(__('GPS').' X: '.help::hint('gps_coordinates'))
|
||
|
->label(__('GPS').' X:')
|
||
|
->help(help::hint('gps_coordinates'))
|
||
|
->rules('gps');
|
||
|
|
||
|
$form->input('gpsy')
|
||
|
->label(__('GPS').' Y: '.help::hint('gps_coordinates'))
|
||
|
->label(__('GPS').' Y:')
|
||
|
->help(help::hint('gps_coordinates'))
|
||
|
->rules('gps');
|
||
|
|
||
|
$form->group('Contact information');
|
||
|
|
||
|
$form->dropdown('phone_prefix')
|
||
|
->label('Telephone prefix')
|
||
|
->label('Phone')
|
||
|
->rules('required')
|
||
|
->options($phone_prefixes)
|
||
|
->selected(Settings::get('default_country'))
|
||
|
->style('width:200px');
|
||
|
->class('join1');
|
||
|
|
||
|
$form->input('phone')
|
||
|
->rules('required|length[9,40]')
|
||
|
->callback(array($this, 'valid_phone'));
|
||
|
->callback(array($this, 'valid_phone'))
|
||
|
->class('join2');
|
||
|
|
||
|
$form->input('email')
|
||
|
->rules('required|length[3,50]|valid_email')
|
||
|
->callback(array($this, 'valid_email'));
|
||
|
->rules('required|length[3,100]|valid_email')
|
||
|
->callback(array($this, 'valid_email'))
|
||
|
->style('width:300px');
|
||
|
|
||
|
$form->group('Additional information');
|
||
|
|
||
| freenetis/branches/1.1/application/i18n/cs_CZ/texts.php | ||
|---|---|---|
|
'latency' => 'Odezva',
|
||
|
'leaving date' => 'Datum vystoupení',
|
||
|
'leaving_date' => 'Datum vystoupení',
|
||
|
'legal person innformation' => 'Informace o právnické osobě',
|
||
|
'length' => 'Délka',
|
||
|
'level' => 'Úroveň',
|
||
|
'license' => 'Licence',
|
||
| ... | ... | |
|
'reactivate debtor redirection after importing' => 'Reaktivovat přesměrování dlužníků po importu',
|
||
|
'reactivate payment notice redirection after importing' => 'Reaktivovat přesměrování upozornění na placení po importu',
|
||
|
'read' => 'Přečtená',
|
||
|
'read message' => 'Přečíst zprávu',
|
||
|
'read only' => 'Pouze pro čtení',
|
||
|
'read-only tariff cannot be deleted' => 'Tarif pouze pro čtení nelze mazat.',
|
||
|
'read-only tariff cannot be edited' => 'Tarif pouze pro čtení nelze editovat.',
|
||
| freenetis/branches/1.1/application/models/country.php | ||
|---|---|---|
|
'country_code !=' => ''
|
||
|
))->select_list('id', $concat, 'country_code');
|
||
|
}
|
||
|
|
||
|
/**
|
||
|
* Gets list of countries for combo box only with country code
|
||
|
*
|
||
|
* @return array
|
||
|
*/
|
||
|
public function select_country_code_list()
|
||
|
{
|
||
|
return $this->where(array
|
||
|
(
|
||
|
'country_code IS NOT' => NULL,
|
||
|
'country_code !=' => ''
|
||
|
))->select_list('id', 'country_code', 'country_code');
|
||
|
}
|
||
|
|
||
|
/**
|
||
|
* Finds country by area (in VoIP)
|
||
| freenetis/branches/1.1/media/css/installation.css | ||
|---|---|---|
|
textarea {
|
||
|
border: 1px solid black;
|
||
|
font-family: Monospace;
|
||
|
margin-bottom: 20px;
|
||
|
margin-top: 2px;
|
||
|
margin-bottom: 2px;
|
||
|
}
|
||
|
|
||
|
textarea.comment_ta {
|
||
| ... | ... | |
|
color:#068c00;
|
||
|
}
|
||
|
|
||
|
.group-button {
|
||
|
cursor: pointer;
|
||
|
}
|
||
|
|
||
|
.dispNone {
|
||
|
display:none;
|
||
|
}
|
||
|
|
||
|
.warning {
|
||
|
color: red;
|
||
|
}
|
||
| ... | ... | |
|
|
||
|
#district {
|
||
|
margin-left: 20px;
|
||
|
}
|
||
|
}
|
||
Také k dispozici: Unified diff
Upravy:
- vylepseni vzhledu registracniho formulare (reorganitzace nekterych polozek, vylepseni zadavani tel. cisla)
Opravy:
- oprava presmerovani zajemce o clenstci poi prihlaseni, pokud jsou zakazany pozadavky o pripojeni