add tranlsation for user information page

html/inc/languages/english.php

@@ -9,6 +9,7 @@ define("WEB_pkts","Pkt");
 define("WEB_log","Log");
 define("WEB_deleted","Deleted");
 define("WEB_status","Status");
+define ("WEB_unknown","No data available");
 
 define("WEB_page_speed","Page generated for ");
 define("WEB_rows_at_page","Entries per page");
@@ -433,5 +434,11 @@ define("WEB_user_add_ip","New IP access address");
 define("WEB_user_add_mac","Mac (optional)");
 define("WEB_user_list_apply","Apply to list");
 define("WEB_new_user","New user");
+define("WEB_user_deleted","belongs to a non-existent user. Probably the record has been deleted");
+
+/* public */
+define("WEB_msg_access_login","Internet for login");
+define("WEB_msg_access_ip","Internet for ip");
+define("WEB_traffic_stats","Current statisticks for");
 
 ?>

html/inc/languages/russian.php

@@ -9,6 +9,7 @@ define("WEB_pkts","Pkt");
 define("WEB_log","Лог");
 define("WEB_deleted","Удалён");
 define("WEB_status","Состояние");
+define ("WEB_unknown","В списках не значится");
 
 define("WEB_page_speed","Страница сгенерирована за ");
 define("WEB_rows_at_page","Записей на страницу");
@@ -433,5 +434,11 @@ define("WEB_user_add_ip","Новый адрес доступа IP");
 define("WEB_user_add_mac","Mac (необязательно)");
 define("WEB_user_list_apply","Применить к списку");
 define("WEB_new_user","Новый юзер");
+define("WEB_user_deleted","принадлежит несуществующему юзеру. Вероятно запись удалена");
+
+/* public */
+define("WEB_msg_access_login","Интернет (логин)");
+define("WEB_msg_access_ip","Интернет (ip)");
+define("WEB_traffic_stats","Текущий трафик для");
 
 ?>

html/public/blocked.php

@@ -10,15 +10,17 @@ require_once ($_SERVER['DOCUMENT_ROOT']."/inc/header_public.php");
 if (! isset($auth_ip)) { $auth_ip = get_user_ip(); }
 if (! isset($auth_ip)) { print "Error detecting user!!!"; }
 
-$start = mktime(0, 0, 0, date("m"), 1, date("Y"));
-$date1m = strftime('%Y-%m-%d', $start);
-$stop = mktime(0, 0, 0, date("m")+1, 1, date("Y"));
-$date2m = strftime('%Y-%m-%d', $stop);
-
-$start = mktime(0, 0, 0, date("m"), date("d"), date("Y"));
-$date1 = strftime('%Y-%m-%d', $start);
-$stop = mktime(0, 0, 0, date("m"), date("d")+1, date("Y"));
-$date2 = strftime('%Y-%m-%d', $stop);
+/* month */
+$pmdate_start = DateTimeImmutable::createFromFormat('U', mktime(0, 0, 0, date("m"), 1, date("Y")));
+$date1m = $pmdate_start->format('Y-m-d');
+$pmdate_stop = DateTimeImmutable::createFromFormat('U', mktime(0, 0, 0, date("m")+1, 1, date("Y")));
+$date2m = $pmdate_stop->format('Y-m-d');
+
+/* day */
+$pdate_start = DateTimeImmutable::createFromFormat('U', mktime(0, 0, 0, date("m"), date("d"), date("Y")));
+$date1 = $pdate_start->format('Y-m-d');
+$pdate_stop = DateTimeImmutable::createFromFormat('U', mktime(0, 0, 0, date("m"), date("d")+1, date("Y")));
+$date2 = $pdate_stop->format('Y-m-d');
 
 ?>
 
@@ -30,7 +32,7 @@ if (! $ip_aton) { $ip_aton = 0; }
 
 $sSQL = "SELECT * FROM User_auth WHERE ip_int='".$ip_aton."' and deleted = 0";
 $auth = get_record_sql($db_link,$sSQL);
-if (! isset($auth) or empty($auth)) { print "<font color=red><b>Адрес $auth_ip в списках не значится!</b><br></font>"; die; }
+if (! isset($auth) or empty($auth)) { print "<font color=red><b>".WEB_cell_ip."&nbsp". $auth_ip ."&bnsp - ".WEB_unknown."!</b><br></font>"; die; }
 
 $id = $auth['id'];
 $user_id = $auth['user_id'];
@@ -38,53 +40,55 @@ $user_id = $auth['user_id'];
 $uSQL = "SELECT * FROM User_list WHERE id='".$user_id."'";
 $user = get_record_sql($db_link,$uSQL);
 
-if (! isset($user) or empty($user)) { print "<font color=red><b>Адрес $auth_ip принадлежит несуществующему юзеру. Вероятно запись удалена.</b><br></font>"; die; }
+if (! isset($user) or empty($user)) { print "<font color=red><b>".WEB_cell_ip."&nbsp". $auth_ip .WEB_user_deleted."</b><br></font>"; die; }
 
 if (empty($user['month_quota'])) { $user['month_quota']=0; }
 if (empty($user['day_quota'])) { $user['day_quota']=0; }
 if (empty($auth['month_quota'])) { $auth['month_quota']=0; }
 if (empty($auth['day_quota'])) { $auth['day_quota']=0; }
 
-$user['month_quota'] = $user['month_quota'] * get_const('KB') * get_const('KB');
-$user['day_quota'] = $user['day_quota'] * get_const('KB') * get_const('KB');
-$auth['month_quota'] = $auth['month_quota'] * get_const('KB') * get_const('KB');
-$auth['day_quota'] = $auth['day_quota'] * get_const('KB') * get_const('KB');
+$KB = get_const('KB');
+if ($KB) { $KB = 1024; } else { $KB = 1000; }
+$user['month_quota'] = $user['month_quota'] * $KB * $KB;
+$user['day_quota'] = $user['day_quota'] * $KB * $KB;
+$auth['month_quota'] = $auth['month_quota'] * $KB * $KB;
+$auth['day_quota'] = $auth['day_quota'] * $KB * $KB;
 
 $day =  GetNowDayString();
-$month = strftime('%m',time());
-$year = strftime('%Y',time());
+$date_now = DateTimeImmutable::createFromFormat('U', time());
+$month = $date_now->format('m');
+$year = $date_now->format('Y');
 
 ?>
 <table>
 <tr>
-<td><b>Сейчас</b></td><td><?php print GetNowTimeString(); ?></td></tr>
+<td><b><?php echo WEB_msg_now; ?></b></td><td><?php print GetNowTimeString(); ?></td></tr>
 <tr>
-<td><b>Login</b></td> <td><?php print $user['login']; ?></td>
+<td><b><?php echo WEB_cell_login; ?></b></td> <td><?php print $user['login']; ?></td>
 </tr><tr>
 <td><b>ФИО</b></td> <td><?php print $user['fio']; ?></td>
 </tr><tr>
-<td> Интернет (логин) </td> <td><b><?php 
-if ($user['enabled'] and !$user['blocked']) { print "Включен"; }
-if (!$user['enabled']) { print "<font color=red>Запрещён</font> &nbsp"; }
-if ($user['blocked']) { print "<font colot=red>Блок по трафику</font>"; }
+<td> <?php echo WEB_msg_access_login; ?> </td> <td><b><?php 
+if ($user['enabled'] and !$user['blocked']) { print WEB_msg_enabled; }
+if (!$user['enabled']) { print "<font color=red>".WEB_msg_disabled."</font> &nbsp"; }
+if ($user['blocked']) { print "<font colot=red>".WEB_msg_traffic_blocked."</font>"; }
 ?></b>
 </td></tr><tr>
-<td> Интернет (этот IP) </td> <td><b><?php 
-if ($user['enabled'] and !$user['blocked'] and !$auth['blocked'] and $auth['enabled']) { print "Включен"; }
-if (!$user['enabled'] or !$auth['enabled']) { print "<font color=red>Запрещён</font> &nbsp"; }
-if ($auth['blocked']) { print "<font color=red>Блок по трафику</font>"; }
+<td> <?php echo WEB_msg_access_ip; ?> </td> <td><b><?php 
+if ($user['enabled'] and !$user['blocked'] and !$auth['blocked'] and $auth['enabled']) { print WEB_msg_enabled; }
+if (!$user['enabled'] or !$auth['enabled']) { print "<font color=red>".WEB_msg_disabled."</font> &nbsp"; }
+if ($auth['blocked']) { print "<font color=red>".WEB_msg_traffic_blocked."</font>"; }
 ?></b>
 </td>
 </tr>
-<tr><td>Фильтр</td><td><?php print get_group($db_link, $auth["filter_group_id"]); ?> </td></tr>
-<tr><td>Шейпер</td><td><?php print get_queue($db_link, $auth["queue_id"]); ?></td></tr>
-<tr><td> Квота на логин, месяц <td><td><?php print fbytes($user['month_quota']); ?> </td></tr>
-<tr><td> Квота на логин, день <td><td><?php print fbytes($user['day_quota']); ?> </td></tr>
-<tr><td> Лимит на ip, месяц <td><td><?php print fbytes($auth['month_quota']); ?> </td></tr>
-<tr><td> Лимит на ip, день <td><td><?php print fbytes($auth['day_quota']); ?> </td></tr>
+<tr><td><?php echo WEB_cell_filter; ?></td><td><?php print get_group($db_link, $auth["filter_group_id"]); ?> </td></tr>
+<tr><td><?php echo WEB_cell_shaper; ?></td><td><?php print get_queue($db_link, $auth["queue_id"]); ?></td></tr>
+<tr><td><?php echo WEB_cell_login_quote_month; ?> <td><td><?php print fbytes($user['month_quota']); ?> </td></tr>
+<tr><td><?php echo WEB_cell_login_quote_day; ?> <td><td><?php print fbytes($user['day_quota']); ?> </td></tr>
+<tr><td><?php echo WEB_cell_ip_quote_month; ?> <td><td><?php print fbytes($auth['month_quota']); ?> </td></tr>
+<tr><td><?php echo WEB_cell_ip_quote_day;?> <td><td><?php print fbytes($auth['day_quota']); ?> </td></tr>
 
 <?php
-$auth_list = get_records_sql($db_link,"SELECT id FROM User_auth WHERE user_id='".$user_id."' AND deleted=0");
 
 ####### day
 $sSQL = "SELECT SUM(byte_in) as tin, SUM(byte_out) as tout FROM User_stats WHERE `timestamp`>='".$date1."' AND `timestamp`<'".$date2."' AND auth_id='".$id."'";
@@ -103,6 +107,8 @@ if (!empty($day_auth_itog)) {
 $day_user_sum_in=0;
 $day_user_sum_out=0;
 
+$auth_list = get_records_sql($db_link,"SELECT id FROM User_auth WHERE user_id='".$user_id."' AND deleted=0");
+
 if (!empty($auth_list)) {
     foreach ($auth_list as $row) {
         $auth_itog2 = get_record_sql($db_link,"SELECT SUM(byte_in) as tin, SUM(byte_out) as tout FROM User_stats WHERE `timestamp`>='".$date1."' AND `timestamp`<'".$date2."' AND auth_id='".$row['id']."'");
@@ -145,12 +151,12 @@ if (!empty($auth_list)) {
     }
 
 #### print
-print "<tr class='data'><td><b>Текущий трафик на IP</b></td><td>$auth_ip</td></tr>\n";
-print "<tr class='data'><td>за день in/out </td><td>" . fbytes($day_auth_sum_in)." / ".fbytes($day_auth_sum_out). "</td></tr>\n";
-print "<tr class='data'><td>за месяц in/out </td><td>" . fbytes($month_auth_sum_in)." / ".fbytes($month_auth_sum_out). "</td></tr>\n";
-print "<tr class='data'><td><b>Текущий трафик на логин</b></td><td>".$user['login']."</td></tr>\n";
-print "<tr class='data'><td>за день in/out </td><td>" . fbytes($day_user_sum_in)." / ".fbytes($day_user_sum_out). "</td></tr>\n";
-print "<tr class='data'><td>за месяц in/out </td><td>" . fbytes($month_user_sum_in)." / ".fbytes($month_user_sum_out). "</td></tr>\n";
+print "<tr class='data'><td><b>".WEB_traffic_stats." ".WEB_cell_ip."</b></td><td>$auth_ip</td></tr>\n";
+print "<tr class='data'><td>".WEB_public_day_traffic."</td><td>" . fbytes($day_auth_sum_in)." / ".fbytes($day_auth_sum_out). "</td></tr>\n";
+print "<tr class='data'><td>".WEB_public_month_traffic."</td><td>" . fbytes($month_auth_sum_in)." / ".fbytes($month_auth_sum_out). "</td></tr>\n";
+print "<tr class='data'><td><b>".WEB_traffic_stats." ".WEB_cell_login."</b></td><td>".$user['login']."</td></tr>\n";
+print "<tr class='data'><td>".WEB_public_day_traffic."</td><td>" . fbytes($day_user_sum_in)." / ".fbytes($day_user_sum_out). "</td></tr>\n";
+print "<tr class='data'><td>".WEB_public_month_traffic."</td><td>" . fbytes($month_user_sum_in)." / ".fbytes($month_user_sum_out). "</td></tr>\n";
 print "</table>\n";
 
 require_once ($_SERVER['DOCUMENT_ROOT']."/inc/footer.php");