Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 1858

Přidáno uživatelem Ondřej Fibich před více než 11 roky(ů)

Novinky:
- fixes #369: Formular pro prijeti cekatele na clenstvi - VS

Opravy:
- drobna oprava SQL prikazu v IP adrersach

Zobrazit rozdíly:

freenetis/branches/1.1/application/models/ip_address.php
public function count_ips_and_redirections_of_member($member_id)
{
return $this->db->query("
SELECT COUNT(*) AS total
SELECT COUNT(DISTINCT ip.id) AS total
FROM ip_addresses ip
LEFT JOIN ifaces i ON ip.iface_id = i.id
LEFT JOIN devices d ON i.device_id = d.id
LEFT JOIN users u ON d.user_id = u.id
LEFT JOIN messages_ip_addresses mip ON mip.ip_address_id = ip.id
WHERE u.member_id = ? OR ip.member_id = ?
GROUP BY ip.id
", $member_id, $member_id)->current()->total;
}
......
public function count_all_ip_addresses_by_member_and_subnet($member_id, $subnet_id)
{
return $this->db->query("
SELECT COUNT(*) AS count
SELECT COUNT(DISTINCT ip.id) AS count
FROM ip_addresses ip
JOIN ifaces i ON ip.iface_id = i.id
JOIN devices d ON i.device_id = d.id
freenetis/branches/1.1/application/controllers/variable_symbols.php
} // end of delete function
/**
/**
* Check validity of variable symbol
*
* @param object $input
*/
public function valid_var_sym($input = NULL)
public static function valid_var_sym($input = NULL)
{
// validators cannot be accessed
if (empty($input) || !is_object($input))
......
$value = trim($input->value);
$variable_symbol_model = new Variable_Symbol_Model();
$total = $variable_symbol_model->get_variable_symbol_id($value);
if (!empty($value))
{
$variable_symbol_model = new Variable_Symbol_Model();
if (!preg_match("/^[0-9]{1,10}$/", $value))
{
$input->add_error('required', __('Bad variable symbol format.'));
$total = $variable_symbol_model->get_variable_symbol_id($value);
if (!preg_match("/^[0-9]{1,10}$/", $value))
{
$input->add_error('required', __('Bad variable symbol format.'));
}
else if ($total)
{
$input->add_error('required', __(
'Variable symbol already exists in database.'
));
}
}
else if ($total)
{
$input->add_error('required', __(
'Variable symbol already exists in database.'
));
}
}
}
freenetis/branches/1.1/application/controllers/members.php
->selected($member->registration);
}
if ($this->acl_check_edit('Variable_Symbols_Controller', 'variable_symbols'))
{
$form->input('variable_symbol')
->rules('length[1,10]')
->callback('Variable_Symbols_Controller::valid_var_sym');
}
if ($this->acl_check_edit(get_class($this), 'comment'))
{
$form->textarea('comment')
......
$member->comment = $form_data['comment'];
}
if ($this->acl_check_edit('Variable_Symbols_Controller', 'variable_symbols'))
{
$account = ORM::factory('account')->where(array
(
'member_id' => $member->id,
'account_attribute_id' => Account_attribute_Model::CREDIT
))->find();
$vs = new Variable_Symbol_Model();
$vs->account_id = $account->id;
$vs->variable_symbol = $form_data['variable_symbol'];
$vs->save_throwable();
}
$member->type = Member_Model::TYPE_REGULAR;
$member->locked = 0;

Také k dispozici: Unified diff