$sql = "select distinct c.id, c.name, c.projects from tt_user_project_binds upb
inner join tt_client_project_binds cpb on (cpb.project_id = upb.project_id)
inner join tt_clients c on (c.id = cpb.client_id and c.status = 1)
- where upb.user_id = $user_id and upb.status = 1 order by c.name";
+ where upb.user_id = $user_id and upb.status = 1 order by upper(c.name)";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
if (preg_match('/^([0-1]{0,1}[0-9]|2[0-4])h?$/', $value )) { // 0, 1 ... 24
return true;
}
- if (preg_match('/^([0-1]{0,1}[0-9]|2[0-3])?[.][0-9]{1,4}h?$/', $value )) { // decimal values like 0.5, 1.25h, ... .. 23.9999h
+
+ global $user;
+ $localizedPattern = '/^([0-1]{0,1}[0-9]|2[0-3])?['.$user->decimal_mark.'][0-9]{1,4}h?$/';
+ if (preg_match($localizedPattern, $value )) { // decimal values like 0.5, 1.25h, ... .. 23.9999h (or with comma)
return true;
}
$time_value = $value;
// If we have a decimal format - convert to time format 00:00.
+ global $user;
+ if ($user->decimal_mark == ',')
+ $time_value = str_replace (',', '.', $time_value);
+
if((strpos($time_value, '.') !== false) || (strpos($time_value, 'h') !== false)) {
$val = floatval($time_value);
$mins = round($val * 60);
<br>
<table cellspacing="0" cellpadding="4" width="100%" border="0">
<tr>
- <td align="center"> Anuko Time Tracker 1.11.44.3639 | Copyright © <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+ <td align="center"> Anuko Time Tracker 1.11.44.3640 | Copyright © <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
<a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
<a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
<a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>
{if (($smarty.const.TYPE_DURATION == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
<tr>
<td align="right">{$i18n.label.duration}:</td>
- <td>{$forms.timeRecordForm.duration.control} {$i18n.form.time.duration_format}</td>
+ <td>{$forms.timeRecordForm.duration.control} {if $user->decimal_mark == ','}{str_replace('.', ',', $i18n.form.time.duration_format)}{else}{$i18n.form.time.duration_format}{/if}</td>
</tr>
{/if}
</table>
{if (($smarty.const.TYPE_DURATION == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
<tr>
<td align="right">{$i18n.label.duration}:</td>
- <td>{$forms.timeRecordForm.duration.control} {$i18n.form.time.duration_format}</td>
+ <td>{$forms.timeRecordForm.duration.control} {if $user->decimal_mark == ','}{str_replace('.', ',', $i18n.form.time.duration_format)}{else}{$i18n.form.time.duration_format}{/if}</td>
</tr>
{/if}
<tr>