Revize 2247
Přidáno uživatelem Ondřej Fibich před asi 11 roky(ů)
| freenetis/branches/1.1/application/controllers/comments.php | ||
|---|---|---|
|
// form is validate
|
||
|
if ($form->validate())
|
||
|
{
|
||
|
$form_data = $form->as_array();
|
||
|
$form_data = $form->as_array(FALSE);
|
||
|
|
||
|
$comment = new Comment_Model();
|
||
|
|
||
| ... | ... | |
|
// form is validate
|
||
|
if ($form->validate())
|
||
|
{
|
||
|
$form_data = $form->as_array();
|
||
|
$form_data = $form->as_array(FALSE);
|
||
|
|
||
|
try
|
||
|
{
|
||
| freenetis/branches/1.1/application/controllers/connection_requests.php | ||
|---|---|---|
|
|
||
|
$subnet = $subnet_model->get_net_and_mask_of_subnet();
|
||
|
|
||
|
if (!valid::ip_check_subnet(ip2long($ip_address), $subnet->net + 0, $subnet->mask))
|
||
|
if (!valid::ip_check_subnet(ip2long($ip_address), $subnet->net + 0, ip2long($subnet->netmask)))
|
||
|
{
|
||
|
Controller::warning(PARAMETER);
|
||
|
}
|
||
| freenetis/branches/1.1/application/controllers/json.php | ||
|---|---|---|
|
$subnet = $subnet_model->get_net_and_mask_of_subnet();
|
||
|
|
||
|
// checks mask
|
||
|
if (!valid::ip_check_subnet(ip2long($ip_str), $subnet->net + 0, $subnet->mask))
|
||
|
if (!valid::ip_check_subnet(ip2long($ip_str), $subnet->net + 0, ip2long($subnet->netmask)))
|
||
|
{
|
||
|
die(json_encode(array
|
||
|
(
|
||
| freenetis/branches/1.1/application/controllers/members.php | ||
|---|---|---|
|
|
||
|
$redir_grid = new Grid('members', null, array
|
||
|
(
|
||
|
'selector_increace' => 20,
|
||
|
'use_selector' => false,
|
||
|
'selector_min' => 20,
|
||
|
'selector_max_multiplier' => 10,
|
||
|
'current' => $limit_results,
|
||
|
'base_url' => Config::get('lang'). '/members/show/' . $member_id . '/'
|
||
|
. $limit_results.'/'.$order_by.'/'.$order_by_direction,
|
||
| freenetis/branches/1.1/application/helpers/valid.php | ||
|---|---|---|
|
*/
|
||
|
public static function ip_check_subnet($ip, $net, $mask)
|
||
|
{
|
||
|
$mask = 0xffffffff << (32 - $mask) & 0xffffffff;
|
||
|
$size = (~$mask & 0xffffffff)+1;
|
||
|
|
||
|
if (($ip & $mask) != (int) $net)
|
||
|
if (($ip & $mask) != $net)
|
||
|
{
|
||
|
return false; // IP address does not match the subnet/mask
|
||
|
}
|
||
|
else if ($ip == $net || ($ip == ($net | ~$mask)) && ~$mask != 0)
|
||
|
else if ($size > 1 && ($ip == $net || $ip == ($net + $size - 1)))
|
||
|
{
|
||
|
return false; // Invalid IP address
|
||
|
}
|
||
| freenetis/branches/1.1/media/css/installation.css | ||
|---|---|---|
|
}
|
||
|
|
||
|
#main #main-padd #content{
|
||
|
float: left;
|
||
|
margin: 30px;
|
||
|
}
|
||
|
|
||
Také k dispozici: Unified diff
Upravy:
Opravy:
- fixes #820: Spatne escapovani nekterych znaku u komentaru
- fixes #823: Nelze pridat IP adresa s maskou podsite 255.255.255.255 ve formulari pro pridani zarizeni
- oprava zobrazeni stranek se stylem installation.css v IE7 <= (obsah nebyl na stredu)
- nezobrazovani selektoru stranek u seznamu IP adres clena