Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 2094

Přidáno uživatelem David Raška před více než 11 roky(ů)

Oprava:
- fixes #704 - Oprava shlukovani radku u provozu

Zobrazit rozdíly:

freenetis/branches/1.1/application/controllers/traffic.php
$filter_form->add('month')
->type('select_number')
->values(array
(
1 => __('January'),
2 => __('February'),
3 => __('March'),
4 => __('April'),
5 => __('May'),
6 => __('June'),
7 => __('July'),
8 => __('August'),
9 => __('September'),
10 => __('October'),
11 => __('November'),
12 => __('December')
));
->values(date::months_array());
}
if ($type_number == 2)
......
{
$filter_form->add('month')
->type('select_number')
->values(array
(
1 => __('January'),
2 => __('February'),
3 => __('March'),
4 => __('April'),
5 => __('May'),
6 => __('June'),
7 => __('July'),
8 => __('August'),
9 => __('September'),
10 => __('October'),
11 => __('November'),
12 => __('December')
));
->values(date::months_array());
}
if ($type_number != 0)
......
{
$filter_form->add('month')
->type('select_number')
->values(array
(
1 => __('January'),
2 => __('February'),
3 => __('March'),
4 => __('April'),
5 => __('May'),
6 => __('June'),
7 => __('July'),
8 => __('August'),
9 => __('September'),
10 => __('October'),
11 => __('November'),
12 => __('December')
));
->values(date::months_array());
}
if ($type_number > 0)
......
{
case 'daily':
$before_2_months = time() - 86400 * 31 * 2;
$before_2_months = time() - 86400 * 31 * 2;
if ($before_2_months > $time)
{
$time = $before_2_months;
}
if ($before_2_months > $time)
{
$time = $before_2_months;
}
break;
case 'monthly':
......
if ($before_2_years > $time)
{
$time = $before_2_years;
}
}
break;
}
......
}
}
$arr_traffics = array_merge($arr_traffics, $traffics);
$arr_traffics = $traffics + $arr_traffics;
ksort($arr_traffics);
$total_traffics = count($arr_traffics);
freenetis/branches/1.1/application/helpers/date.php
return $days;
}
/**
* Returns array of months
*
* @param bool $translate Translate months names
* @return array
*/
public static function months_array($translate = TRUE)
{
if ($translate)
{
return array_map('__', self::$months);
}
else
{
return self::$months;
}
}
/**
* Number of months in a year

Také k dispozici: Unified diff