#334 slot and traffic usage for TS3 at userpanel

web/ajax.php

@@ -100,6 +100,51 @@ if (isset($admin_id) and $pa['dedicatedServer'] and $ui->smallletters('d', 7, 'g
 
     $template_file = 'ajax_admin_web_master.tpl';
 
+} else if (isset($user_id) and $pa['voiceserverStats'] and $ui->smallletters('d', 14, 'get') == 'uservoicestats' and $ui->st('w', 'get')) {
+
+    $data = array();
+
+    if ($ui->st('w', 'get') == 'se') {
+
+        $query = $sql->prepare("SELECT v.`id`,v.`ip`,v.`port`,v.`dns`,m.`usedns` FROM `voice_server` v INNER JOIN `voice_masterserver` m ON v.`masterserver`=m.`id` WHERE v.`userid`=? AND v.`resellerid`=? AND v.`active`='Y' AND m.`active`='Y' ORDER BY v.`ip`,v.`port`");
+        $query->execute(array($user_id, $resellerLockupID));
+        foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
+            $data[] = '<option value=' . $row['id'] . '>' . $row['ip'] . ':' . $row['port'] . '</option>';
+        }
+    }
+
+    require_once IncludeTemplate($template_to_use,'ajax_userpanel_voice_stats.tpl', 'ajax');
+
+} else if (isset($admin_id) and $pa['voiceserverStats'] and $ui->smallletters('d', 15, 'get') == 'adminvoicestats' and $ui->st('w', 'get')) {
+
+    $data = array();
+
+    if ($ui->st('w', 'get') == 'us') {
+        $query = $sql->prepare("SELECT u.`id`,u.`cname`,u.`vname`,u.`name` FROM `userdata` u INNER JOIN `voice_server` v ON u.`id`=v.`userid` AND v.`active`='Y' WHERE u.`resellerid`=? GROUP BY u.`id`");
+        $query->execute(array($resellerLockupID));
+        foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
+            $data[] = '<option value=' . $row['id'] . '>' . trim($row['cname'] . ' ' . $row['vname'] . ' ' . $row['name']) . '</option>';
+        }
+
+    } else if ($ui->st('w', 'get') == 'se') {
+
+        $query = $sql->prepare("SELECT v.`id`,v.`ip`,v.`port`,v.`dns`,m.`usedns` FROM `voice_server` v INNER JOIN `voice_masterserver` m ON v.`masterserver`=m.`id` WHERE v.`resellerid`=? ORDER BY v.`ip`,v.`port`");
+        $query->execute(array($resellerLockupID));
+        foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
+            $data[] = '<option value=' . $row['id'] . '>' . $row['ip'] . ':' . $row['port'] . '</option>';
+        }
+
+    } else if ($ui->st('w', 'get') == 'ma') {
+
+        $query = $sql->prepare("SELECT `id`,`ssh2ip` FROM `voice_masterserver` WHERE `resellerid`=? AND `active`='Y' ORDER BY `ssh2ip`");
+        $query->execute(array($resellerLockupID));
+        foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
+            $data[] = '<option value=' . $row['id'] . '>' . $row['ssh2ip'] . '</option>';
+        }
+
+    }
+
+    require_once IncludeTemplate($template_to_use,'ajax_admin_voice_stats.tpl', 'ajax');
 }
 
 if (isset($template_file)) {

web/images.php

@@ -45,11 +45,16 @@ include(EASYWIDIR . '/stuff/methods/class_validator.php');
 include(EASYWIDIR . '/stuff/methods/vorlage.php');
 include(EASYWIDIR . '/stuff/settings.php');
 
-if (isset($admin_id) and $ui->st('img', 'get')) {
+if (((isset($admin_id) and $ui->w('from', 5,'get') == 'admin') or (isset($user_id) and $ui->w('from', 5,'get') == 'user')) and $ui->st('img', 'get')) {
-    $pa = User_Permissions($admin_id);
+
+    $pa = User_Permissions((isset($user_id) and $ui->w('from', 5,'get') == 'user') ? $user_id : $admin_id);
+
     $multiplier = 1;
-    if ($ui->st('img', 'get') == 'tr' and ($pa['traffic'] or $pa['root'])) {
+
+    if ($ui->st('img', 'get') == 'tr' and ($pa['traffic'] or $pa['root']) and isset($admin_id)) {
+
         $values = array();
+
         $query = $sql->prepare("SELECT `multiplier`,`text_colour_1`,`text_colour_2`,`text_colour_3`,`barin_colour_1`,`barin_colour_2`,`barin_colour_3`,`barout_colour_1`,`barout_colour_2`,`barout_colour_3`,`bartotal_colour_1`,`bartotal_colour_2`,`bartotal_colour_3`,`bg_colour_1`,`bg_colour_2`,`bg_colour_3`,`border_colour_1`,`border_colour_2`,`border_colour_3`,`line_colour_1`,`line_colour_2`,`line_colour_3` FROM `traffic_settings` LIMIT 1");
         $query->execute();
         foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
@@ -76,6 +81,7 @@ if (isset($admin_id) and $ui->st('img', 'get')) {
             $line_colour_2 = $row['line_colour_2'];
             $line_colour_3 = $row['line_colour_3'];
         }
+
         if ($ui->id('id', 19, 'get') and $list_gtype != '' and $ui->id('p', 19, 'get') . '-' . $ui->port('po', 'get') . '-' . $ui->id('id',19, 'get') > 0) {
             $i = 0;
             $stop = $list_gtype;
@@ -230,10 +236,13 @@ if (isset($admin_id) and $ui->st('img', 'get')) {
                 $i++;
             }
         }
+
         foreach($values as $value) {
             $max_values[] = max($value);
         }
+
         $total_bars = count($max_values);
+
         if ($total_bars > 0) {
             $img_width = 725;
             $margintop = 30;
@@ -330,7 +339,9 @@ if (isset($admin_id) and $ui->st('img', 'get')) {
             imagepng($img);
         }
     } else if ($ui->st('img', 'get') == 'vo' and ($pa['voicemasterserver'] or $pa['voiceserver'] or $pa['root'])) {
+
         $values = array();
+
         $query = $sql->prepare("SELECT * FROM `voice_stats_settings` WHERE `resellerid`=? LIMIT 1");
         $query->execute(array($reseller_id));
         foreach ($query->fetchall(PDO::FETCH_ASSOC) as $row) {
@@ -343,6 +354,9 @@ if (isset($admin_id) and $ui->st('img', 'get')) {
             $barout_colour_1 = $row['barout_colour_1'];
             $barout_colour_2 = $row['barout_colour_2'];
             $barout_colour_3 = $row['barout_colour_3'];
+            $bartraffic_colour_1 = $row['bartraffic_colour_1'];
+            $bartraffic_colour_2 = $row['bartraffic_colour_2'];
+            $bartraffic_colour_3 = $row['bartraffic_colour_3'];
             $bg_colour_1 = $row['bg_colour_1'];
             $bg_colour_2 = $row['bg_colour_2'];
             $bg_colour_3 = $row['bg_colour_3'];
@@ -353,24 +367,29 @@ if (isset($admin_id) and $ui->st('img', 'get')) {
             $line_colour_2 = $row['line_colour_2'];
             $line_colour_3 = $row['line_colour_3'];
         }
-        if ($ui->id('id', 19, 'get') and $list_gtype != '' and $start>0) {
+
+        if ($ui->id('id', 19, 'get') and $start > 0) {
+
             $i = 0;
-            $stop = $list_gtype;
+            $stop = ($ui->pregw('m', 14, 'get')) ? $ui->pregw('m', 14, 'get') : 1;
+
             if ($ui->st('d', 'get') == 'md' or $ui->st('d', 'get') == 'to') {
                 $stop = 23;
-                $starttime = strtotime($ui->id('p', 19, 'get') . '-' . $ui->port('po', 'get') . '-' . $ui->id('id',19, 'get'));
+                $starttime = strtotime($ui->id('p', 19, 'get') . '-' . $ui->id('po', 19, 'get') . '-' . $ui->id('id', 19, 'get'));
                 $now = date('Y-m-d H');
             } else if ($ui->st('d', 'get') == 'da') {
-                $starttime = strtotime($ui->id('p', 19, 'get') . '-' . $ui->port('po', 'get') . '-' . $ui->id('id',19, 'get'));
+                $starttime = strtotime($ui->id('p', 19, 'get') . '-' . $ui->id('po', 19, 'get') . '-' . $ui->id('id', 19, 'get'));
                 $now = date('Y-m-d');
             } else if ($ui->st('d', 'get') == 'mo') {
-                $starttime = strtotime($ui->id('p', 19, 'get') . '-' . $ui->port('po', 'get'));
+                $starttime = strtotime($ui->id('p', 19, 'get') . '-' . $ui->id('po', 19, 'get'));
                 $now = date('Y-m-d');
             } else if ($ui->st('d', 'get') == 'ye') {
                 $starttime = strtotime($ui->id('p', 19, 'get'));
                 $now = date('Y-m-d');
             }
+
             while ($i < $stop) {
+
                 if ($ui->st('d', 'get') == 'md' or $ui->st('d', 'get') == 'to') {
                     $day1 = date('Y-m-d H',strtotime("+$i hour", $starttime));
                 } else if ($ui->st('d', 'get') == 'da') {
@@ -380,45 +399,82 @@ if (isset($admin_id) and $ui->st('img', 'get')) {
                 } else if ($ui->st('d', 'get') == 'ye') {
                     $day1 = date('Y',strtotime("+$i year", $starttime));
                 }
+
                 if ($day1 <= $now) {
+
                     $like = $day1 . '%';
+
                     if ($ui->st('d', 'get') == 'md' or $ui->st('d', 'get') == 'to') {
-                        $day2 = date('H',strtotime($day1.':00:00')).':00:00';
+                        $day2 = date('H', strtotime($day1.':00:00')).':00:00';
                     } else if ($ui->st('d', 'get') == 'da') {
-                        $day2 = date('d.m.Y',strtotime($day1));
+                        $day2 = date('d.m.Y', strtotime($day1));
                     } else if ($ui->st('d', 'get') == 'mo') {
-                        $day2 = date('m.Y',strtotime($day1));
+                        $day2 = date('m.Y', strtotime($day1));
                     } else if ($ui->st('d', 'get') == 'ye') {
-                        $day2 = date('Y',strtotime($day1));
+                        $day2 = date('Y', strtotime($day1));
                     }
+
+                    $values[$day2] = array(0, 0, 0);
+
                     if ($ui->username('shorten', 50, 'get')) {
-                        $query = $sql->prepare("SELECT SUM(`used`)/COUNT(`sid`) AS `averageused`,SUM(`installed`)/COUNT(`sid`) AS `averageinstalled` FROM `voice_server_stats` WHERE `date` LIKE ? AND `sid`=? AND `resellerid`=?");
+
-                        $query->execute(array($like, $ui->username('shorten', 50, 'get'), $reseller_id));
+                        if ($ui->w('from', 5,'get') == 'admin' and isset($admin_id)) {
-                    } else if ($ui->username('distro', 50, 'get')) {
+
-                        $query = $sql->prepare("SELECT SUM(`used`)/COUNT(`sid`)*COUNT(DISTINCT(`sid`)) AS `averageused`,SUM(`installed`)/COUNT(`sid`)*COUNT(DISTINCT(`sid`)) AS `averageinstalled` FROM `voice_server_stats` WHERE `date` LIKE ? AND `uid`=? AND `resellerid`=?");
+                            $query = $sql->prepare("SELECT SUM(`used`)/COUNT(`sid`) AS `averageused`,SUM(`installed`)/COUNT(`sid`) AS `averageinstalled`,SUM(`traffic`)/1048576 as `fileTrafficGB` FROM `voice_server_stats` WHERE `date` LIKE ? AND `sid`=? AND `resellerid`=?");
+                            $query->execute(array($like, $ui->username('shorten', 50, 'get'), $reseller_id));
+
+                        } else {
+
+                            $query = $sql->prepare("SELECT SUM(`used`)/COUNT(`sid`) AS `averageused`,SUM(`installed`)/COUNT(`sid`) AS `averageinstalled`,SUM(`traffic`)/1048576 as `fileTrafficGB` FROM `voice_server_stats` WHERE `date` LIKE ? AND `sid`=? AND `uid`=? AND `resellerid`=?");
+                            $query->execute(array($like, $ui->username('shorten', 50, 'get'), $user_id, $reseller_id));
+
+                        }
+
+                    } else if ($ui->username('distro', 50, 'get') and isset($admin_id) and $ui->w('from', 5,'get') == 'admin') {
+
+                        $query = $sql->prepare("SELECT SUM(`used`)/COUNT(`sid`)*COUNT(DISTINCT(`sid`)) AS `averageused`,SUM(`installed`)/COUNT(`sid`)*COUNT(DISTINCT(`sid`)) AS `averageinstalled`,SUM(`traffic`)/1048576 as `fileTrafficGB` FROM `voice_server_stats` WHERE `date` LIKE ? AND `uid`=? AND `resellerid`=?");
                         $query->execute(array($like, $ui->username('distro', 50, 'get'), $reseller_id));
-                    } else if ($ui->username('short', 50, 'get')) {
+
-                        $query = $sql->prepare("SELECT SUM(`used`)/COUNT(`sid`)*COUNT(DISTINCT(`sid`)) AS `averageused`,SUM(`installed`)/COUNT(`sid`)*COUNT(DISTINCT(`sid`)) AS `averageinstalled` FROM `voice_server_stats` WHERE `date` LIKE ? AND `mid`=? AND `resellerid`=?");
+                    } else if ($ui->username('short', 50, 'get') and isset($admin_id) and $ui->w('from', 5,'get') == 'admin') {
+
+                        $query = $sql->prepare("SELECT SUM(`used`)/COUNT(`sid`)*COUNT(DISTINCT(`sid`)) AS `averageused`,SUM(`installed`)/COUNT(`sid`)*COUNT(DISTINCT(`sid`)) AS `averageinstalled`,SUM(`traffic`)/1048576 as `fileTrafficGB` FROM `voice_server_stats` WHERE `date` LIKE ? AND `mid`=? AND `resellerid`=?");
                         $query->execute(array($like, $ui->username('short', 50, 'get'), $reseller_id));
+
                     } else {
-                        $query = $sql->prepare("SELECT SUM(`used`)/COUNT(`sid`)*COUNT(DISTINCT(`sid`)) AS `averageused`,SUM(`installed`)/COUNT(`sid`)*COUNT(DISTINCT(`sid`)) AS `averageinstalled` FROM `voice_server_stats` WHERE `date` LIKE ? AND `resellerid`=?");
+
-                        $query->execute(array($like, $reseller_id));
+                        if ($ui->w('from', 5,'get') == 'admin' and isset($admin_id)) {
+
+                            $query = $sql->prepare("SELECT SUM(`used`)/COUNT(`sid`)*COUNT(DISTINCT(`sid`)) AS `averageused`,SUM(`installed`)/COUNT(`sid`)*COUNT(DISTINCT(`sid`)) AS `averageinstalled`,SUM(`traffic`)/1048576 as `fileTrafficGB` FROM `voice_server_stats` WHERE `date` LIKE ? AND `resellerid`=?");
+                            $query->execute(array($like, $reseller_id));
+
+                        } else {
+                            $query = $sql->prepare("SELECT SUM(`used`)/COUNT(`sid`)*COUNT(DISTINCT(`sid`)) AS `averageused`,SUM(`installed`)/COUNT(`sid`)*COUNT(DISTINCT(`sid`)) AS `averageinstalled`,SUM(`traffic`)/1048576 as `fileTrafficGB` FROM `voice_server_stats` WHERE `date` LIKE ? AND `uid`=? AND `resellerid`=?");
+                            $query->execute(array($like, $user_id, $reseller_id));
+                        }
                     }
+
                     foreach ($query->fetchall(PDO::FETCH_ASSOC) as $row) {
                         $averageused = (isset($row['averageused'])) ? round($row['averageused']) : 0;
                         $averageinstalled = (isset($row['averageinstalled'])) ? round($row['averageinstalled']) : 0;
-                        $values[$day2] = array($averageused, $averageinstalled);
+                        $fileTrafficGB = (isset($row['fileTrafficGB'])) ? $row['fileTrafficGB'] : 0;
+                        $values[$day2] = array($averageused, $averageinstalled, $fileTrafficGB);
                     }
                 }
+
                 $i++;
             }
         }
+
         $max_values = array();
+
         foreach($values as $value) {
             $max_values[] = max($value);
         }
+
         $total_bars = count($max_values);
-        if ($total_bars>0) {
+
+        if ($total_bars > 0) {
+
             $img_width = 725;
             $margintop = 30;
             $marginbottom = 30;
@@ -427,25 +483,32 @@ if (isset($admin_id) and $ui->st('img', 'get')) {
             $bar_heigth = 10;
             $spacing1 = 2;
             $spacing2 = 20;
+
             $textspacingleft = ($marginleft / 10) + 2;
-            $img_height = $margintop + $marginbottom + ($total_bars * 2 * $bar_heigth) + ((( $total_bars * 2 ) - $total_bars) * $spacing1 ) + ( ( $total_bars - 1 ) * $spacing2 );
+            $img_height = $margintop + $marginbottom + ($total_bars * 3 * $bar_heigth) + ((( $total_bars * 3 ) - $total_bars) * $spacing1 ) + ( ( $total_bars - 1 ) * $spacing2 );
-            $graph_width = $img_width - ($marginleft + $marginright);
+            $graph_width = $img_width - ($marginleft + $marginright + 40);
             $img = imagecreate($img_width, $img_height);
             $text_color = imagecolorallocate($img, $text_colour_1, $text_colour_2, $text_colour_3);
             $bar_in = imagecolorallocate($img, $barin_colour_1, $barin_colour_2, $barin_colour_3);
             $bar_out = imagecolorallocate($img, $barout_colour_1, $barout_colour_2, $barout_colour_3);
+            $bar_traffic = imagecolorallocate($img, $bartraffic_colour_1, $bartraffic_colour_2, $bartraffic_colour_3);
             $background_color = imagecolorallocate($img, $bg_colour_1, $bg_colour_2, $bg_colour_3);
             $border_color = imagecolorallocate($img, $border_colour_1, $border_colour_2, $border_colour_3);
             $line_color = imagecolorallocate($img, $line_colour_1, $line_colour_2, $line_colour_3);
             $max_value = max($max_values);
+
             if ($max_value == 0) {
-                $max_value=0.000001;
+                $max_value = 0.000001;
             }
+
             $ratio = $graph_width / $max_value;
+
             imagefilledrectangle($img, 0, 0, $img_width, $img_height, $background_color);
             $lines = 10;
-            $vertical_gap = $graph_width/$lines;
+
+            $vertical_gap = $graph_width / $lines;
             $i = 1;
+
             while ($i <= $lines) {
                 $key = round(($max_value / $lines ) * ($lines - $i));
                 $x = $img_width - $marginright - $vertical_gap * $i ;
@@ -455,35 +518,53 @@ if (isset($admin_id) and $ui->st('img', 'get')) {
                 $v = intval($vertical_gap * $i /$ratio);
                 $i++;
             }
+
             $i = 0;
             $more = 0;
+
             while ($i < $total_bars) {
-                foreach ($values as $key=>$array) {
+
+                foreach ($values as $key => $array) {
+
                     $i2 = 0;
+
                     foreach ($array as $amount) {
+
                         $x1 = $marginleft;
                         $x2 = $marginleft + $amount * $ratio ;
-                        $y1 = $margintop + $i * $bar_heigth ;
+                        $y1 = $margintop + ($i * $bar_heigth) + $more;
-                        $y1new = $y1+$more;
-                        $y1 = $y1new;
                         $y2= $y1 + $bar_heigth;
-                        if ($i2 == 1) {
+
-                            $morenew = $more+$spacing2;
+                        if ($i2 == 2) {
+                            $morenew = $more + $spacing2;
                             $more = $morenew;
                         } else {
-                            $morenew = $more+$spacing1;
+                            $morenew = $more + $spacing1;
                             $more = $morenew;
                         }
-                        $display = round($amount);
+
-                        imagestring($img,0, $x2+5, $y1, $display, $text_color);
                         if ($i2 == 0) {
-                            imagestring($img, $y1+$spacing1+$bar_heigth,2, $y1+$spacing1, $key, $text_color);
+                            imagestring($img, 0, $x2 + 5, $y1, round($amount) . ' Used', $text_color);
+                        } else if ($i2 == 1) {
+                            imagestring($img, 0, $x2 + 5, $y1, round($amount) . ' Installed', $text_color);
+                        } else if ($i2 == 2) {
+                            imagestring($img, 0, $x2 + 5, $y1, $amount . 'GB Filetraffic', $text_color);
                         }
+
+
+
+                        if ($i2 == 0) {
+                            imagestring($img, $y1 + $spacing1 + $bar_heigth, 2, $y1 + $spacing1, $key, $text_color);
+                        }
+
                         if ($i2 == 0) {
                             imagefilledrectangle($img, $x1, $y1, $x2, $y2, $bar_in);
                         } else if ($i2 == 1) {
                             imagefilledrectangle($img, $x1, $y1, $x2, $y2, $bar_out);
+                        } else if ($i2 == 2) {
+                            imagefilledrectangle($img, $x1, $y1, $x2, $y2, $bar_traffic);
                         }
+
                         $i++;
                         $i2++;
                     }

web/languages/default/de/traffic.xml

@@ -3,6 +3,8 @@
 	<all>Alles</all>
 	<barin_colour>Eingehender Traffic</barin_colour>
 	<barout_colour>Ausgehender Traffic</barout_colour>
+    <bar_slots_total_colour>Verfügbare Slots</bar_slots_total_colour>
+    <bar_slots_usage_colour>Benutzte Slots</bar_slots_usage_colour>
 	<bartotal_colour>Gesamter Traffic</bartotal_colour>
     <blue>Blau</blue>
 	<bg_colour>Hintergrund</bg_colour>

web/languages/default/uk/traffic.xml

@@ -3,6 +3,8 @@
 	<all>All</all>
 	<barin_colour>Incomming traffic</barin_colour>
 	<barout_colour>Outgoing traffic</barout_colour>
+    <bar_slots_total_colour>Total Slots</bar_slots_total_colour>
+    <bar_slots_usage_colour>Used Slots</bar_slots_usage_colour>
 	<bartotal_colour>Total traffic</bartotal_colour>
 	<bg_colour>Background</bg_colour>
     <blue>Blue</blue>

web/reboot.php

@@ -589,11 +589,11 @@ if (!isset($ip) or $ui->escaped('SERVER_ADDR', 'server') == $ip or in_array($ip,
 
     if (date('G') == 5) {
         print "Reparing tables\r\n";
-        $query = $sql->prepare("REPAIR TABLE `addons`,`addons_installed`,`api_external_auth`,`api_ips`,`api_settings`,`badips`,`dhcpdata`,`eac`,`easywi_version`,`gserver_restarts`,`gsstatus`,`gsswitch`,`imprints`,`jobs`,`lendedserver`,`lendsettings`,`lendstats`,`mail_log`,`mysql_external_dbs`,`mysql_external_servers`,`page_pages`,`page_pages_text`,`page_settings`,`page_terms`,`page_terms_used`,`resellerdata`,`resellerimages`,`rserverdata`,`rservermasterg`,`serverlist`,`servertypes`,`settings`,`test`,`tickets`,`ticket_topics`,`traffic_data`,`traffic_data_day`,`traffic_settings`,`userdata`,`usergroups`,`userlog`,`userpermissions`,`virtualcontainer`,`virtualhosts`,`voice_masterserver`,`voice_server`,`voice_server_backup`,`voice_server_stats`,`voice_server_stats_hours`,`voice_stats_settings`");
+        $query = $sql->prepare("REPAIR TABLE `addons`,`addons_installed`,`api_external_auth`,`api_ips`,`api_settings`,`badips`,`dhcpdata`,`eac`,`easywi_version`,`gserver_restarts`,`gsstatus`,`gsswitch`,`imprints`,`jobs`,`lendedserver`,`lendsettings`,`lendstats`,`mail_log`,`mysql_external_dbs`,`mysql_external_servers`,`page_pages`,`page_pages_text`,`page_settings`,`page_terms`,`page_terms_used`,`resellerdata`,`resellerimages`,`rserverdata`,`rservermasterg`,`serverlist`,`servertypes`,`settings`,`test`,`tickets`,`ticket_topics`,`traffic_data`,`traffic_data_day`,`traffic_settings`,`userdata`,`usergroups`,`userlog`,`userpermissions`,`virtualcontainer`,`virtualhosts`,`voice_masterserver`,`voice_server`,`voice_server_backup`,`voice_server_stats`,`voice_stats_settings`");
         $query->execute();
 
         print "Optimizing tables\r\n";
-        $query = $sql->prepare("OPTIMIZE TABLE `addons`,`addons_installed`,`api_external_auth`,`api_ips`,`api_settings`,`badips`,`dhcpdata`,`eac`,`easywi_version`,`gserver_restarts`,`gsstatus`,`gsswitch`,`imprints`,`jobs`,`lendedserver`,`lendsettings`,`lendstats`,`mail_log`,`mysql_external_dbs`,`mysql_external_servers`,`page_pages`,`page_pages_text`,`page_settings`,`page_terms`,`page_terms_used`,`resellerdata`,`resellerimages`,`rserverdata`,`rservermasterg`,`serverlist`,`servertypes`,`settings`,`test`,`tickets`,`ticket_topics`,`traffic_data`,`traffic_data_day`,`traffic_settings`,`userdata`,`usergroups`,`userlog`,`userpermissions`,`virtualcontainer`,`virtualhosts`,`voice_masterserver`,`voice_server`,`voice_server_backup`,`voice_server_stats`,`voice_server_stats_hours`,`voice_stats_settings`");
+        $query = $sql->prepare("OPTIMIZE TABLE `addons`,`addons_installed`,`api_external_auth`,`api_ips`,`api_settings`,`badips`,`dhcpdata`,`eac`,`easywi_version`,`gserver_restarts`,`gsstatus`,`gsswitch`,`imprints`,`jobs`,`lendedserver`,`lendsettings`,`lendstats`,`mail_log`,`mysql_external_dbs`,`mysql_external_servers`,`page_pages`,`page_pages_text`,`page_settings`,`page_terms`,`page_terms_used`,`resellerdata`,`resellerimages`,`rserverdata`,`rservermasterg`,`serverlist`,`servertypes`,`settings`,`test`,`tickets`,`ticket_topics`,`traffic_data`,`traffic_data_day`,`traffic_settings`,`userdata`,`usergroups`,`userlog`,`userpermissions`,`virtualcontainer`,`virtualhosts`,`voice_masterserver`,`voice_server`,`voice_server_backup`,`voice_server_stats`,`voice_stats_settings`");
         $query->execute();
     }
 

web/serverallocation.php

@@ -264,24 +264,7 @@ if ($ui->smallletters('w',5, 'get') == 'check') {
 		foreach ($ips as $ip) $data[] = '<option>'.$ip.'</option>';
 	}
     require_once IncludeTemplate($template_to_use,'ajax_admin_traffic.tpl', 'ajax');
-} else if ($ui->st('d', 'get')=="vu" and $ui->st('w', 'get')) {
+
-	if ($ui->st('w', 'get')=="us") {
-		$query = $sql->prepare("SELECT u.`id`,u.`cname`,u.`vname`,u.`name` FROM `userdata` u INNER JOIN `voice_server` v ON u.`id`=v.`userid` AND v.`active`='Y' WHERE u.`resellerid`=? GROUP BY u.`id`");
-        $query->execute(array($reseller_id));
-		foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) $data[] = '<option value='.$row['id'].'>'.trim($row['cname'] . ' ' . $row['vname'] . ' ' . $row['name']).'</option>';
-	} else if ($ui->st('w', 'get')=="se") {
-        $query = $sql->prepare("SELECT v.`id`,v.`ip`,v.`port`,v.`dns`,m.`usedns` FROM `voice_server` v LEFT JOIN `voice_masterserver` m ON v.`masterserver`=m.`id` WHERE v.`resellerid`=? ORDER BY v.`ip`,v.`port`");
-        $query->execute(array($reseller_id));
-		foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
-            $server = $row['ip'] . ':' . $row['port'];
-			$data[] = '<option value='.$row['id'].'>'.$server.'</option>';
-		}
-	} else if ($ui->st('w', 'get')=="ma") {
-        $query = $sql->prepare("SELECT `id`,`ssh2ip` FROM `voice_masterserver` WHERE `resellerid`=? ORDER BY `ssh2ip`");
-        $query->execute(array($reseller_id));
-		foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) $data[] = '<option value='.$row['id'].'>'.$row['ssh2ip'].'</option>';
-	}
-    require_once IncludeTemplate($template_to_use,'ajax_admin_voice_stats.tpl', 'ajax');
 } else if ($ui->username('distro', 50, 'get') and $ui->id('id',19, 'get') and ($pa['vserversettings'] or $pa['root']) and $reseller_id == 0) {
 	$pselect = $sql->prepare("SELECT `pxeautorun` FROM `resellerimages` WHERE `bitversion`=? AND `distro`=?");
 	$pselect->execute(array($ui->id('id',19, 'get'), $ui->username('distro', 50, 'get')));

web/stuff/admin/roots_subnets.php

@@ -351,10 +351,10 @@ option domain-name-servers 1.1.1.1;';
     }
     $pages = implode(', ', $pages);
 
-    $query = $sql->prepare("SELECT * FROM `rootsSubnets` ORDER BY $orderby LIMIT $start,$amount");
+    $query = $sql->prepare("SELECT * FROM `rootsSubnets` ORDER BY $orderby LIMIT " . $start . "," . $amount);
     $query->execute();
     foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
-        $table[] = array('id' => $row['subnetID'], 'active' => $row['active'], 'subnet' => $row['subnet'], 'vlanName' => $row['vlanName']);
+        $table[] = array('id' => $row['subnetID'], 'active' => $row['active'], 'subnet' => $row['subnet'] . '.' . $row['subnetStart'] . ' - ' . $row['subnet'] . '.' . $row['subnetStop'], 'vlanName' => $row['vlanName']);
     }
 
     $template_file = 'admin_root_subnets_list.tpl';

web/stuff/admin/traffic.php

@@ -436,6 +436,6 @@ if ($d== 'se' and $reseller_id == 0) {
 		$startdate="$year-$month-$day";
 		$stopdate="$yearstop-$monthstop-$daystop";
 	}
-	$trafficdata="images.php?img=tr&d=$dmy&w = $unit&p=$year&id=$day&po=$month&m=$amount$whichdata";
+	$trafficdata = "images.php?img=tr&from=admin&d={$dmy}&w={$unit}&p={$year}&id={$day}&po={$month}&m={$amount}{$whichdata}";
 	$template_file = "admin_traffic.tpl";
 }

web/stuff/admin/user_groups.php

@@ -278,6 +278,7 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
                 $usertickets = yesNo('usertickets');
                 $ftpbackup = yesNo('ftpbackup');
                 $voiceserver = yesNo('voiceserver');
+                $voiceserverStats = yesNo('uvoiceserverStats');
                 $apiSettings = yesNo('uapiSettings');
                 $jobs = yesNo('ujobs');
                 $mysql = yesNo('umysql');

web/stuff/admin/voice_usage.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * File: voice_usage.php.
  * Author: Ulrich Block
@@ -39,12 +40,19 @@ if (!isset($admin_id) or $main != 1 or (isset($admin_id) and !$pa['voiceserver']
     header('Location: admin.php');
     die;
 }
+
 $sprache = getlanguagefile('traffic',$user_language,$reseller_id);
+
 if ($ui->w('action', 4, 'post') and !token(true)) {
+
     $template_file = $spracheResponse->token;
-} else if ($d== 'se' and $pa['voiceserverSettings']) {
+
+} else if ($d == 'se' and $pa['voiceserverSettings']) {
+
 	if (isset($ui->post['text_colour_1']) and $ui->w('action', 4, 'post') == 'md') {
+
 		$error = 0;
+
 		if (!validate_int($ui->post['text_colour_1'], 0 , 255) and $ui->post['text_colour_1'] != 0) $error = 1;
 		if (!validate_int($ui->post['text_colour_2'], 0 , 255) and $ui->post['text_colour_2'] != 0) $error = 1;
 		if (!validate_int($ui->post['text_colour_3'], 0 , 255) and $ui->post['text_colour_3'] != 0) $error = 1;
@@ -54,6 +62,9 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
 		if (!validate_int($ui->post['barout_colour_1'], 0 , 255) and $ui->post['barout_colour_1'] != 0) $error = 1;
 		if (!validate_int($ui->post['barout_colour_2'], 0 , 255) and $ui->post['barout_colour_2'] != 0) $error = 1;
 		if (!validate_int($ui->post['barout_colour_3'], 0 , 255) and $ui->post['barout_colour_3'] != 0) $error = 1;
+        if (!validate_int($ui->post['bartraffic_colour_1'], 0 , 255) and $ui->post['bartraffic_colour_1'] != 0) $error = 1;
+        if (!validate_int($ui->post['bartraffic_colour_2'], 0 , 255) and $ui->post['bartraffic_colour_2'] != 0) $error = 1;
+        if (!validate_int($ui->post['bartraffic_colour_3'], 0 , 255) and $ui->post['bartraffic_colour_3'] != 0) $error = 1;
 		if (!validate_int($ui->post['bg_colour_1'], 0 , 255) and $ui->post['bg_colour_1'] != 0) $error = 1;
 		if (!validate_int($ui->post['bg_colour_2'], 0 , 255) and $ui->post['bg_colour_2'] != 0) $error = 1;
 		if (!validate_int($ui->post['bg_colour_3'], 0 , 255) and $ui->post['bg_colour_3'] != 0) $error = 1;
@@ -63,14 +74,18 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
 		if (!validate_int($ui->post['line_colour_1'], 0 , 255) and $ui->post['line_colour_1'] != 0) $error = 1;
 		if (!validate_int($ui->post['line_colour_2'], 0 , 255) and $ui->post['line_colour_2'] != 0) $error = 1;
 		if (!validate_int($ui->post['line_colour_3'], 0 , 255) and $ui->post['line_colour_3'] != 0) $error = 1;
-		if ($error==0) {
+
-            $query = $sql->prepare("UPDATE `voice_stats_settings` SET `text_colour_1`=?,`text_colour_2`=?,`text_colour_3`=?,`barin_colour_1`=?,`barin_colour_2`=?,`barin_colour_3`=?,`barout_colour_1`=?,`barout_colour_2`=?,`barout_colour_3`=?,`bg_colour_1`=?,`bg_colour_2`=?,`bg_colour_3`=?,`border_colour_1`=?,`border_colour_2`=?,`border_colour_3`=?,`line_colour_1`=?,`line_colour_2`=?,`line_colour_3`=? WHERE `resellerid`=? LIMIT 1");
+		if ($error == 0) {
-            $query->execute(array($ui->post['text_colour_1'],$ui->post['text_colour_2'],$ui->post['text_colour_3'],$ui->post['barin_colour_1'],$ui->post['barin_colour_2'],$ui->post['barin_colour_3'],$ui->post['barout_colour_1'],$ui->post['barout_colour_2'],$ui->post['barout_colour_3'],$ui->post['bg_colour_1'],$ui->post['bg_colour_2'],$ui->post['bg_colour_3'],$ui->post['border_colour_1'],$ui->post['border_colour_2'],$ui->post['border_colour_3'],$ui->post['line_colour_1'],$ui->post['line_colour_2'],$ui->post['line_colour_3'],$reseller_id));
+
+            $query = $sql->prepare("UPDATE `voice_stats_settings` SET `text_colour_1`=?,`text_colour_2`=?,`text_colour_3`=?,`barin_colour_1`=?,`barin_colour_2`=?,`barin_colour_3`=?,`barout_colour_1`=?,`barout_colour_2`=?,`barout_colour_3`=?,`bartraffic_colour_1`=?,`bartraffic_colour_2`=?,`bartraffic_colour_3`=?,`bg_colour_1`=?,`bg_colour_2`=?,`bg_colour_3`=?,`border_colour_1`=?,`border_colour_2`=?,`border_colour_3`=?,`line_colour_1`=?,`line_colour_2`=?,`line_colour_3`=? WHERE `resellerid`=? LIMIT 1");
+            $query->execute(array($ui->post['text_colour_1'],$ui->post['text_colour_2'],$ui->post['text_colour_3'],$ui->post['barin_colour_1'],$ui->post['barin_colour_2'],$ui->post['barin_colour_3'],$ui->post['barout_colour_1'],$ui->post['barout_colour_2'],$ui->post['barout_colour_3'],$ui->post['bartraffic_colour_1'],$ui->post['bartraffic_colour_2'],$ui->post['bartraffic_colour_3'],$ui->post['bg_colour_1'],$ui->post['bg_colour_2'],$ui->post['bg_colour_3'],$ui->post['border_colour_1'],$ui->post['border_colour_2'],$ui->post['border_colour_3'],$ui->post['line_colour_1'],$ui->post['line_colour_2'],$ui->post['line_colour_3'],$reseller_id));
 			$template_file = $spracheResponse->table_add;
 		} else {
 			$template_file = 'Error';
 		}
+
 	} else {
+
 		$query = $sql->prepare("SELECT * FROM `voice_stats_settings` WHERE `resellerid`=? LIMIT 1");
         $query->execute(array($reseller_id));
 		foreach ($query->fetchall(PDO::FETCH_ASSOC) as $row) {
@@ -83,6 +98,9 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
 			$barout_colour_1 = $row['barout_colour_1'];
 			$barout_colour_2 = $row['barout_colour_2'];
 			$barout_colour_3 = $row['barout_colour_3'];
+            $bartraffic_colour_1 = $row['bartraffic_colour_1'];
+            $bartraffic_colour_2 = $row['bartraffic_colour_2'];
+            $bartraffic_colour_3 = $row['bartraffic_colour_3'];
 			$bg_colour_1 = $row['bg_colour_1'];
 			$bg_colour_2 = $row['bg_colour_2'];
 			$bg_colour_3 = $row['bg_colour_3'];
@@ -95,253 +113,203 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
 		}
 		$template_file = 'admin_voice_stats_settings.tpl';
 	}
+
 } else if ($pa['voiceserverStats']) {
+
+    $data = array();
+
 	$display = $sprache->total;
-	$data = array();
+
 	if (!$ui->st('kind', 'post') or $ui->st('kind', 'post') == 'al') {
-		$kind='al';
+
+		$kind = 'al';
 		$whichdata = '';
-	} else if (isid($ui->post['what'],30) and $ui->st('kind', 'post') == 'us') {
+
-		$kind='us';
+	} else if ($ui->id('what', 30, 'post') and $ui->st('kind', 'post') == 'us') {
-		$whichdata="&amp;distro=".$ui->post['what'];
+
-		$extra = $sprache->user;
+		$kind = 'us';
-		$pselect = $sql->prepare("SELECT u.`id`,u.`cname`,u.`vname`,u.`name` FROM `userdata` u INNER JOIN `voice_server` v ON u.`id`=v.`userid` AND v.`active`='Y' WHERE u.`resellerid`=? GROUP BY u.`id`");
+        $extra = $sprache->user;
-		$pselect->execute(array($reseller_id));
+
-		foreach ($pselect->fetchall(PDO::FETCH_ASSOC) as $row) {
+		$whichdata = '&amp;distro=' . $ui->id('what', 30, 'post');
-			if ($ui->post['what'] == $row['id']) {
+
-				$data[] = '<option value='.$row['id'].' selected="selected">'.trim($row['cname'] . ' ' . $row['vname'] . ' ' . $row['name']).'</option>';
+		$query = $sql->prepare("SELECT u.`id`,u.`cname`,u.`vname`,u.`name` FROM `userdata` u INNER JOIN `voice_server` v ON u.`id`=v.`userid` AND v.`active`='Y' WHERE u.`resellerid`=? GROUP BY u.`id`");
+        $query->execute(array($reseller_id));
+		foreach ($query->fetchall(PDO::FETCH_ASSOC) as $row) {
+			if ($ui->id('what', 30, 'post') == $row['id']) {
+				$data[] = '<option value=' . $row['id'] . ' selected="selected">' . trim($row['cname'] . ' ' . $row['vname'] . ' ' . $row['name']).'</option>';
 			} else {
-				$data[] = '<option value='.$row['id'].'>'.trim($row['cname'] . ' ' . $row['vname'] . ' ' . $row['name']).'</option>';
+				$data[] = '<option value=' . $row['id'] . '>' . trim($row['cname'] . ' ' . $row['vname'] . ' ' . $row['name']) . '</option>';
 			}
 		}
-		$pselect = $sql->prepare("SELECT `cname` FROM `userdata` WHERE `accounttype`='r' AND `id`=? AND `resellerid`=? LIMIT 1");
+
-		$pselect->execute(array($ui->post['what'],$reseller_id));
+        $query = $sql->prepare("SELECT `cname` FROM `userdata` WHERE `accounttype`='r' AND `id`=? AND `resellerid`=? LIMIT 1");
-		foreach ($pselect->fetchall(PDO::FETCH_ASSOC) as $row) {
+        $query->execute(array($ui->id('what', 30, 'post'),$reseller_id));
+		foreach ($query->fetchall(PDO::FETCH_ASSOC) as $row) {
 			$display = $extra . '  ' . $row['cname'];
 		}
-	} else if (isid($ui->post['what'], '30') and $ui->st('kind', 'post')=="se") {
+
-		$kind='se';
+	} else if ($ui->id('what', 30, 'post') and $ui->st('kind', 'post') == 'se') {
-		$whichdata="&amp;shorten=".$ui->post['what'];
+
-		$pselect = $sql->prepare("SELECT v.`id`,v.`ip`,v.`port`,v.`dns`,m.`usedns` FROM `voice_server` v INNER JOIN `voice_masterserver` m ON v.`masterserver`=m.`id` WHERE v.`id`=? AND v.`resellerid`=? LIMIT 1");
+		$kind = 'se';
-		$pselect->execute(array($ui->post['what'],$reseller_id));
+		$whichdata = '&amp;shorten=' . $ui->id('what', 30, 'post');
-		foreach ($pselect->fetchall(PDO::FETCH_ASSOC) as $row) {
+
+        $query = $sql->prepare("SELECT v.`id`,v.`ip`,v.`port`,v.`dns`,m.`usedns` FROM `voice_server` v INNER JOIN `voice_masterserver` m ON v.`masterserver`=m.`id` WHERE v.`id`=? AND v.`resellerid`=? AND v.`active`='Y' AND m.`active`='Y' LIMIT 1");
+        $query->execute(array($ui->id('what', 30, 'post'),$reseller_id));
+		foreach ($query->fetchall(PDO::FETCH_ASSOC) as $row) {
 			$display = $sprache->server . '  ' . $row['ip'] . ':' . $row['port'];
 		}
-		$pselect = $sql->prepare("SELECT v.`id`,v.`ip`,v.`port`,v.`dns`,m.`usedns` FROM `voice_server` v INNER JOIN `voice_masterserver` m ON v.`masterserver`=m.`id` WHERE v.`resellerid`=? ORDER BY v.`ip`,v.`port`");
+
-		$pselect->execute(array($reseller_id));
+        $query = $sql->prepare("SELECT v.`id`,v.`ip`,v.`port`,v.`dns`,m.`usedns` FROM `voice_server` v INNER JOIN `voice_masterserver` m ON v.`masterserver`=m.`id` WHERE v.`resellerid`=? AND v.`active`='Y' AND m.`active`='Y' ORDER BY v.`ip`,v.`port`");
-		foreach ($pselect->fetchall(PDO::FETCH_ASSOC) as $row) {
+        $query->execute(array($reseller_id));
+		foreach ($query->fetchall(PDO::FETCH_ASSOC) as $row) {
             $server = $row['ip'] . ':' . $row['port'];
-			if ($ui->post['what'] == $row['id']) {
+			if ($ui->id('what', 30, 'post') == $row['id']) {
-				$data[] = '<option value='.$row['id'].' selected="selected">'.$server.'</option>';
+				$data[] = '<option value='. $row['id'] .' selected="selected">' . $server . '</option>';
 			} else {
-				$data[] = '<option value='.$row['id'].'>'.$server.'</option>';
+				$data[] = '<option value=' . $row['id'] . '>' . $server . '</option>';
 			}
 		}
-	} else if (isid($ui->post['what'], '30') and $ui->st('kind', 'post') == 'ma') {
+
-		$kind='ma';
+	} else if ($ui->id('what', 30, 'post') and $ui->st('kind', 'post') == 'ma') {
-		$whichdata="&amp;short=".$ui->post['what'];
+
-		$pselect = $sql->prepare("SELECT `ssh2ip` FROM `voice_masterserver` WHERE `id`=? AND `resellerid`=? LIMIT 1");
+		$kind = 'ma';
-		$pselect->execute(array($ui->post['what'],$reseller_id));
+		$whichdata = '&amp;short=' . $ui->id('what', 30, 'post');
-		foreach ($pselect->fetchall(PDO::FETCH_ASSOC) as $row) {
+
+        $query = $sql->prepare("SELECT `ssh2ip` FROM `voice_masterserver` WHERE `id`=? AND `resellerid`=? AND `active`='Y' LIMIT 1");
+        $query->execute(array($ui->id('what', 30, 'post'), $reseller_id));
+		foreach ($query->fetchall(PDO::FETCH_ASSOC) as $row) {
 			$display = $sprache->server . '  ' . $row['ssh2ip'];
 		}
-		$pselect = $sql->prepare("SELECT `id`,`ssh2ip` FROM `voice_masterserver` WHERE `resellerid`=? ORDER BY `ssh2ip`");
+
-		$pselect->execute(array($reseller_id));
+        $query = $sql->prepare("SELECT `id`,`ssh2ip` FROM `voice_masterserver` WHERE `resellerid`=? AND `active`='Y' ORDER BY `ssh2ip`");
-		foreach ($pselect->fetchall(PDO::FETCH_ASSOC) as $row) {
+        $query->execute(array($reseller_id));
-			if ($ui->post['what'] == $row['id']) {
+		foreach ($query->fetchall(PDO::FETCH_ASSOC) as $row) {
-				$data[] = '<option value='.$row['id'].' selected="selected">'.$row['ssh2ip'].'</option>';
+			if ($ui->id('what', 30, 'post') == $row['id']) {
+				$data[] = '<option value=' . $row['id'] . ' selected="selected">' . $row['ssh2ip'] . '</option>';
 			} else {
-				$data[] = '<option value='.$row['id'].'>'.$row['ssh2ip'].'</option>';
+				$data[] = '<option value=' . $row['id'] . '>' . $row['ssh2ip'] . '</option>';
 			}
 		}
 	}
+
 	if (!isset($ui->post['dmy'])) {
-		$dmy='da';
+
-		$year=date('Y',strtotime("-6 days"));
+		$dmy = 'da';
-		$month=date('m',strtotime("-6 days"));
+		$year = date('Y',strtotime('-6 days'));
-		$day=date('d',strtotime("-6 days"));
+		$month = date('m',strtotime('-6 days'));
-		$yearstop=date('Y');
+		$day = date('d',strtotime('-6 days'));
-		$monthstop=date('m');
+		$yearstop = date('Y');
-		$daystop=date('d');
+		$monthstop = date('m');
+		$daystop = date('d');
 		$amount = 7;
-	} else if ($ui->post['dmy'] == 'to') {
+
-		$dmy='to';
-		if (validate_int($ui->post['daystart'],1,31)) {
-			$day = $ui->post['daystart'];
-		} else {
-			$day=date('d');
-		}
-		if (validate_int($ui->post['daystop'],1,31)) {
-			$daystop = $ui->post['daystop'];
-		} else {
-			$day=date('d');
-		}
-		if (validate_int($ui->post['monthstart'],1,12)) {
-			$month = $ui->post['monthstart'];
-		} else {
-			$month=date('m');
-		}
-		if (validate_int($ui->post['monthstop'],1,12)) {
-			$monthstop = $ui->post['monthstop'];
-		} else {
-			$monthstop=date('m');
-		}
-		if (validate_int($ui->post['yearstart'],2000,date('Y'))) {
-			$year = $ui->post['yearstart'];
-		} else {
-			$year=date('Y');
-		}
-		if (validate_int($ui->post['yearstop'],2000,date('Y'))) {
-			$yearstop = $ui->post['yearstop'];
-		} else {
-			$yearstop=date('Y');
-		}
-		$now=date('Y-m-d');
-		$date1=strtotime("$year-$month-$day");
-		$date2=strtotime("$yearstop-$monthstop-$daystop");
-		$amount=intval(($date2-$date1)/86400)+1;
-		if ($amount<0 and "$yearstop-$monthstop-$daystop">$now){
-			$yearstop=date('Y');
-			$monthstop=date('m');
-			$daystop=date('d');
-			$day=date('d');
-			$month=date('m');
-			$year=date('Y');
-			$amount = 1;
-		}
 	} else if ($ui->post['dmy'] == 'da') {
-		$dmy='da';
+
-		if (validate_int($ui->post['daystart'],1,31)) {
+		$dmy = 'da';
-			$day = $ui->post['daystart'];
+
-		} else {
+        $year = ($ui->isinteger('yearstart', 'post') and $ui->isinteger('yearstart', 'post') <= date('Y')) ? $ui->isinteger('yearstart', 'post') : date('Y', strtotime('-6 days'));
-			$day=date('d',strtotime("-6 days"));
+        $yearstop = ($ui->isinteger('yearstop', 'post') and $ui->isinteger('yearstop', 'post') <= date('Y')) ? $ui->isinteger('yearstop', 'post') : date('Y');
-		}
+
-		if (validate_int($ui->post['daystop'],1,31)) {
+        $month = ($ui->isinteger('monthstart', 'post') and $ui->isinteger('monthstart', 'post') <= 12) ? $ui->isinteger('monthstart', 'post') : date('m', strtotime('-6 days'));
-			$daystop = $ui->post['daystop'];
+        $monthstop = ($ui->isinteger('monthstop', 'post') and $ui->isinteger('monthstop', 'post') <= 12) ? $ui->isinteger('monthstop', 'post') : date('m');
-		} else {
+
-			$day=date('d');
+        $day = ($ui->isinteger('daystart', 'post') and $ui->isinteger('daystart', 'post') <= 31) ? $ui->isinteger('daystart', 'post') : date('d', strtotime('-6 days'));
-		}
+        $daystop = ($ui->isinteger('daystop', 'post') and $ui->isinteger('daystop', 'post') <= 31) ? $ui->isinteger('daystop', 'post') : date('d');
-		if (validate_int($ui->post['monthstart'],1,12)) {
+
-			$month = $ui->post['monthstart'];
+		$now = date('Y-m-d');
-		} else {
+		$date1 = strtotime("$year-$month-$day");
-			$month=date('m',strtotime("-6 days"));
+		$date2 = strtotime("$yearstop-$monthstop-$daystop");
-		}
+		$amount = intval(($date2 - $date1) / 86400) + 1;
-		if (validate_int($ui->post['monthstop'],1,12)) {
+
-			$monthstop = $ui->post['monthstop'];
+		if ($amount < 0 and "$yearstop-$monthstop-$daystop" > $now){
-		} else {
+			$yearstop = date('Y');
-			$monthstop=date('m');
+			$monthstop = date('m');
-		}
+			$daystop = date('d');
-		if (validate_int($ui->post['yearstart'],2000,date('Y'))) {
+			$day = date('d',strtotime('-6 days'));
-			$year = $ui->post['yearstart'];
+			$month = date('m',strtotime('-6 days'));
-		} else {
+			$year = date('Y',strtotime('-6 days'));
-			$year=date('Y',strtotime("-6 days"));
-		}
-		if (validate_int($ui->post['yearstop'],2000,date('Y'))) {
-			$yearstop = $ui->post['yearstop'];
-		} else {
-			$yearstop=date('Y');
-		}
-		$now=date('Y-m-d');
-		$date1=strtotime("$year-$month-$day");
-		$date2=strtotime("$yearstop-$monthstop-$daystop");
-		$amount=intval(($date2-$date1)/86400)+1;
-		if ($amount<0 and "$yearstop-$monthstop-$daystop">$now){
-			$yearstop=date('Y');
-			$monthstop=date('m');
-			$daystop=date('d');
-			$day=date('d',strtotime("-6 days"));
-			$month=date('m',strtotime("-6 days"));
-			$year=date('Y',strtotime("-6 days"));
 			$amount = 7;
 		}
+
 	} else if ($ui->post['dmy'] == 'mo') {
-		$dmy='mo';
+
+		$dmy = 'mo';
 		$day = 1;
-		if (validate_int($ui->post['monthstart'],1,12)) {
+
-			$month = $ui->post['monthstart'];
+        $year = ($ui->isinteger('yearstart', 'post') and $ui->isinteger('yearstart', 'post') <= date('Y')) ? $ui->isinteger('yearstart', 'post') : date('Y', strtotime('-6 days'));
-		} else {
+        $yearstop = ($ui->isinteger('yearstop', 'post') and $ui->isinteger('yearstop', 'post') <= date('Y')) ? $ui->isinteger('yearstop', 'post') : date('Y');
-			$month=date('m',strtotime("-6 days"));
+
-		}
+        $month = ($ui->isinteger('monthstart', 'post') and $ui->isinteger('monthstart', 'post') <= 12) ? $ui->isinteger('monthstart', 'post') : date('m', strtotime('-6 days'));
-		if (validate_int($ui->post['yearstart'],2000,date('Y'))) {
+        $monthstop = ($ui->isinteger('monthstop', 'post') and $ui->isinteger('monthstop', 'post') <= 12) ? $ui->isinteger('monthstop', 'post') : date('m');
-			$year = $ui->post['yearstart'];
+
-		} else {
+		$daystop = date('t', strtotime("$yearstop-$monthstop"));
-			$year=date('Y',strtotime("-6 days"));
+		$now = date('Y-m');
-		}
+		$date1 = strtotime("$year-$month-$day");
-		if (validate_int($ui->post['yearstop'],2000,date('Y'))) {
-			$yearstop = $ui->post['yearstop'];
-		} else {
-			$yearstop=date('Y');
-		}
-		if (validate_int($ui->post['monthstop'],1,12)) {
-			$monthstop = $ui->post['monthstop'];
-		} else {
-			$monthstop=date('m');
-		}
-		$daystop=date('t', strtotime("$yearstop-$monthstop"));
-		$now=date('Y-m');
-		$date1=strtotime("$year-$month-$day");
 		$add = $date1;
-		$date2=strtotime("$yearstop-$monthstop-$daystop");
+		$date2 = strtotime("$yearstop-$monthstop-$daystop");
 		$i = 0;
-		while ($add<=$date2) {
+
-			$newadd=strtotime("+1 months",$add);
+		while ($add <= $date2) {
-			$add = $newadd;
+			$add = strtotime("+1 months", $add);
 			$i++;
 		}
+
 		$amount = $i;
-		if ($amount<0 or "$yearstop-$monthstop">$now){
+
-			$yearstop=date('Y');
+		if ($amount < 0 or "$yearstop-$monthstop" > $now){
-			$monthstop=date('m');
+			$yearstop = date('Y');
-			$daystop=date('t', strtotime("$yearstop-$monthstop"));
+			$monthstop = date('m');
+			$daystop = date('t', strtotime("$yearstop-$monthstop"));
 			$day = 1;
-			$month=date('m',strtotime("-6 months"));
+			$month = date('m', strtotime('-6 months'));
-			$year=date('Y',strtotime("-6 months"));
+			$year = date('Y', strtotime('-6 months'));
 			$amount = 7;
 		}
+
 	} else if ($ui->post['dmy'] == 'ye') {
-		$dmy='ye';
+
+		$dmy = 'ye';
 		$day = 1;
-		if (validate_int($ui->post['yearstart'],2000,date('Y'))) {
+
-			$year = $ui->post['yearstart'];
+        $year = ($ui->isinteger('yearstart', 'post') and $ui->isinteger('yearstart', 'post') <= date('Y')) ? $ui->isinteger('yearstart', 'post') : date('Y', strtotime('-6 days'));
-		} else {
+        $yearstop = ($ui->isinteger('yearstop', 'post') and $ui->isinteger('yearstop', 'post') <= date('Y')) ? $ui->isinteger('yearstop', 'post') : date('Y');
-			$year=date('Y',strtotime("-6 days"));
+
-		}
-		if (validate_int($ui->post['yearstop'],2000,date('Y'))) {
-			$yearstop = $ui->post['yearstop'];
-		} else {
-			$yearstop=date('Y');
-		}
 		$month = 1;
-		$monthstop=12;
+		$monthstop = 12;
-		$daystop=31;
+		$daystop = 31;
-		$now=date('Y');
+
-		$date1=strtotime("$year-$month-$day");
+		$now = date('Y');
-		$date2=strtotime("$yearstop-$monthstop-$daystop");
+		$date1 = strtotime($year . '-' . $month . '-' . $day);
+		$date2 = strtotime($yearstop . '-' . $monthstop . '-' . $daystop);
 		$add = $date1;
 		$i = 0;
-		while ($add<=$date2) {
+
-			$newadd=strtotime("+1 year",$add);
+		while ($add <= $date2) {
-			$add = $newadd;
+			$add = strtotime('+1 year', $add);
 			$i++;
 		}
+
 		$amount = $i;
-		if ($amount<0 or "$yearstop">$now){
+
-			$yearstop=date('Y');
+		if ($amount < 0 or "$yearstop" > $now){
-			$monthstop=12;
+			$yearstop = date('Y');
-			$daystop=31;
+			$monthstop = 12;
+			$daystop = 31;
 			$day = 1;
 			$month = 1;
-			$year=date('Y',strtotime("-1 year"));
+			$year = date('Y', strtotime('-1 year'));
 			$amount = 2;
 		}
 	}
-	if ($user_language="de") {
+
-		$startdate="$day.$month.$year";
+	if ($user_language == 'de') {
-		$stopdate="$daystop.$monthstop.$yearstop";
+		$startdate = $day . '.' . $month . '.' . $year;
+		$stopdate = $daystop . '.' . $monthstop . '.' . $yearstop;
 	} else {
-		$startdate="$year-$month-$day";
+		$startdate = $year . '-' . $month . '-' . $day;
-		$stopdate="$yearstop-$monthstop-$daystop";
+		$stopdate = $yearstop . '-' . $monthstop . '-' . $daystop;
 	}
-	$getlink="images.php?img=vo&amp;d=$dmy&amp;p=$year&amp;id=$day&amp;po=$month&amp;m=$amount$whichdata";
+
-	$template_file = "admin_voice_stats.tpl";
+	$getlink = "images.php?img=vo&amp;from=admin&amp;d={$dmy}&amp;p={$year}&amp;id={$day}&amp;po={$month}&amp;m={$amount}{$whichdata}";
+	$template_file = 'admin_voice_stats.tpl';
 }

web/stuff/jobs/jobs_user_rm.php

@@ -108,7 +108,6 @@ foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
                     'voice_masterserver' => 'resellerid',
                     'translations' => 'resellerID',
                     'voice_server_stats' => 'resellerid',
-                    'voice_server_stats_hours' => 'resellerid',
                     'voice_stats_settings' => 'resellerid',
                     'mysql_external_servers' => 'resellerid',
                     'mysql_external_dbs' => 'resellerid',

web/stuff/methods/tables_add.php

@@ -1589,21 +1589,6 @@ $query = "CREATE TABLE IF NOT EXISTS `voice_server_stats` (
 $add = $sql->prepare($query);
 $add->execute();
 
-$query = "CREATE TABLE IF NOT EXISTS `voice_server_stats_hours` (
-  `sid` int(10) unsigned NOT NULL,
-  `mid` int(10) unsigned NOT NULL,
-  `installed` decimal(6,2) unsigned NOT NULL,
-  `used` decimal(6,2) unsigned NOT NULL,
-  `traffic` bigint(19) unsigned NOT NULL,
-  `date` datetime DEFAULT NULL,
-  `uid` int(10) unsigned DEFAULT NULL,
-  `count` bigint(19) unsigned DEFAULT 0,
-  `resellerid` int(10) unsigned DEFAULT NULL,
-  PRIMARY KEY (`sid`,`date`),KEY(`mid`),KEY(`uid`),KEY(`resellerid`)
-) ENGINE=InnoDB";
-$add = $sql->prepare($query);
-$add->execute();
-
 $query = "CREATE TABLE IF NOT EXISTS `voice_stats_settings` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `text_colour_1` smallint(3) unsigned DEFAULT 0,
@@ -1615,6 +1600,9 @@ $query = "CREATE TABLE IF NOT EXISTS `voice_stats_settings` (
   `barout_colour_1` smallint(3) unsigned DEFAULT 0,
   `barout_colour_2` smallint(3) unsigned DEFAULT '191',
   `barout_colour_3` smallint(3) unsigned DEFAULT '255',
+  `bartraffic_colour_1` smallint(3) unsigned DEFAULT 0,
+  `bartraffic_colour_2` smallint(3) unsigned DEFAULT 0,
+  `bartraffic_colour_3` smallint(3) unsigned DEFAULT 0,
   `bg_colour_1` smallint(3) unsigned DEFAULT '240',
   `bg_colour_2` smallint(3) unsigned DEFAULT '240',
   `bg_colour_3` smallint(3) unsigned DEFAULT '255',

web/stuff/methods/tables_repair.php

@@ -1381,18 +1381,6 @@ $defined['voice_server_stats'] = array(
     'resellerid' => array("Type"=>"int(10) unsigned","Null"=>"YES","Key"=>"MUL","Default"=>"0","Extra"=>"")
 );
 
-$defined['voice_server_stats_hours'] = array(
-    'sid' => array("Type"=>"int(10) unsigned","Null"=>"NO","Key"=>"PRI","Default"=>"","Extra"=>""),
-    'date' => array("Type"=>"datetime","Null"=>"NO","Key"=>"PRI","Default"=>"0000-00-00 00:00:00","Extra"=>""),
-    'mid' => array("Type"=>"int(10) unsigned","Null"=>"NO","Key"=>"MUL","Default"=>"","Extra"=>""),
-    'installed' => array("Type"=>"decimal(6,2) unsigned","Null"=>"NO","Key"=>"","Default"=>"","Extra"=>""),
-    'used' => array("Type"=>"decimal(6,2) unsigned","Null"=>"NO","Key"=>"","Default"=>"","Extra"=>""),
-    'traffic' => array("Type"=>"bigint(19) unsigned","Null"=>"NO","Key"=>"","Default"=>"","Extra"=>""),
-    'uid' => array("Type"=>"int(10) unsigned","Null"=>"YES","Key"=>"MUL","Default"=>"","Extra"=>""),
-    'count' => array("Type"=>"bigint(19) unsigned","Null"=>"YES","Key"=>"","Default"=>"1","Extra"=>""),
-    'resellerid' => array("Type"=>"int(10) unsigned","Null"=>"YES","Key"=>"MUL","Default"=>"0","Extra"=>"")
-);
-
 $defined['voice_stats_settings'] = array(
     'id' => array("Type"=>"int(10) unsigned","Null"=>"NO","Key"=>"PRI","Default"=>"","Extra"=>"auto_increment"),
     'text_colour_1' => array("Type"=>"smallint(3) unsigned","Null"=>"YES","Key"=>"","Default"=>"0","Extra"=>""),
@@ -1404,6 +1392,9 @@ $defined['voice_stats_settings'] = array(
     'barout_colour_1' => array("Type"=>"smallint(3) unsigned","Null"=>"YES","Key"=>"","Default"=>"0","Extra"=>""),
     'barout_colour_2' => array("Type"=>"smallint(3) unsigned","Null"=>"YES","Key"=>"","Default"=>"191","Extra"=>""),
     'barout_colour_3' => array("Type"=>"smallint(3) unsigned","Null"=>"YES","Key"=>"","Default"=>"255","Extra"=>""),
+    'bartraffic_colour_1' => array("Type"=>"smallint(3) unsigned","Null"=>"YES","Key"=>"","Default"=>"0","Extra"=>""),
+    'bartraffic_colour_2' => array("Type"=>"smallint(3) unsigned","Null"=>"YES","Key"=>"","Default"=>"0","Extra"=>""),
+    'bartraffic_colour_3' => array("Type"=>"smallint(3) unsigned","Null"=>"YES","Key"=>"","Default"=>"0","Extra"=>""),
     'bg_colour_1' => array("Type"=>"smallint(3) unsigned","Null"=>"YES","Key"=>"","Default"=>"240","Extra"=>""),
     'bg_colour_2' => array("Type"=>"smallint(3) unsigned","Null"=>"YES","Key"=>"","Default"=>"240","Extra"=>""),
     'bg_colour_3' => array("Type"=>"smallint(3) unsigned","Null"=>"YES","Key"=>"","Default"=>"255","Extra"=>""),

web/stuff/user/init_user.php

@@ -202,6 +202,7 @@ if ($vhostcount > 0 and $easywiModules['ws'] === true) {
 
 if ($voicecount > 0 and $easywiModules['vo'] === true) {
     $what_to_be_included_array['vo'] = 'userpanel_voice.php';
+    $what_to_be_included_array['vu'] = 'userpanel_voice_usage.php';
 }
 
 if ($tsdnscount > 0 and $easywiModules['vo'] === true) {

web/stuff/user/userpanel_voice_usage.php

@@ -0,0 +1,205 @@
+<?php
+
+/**
+ * File: userpanel_voice_usage.php.
+ * Author: Ulrich Block
+ * Date: 30.03.14
+ * Contact: <ulrich.block@easy-wi.com>
+ *
+ * This file is part of Easy-WI.
+ *
+ * Easy-WI is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Easy-WI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Easy-WI.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Diese Datei ist Teil von Easy-WI.
+ *
+ * Easy-WI ist Freie Software: Sie koennen es unter den Bedingungen
+ * der GNU General Public License, wie von der Free Software Foundation,
+ * Version 3 der Lizenz oder (nach Ihrer Wahl) jeder spaeteren
+ * veroeffentlichten Version, weiterverbreiten und/oder modifizieren.
+ *
+ * Easy-WI wird in der Hoffnung, dass es nuetzlich sein wird, aber
+ * OHNE JEDE GEWAEHELEISTUNG, bereitgestellt; sogar ohne die implizite
+ * Gewaehrleistung der MARKTFAEHIGKEIT oder EIGNUNG FUER EINEN BESTIMMTEN ZWECK.
+ * Siehe die GNU General Public License fuer weitere Details.
+ *
+ * Sie sollten eine Kopie der GNU General Public License zusammen mit diesem
+ * Programm erhalten haben. Wenn nicht, siehe <http://www.gnu.org/licenses/>.
+ */
+
+if (!isset($user_id) or $main != 1 or (isset($user_id) and !$pa['voiceserverStats'])) {
+    header('Location: userpanel.php');
+    die;
+}
+
+$sprache = getlanguagefile('traffic', $user_language, $reseller_id);
+
+if ($ui->w('action', 4, 'post') and !token(true)) {
+
+    $template_file = $spracheResponse->token;
+
+} else {
+
+    $data = array();
+
+    $display = $sprache->total;
+
+    if (!$ui->st('kind', 'post') or $ui->st('kind', 'post') == 'al') {
+
+        $kind = 'al';
+        $whichdata = '';
+
+    } else if ($ui->id('what', 30, 'post') and $ui->st('kind', 'post') == 'se') {
+
+        $kind = 'se';
+        $whichdata = '&amp;shorten=' . $ui->id('what', 30, 'post');
+
+        $query = $sql->prepare("SELECT v.`id`,v.`ip`,v.`port`,v.`dns`,m.`usedns` FROM `voice_server` v INNER JOIN `voice_masterserver` m ON v.`masterserver`=m.`id` WHERE v.`id`=? AND v.`userid`=? AND v.`resellerid`=? AND v.`resellerid`=? LIMIT 1");
+        $query->execute(array($ui->id('what', 30, 'post'), $user_id, $reseller_id));
+        foreach ($query->fetchall(PDO::FETCH_ASSOC) as $row) {
+            $display = $sprache->server . '  ' . $row['ip'] . ':' . $row['port'];
+        }
+
+        $query = $sql->prepare("SELECT v.`id`,v.`ip`,v.`port`,v.`dns`,m.`usedns` FROM `voice_server` v INNER JOIN `voice_masterserver` m ON v.`masterserver`=m.`id` WHERE v.`userid`=? AND v.`resellerid`=? ORDER BY v.`ip`,v.`port`");
+        $query->execute(array($user_id, $reseller_id));
+        foreach ($query->fetchall(PDO::FETCH_ASSOC) as $row) {
+            $server = $row['ip'] . ':' . $row['port'];
+            if ($ui->id('what', 30, 'post') == $row['id']) {
+                $data[] = '<option value='. $row['id'] .' selected="selected">' . $server . '</option>';
+            } else {
+                $data[] = '<option value=' . $row['id'] . '>' . $server . '</option>';
+            }
+        }
+    }
+
+    if (!isset($ui->post['dmy'])) {
+
+        $dmy = 'da';
+        $year = date('Y',strtotime('-6 days'));
+        $month = date('m',strtotime('-6 days'));
+        $day = date('d',strtotime('-6 days'));
+        $yearstop = date('Y');
+        $monthstop = date('m');
+        $daystop = date('d');
+        $amount = 7;
+
+    } else if ($ui->post['dmy'] == 'da') {
+
+        $dmy = 'da';
+
+        $year = ($ui->isinteger('yearstart', 'post') and $ui->isinteger('yearstart', 'post') <= date('Y')) ? $ui->isinteger('yearstart', 'post') : date('Y', strtotime('-6 days'));
+        $yearstop = ($ui->isinteger('yearstop', 'post') and $ui->isinteger('yearstop', 'post') <= date('Y')) ? $ui->isinteger('yearstop', 'post') : date('Y');
+
+        $month = ($ui->isinteger('monthstart', 'post') and $ui->isinteger('monthstart', 'post') <= 12) ? $ui->isinteger('monthstart', 'post') : date('m', strtotime('-6 days'));
+        $monthstop = ($ui->isinteger('monthstop', 'post') and $ui->isinteger('monthstop', 'post') <= 12) ? $ui->isinteger('monthstop', 'post') : date('m');
+
+        $day = ($ui->isinteger('daystart', 'post') and $ui->isinteger('daystart', 'post') <= 31) ? $ui->isinteger('daystart', 'post') : date('d', strtotime('-6 days'));
+        $daystop = ($ui->isinteger('daystop', 'post') and $ui->isinteger('daystop', 'post') <= 31) ? $ui->isinteger('daystop', 'post') : date('d');
+
+        $now = date('Y-m-d');
+        $date1 = strtotime("$year-$month-$day");
+        $date2 = strtotime("$yearstop-$monthstop-$daystop");
+        $amount = intval(($date2 - $date1) / 86400) + 1;
+
+        if ($amount < 0 and "$yearstop-$monthstop-$daystop" > $now){
+            $yearstop = date('Y');
+            $monthstop = date('m');
+            $daystop = date('d');
+            $day = date('d',strtotime('-6 days'));
+            $month = date('m',strtotime('-6 days'));
+            $year = date('Y',strtotime('-6 days'));
+            $amount = 7;
+        }
+
+    } else if ($ui->post['dmy'] == 'mo') {
+
+        $dmy = 'mo';
+        $day = 1;
+
+        $year = ($ui->isinteger('yearstart', 'post') and $ui->isinteger('yearstart', 'post') <= date('Y')) ? $ui->isinteger('yearstart', 'post') : date('Y', strtotime('-6 days'));
+        $yearstop = ($ui->isinteger('yearstop', 'post') and $ui->isinteger('yearstop', 'post') <= date('Y')) ? $ui->isinteger('yearstop', 'post') : date('Y');
+
+        $month = ($ui->isinteger('monthstart', 'post') and $ui->isinteger('monthstart', 'post') <= 12) ? $ui->isinteger('monthstart', 'post') : date('m', strtotime('-6 days'));
+        $monthstop = ($ui->isinteger('monthstop', 'post') and $ui->isinteger('monthstop', 'post') <= 12) ? $ui->isinteger('monthstop', 'post') : date('m');
+
+        $daystop = date('t', strtotime("$yearstop-$monthstop"));
+        $now = date('Y-m');
+        $date1 = strtotime("$year-$month-$day");
+        $add = $date1;
+        $date2 = strtotime("$yearstop-$monthstop-$daystop");
+        $i = 0;
+
+        while ($add <= $date2) {
+            $add = strtotime("+1 months", $add);
+            $i++;
+        }
+
+        $amount = $i;
+
+        if ($amount < 0 or "$yearstop-$monthstop" > $now){
+            $yearstop = date('Y');
+            $monthstop = date('m');
+            $daystop = date('t', strtotime("$yearstop-$monthstop"));
+            $day = 1;
+            $month = date('m', strtotime('-6 months'));
+            $year = date('Y', strtotime('-6 months'));
+            $amount = 7;
+        }
+
+    } else if ($ui->post['dmy'] == 'ye') {
+
+        $dmy = 'ye';
+        $day = 1;
+
+        $year = ($ui->isinteger('yearstart', 'post') and $ui->isinteger('yearstart', 'post') <= date('Y')) ? $ui->isinteger('yearstart', 'post') : date('Y', strtotime('-6 days'));
+        $yearstop = ($ui->isinteger('yearstop', 'post') and $ui->isinteger('yearstop', 'post') <= date('Y')) ? $ui->isinteger('yearstop', 'post') : date('Y');
+
+        $month = 1;
+        $monthstop = 12;
+        $daystop = 31;
+
+        $now = date('Y');
+        $date1 = strtotime($year . '-' . $month . '-' . $day);
+        $date2 = strtotime($yearstop . '-' . $monthstop . '-' . $daystop);
+        $add = $date1;
+        $i = 0;
+
+        while ($add <= $date2) {
+            $add = strtotime('+1 year', $add);
+            $i++;
+        }
+
+        $amount = $i;
+
+        if ($amount < 0 or "$yearstop" > $now){
+            $yearstop = date('Y');
+            $monthstop = 12;
+            $daystop = 31;
+            $day = 1;
+            $month = 1;
+            $year = date('Y', strtotime('-1 year'));
+            $amount = 2;
+        }
+    }
+
+    if ($user_language == 'de') {
+        $startdate = $day . '.' . $month . '.' . $year;
+        $stopdate = $daystop . '.' . $monthstop . '.' . $yearstop;
+    } else {
+        $startdate = $year . '-' . $month . '-' . $day;
+        $stopdate = $yearstop . '-' . $monthstop . '-' . $daystop;
+    }
+
+    $getlink = "images.php?img=vo&amp;from=admin&amp;d={$dmy}&amp;p={$year}&amp;id={$day}&amp;po={$month}&amp;m={$amount}{$whichdata}";
+    $template_file = 'userpanel_voice_stats.tpl';
+}

web/template/default/admin/admin_user_groups_add.tpl

@@ -380,6 +380,12 @@
                     <input id="inputVoiceserver" type="checkbox" name="voiceserver" value="Y">
                 </div>
             </div>
+            <div class="u switch control-group">
+                <label class="control-label" for="inputUVoiceserverStats"><?php echo $gsprache->voiceserver." ".$gsprache->stats;?></label>
+                <div class="controls">
+                    <input id="inputUVoiceserverStats" type="checkbox" name="uvoiceserverStats" value="Y">
+                </div>
+            </div>
             <div class="u switch control-group">
                 <label class="control-label" for="inputURestart"><?php echo $gsprache->gameserver." ".$sprache->restart;?></label>
                 <div class="controls">

web/template/default/admin/admin_user_groups_md.tpl

@@ -381,6 +381,12 @@
                     <input id="inputVoiceserver" type="checkbox" name="voiceserver" value="Y" <?php if ($voiceserver=='Y') echo 'checked="checked"'; ?>>
                 </div>
             </div>
+            <div class="u <?php if ($grouptype!='u') echo 'display_none';?> switch control-group">
+                <label class="control-label" for="inputUVoiceserverStats"><?php echo $gsprache->voiceserver." ".$gsprache->stats;?></label>
+                <div class="controls">
+                    <input id="inputUVoiceserverStats" type="checkbox" name="uvoiceserverStats" value="Y" <?php if ($voiceserverStats=='Y') echo 'checked="checked"'; ?>>
+                </div>
+            </div>
             <div class="u <?php if ($grouptype!='u') echo 'display_none';?> switch control-group">
                 <label class="control-label" for="inputURestart"><?php echo $gsprache->gameserver." ".$sprache->restart;?></label>
                 <div class="controls">

web/template/default/admin/admin_voice_stats.tpl

@@ -42,7 +42,7 @@
             <div class="control-group">
                 <label class="control-label" for="inputStats"><?php echo $gsprache->stats;?></label>
                 <div class="controls">
-                    <select id="inputStats" name="kind" onchange="getdetails('serverallocation.php?d=vu&amp;w=',this.value)">
+                    <select id="inputStats" name="kind" onchange="getdetails('ajax.php?d=adminvoicestats&amp;w=',this.value)">
                         <option value="al"><?php echo $sprache->all;?></option>
                         <option value="ma" <?php if ($kind=='ma') echo 'selected="selected"'?>><?php echo $gsprache->master;?></option>
                         <option value="se" <?php if ($kind=='se') echo 'selected="selected"'?>><?php echo $sprache->server;?></option>

web/template/default/admin/admin_voice_stats_settings.tpl

@@ -24,29 +24,41 @@
                 <div class="controls"><input id="inputTextColourBlue" type="number" name="text_colour_3" value="<?php echo $text_colour_3?>" min="0" max="255" step="1" required></div>
             </div>
             <div class="control-group error">
-                <label class="control-label" for="inputBarInColourRed"><?php echo $sprache->barin_colour.' '.$sprache->red;?></label>
+                <label class="control-label" for="inputBarInColourRed"><?php echo $sprache->bar_slots_usage_colour.' '.$sprache->red;?></label>
                 <div class="controls"><input id="inputBarInColourRed" type="number" name="barin_colour_1" value="<?php echo $barin_colour_1?>" min="0" max="255" step="1" required></div>
             </div>
             <div class="control-group info">
-                <label class="control-label" for="inputBarInColourGreen"><?php echo $sprache->barin_colour.' '.$sprache->blue;?></label>
+                <label class="control-label" for="inputBarInColourGreen"><?php echo $sprache->bar_slots_usage_colour.' '.$sprache->blue;?></label>
                 <div class="controls"><input id="inputBarInColourGreen" type="number" name="barin_colour_2" value="<?php echo $barin_colour_2?>" min="0" max="255" step="1" required></div>
             </div>
             <div class="control-group success">
-                <label class="control-label" for="inputBarInColourBlue"><?php echo $sprache->barin_colour.' '.$sprache->green;?></label>
+                <label class="control-label" for="inputBarInColourBlue"><?php echo $sprache->bar_slots_usage_colour.' '.$sprache->green;?></label>
                 <div class="controls"><input id="inputBarInColourBlue" type="number" name="barin_colour_3" value="<?php echo $barin_colour_3?>" min="0" max="255" step="1" required></div>
             </div>
             <div class="control-group error">
-                <label class="control-label" for="inputBarOutColourRed"><?php echo $sprache->barout_colour.' '.$sprache->red;?></label>
+                <label class="control-label" for="inputBarOutColourRed"><?php echo $sprache->bar_slots_total_colour.' '.$sprache->red;?></label>
                 <div class="controls"><input id="inputBarOutColourRed" type="number" name="barout_colour_1" value="<?php echo $barout_colour_1?>" min="0" max="255" step="1" required></div>
             </div>
             <div class="control-group info">
-                <label class="control-label" for="inputBarOutColourGreen"><?php echo $sprache->barout_colour.' '.$sprache->blue;?></label>
+                <label class="control-label" for="inputBarOutColourGreen"><?php echo $sprache->bar_slots_total_colour.' '.$sprache->blue;?></label>
                 <div class="controls"><input id="inputBarOutColourGreen" type="number" name="barout_colour_2" value="<?php echo $barout_colour_2?>" min="0" max="255" step="1" required></div>
             </div>
             <div class="control-group success">
-                <label class="control-label" for="inputBarOutColourBlue"><?php echo $sprache->barout_colour.' '.$sprache->green;?></label>
+                <label class="control-label" for="inputBarOutColourBlue"><?php echo $sprache->bar_slots_total_colour.' '.$sprache->green;?></label>
                 <div class="controls"><input id="inputBarOutColourBlue" type="number" name="barout_colour_3" value="<?php echo $barout_colour_3?>" min="0" max="255" step="1" required></div>
             </div>
+            <div class="control-group error">
+                <label class="control-label" for="inputBarTrafficColourRed"><?php echo $sprache->bartotal_colour.' '.$sprache->red;?></label>
+                <div class="controls"><input id="inputBarTrafficColourRed" type="number" name="bartraffic_colour_1" value="<?php echo $bartraffic_colour_1?>" min="0" max="255" step="1" required></div>
+            </div>
+            <div class="control-group info">
+                <label class="control-label" for="inputBarTrafficColourGreen"><?php echo $sprache->bartotal_colour.' '.$sprache->blue;?></label>
+                <div class="controls"><input id="inputBarTrafficColourGreen" type="number" name="bartraffic_colour_2" value="<?php echo $bartraffic_colour_2?>" min="0" max="255" step="1" required></div>
+            </div>
+            <div class="control-group success">
+                <label class="control-label" for="inputBarTrafficColourBlue"><?php echo $sprache->bartotal_colour.' '.$sprache->green;?></label>
+                <div class="controls"><input id="inputBarTrafficColourBlue" type="number" name="bartraffic_colour_3" value="<?php echo $bartraffic_colour_3?>" min="0" max="255" step="1" required></div>
+            </div>
             <div class="control-group error">
                 <label class="control-label" for="inputBGColourRed"><?php echo $sprache->bg_colour.' '.$sprache->red;?></label>
                 <div class="controls"><input id="inputBGColourRed" type="number" name="bg_colour_1" value="<?php echo $bg_colour_1?>" min="0" max="255" step="1" required></div>

web/template/default/ajax/ajax_userpanel_voice_stats.tpl

@@ -0,0 +1,9 @@
+<?php
+if ($w!='al') {
+    echo '<select name="what">';
+foreach ($data as $value) echo $value;
+echo '</select>';
+} else {
+echo '';
+}
+?>

web/template/default/user/userpanel_header.tpl

@@ -146,10 +146,11 @@
                         <div class="accordion-heading">
                             <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordionMenu" href="#collapseFour"><i class="fa fa-microphone fa-fw"></i> <?php echo $gsprache->voiceserver;?></a>
                         </div>
-                        <div id="collapseFour" class="accordion-body collapse <?php if(in_array($w,array('vo','vd'))) echo 'in';?>">
+                        <div id="collapseFour" class="accordion-body collapse <?php if(in_array($w,array('vo','vu','vd'))) echo 'in';?>">
                             <div class="accordion-inner">
                                 <ul class="nav nav-pills nav-stacked">
                                     <?php if($voicecount>0) { ?><li <?php if($w=='vo') echo 'class="active"';?>><a href="userpanel.php?w=vo"><?php echo $gsprache->overview;?></a></li><?php } ?>
+                                    <?php if($voicecount>0) { ?><li <?php if($w=='vu') echo 'class="active"';?>><a href="userpanel.php?w=vu"><?php echo $gsprache->stats;?></a></li><?php } ?>
                                     <?php if($tsdnscount>0) { ?><li <?php if($w=='vd') echo 'class="active"';?>><a href="userpanel.php?w=vd">TS3 DNS</a></li><?php } ?>
                                     <?php foreach ($customModules['vo'] as $k => $v) { echo '<li '; echo ($ui->smallletters('w',255,'get')==$k) ? 'class="active"' : ''; echo '><a href="userpanel.php?w='.$k.'">'.$v.'</a></li>'; }; ?>
                                 </ul>

web/template/default/user/userpanel_voice_stats.tpl

@@ -0,0 +1,71 @@
+<div class="row-fluid">
+    <div class="span12">
+        <ul class="breadcrumb">
+            <li><a href="userpanel.php">Home</a> <span class="divider">/</span></li>
+            <li><?php echo $gsprache->voiceserver." ".$gsprache->stats;?></li>
+        </ul>
+    </div>
+</div>
+<div class="row-fluid">
+    <div class="span6">
+        <dl>
+            <dt><?php echo $gsprache->voiceserver." ".$gsprache->stats." ".$display;?></dt>
+            <dd><?php echo $startdate." - ".$stopdate;?></dd>
+        </dl>
+    </div>
+</div>
+<div class="row-fluid">
+    <div class="span11">
+        <form class="form-horizontal" action="userpanel.php?w=vu" onsubmit="return confirm('<?php echo $gsprache->sure; ?>');" method="post">
+            <input type="hidden" name="token" value="<?php echo token();?>">
+            <div class="control-group">
+                <label class="control-label" for="inputFormat"><?php echo $sprache->dmy;?></label>
+                <div class="controls">
+                    <select id="inputFormat" name="dmy">
+                        <option value="da" <?php if ($dmy=='da') echo 'selected="selected"'?>><?php echo $sprache->days;?></option>
+                        <option value="mo" <?php if ($dmy=='mo') echo 'selected="selected"'?>><?php echo $sprache->months;?></option>
+                        <option value="ye" <?php if ($dmy=='ye') echo 'selected="selected"'?>><?php echo $sprache->years;?></option>
+                    </select>
+                </div>
+            </div>
+            <div class="control-group">
+                <label class="control-label" for="inputRange"><?php echo $sprache->range;?></label>
+                <div class="controls form-inline">
+                    <input class="span2" name="daystart" type="number" min="1" max="31" step="1" value="<?php echo $day; ?>">
+                    <input class="span2" name="monthstart" type="number" min="1" max="12" step="1" value="<?php echo $month; ?>">
+                    <input class="span2" name="yearstart" type="number" min="2011" max="2200" step="1" value="<?php echo $year; ?>">
+                    -
+                    <input class="span2" name="daystop" type="number" min="1" max="31" step="1" value="<?php echo $daystop; ?>">
+                    <input class="span2" name="monthstop" type="number" min="1" max="12" step="1" value="<?php echo $monthstop; ?>">
+                    <input class="span2" name="yearstop" type="number" min="2011" max="2200" step="1" value="<?php echo $yearstop; ?>">
+                </div>
+            </div>
+            <div class="control-group">
+                <label class="control-label" for="inputStats"><?php echo $gsprache->stats;?></label>
+                <div class="controls">
+                    <select id="inputStats" name="kind" onchange="getdetails('ajax.php?d=uservoicestats&amp;w=',this.value)">
+                        <option value="al"><?php echo $sprache->all;?></option>
+                        <option value="se" <?php if ($kind=='se') echo 'selected="selected"'?>><?php echo $sprache->server;?></option>
+                    </select>
+                </div>
+            </div>
+            <div class="control-group">
+                <label class="control-label" for="inputSelect"></label>
+                <div id="information" class="controls">
+                    <?php if($ui->st('kind','post')!='al'){ ?>
+                    <select id="inputSelect" name="what">
+                        <?php foreach ($data as $value) echo $value;?>
+                    </select>
+                    <?php } ?>
+                </div>
+            </div>
+            <div class="control-group">
+                <label class="control-label" for="inputEdit"></label>
+                <div class="controls"><button class="btn btn-primary" id="inputEdit" type="submit"><i class="icon-edit icon-white"></i> <?php echo $gsprache->save;?></button></div>
+            </div>
+        </form>
+    </div>
+</div>
+<div class="row-fluid">
+    <div class="span11"><img src="<?php echo $getlink; ?>" alt="Stats" /></div>
+</div>