#30 Voice Server, Master, TSDNS Master #481 DMZ IPs

web/ajax.php

@@ -46,11 +46,13 @@ if (is_dir(EASYWIDIR . '/install')) {
     die('Please remove the "install" folder');
 }
 
-include(EASYWIDIR . '/stuff/methods/functions.php');
-include(EASYWIDIR . '/stuff/methods/class_validator.php');
-include(EASYWIDIR . '/stuff/methods/vorlage.php');
 include(EASYWIDIR . '/stuff/config.php');
 include(EASYWIDIR . '/stuff/keyphrasefile.php');
+include(EASYWIDIR . '/stuff/methods/functions.php');
+include(EASYWIDIR . '/stuff/methods/class_validator.php');
+include(EASYWIDIR . '/stuff/methods/class_ts3.php');
+include(EASYWIDIR . '/stuff/methods/functions_ts3.php');
+include(EASYWIDIR . '/stuff/methods/vorlage.php');
 include(EASYWIDIR . '/stuff/settings.php');
 
 if (!isset($admin_id) and !isset($user_id)) {
@@ -166,11 +168,11 @@ if ($ui->smallletters('w', 9, 'get') == 'datatable') {
         if ($ui->smallletters('d', 10, 'get') == 'gameserver' and isset($admin_id) and isset($reseller_id) and isset($resellerLockupID) and $pa['gserver']) {
 
             require_once(EASYWIDIR . '/stuff/ajax/datatable_gameserver.php');
-/*
-        } else if ($ui->smallletters('d', 10, 'get') == 'voiceserver' and isset($admin_id) and isset($reseller_id) and isset($resellerLockupID) and $pa['gserver']) {
+
+        } else if ($ui->smallletters('d', 11, 'get') == 'voiceserver' and isset($admin_id) and isset($reseller_id) and isset($resellerLockupID) and $pa['voiceserver']) {
 
             require_once(EASYWIDIR . '/stuff/ajax/datatable_voiceserver.php');
-*/
+
         }
     }
 
@@ -207,6 +209,20 @@ if ($ui->smallletters('w', 9, 'get') == 'datatable') {
     require_once(EASYWIDIR . '/stuff/ajax/app_master_app_details.php');
     die;
 
+} else if (isset($admin_id) and $pa['voiceserver'] and $ui->smallletters('d', 16, 'get') == 'voicemasterusage') {
+
+    if ($ui->id('id', 10, 'get')) {
+        require_once(EASYWIDIR . '/stuff/ajax/voice_master_usage.php');
+    }
+    die;
+
+} else if ($ui->smallletters('d', 20, 'get') == 'voicemasterportusage' and isset($admin_id) and $pa['voiceserver']) {
+
+    if ($ui->ip4('ip', 'get')) {
+        require_once(EASYWIDIR . '/stuff/ajax/voice_master_port_usage.php');
+    }
+    die;
+
 } else if (isset($admin_id) and $pa['dedicatedServer'] and $ui->smallletters('d', 7, 'get') == 'freeips' and $reseller_id == 0) {
 
     if ($ui->id('userID', 10, 'get')) {

web/js/default/easy-wi.js

@@ -108,6 +108,14 @@ function textdrop(id) {
     }
 }
 
+function toggleID (id, value) {
+    if (value == 'Y') {
+        $(id).show();
+    } else {
+        $(id).hide();
+    }
+}
+
 window.onDomReady = initReady;
 
 function initReady(fn) {

web/stuff/admin/voice_master.php

@@ -89,6 +89,7 @@ if ($ui->w('action',4, 'post') and !token(true)) {
     $autorestart = $ui->active('autorestart', 'post');
     $externalDefaultDNS = $ui->active('externalDefaultDNS', 'post');
     $ip = $ui->ip('ip', 'post');
+    $connectIpOnly = $ui->active('connectIpOnly', 'post');
     $user = $ui->username('user', 50, 'post');
     $externalID = $ui->escaped('externalID', 'post');
     $ips = $ui->ips('ips', 'post');
@@ -198,6 +199,7 @@ if ($ui->w('action',4, 'post') and !token(true)) {
                 $defaultFlexSlotsPercent = $row['defaultFlexSlotsPercent'];
                 $publickey = $row['publickey'];
                 $ip = $row['ssh2ip'];
+                $connectIpOnly = $row['connect_ip_only'];
                 $ips = $row['ips'];
                 $port = $row['decryptedssh2port'];
                 $user = $row['decryptedssh2user'];
@@ -488,8 +490,8 @@ if ($ui->w('action',4, 'post') and !token(true)) {
 
                     if ($ui->st('d', 'get') != 'ri') {
                         // https://github.com/easy-wi/developer/issues/36 managedServer,managedForID added
-                        $query = $sql->prepare("INSERT INTO `voice_masterserver` (`active`,`type`,`description`,`defaultname`,`bitversion`,`queryport`,`querypassword`,`filetransferport`,`maxserver`,`maxslots`,`rootid`,`addedby`,`usedns`,`defaultdns`,`defaultwelcome`,`defaulthostbanner_url`,`defaulthostbanner_gfx_url`,`defaulthostbutton_tooltip`,`defaulthostbutton_url`,`defaulthostbutton_gfx_url`,`defaultFlexSlotsFree`,`defaultFlexSlotsPercent`,`publickey`,`ssh2ip`,`ssh2port`,`ssh2user`,`ssh2password`,`ips`,`serverdir`,`keyname`,`autorestart`,`externalID`,`tsdnsServerID`,`externalDefaultDNS`,`managedServer`,`managedForID`,`resellerid`) VALUES (:active,:type,:description,:defaultname,:bit,:queryport,AES_ENCRYPT(:querypassword,:aeskey),:filetransferport,:maxserver,:maxslots,:rootid,:addedby,:usedns,:defaultdns,:defaultwelcome,:defaulthostbanner_url,:defaulthostbanner_gfx_url,:defaulthostbutton_tooltip,:defaulthostbutton_url,:defaulthostbutton_gfx_url,:defaultFlexSlotsFree,:defaultFlexSlotsPercent,:publickey,:ssh2ip,AES_ENCRYPT(:ssh2port,:aeskey),AES_ENCRYPT(:ssh2user,:aeskey),AES_ENCRYPT(:ssh2password,:aeskey),:ips,:serverdir,:keyname,:autorestart,:externalID,:tsdnsServerID,:externalDefaultDNS,:managedServer,:managedForID,:reseller_id)");
-                        $query->execute(array(':aeskey' => $aeskey, ':active' => $active, ':type' => $type, ':description' => $description, ':defaultname' => $defaultname, ':bit' => $bit, ':queryport' => $queryport, ':querypassword' => $querypassword, ':filetransferport' => $filetransferport, ':maxserver' => $maxserver, ':maxslots' => $maxslots, ':rootid' => $rootid, ':addedby' => $addtype, ':usedns' => $usedns, ':defaultdns' => $defaultdns, ':defaultwelcome' => $defaultwelcome, ':defaulthostbanner_url' => $defaulthostbanner_url, ':defaulthostbanner_gfx_url' => $defaulthostbanner_gfx_url, ':defaulthostbutton_tooltip' => $defaulthostbutton_tooltip, ':defaulthostbutton_url' => $defaulthostbutton_url, ':defaulthostbutton_gfx_url' => $defaulthostbutton_gfx_url, ':defaultFlexSlotsFree' => $defaultFlexSlotsFree, ':defaultFlexSlotsPercent' => $defaultFlexSlotsPercent, ':publickey' => $publickey, ':ssh2ip' => $ip, ':ssh2port' => $port, ':ssh2user' => $user, ':ssh2password' => $pass, ':ips' => $ips, ':serverdir' => $serverdir, ':keyname' => $keyname, ':autorestart' => $autorestart, ':externalID' => $externalID, ':tsdnsServerID' => $tsdnsServerID, ':externalDefaultDNS' => $externalDefaultDNS, ':managedServer' => $managedServer , ':managedForID' => $resellerToBeWritten, ':reseller_id' => $reseller_id));
+                        $query = $sql->prepare("INSERT INTO `voice_masterserver` (`active`,`connect_ip_only`,`type`,`description`,`defaultname`,`bitversion`,`queryport`,`querypassword`,`filetransferport`,`maxserver`,`maxslots`,`rootid`,`addedby`,`usedns`,`defaultdns`,`defaultwelcome`,`defaulthostbanner_url`,`defaulthostbanner_gfx_url`,`defaulthostbutton_tooltip`,`defaulthostbutton_url`,`defaulthostbutton_gfx_url`,`defaultFlexSlotsFree`,`defaultFlexSlotsPercent`,`publickey`,`ssh2ip`,`ssh2port`,`ssh2user`,`ssh2password`,`ips`,`serverdir`,`keyname`,`autorestart`,`externalID`,`tsdnsServerID`,`externalDefaultDNS`,`managedServer`,`managedForID`,`resellerid`) VALUES (:active,:connect_ip_only,:type,:description,:defaultname,:bit,:queryport,AES_ENCRYPT(:querypassword,:aeskey),:filetransferport,:maxserver,:maxslots,:rootid,:addedby,:usedns,:defaultdns,:defaultwelcome,:defaulthostbanner_url,:defaulthostbanner_gfx_url,:defaulthostbutton_tooltip,:defaulthostbutton_url,:defaulthostbutton_gfx_url,:defaultFlexSlotsFree,:defaultFlexSlotsPercent,:publickey,:ssh2ip,AES_ENCRYPT(:ssh2port,:aeskey),AES_ENCRYPT(:ssh2user,:aeskey),AES_ENCRYPT(:ssh2password,:aeskey),:ips,:serverdir,:keyname,:autorestart,:externalID,:tsdnsServerID,:externalDefaultDNS,:managedServer,:managedForID,:reseller_id)");
+                        $query->execute(array(':aeskey' => $aeskey, ':active' => $active, ':connect_ip_only' => $connectIpOnly, ':type' => $type, ':description' => $description, ':defaultname' => $defaultname, ':bit' => $bit, ':queryport' => $queryport, ':querypassword' => $querypassword, ':filetransferport' => $filetransferport, ':maxserver' => $maxserver, ':maxslots' => $maxslots, ':rootid' => $rootid, ':addedby' => $addtype, ':usedns' => $usedns, ':defaultdns' => $defaultdns, ':defaultwelcome' => $defaultwelcome, ':defaulthostbanner_url' => $defaulthostbanner_url, ':defaulthostbanner_gfx_url' => $defaulthostbanner_gfx_url, ':defaulthostbutton_tooltip' => $defaulthostbutton_tooltip, ':defaulthostbutton_url' => $defaulthostbutton_url, ':defaulthostbutton_gfx_url' => $defaulthostbutton_gfx_url, ':defaultFlexSlotsFree' => $defaultFlexSlotsFree, ':defaultFlexSlotsPercent' => $defaultFlexSlotsPercent, ':publickey' => $publickey, ':ssh2ip' => $ip, ':ssh2port' => $port, ':ssh2user' => $user, ':ssh2password' => $pass, ':ips' => $ips, ':serverdir' => $serverdir, ':keyname' => $keyname, ':autorestart' => $autorestart, ':externalID' => $externalID, ':tsdnsServerID' => $tsdnsServerID, ':externalDefaultDNS' => $externalDefaultDNS, ':managedServer' => $managedServer , ':managedForID' => $resellerToBeWritten, ':reseller_id' => $reseller_id));
 
                         $rowCount = $query->rowCount();
 
@@ -555,8 +557,8 @@ if ($ui->w('action',4, 'post') and !token(true)) {
                 }
 
                 // https://github.com/easy-wi/developer/issues/36 managedServer,managedForID added
-                $query = $sql->prepare("UPDATE `voice_masterserver` SET `active`=:active,`description`=:description,`managedServer`=:managedServer,`managedForID`=:managedForID,`externalID`=:externalID,`defaultname`=:defaultname,`bitversion`=:bit,`queryport`=:queryport,`querypassword`=AES_ENCRYPT(:querypassword,:aeskey),`filetransferport`=:filetransferport,`maxserver`=:maxserver,`maxslots`=:maxslots,`usedns`=:usedns,`defaultdns`=:defaultdns,`defaultwelcome`=:defaultwelcome,`defaulthostbanner_url`=:defaulthostbanner_url,`defaulthostbanner_gfx_url`=:defaulthostbanner_gfx_url,`defaulthostbutton_tooltip`=:defaulthostbutton_tooltip,`defaulthostbutton_url`=:defaulthostbutton_url,`defaulthostbutton_gfx_url`=:defaulthostbutton_gfx_url,`defaultFlexSlotsFree`=:defaultFlexSlotsFree,`defaultFlexSlotsPercent`=:defaultFlexSlotsPercent,`publickey`=:publickey,`ssh2ip`=:ssh2ip,`ssh2port`=AES_ENCRYPT(:ssh2port,:aeskey),`ssh2user`=AES_ENCRYPT(:ssh2user,:aeskey),`ssh2password`=AES_ENCRYPT(:ssh2password,:aeskey),`ips`=:ips,`serverdir`=:serverdir,`keyname`=:keyname,`autorestart`=:autorestart,`tsdnsServerID`=:tsdnsServerID,`externalDefaultDNS`=:externalDefaultDNS WHERE `id`=:id AND `resellerid`=:reseller_id LIMIT 1");
-                $query->execute(array(':aeskey' => $aeskey,':active' => $active,':description' => $description,':managedServer' => $managedServer,':managedForID' => $resellerToBeWritten,':externalID' => $externalID,':defaultname' => $defaultname,':bit' => $bit,':queryport' => $queryport,':querypassword' => $querypassword,':filetransferport' => $filetransferport,':maxserver' => $maxserver,':maxslots' => $maxslots,':usedns' => $usedns,':defaultdns' => $defaultdns,':defaultwelcome' => $defaultwelcome,':defaulthostbanner_url' => $defaulthostbanner_url,':defaulthostbanner_gfx_url' => $defaulthostbanner_gfx_url,':defaulthostbutton_tooltip' => $defaulthostbutton_tooltip,':defaulthostbutton_url' => $defaulthostbutton_url,':defaulthostbutton_gfx_url' => $defaulthostbutton_gfx_url,':defaultFlexSlotsFree' => $defaultFlexSlotsFree,':defaultFlexSlotsPercent' => $defaultFlexSlotsPercent,':publickey' => $publickey,':ssh2ip' => $ip,':ssh2port' => $port,':ssh2user' => $user,':ssh2password' => $pass,':ips' => $ips,':serverdir' => $serverdir,':keyname' => $keyname,':autorestart' => $autorestart,':tsdnsServerID' => $tsdnsServerID,':externalDefaultDNS' => $externalDefaultDNS,':id' => $id,':reseller_id' => $reseller_id));
+                $query = $sql->prepare("UPDATE `voice_masterserver` SET `active`=:active,`connect_ip_only`=:connect_ip_only,`description`=:description,`managedServer`=:managedServer,`managedForID`=:managedForID,`externalID`=:externalID,`defaultname`=:defaultname,`bitversion`=:bit,`queryport`=:queryport,`querypassword`=AES_ENCRYPT(:querypassword,:aeskey),`filetransferport`=:filetransferport,`maxserver`=:maxserver,`maxslots`=:maxslots,`usedns`=:usedns,`defaultdns`=:defaultdns,`defaultwelcome`=:defaultwelcome,`defaulthostbanner_url`=:defaulthostbanner_url,`defaulthostbanner_gfx_url`=:defaulthostbanner_gfx_url,`defaulthostbutton_tooltip`=:defaulthostbutton_tooltip,`defaulthostbutton_url`=:defaulthostbutton_url,`defaulthostbutton_gfx_url`=:defaulthostbutton_gfx_url,`defaultFlexSlotsFree`=:defaultFlexSlotsFree,`defaultFlexSlotsPercent`=:defaultFlexSlotsPercent,`publickey`=:publickey,`ssh2ip`=:ssh2ip,`ssh2port`=AES_ENCRYPT(:ssh2port,:aeskey),`ssh2user`=AES_ENCRYPT(:ssh2user,:aeskey),`ssh2password`=AES_ENCRYPT(:ssh2password,:aeskey),`ips`=:ips,`serverdir`=:serverdir,`keyname`=:keyname,`autorestart`=:autorestart,`tsdnsServerID`=:tsdnsServerID,`externalDefaultDNS`=:externalDefaultDNS WHERE `id`=:id AND `resellerid`=:reseller_id LIMIT 1");
+                $query->execute(array(':aeskey' => $aeskey,':active' => $active, ':connect_ip_only' => $connectIpOnly,':description' => $description,':managedServer' => $managedServer,':managedForID' => $resellerToBeWritten,':externalID' => $externalID,':defaultname' => $defaultname,':bit' => $bit,':queryport' => $queryport,':querypassword' => $querypassword,':filetransferport' => $filetransferport,':maxserver' => $maxserver,':maxslots' => $maxslots,':usedns' => $usedns,':defaultdns' => $defaultdns,':defaultwelcome' => $defaultwelcome,':defaulthostbanner_url' => $defaulthostbanner_url,':defaulthostbanner_gfx_url' => $defaulthostbanner_gfx_url,':defaulthostbutton_tooltip' => $defaulthostbutton_tooltip,':defaulthostbutton_url' => $defaulthostbutton_url,':defaulthostbutton_gfx_url' => $defaulthostbutton_gfx_url,':defaultFlexSlotsFree' => $defaultFlexSlotsFree,':defaultFlexSlotsPercent' => $defaultFlexSlotsPercent,':publickey' => $publickey,':ssh2ip' => $ip,':ssh2port' => $port,':ssh2user' => $user,':ssh2password' => $pass,':ips' => $ips,':serverdir' => $serverdir,':keyname' => $keyname,':autorestart' => $autorestart,':tsdnsServerID' => $tsdnsServerID,':externalDefaultDNS' => $externalDefaultDNS,':id' => $id,':reseller_id' => $reseller_id));
 
                 $rowCount = $query->rowCount();
                 $template_file = $spracheResponse->table_add;

web/stuff/ajax/datatable_voiceserver.php

@@ -0,0 +1,149 @@
+<?php
+
+/**
+ * File: datatable_voiceserver.php.
+ * Author: Ulrich Block
+ * Date: 01.02.15
+ * 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 (!defined('AJAXINCLUDED')) {
+    die('Do not access directly!');
+}
+
+$query = $sql->prepare("SELECT COUNT(1) AS `amount` FROM `voice_server` WHERE `resellerid`=?");
+$query->execute(array($resellerLockupID));
+
+$array['iTotalRecords'] = $query->fetchColumn();
+
+if ($sSearch) {
+
+    $userInQuery = (count($userIDs) > 0) ? ' OR `userid` IN (' . implode(',', $userIDs) . ')' : '';
+
+    $toLower = strtolower($sSearch);
+
+    $statusQuery = array();
+
+    if (strpos(strtolower($gsprache->status_crashed), $toLower) !== false) {
+        $statusQuery[] = 'OR `status`=2';
+    }
+    if (strpos(strtolower($gsprache->status_inactive), $toLower) !== false or strpos(strtolower($gsprache->status_stop), $toLower) !== false) {
+        $statusQuery[] = 'OR `status`=3';
+    }
+    if (strpos(strtolower($gsprache->status_ok), $toLower) !== false) {
+        $statusQuery[] = 'OR `status`=0';
+    }
+    if (strpos(strtolower($gsprache->status_password), $toLower) !== false or strpos(strtolower($gsprache->status_server_tag), $toLower) !== false) {
+        $statusQuery[] = 'OR `status`=1';
+    }
+
+    $statusQuery = (count($statusQuery) > 0) ? implode(' ', $statusQuery) : '';
+
+    $query = $sql->prepare("SELECT COUNT(1) AS `amount` FROM `voice_server` AS v JOIN (SELECT s.`id`,s.`userid`,CASE WHEN s.`active` = 'N' OR s.`uptime` < 2 THEN 3 WHEN s.`password` = 'Y' AND s.`queryPassword` = 'N' THEN 1 ELSE 0 END AS `status`,CASE WHEN m.`usedns`='Y' AND `dns` IS NOT NULL AND `dns`!='' THEN CONCAT(`ip`,':',`port`,' (',`dns`,')') ELSE CONCAT(`ip`,':',`port`) END AS `server` FROM `voice_server` AS s LEFT JOIN `voice_masterserver` m ON s.`masterserver`=m.`id` LEFT JOIN `userdata` AS u ON s.`userid`=u.`id` WHERE s.`resellerid`=:reseller_id HAVING (s.`id` LIKE :search OR `server` LIKE :search {$userInQuery} {$statusQuery})) AS v2 ON v2.`id`=v.`id`");
+    $query->execute(array(':search' => '%' . $sSearch . '%', ':reseller_id' => $resellerLockupID));
+    $array['iTotalDisplayRecords'] = $query->fetchColumn();
+
+} else {
+    $array['iTotalDisplayRecords'] = $array['iTotalRecords'];
+}
+
+$orderFields = array(0 => '`server`', 1 => 'v.`id`', 2 => '`status`', 3 => 'v.`localserverid`', 4 => 'u.`cname`');
+
+if (isset($orderFields[$iSortCol]) and is_array($orderFields[$iSortCol])) {
+    $orderBy = implode(' ' . $sSortDir . ', ', $orderFields[$iSortCol]) . ' ' . $sSortDir;
+} else if (isset($orderFields[$iSortCol]) and !is_array($orderFields[$iSortCol])) {
+    $orderBy = $orderFields[$iSortCol] . ' ' . $sSortDir;
+} else {
+    $orderBy = 'v.`id` DESC';
+}
+
+if ($sSearch) {
+    $query = $sql->prepare("SELECT v.*,m.`usedns`,u.`cname`,CONCAT(u.`name`,' ',u.`vname`) AS `full_name`,CASE WHEN v.`active` = 'N' OR v.`uptime` < 2 THEN 3 WHEN v.`password` = 'Y' AND v.`queryPassword` = 'N' THEN 1 ELSE 0 END AS `status`,CASE WHEN m.`usedns`='Y' AND `dns` IS NOT NULL AND `dns`!='' THEN CONCAT(`ip`,':',`port`,' (',`dns`,')') ELSE CONCAT(`ip`,':',`port`) END AS `server` FROM `voice_server` v LEFT JOIN `voice_masterserver` m ON v.`masterserver`=m.`id` LEFT JOIN `userdata` u ON v.`userid`=u.`id` WHERE v.`resellerid`=:reseller_id HAVING (v.`id` LIKE :search OR `server` LIKE :search {$userInQuery} {$statusQuery}) ORDER BY $orderBy LIMIT {$iDisplayStart},{$iDisplayLength}");
+    $query->execute(array(':search' => '%' . $sSearch . '%', ':reseller_id' => $resellerLockupID));
+} else {
+    $query = $sql->prepare("SELECT v.*,m.`usedns`,u.`cname`,CONCAT(u.`name`,' ',u.`vname`) AS `full_name`,CASE WHEN v.`active` = 'N' OR v.`uptime` < 2 THEN 3 WHEN v.`password` = 'Y' AND v.`queryPassword` = 'N' THEN 1 ELSE 0 END AS `status`,CASE WHEN m.`usedns`='Y' AND `dns` IS NOT NULL AND `dns`!='' THEN CONCAT(`ip`,':',`port`,' (',`dns`,')') ELSE CONCAT(`ip`,':',`port`) END AS `server` FROM `voice_server` v LEFT JOIN `voice_masterserver` m ON v.`masterserver`=m.`id` LEFT JOIN `userdata` u ON v.`userid`=u.`id` WHERE v.`resellerid`=? ORDER BY $orderBy LIMIT {$iDisplayStart},{$iDisplayLength}");
+    $query->execute(array($resellerLockupID));
+}
+
+$query2 = $sql->prepare("SELECT `action`,`extraData` FROM `jobs` WHERE `affectedID`=? AND `resellerID`=? AND `type`='vo' AND (`status` IS NULL OR `status`=1) ORDER BY `jobID` DESC LIMIT 1");
+$query3 = $sql->prepare("UPDATE `voice_server` SET `jobPending`='N' WHERE `id`=? AND `resellerid`=? LIMIT 1");
+
+while ($row = $query->fetch(PDO::FETCH_ASSOC)) {
+
+    $jobPending = $gsprache->no;
+    $statusMessage = $gsprache->status_ok;
+
+    if ($row['jobPending'] == 'Y') {
+
+        $query2->execute(array($row['id'], $resellerLockupID));
+        while ($row2 = $query2->fetch(PDO::FETCH_ASSOC)) {
+
+            if ($row2['action'] == 'ad') {
+                $jobPending = $gsprache->add;
+            } else if ($row2['action'] == 'dl') {
+                $jobPending = $gsprache->del;
+            } else {
+                $jobPending = $gsprache->mod;
+            }
+
+            $json = @json_decode($row2['extraData']);
+            $row['status'] = ((is_object($json) and isset($json->newActive) and $json->newActive == 'N')) ? 2 : 0;
+        }
+
+        if ($query2->rowCount() == 0) {
+            $query3->execute(array($row['id'], $resellerLockupID));
+        }
+    }
+
+    if ($row['active'] == 'N') {
+
+        $statusMessage = $gsprache->status_inactive;
+
+    } else if ($row['uptime'] == 1) {
+
+        $statusMessage = $gsprache->status_stop;
+
+    } else if ($row['uptime'] < 1) {
+
+        $statusMessage = $gsprache->status_crashed;
+
+    } else if ($row['password'] == 'Y' and $row['queryPassword'] == 'N') {
+
+        $statusMessage = $gsprache->status_password;
+    }
+
+    $password = ($row['initialpassword'] != null and $row['initialpassword'] != '') ? '?password=' . $row['initialpassword'] : '';
+    $server = ($row['usedns'] == 'Y' and $row['dns'] != null or $row['dns'] != '') ? '<a href="ts3server://' . $row['dns'] . $password . '">' . $row['ip'] . ':' . $row['port'] . '</a> ( ' . $row['dns'] . ' )' : '<a href="ts3server://' . $row['ip'] . ':' . $row['port'] . $password . '">' . $row['ip'] . ':' . $row['port'] . '</a>';
+
+    $array['aaData'][] = array($server, $row['id'], returnButton($template_to_use, 'ajax_admin_show_status.tpl', '', '', $row['status'], (string) $statusMessage), $row['localserverid'], returnButton($template_to_use, 'ajax_admin_user_switch.tpl', $row['cname'], $row['full_name'], $row['userid'], ''), ((int) $row['usedslots']). '/' . ((int) $row['slots']), (string) $jobPending, returnButton($template_to_use, 'ajax_admin_buttons_dl.tpl', 'vo', 'dl', $row['id'], $gsprache->del) . ' ' . returnButton($template_to_use, 'ajax_admin_buttons_md.tpl', 'vo', 'md', $row['id'], $gsprache->mod));
+}

web/stuff/ajax/voice_master_port_usage.php

@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * File: voice_master_port_usage.php.
+ * Author: Ulrich Block
+ * Date: 01.02.15
+ * 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 (!defined('AJAXINCLUDED')) {
+    die('Do not access directly!');
+}
+
+$sprache = getlanguagefile('voice', $user_language, $reseller_id);
+
+$usedPorts = usedPorts(array($ui->ip4('ip', 'get')));
+$portList = (count($usedPorts['ports']) > 0) ? implode(', ', $usedPorts['ports']) : 'None';
+
+if ($ui->id('serverID', 10, 'get') and $ui->ip4('ip', 'get')) {
+
+    $query = $sql->prepare("SELECT `port` FROM `voice_server` WHERE `id`=? AND `resellerid`=? AND `ip`=? LIMIT 1");
+    $query->execute(array($ui->id('serverID', 10, 'get'), $resellerLockupID, $ui->ip4('ip', 'get')));
+
+    $port = $query->fetchColumn();
+
+} else {
+
+    $port = 9987;
+
+    while (in_array($port, $usedPorts['ports'])) {
+        $port++;
+    }
+}
+
+require_once IncludeTemplate($template_to_use, 'ajax_admin_voice_ports.tpl', 'ajax');

web/stuff/ajax/voice_master_usage.php

@@ -0,0 +1,124 @@
+<?php
+
+/**
+ * File: voice_master_usage.php.
+ * Author: Ulrich Block
+ * Date: 01.02.15
+ * 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 (!defined('AJAXINCLUDED')) {
+    die('Do not access directly!');
+}
+
+$sprache = getlanguagefile('voice', $user_language, $reseller_id);
+
+if ($ui->id('id', 10, 'get')) {
+
+    $currentIP = '';
+    $dns = '';
+    $name = '';
+    $welcome = '';
+    $hostbanner_url = '';
+    $hostbanner_gfx_url = '';
+    $hostbutton_tooltip = '';
+    $hostbutton_url = '';
+    $hostbutton_gfx_url = '';
+    $flexSlots = '';
+    $flexSlotsFree = '';
+    $flexSlotsPercent = '';
+
+    $query = $sql->prepare("SELECT m.*,AES_DECRYPT(m.`querypassword`,?) AS `decryptedquerypassword`,COUNT(v.`id`)*(100/m.`maxserver`) AS `serverpercent`,SUM(v.`slots`)*(100/m.`maxslots`) AS `slotpercent`,COUNT(v.`id`) AS `installedserver`,SUM(v.`slots`) AS `installedslots`,SUM(v.`usedslots`) AS `uslots`,r.`ip`  FROM `voice_masterserver` m LEFT JOIN `rserverdata` r ON m.`rootid`=r.`id` LEFT JOIN `voice_server` v ON m.`id`=v.`masterserver` WHERE m.`id`=? AND m.`active`='Y' AND (m.`resellerid`=? OR m.`managedForID`=?) GROUP BY m.`id` HAVING (`installedserver`<`maxserver` AND (`installedslots`<`maxslots` OR `installedslots` IS NULL)) LIMIT 1");
+    $query->execute(array($aeskey, $ui->id('id', 10, 'get'), $resellerLockupID, $admin_id));
+    while ($row = $query->fetch(PDO::FETCH_ASSOC)) {
+
+        $installedServer = (int) $row['installedserver'];
+        $maxServer = (int) $row['maxserver'];
+        $installedSlots = (int) $row['installedslots'];
+        $maxSlots = (int) $row['maxslots'];
+
+        $masterServerData['ssh2ip'] = $row['ssh2ip'];
+        $masterServerData['queryport'] = $row['queryport'];
+        $masterServerData['decryptedquerypassword'] = $row['decryptedquerypassword'];
+
+        $ips = ($row['connect_ip_only'] == 'Y') ? array() : array($row['ssh2ip']);
+
+        foreach (preg_split('/\r\n/', $row['ips'], -1, PREG_SPLIT_NO_EMPTY) as $ip) {
+            $ips[] = $ip;
+        }
+
+        $dns = $row['defaultdns'];
+        $name = $row['defaultname'];
+        $welcome = $row['defaultwelcome'];
+        $hostbanner_url = $row['defaulthostbanner_url'];
+        $hostbanner_gfx_url = $row['defaulthostbanner_gfx_url'];
+        $hostbutton_tooltip = $row['defaulthostbutton_tooltip'];
+        $hostbutton_url = $row['defaulthostbutton_url'];
+        $hostbutton_gfx_url = $row['defaulthostbutton_gfx_url'];
+        $flexSlotsFree = $row['defaultFlexSlotsFree'];
+        $flexSlotsPercent = $row['defaultFlexSlotsPercent'];
+   }
+
+    if ($ui->id('serverID', 10, 'get') and isset($masterServerData)) {
+
+        $query = $sql->prepare("SELECT `localserverid`,`ip`,`dns`,`flexSlots`,`flexSlotsPercent`,`flexSlotsFree` FROM `voice_server` WHERE `id`=? AND `resellerid`=? LIMIT 1");
+        $query->execute(array($ui->id('serverID', 10, 'get'), $resellerLockupID));
+        while ($row = $query->fetch(PDO::FETCH_ASSOC)) {
+            $localID = $row['localserverid'];
+            $currentIP = $row['ip'];
+            $dns = $row['dns'];
+            $flexSlots = $row['flexSlots'];
+            $flexSlotsPercent = $row['flexSlotsPercent'];
+            $flexSlotsFree = $row['flexSlotsFree'];
+        }
+
+        $connection = new TS3($masterServerData['ssh2ip'], $masterServerData['queryport'], 'serveradmin', $masterServerData['decryptedquerypassword']);
+
+        if (strpos($connection->errorcode,'error id=0') !== false and isset($localID)) {
+
+            $serverDetails = $connection->ServerDetails($localID);
+
+            $name = $serverDetails['virtualserver_name'];
+            $welcome = $serverDetails['virtualserver_welcomemessage'];
+            $hostbanner_url = $serverDetails['virtualserver_hostbanner_url'];
+            $hostbanner_gfx_url = $serverDetails['virtualserver_hostbanner_gfx_url'];
+            $hostbutton_tooltip = $serverDetails['virtualserver_hostbutton_tooltip'];
+            $hostbutton_url = $serverDetails['virtualserver_hostbutton_url'];
+            $hostbutton_gfx_url = $serverDetails['virtualserver_hostbutton_gfx_url'];
+        }
+
+        $connection->CloseConnection();
+    }
+}
+
+require_once IncludeTemplate($template_to_use, 'ajax_admin_voice_server_usage.tpl', 'ajax');

web/stuff/api/api_voice.php

@@ -147,7 +147,7 @@ if (!isset($success['false']) and array_value_exists('action','add',$data) and $
             }
 
             $query2 = $sql->prepare("SELECT `defaultdns` FROM `voice_tsdns` WHERE `active`='Y' AND `id`=? AND `resellerid`=? LIMIT 1");
-            $query3 = $sql->prepare("SELECT `ip`,`altips` FROM `rserverdata` WHERE `id`=? AND `resellerid`=? LIMIT 1");
+            $query3 = $sql->prepare("SELECT `ip`,`altips`,`connect_ip_only` FROM `rserverdata` WHERE `id`=? AND `resellerid`=? LIMIT 1");
 
             $query = $sql->prepare("SELECT m.`id` AS `hostID`,m.*,COUNT(v.`id`)*(100/m.`maxserver`) AS `serverpercent`,SUM(v.`slots`)*(100/m.`maxslots`) AS `slotpercent`,COUNT(v.`id`) AS `installedserver`,SUM(v.`slots`) AS `installedslots`,SUM(v.`usedslots`) AS `uslots`,r.`ip`  FROM `voice_masterserver` m LEFT JOIN `rserverdata` r ON m.`rootid`=r.`id` LEFT JOIN `voice_server` v ON m.`id`=v.`masterserver` GROUP BY m.`id` HAVING `active`='Y' AND $inSQLArray (`installedserver`<`maxserver` AND (`installedslots`<`maxslots` OR `installedslots` IS NULL) AND ((`maxslots`-`installedslots`)>? OR `installedslots` IS NULL) AND `active`='Y' AND `resellerid`=?) ORDER BY `slotpercent`,`serverpercent` ASC LIMIT 1");
             $query->execute(array($slots, $resellerID));
@@ -181,7 +181,7 @@ if (!isset($success['false']) and array_value_exists('action','add',$data) and $
                         $query3->execute(array($row['rootid'], $resellerID));
                         while ($row3 = $query3->fetch(PDO::FETCH_ASSOC)) {
 
-                            $ips[] = $row3['ip'];
+                            $ips = ($row3['connect_ip_only'] == 'Y') ? array() : array($row['ip']);
 
                             foreach (preg_split('/\r\n/', $row3['altips'], -1, PREG_SPLIT_NO_EMPTY) as $ip) {
                                 $ips[] = $ip;
@@ -190,7 +190,7 @@ if (!isset($success['false']) and array_value_exists('action','add',$data) and $
 
                     } else {
 
-                        $ips[] = $row['ssh2ip'];
+                        $ips = ($row['connect_ip_only'] == 'Y') ? array() : array($row['ip']);
 
                         foreach (preg_split('/\r\n/', $row['ips'], -1, PREG_SPLIT_NO_EMPTY) as $ip) {
                             $ips[] = $ip;

web/stuff/methods/class_ts3.php

@@ -44,13 +44,16 @@ class TS3 {
     public $errorcode = false, $socketConnected = false;
 
     public function ReplaceToTS3 ($value) {
-        $return = str_replace(array('\\', '/', ' ', '|'), array('\\\\', '\/', '\s', '\p'), $value);
-        return $return;
+
+        if ($value === false or $value === null) {
+            $value = '';
+        }
+
+        return str_replace(array('\\', '/', ' ', '|'), array('\\\\', '\/', '\s', '\p'), $value);
     }
 
     private function ReplaceFromTS3 ($value) {
-        $return = str_replace(array('\\\\', '\/', '\s', '\p'), array('\\', '/', ' ', '|'), $value);
-        return $return;
+        return str_replace(array('\\\\', '\/', '\s', '\p'), array('\\', '/', ' ', '|'), $value);
     }
 
     public function SendCommand ($value) {

web/stuff/methods/functions.php

@@ -334,6 +334,7 @@ if (!function_exists('passwordgenerate')) {
 
         return array('left' => $left, 'count' => $count, 'gsCount' => $gsCount, 'vCount' => $vCount, 'voCount' => $voCount, 'dCount' => $dCount, 'mG' => $mG, 'mVs' => $mVs, 'mVo' => $mVo, 'mD' => $mD, 'lG' => $lG, 'lVs' => $lVs, 'lVo' => $lVo, 'lD' => $lD, 'p' => $json->p, 'b' => $json->b, 't' => $json->t, 'u' => $json->u, 'c' => $json->c, 'v' => $json->v);
     }
+
     function getusername($userid) {
 
         global $sql;

web/stuff/methods/functions_ts3.php

@@ -575,4 +575,19 @@ function getTS3Version ($type = 'server', $os = 'linux', $bit = 64, $url = null)
     }
 
     return false;
+}
+
+function getVoiceMasterList ($resellerID, $adminID) {
+
+    $table = array();
+
+    global $sql;
+
+    $query = $sql->prepare("SELECT m.`id`,m.`ssh2ip`,m.`description`,m.`maxserver`,m.`maxslots`,m.`active`,m.`resellerid`,m.`managedForID`,COUNT(v.`id`)*(100/m.`maxserver`) AS `serverpercent`,SUM(v.`slots`)*(100/m.`maxslots`) AS `slotpercent`,COUNT(v.`id`) AS `installedserver`,SUM(v.`slots`) AS `installedslots`,SUM(v.`usedslots`) AS `uslots`,r.`ip`  FROM `voice_masterserver` m LEFT JOIN `rserverdata` r ON m.`rootid`=r.`id` LEFT JOIN `voice_server` v ON m.`id`=v.`masterserver` GROUP BY m.`id` HAVING (`installedserver`<`maxserver` AND (`installedslots`<`maxslots` OR `installedslots` IS NULL) AND `active`='Y' AND (`resellerid`=? OR m.`managedForID`=?)) ORDER BY `slotpercent`,`serverpercent` ASC");
+    $query->execute(array($resellerID, $adminID));
+    while ($row = $query->fetch(PDO::FETCH_ASSOC)) {
+        $table[$row['id']] = ($row['description'] != null and $row['description'] != '') ? $row['ssh2ip'] . ' ' . $row['description'] : $row['ssh2ip'];
+    }
+
+    return $table;
 }

web/stuff/methods/tables_add.php

@@ -337,6 +337,7 @@ $query = "CREATE TABLE IF NOT EXISTS `webMaster` (
   `pass` blob,
   `publickey` enum('B','Y','N') DEFAULT 'N',
   `keyname` varchar(255),
+  `connect_ip_only` enum('Y','N') NOT NULL DEFAULT 'N',
   `ftpIP` varchar(15),
   `ftpPort` int(5) unsigned,
   `maxVhost` int(10) unsigned,
@@ -682,6 +683,8 @@ $query = "CREATE TABLE IF NOT EXISTS `mysql_external_servers` (
   `port` smallint(5) unsigned DEFAULT '3306',
   `user` varchar(255) NOT NULL,
   `password` blob,
+  `connect_ip_only` enum('Y','N') NOT NULL DEFAULT 'N',
+  `alt_ips` text CHARACTER SET utf8,
   `max_databases` bigint(19) unsigned DEFAULT '100',
   `interface` varchar(255) DEFAULT NULL,
   `max_queries_per_hour` bigint(19) unsigned DEFAULT 0,
@@ -1651,6 +1654,7 @@ $query = "CREATE TABLE IF NOT EXISTS `voice_masterserver` (
   `ssh2port` blob,
   `ssh2user` blob,
   `ssh2password` blob,
+  `connect_ip_only` enum('Y','N') NOT NULL DEFAULT 'N',
   `bitversion` smallint(2) unsigned DEFAULT 64 NOT NULL,
   `serverdir` varchar(255) DEFAULT NULL,
   `keyname` varchar(50) DEFAULT NULL,
@@ -1752,6 +1756,8 @@ $query = "CREATE TABLE IF NOT EXISTS `voice_tsdns` (
   `ssh2port` blob,
   `ssh2user` blob,
   `ssh2password` blob,
+  `connect_ip_only` enum('Y','N') NOT NULL DEFAULT 'N',
+  `alt_ips` text CHARACTER SET utf8,
   `bitversion` smallint(2) unsigned NOT NULL,
   `serverdir` varchar(255) DEFAULT NULL,
   `keyname` varchar(50) DEFAULT NULL,

web/stuff/methods/tables_repair.php

@@ -377,6 +377,7 @@ $defined['webMaster'] = array(
     'pass' => array("Type"=>"blob","Null"=>"YES","Key"=>"","Default"=>"","Extra"=>""),
     'publickey' => array("Type"=>"enum('B','Y','N')","Null"=>"YES","Key"=>"","Default"=>"","Extra"=>""),
     'keyname' => array("Type"=>"varchar(255)","Null"=>"YES","Key"=>"","Default"=>"","Extra"=>""),
+    'connect_ip_only' => array("Type"=>"enum('Y','N')","Null"=>"NO","Key"=>"","Default"=>"N","Extra"=>""),
     'ftpIP' => array("Type"=>"varchar(15)","Null"=>"YES","Key"=>"","Default"=>"","Extra"=>""),
     'ftpPort' => array("Type"=>"int(5) unsigned","Null"=>"YES","Key"=>"","Default"=>"","Extra"=>""),
     'maxVhost' => array("Type"=>"int(10) unsigned","Null"=>"YES","Key"=>"","Default"=>"0","Extra"=>""),
@@ -675,6 +676,8 @@ $defined['mysql_external_servers'] = array(
     'port' => array("Type"=>"smallint(5) unsigned","Null"=>"YES","Key"=>"","Default"=>"3306","Extra"=>""),
     'user' => array("Type"=>"varchar(255)","Null"=>"NO","Key"=>"","Default"=>"","Extra"=>""),
     'password' => array("Type"=>"blob","Null"=>"YES","Key"=>"","Default"=>"","Extra"=>""),
+    'connect_ip_only' => array("Type"=>"enum('Y','N')","Null"=>"NO","Key"=>"","Default"=>"N","Extra"=>""),
+    'alt_ips' => array("Type"=>"text","Null"=>"YES","Key"=>"","Default"=>"","Extra"=>""),
     'max_databases' => array("Type"=>"bigint(19) unsigned","Null"=>"YES","Key"=>"","Default"=>"100","Extra"=>""),
     'interface' => array("Type"=>"varchar(255)","Null"=>"YES","Key"=>"","Default"=>"","Extra"=>""),
     'max_queries_per_hour' => array("Type"=>"bigint(19) unsigned","Null"=>"YES","Key"=>"","Default"=>"0","Extra"=>""),
@@ -1449,6 +1452,7 @@ $defined['voice_masterserver'] = array(
     'ssh2port' => array("Type"=>"blob","Null"=>"YES","Key"=>"","Default"=>"","Extra"=>""),
     'ssh2user' => array("Type"=>"blob","Null"=>"YES","Key"=>"","Default"=>"","Extra"=>""),
     'ssh2password' => array("Type"=>"blob","Null"=>"YES","Key"=>"","Default"=>"","Extra"=>""),
+    'connect_ip_only' => array("Type"=>"enum('Y','N')","Null"=>"NO","Key"=>"","Default"=>"N","Extra"=>""),
     'bitversion' => array("Type"=>"smallint(2) unsigned","Null"=>"NO","Key"=>"","Default"=>"","Extra"=>""),
     'serverdir' => array("Type"=>"varchar(255)","Null"=>"YES","Key"=>"","Default"=>"","Extra"=>""),
     'keyname' => array("Type"=>"varchar(50)","Null"=>"YES","Key"=>"","Default"=>"","Extra"=>""),
@@ -1538,6 +1542,8 @@ $defined['voice_tsdns'] = array(
     'ssh2port' => array("Type"=>"blob","Null"=>"YES","Key"=>"","Default"=>"","Extra"=>""),
     'ssh2user' => array("Type"=>"blob","Null"=>"YES","Key"=>"","Default"=>"","Extra"=>""),
     'ssh2password' => array("Type"=>"blob","Null"=>"YES","Key"=>"","Default"=>"","Extra"=>""),
+    'connect_ip_only' => array("Type"=>"enum('Y','N')","Null"=>"NO","Key"=>"","Default"=>"N","Extra"=>""),
+    'alt_ips' => array("Type"=>"text","Null"=>"YES","Key"=>"","Default"=>"","Extra"=>""),
     'bitversion' => array("Type"=>"smallint(2) unsigned","Null"=>"NO","Key"=>"","Default"=>"","Extra"=>""),
     'serverdir' => array("Type"=>"varchar(255)","Null"=>"YES","Key"=>"","Default"=>"","Extra"=>""),
     'keyname' => array("Type"=>"varchar(50)","Null"=>"YES","Key"=>"","Default"=>"","Extra"=>""),

web/template/default/admin/admin_voice_tsdns_add.tpl

@@ -26,7 +26,7 @@
         <div class="col-md-12">
             <div class="box box-success">
 
-                <form role="form" action="admin.php?w=vd&amp;d=ad&amp;id=<?php echo $id;?>" onsubmit="return confirm('<?php echo $gsprache->sure;?>');" method="post">
+                <form role="form" action="admin.php?w=vd&amp;d=ad" onsubmit="return confirm('<?php echo $gsprache->sure;?>');" method="post">
 
                     <input class="form-control" type="hidden" name="token" value="<?php echo token();?>">
                     <input class="form-control" type="hidden" name="action" value="ad">

web/template/default/admin/admin_voice_tsdns_dl.tpl

@@ -14,7 +14,7 @@
         <div class="col-md-12">
             <div class="box box-danger">
 
-                <form role="form" action="admin.php?w=vd&amp;d=dl&amp;id=<?php echo $id;?>&amp;r=vm" onsubmit="return confirm('<?php echo $gsprache->sure;?>');" method="post">
+                <form role="form" action="admin.php?w=vd&amp;d=dl&amp;id=<?php echo $id;?>&amp;r=vn" onsubmit="return confirm('<?php echo $gsprache->sure;?>');" method="post">
 
                     <input type="hidden" name="token" value="<?php echo token();?>">
                     <input type="hidden" name="action" value="dl">

web/template/default/admin/admin_voicemasterserver_add.tpl

@@ -237,9 +237,19 @@
                             <div class="controls"><input class="form-control" id="inputSshIP" type="text" name="ip" maxlength="15" value="<?php echo $ip;?>"></div>
                         </div>
 
+                        <div class="control-group">
+                            <label class="control-label" for="inputAssignToReseller"><?php echo $gsprache->connect_ip_only;?></label>
+                            <div class="controls">
+                                <select class="form-control" id="inputAssignToReseller" name="assignToReseller">
+                                    <option value="N"><?php echo $gsprache->no;?></option>
+                                    <option value="Y" <?php if ($assignToReseller=='Y') echo 'selected="selected"'; ?>><?php echo $gsprache->yes;?></option>
+                                </select>
+                            </div>
+                        </div>
+
                         <div class="control-group">
                             <label for="inputIps"><?php echo $sprache->ips;?></label>
-                            <div class="controls"><textarea class="form-control" id="inputIps" name="ips" rows="5" cols="23" ><?php echo $ips;?></textarea></div>
+                            <div class="controls"><input class="form-control" id="inputIps" name="ips" type="text" value="<?php echo $ips;?>"></div>
                         </div>
 
                         <div class="control-group<?php if(isset($errors['port'])) echo ' has-error';?>">

web/template/default/admin/admin_voicemasterserver_add2.tpl

@@ -33,107 +33,110 @@
                     <div class="form-group">
                         <label for="inputImport"><?php echo $sprache->import;?></label>
                         <div class="controls">
-                            <select class="form-control" id="inputImport" name="<?php echo $virtualserver_id;?>-import">
+                            <select class="form-control" id="inputImport" name="<?php echo $virtualserver_id;?>-import" onchange="toggleID('#<?php echo $virtualserver_id;?>-import', this.value)">
                                 <option value="Y"><?php echo $gsprache->yes;?></option>
                                 <option value="N"><?php echo $gsprache->no;?></option>
                             </select>
                         </div>
                     </div>
 
-                    <div class="form-group">
-                        <label for="inputUser"><?php echo $gsprache->user ;?>:</label>
-                        <div class="controls">
-                            <select class="form-control" id="inputUser" name="<?php echo $virtualserver_id;?>-customer" onchange="SwitchShowHideRows(this.value,'<?php echo $virtualserver_id;?>-customer');">
-                                <option value="0"><?php echo $sprache->newuser;?></option>
-                                <?php foreach ($table as $key=>$value) { ?>
-                                <option value="<?php echo $key;?>"><?php echo $value;?></option>
-                                <?php } ?>
-                            </select>
+                    <div id="<?php echo $virtualserver_id;?>-import">
+
+                        <div class="form-group">
+                            <label for="inputUser"><?php echo $gsprache->user ;?>:</label>
+                            <div class="controls">
+                                <select class="form-control" id="inputUser" name="<?php echo $virtualserver_id;?>-customer">
+                                    <option value="0"><?php echo $sprache->newuser;?></option>
+                                    <?php foreach ($table as $key=>$value) { ?>
+                                    <option value="<?php echo $key;?>"><?php echo $value;?></option>
+                                    <?php } ?>
+                                </select>
+                            </div>
                         </div>
-                    </div>
 
-                    <?php if ($rSA['prefix1']=='N') { ?>
+                        <?php if ($rSA['prefix1']=='N') { ?>
 
-                    <div class="0 <?php echo $virtualserver_id;?>-customer form-group">
-                        <label for="inputUserName"><?php echo $sprache->user;?></label>
-                        <div class="controls"><input class="form-control" id="inputUserName" type="text" name="<?php echo $virtualserver_id;?>-username"></div>
-                    </div>
-
-                    <div class="0 <?php echo $virtualserver_id;?>-customer form-group">
-                        <label for="inputUserMail"><?php echo $usprache->email;?></label>
-                        <div class="controls"><input class="form-control" id="inputUserMail" type="email" name="<?php echo $virtualserver_id;?>-email" value="ts3@import.mail"></div>
-                    </div>
-
-                    <?php } ?>
-
-                    <div class="form-group">
-                        <label for="inputPassword"><?php echo $sprache->password;?></label>
-                        <div class="controls">
-                            <select class="form-control" id="inputPassword" name="<?php echo $virtualserver_id;?>-password">
-                                <option value="N"><?php echo $gsprache->no;?></option>
-                                <option value="Y" <?php if($values['virtualserver_flag_password']=='1') echo 'selected="selected"';?>><?php echo $gsprache->yes;?></option>
-                            </select>
+                        <div class="form-group">
+                            <label for="inputUserName"><?php echo $sprache->user;?></label>
+                            <div class="controls"><input class="form-control" id="inputUserName" type="text" name="<?php echo $virtualserver_id;?>-username"></div>
                         </div>
-                    </div>
 
-                    <div class="form-group">
-                        <label for="inputForceWelcome"><?php echo $sprache->forcewelcome;?></label>
-                        <div class="controls">
-                            <select class="form-control" id="inputForceWelcome" name="<?php echo $virtualserver_id;?>-forcewelcome">
-                                <option value="N"><?php echo $gsprache->no;?></option>
-                                <option value="Y"><?php echo $gsprache->yes;?></option>
-                            </select>
+                        <div class="form-group">
+                            <label for="inputUserMail"><?php echo $usprache->email;?></label>
+                            <div class="controls"><input class="form-control" id="inputUserMail" type="email" name="<?php echo $virtualserver_id;?>-email" value="ts3@import.mail"></div>
                         </div>
-                    </div>
 
-                    <div class="form-group">
-                        <label for="inputForceBanner"><?php echo $sprache->forcebanner;?></label>
-                        <div class="controls">
-                            <select class="form-control" id="inputForceBanner" name="<?php echo $virtualserver_id;?>-forcebanner">
-                                <option value="N"><?php echo $gsprache->no;?></option>
-                                <option value="Y"><?php echo $gsprache->yes;?></option>
-                            </select>
+                        <?php } ?>
+
+                        <div class="form-group">
+                            <label for="inputPassword"><?php echo $sprache->password;?></label>
+                            <div class="controls">
+                                <select class="form-control" id="inputPassword" name="<?php echo $virtualserver_id;?>-password">
+                                    <option value="N"><?php echo $gsprache->no;?></option>
+                                    <option value="Y" <?php if($values['virtualserver_flag_password']=='1') echo 'selected="selected"';?>><?php echo $gsprache->yes;?></option>
+                                </select>
+                            </div>
                         </div>
-                    </div>
 
-                    <div class="form-group">
-                        <label for="inputForceButton"><?php echo $sprache->forcebutton;?></label>
-                        <div class="controls">
-                            <select class="form-control" id="inputForceButton" name="<?php echo $virtualserver_id;?>-forcebutton">
-                                <option value="N"><?php echo $gsprache->no;?></option>
-                                <option value="Y"><?php echo $gsprache->yes;?></option>
-                            </select>
+                        <div class="form-group">
+                            <label for="inputForceWelcome"><?php echo $sprache->forcewelcome;?></label>
+                            <div class="controls">
+                                <select class="form-control" id="inputForceWelcome" name="<?php echo $virtualserver_id;?>-forcewelcome">
+                                    <option value="N"><?php echo $gsprache->no;?></option>
+                                    <option value="Y"><?php echo $gsprache->yes;?></option>
+                                </select>
+                            </div>
                         </div>
-                    </div>
 
-                    <div class="form-group">
-                        <label for="inputForceServerTag"><?php echo $sprache->forceservertag;?></label>
-                        <div class="controls">
-                            <select class="form-control" id="inputForceServerTag" name="<?php echo $virtualserver_id;?>-forceservertag">
-                                <option value="N"><?php echo $gsprache->no;?></option>
-                                <option value="Y"><?php echo $gsprache->yes;?></option>
-                            </select>
+                        <div class="form-group">
+                            <label for="inputForceBanner"><?php echo $sprache->forcebanner;?></label>
+                            <div class="controls">
+                                <select class="form-control" id="inputForceBanner" name="<?php echo $virtualserver_id;?>-forcebanner">
+                                    <option value="N"><?php echo $gsprache->no;?></option>
+                                    <option value="Y"><?php echo $gsprache->yes;?></option>
+                                </select>
+                            </div>
                         </div>
-                    </div>
 
-                    <div class="form-group">
-                        <label for="inputFlexSlots"><?php echo $sprache->flexSlots;?></label>
-                        <div class="controls">
-                            <select class="form-control" id="inputFlexSlots" name="<?php echo $virtualserver_id;?>-flexSlots">
-                                <option value="N"><?php echo $gsprache->no;?></option>
-                                <option value="Y"><?php echo $gsprache->yes;?></option>
-                            </select>
+                        <div class="form-group">
+                            <label for="inputForceButton"><?php echo $sprache->forcebutton;?></label>
+                            <div class="controls">
+                                <select class="form-control" id="inputForceButton" name="<?php echo $virtualserver_id;?>-forcebutton">
+                                    <option value="N"><?php echo $gsprache->no;?></option>
+                                    <option value="Y"><?php echo $gsprache->yes;?></option>
+                                </select>
+                            </div>
                         </div>
-                    </div>
 
-                    <div class="form-group">
-                        <label for="inputFlexSlotsFree"><?php echo $sprache->flexSlotsFree;?></label>
-                        <div class="controls"><input class="form-control" id="inputFlexSlotsFree" type="text" name="<?php echo $virtualserver_id;?>-flexSlotsFree" value="<?php echo $defaultFlexSlotsFree;?>"></div>
-                    </div>
+                        <div class="form-group">
+                            <label for="inputForceServerTag"><?php echo $sprache->forceservertag;?></label>
+                            <div class="controls">
+                                <select class="form-control" id="inputForceServerTag" name="<?php echo $virtualserver_id;?>-forceservertag">
+                                    <option value="N"><?php echo $gsprache->no;?></option>
+                                    <option value="Y"><?php echo $gsprache->yes;?></option>
+                                </select>
+                            </div>
+                        </div>
 
-                    <div class="form-group">
-                        <label for="inputFlexSlotsPercent"><?php echo $sprache->flexSlotsPercent;?></label>
-                        <div class="controls"><input class="form-control" id="inputFlexSlotsPercent" type="text" name="<?php echo $virtualserver_id;?>-flexSlotsPercent" value="<?php echo $defaultFlexSlotsFree;?>"></div>
+                        <div class="form-group">
+                            <label for="inputFlexSlots"><?php echo $sprache->flexSlots;?></label>
+                            <div class="controls">
+                                <select class="form-control" id="inputFlexSlots" name="<?php echo $virtualserver_id;?>-flexSlots">
+                                    <option value="N"><?php echo $gsprache->no;?></option>
+                                    <option value="Y"><?php echo $gsprache->yes;?></option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputFlexSlotsFree"><?php echo $sprache->flexSlotsFree;?></label>
+                            <div class="controls"><input class="form-control" id="inputFlexSlotsFree" type="text" name="<?php echo $virtualserver_id;?>-flexSlotsFree" value="<?php echo $defaultFlexSlotsFree;?>"></div>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputFlexSlotsPercent"><?php echo $sprache->flexSlotsPercent;?></label>
+                            <div class="controls"><input class="form-control" id="inputFlexSlotsPercent" type="text" name="<?php echo $virtualserver_id;?>-flexSlotsPercent" value="<?php echo $defaultFlexSlotsFree;?>"></div>
+                        </div>
                     </div>
 
                     <?php }} else { ?>

web/template/default/admin/admin_voicemasterserver_md.tpl

@@ -211,9 +211,19 @@
                             <div class="controls"><input class="form-control" id="inputSshIP" type="text" name="ip" maxlength="15" value="<?php echo $ip;?>"></div>
                         </div>
 
+                        <div class="control-group">
+                            <label class="control-label" for="inputConnectIpOnly"><?php echo $gsprache->connect_ip_only;?></label>
+                            <div class="controls">
+                                <select class="form-control" id="inputConnectIpOnly" name="connectIpOnly">
+                                    <option value="N"><?php echo $gsprache->no;?></option>
+                                    <option value="Y" <?php if ($connectIpOnly=='Y') echo 'selected="selected"'; ?>><?php echo $gsprache->yes;?></option>
+                                </select>
+                            </div>
+                        </div>
+
                         <div class="form-group">
                             <label for="inputIps"><?php echo $sprache->ips;?></label>
-                            <div class="controls"><textarea class="form-control" id="inputIps" name="ips" rows="5" cols="23" ><?php echo $ips;?></textarea></div>
+                            <div class="controls"><input class="form-control" id="inputIps" name="ips" type="text" value="<?php echo $ips;?>"></div>
                         </div>
 
                         <div class="form-group<?php if(isset($errors['port'])) echo ' has-error';?>">

web/template/default/admin/admin_voiceserver_add.tpl

@@ -1,52 +1,242 @@
-<div class="row-fluid">
-    <div class="span12">
-        <ul class="breadcrumb">
-            <li><a href="admin.php">Home</a> <span class="divider">/</span></li>
-            <li><?php echo $gsprache->voiceserver;?> <span class="divider">/</span></li>
-            <li class="active"><?php echo $gsprache->add;?></li>
-        </ul>
+<section class="content-header">
+    <h1><?php echo $gsprache->voiceserver;?></h1>
+    <ol class="breadcrumb">
+        <li><a href="admin.php"><i class="fa fa-home"></i> Home</a></li>
+        <li><a href="admin.php?w=vo"><i class="fa fa-microphone"></i> <?php echo $gsprache->voiceserver;?></a></li>
+        <li class="active"><?php echo $gsprache->add;?></li>
+    </ol>
+</section>
+
+<section class="content">
+
+    <?php if (count($errors)>0){ ?>
+    <div class="row">
+        <div class="col-md-12">
+            <div class="alert alert-danger">
+                <button type="button" class="close" data-dismiss="alert">&times;</button>
+                <h4><?php echo $gsprache->errors;?></h4>
+                <?php echo implode(', ',$errors);?>
+            </div>
+        </div>
     </div>
-</div>
-<div class="row-fluid">
-    <div class="span6">
-        <form name="form" class="form-horizontal" action="admin.php?w=vo&amp;d=ad" method="post">
-            <input type="hidden" name="token" value="<?php echo token();?>">
-            <input type="hidden" name="action" value="ad">
-            <div class="control-group">
-                <label class="control-label" for="inputUser"><?php echo $sprache->user;?></label>
-                <div class="controls">
-                    <select id="inputUser" name="customer">
-                        <?php foreach ($table as $key=>$val){ ?>
-                        <option value="<?php echo $key;?>"><?php echo $val;?></option>
-                        <?php } ?>
-                    </select>
-                </div>
+    <?php }?>
+
+    <div class="row">
+        <div class="col-md-12">
+            <div class="box box-success">
+
+                <form role="form" action="admin.php?w=vo&amp;d=ad&amp;r=vo" onsubmit="return confirm('<?php echo $gsprache->sure;?>');" method="post">
+
+                    <input type="hidden" name="token" value="<?php echo token();?>">
+                    <input type="hidden" name="action" value="ad">
+
+                    <div class="box-body">
+
+                        <div class="form-group">
+                            <label for="inputExternalID">External ID</label>
+                            <div class="controls"><input class="form-control" id="inputExternalID" type="text" name="externalID" value="<?php echo $externalID;?>"></div>
+                        </div>
+
+                        <div class="form-group<?php if(isset($errors['userID'])) echo ' has-error';?>">
+                            <label for="inputUser"><?php echo $sprache->user;?></label>
+                            <div class="controls">
+                                <select class="form-control chosen-select" id="inputUser" name="userID" required="required">
+                                    <option></option>
+                                    <?php foreach ($table as $key=>$val){ ?>
+                                    <option value="<?php echo $key;?>" <?php if($key==$userID) echo 'selected="selected"';?>><?php echo $val;?></option>
+                                    <?php } ?>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group<?php if(isset($errors['rootID'])) echo ' has-error';?>">
+                            <label for="inputRoot"><?php echo $sprache->rootserver;?></label>
+                            <div class="controls">
+                                <select class="form-control chosen-select" id="inputRoot" name="rootID">
+                                    <?php foreach ($table2 as $key=>$val){ ?>
+                                    <option value="<?php echo $key;?>" <?php if($key==$rootID) echo 'selected="selected"';?>><?php echo $val;?></option>
+                                    <?php } ?>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div id="rootWrapper">
+                        </div>
+
+                        <div class="form-group<?php if(isset($errors['slots'])) echo ' has-error';?>">
+                            <label for="inputSlots"><?php echo $sprache->slots;?></label>
+                            <div class="controls"><input class="form-control" id="inputSlots" type="number" name="slots" value="<?php echo $slots;?>" min="1"></div>
+                        </div>
+
+                        <div class="form-group<?php if(isset($errors['active'])) echo ' has-error';?>">
+                            <label for="inputActive"><?php echo $sprache->active;?></label>
+                            <div class="controls">
+                                <select class="form-control" id="inputActive" name="active">
+                                    <option value="Y"><?php echo $gsprache->yes;?></option>
+                                    <option value="N" <?php if($active=='N') echo 'selected="selected"';?>><?php echo $gsprache->no;?></option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputAutorestart">Auto Restart</label>
+                            <div class="controls">
+                                <select class="form-control" id="inputAutorestart" name="autoRestart">
+                                    <option value="Y"><?php echo $gsprache->yes;?></option>
+                                    <option value="N" <?php if($autoRestart=='N') echo 'selected="selected"';?>><?php echo $gsprache->no;?></option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputLend"><?php echo $gsprache->lendserver;?></label>
+                            <div class="controls">
+                                <select class="form-control" id="inputLend" name="lendserver">
+                                    <option value="N"><?php echo $gsprache->no;?></option>
+                                    <option value="Y" <?php if($lendserver=='Y') echo 'selected="selected"';?>><?php echo $gsprache->yes;?></option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputPassword"><?php echo $sprache->password;?></label>
+                            <div class="controls">
+                                <select class="form-control" id="inputPassword" name="password" onchange="toggleID('#initialPassword',this.value);">
+                                    <option value="Y"><?php echo $gsprache->yes;?></option>
+                                    <option value="N" <?php if($password=='N') echo 'selected="selected"';?>><?php echo $gsprache->no;?></option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group" id="initialPassword">
+                            <label for="inputInitial"><?php echo $sprache->initialpassword;?></label>
+                            <div class="controls"><input class="form-control" id="inputInitial" type="text" name="initialpassword" value="<?php echo $initialpassword; ?>"></div>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputForceWelcome"><?php echo $sprache->forcewelcome;?></label>
+                            <div class="controls">
+                                <select class="form-control" id="inputForceWelcome" name="forcewelcome">
+                                    <option value="Y"><?php echo $gsprache->yes;?></option>
+                                    <option value="N" <?php if($forcewelcome=='N') echo 'selected="selected"';?>><?php echo $gsprache->no;?></option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputForceBanner"><?php echo $sprache->forcebanner;?></label>
+                            <div class="controls">
+                                <select class="form-control" id="inputForceBanner" name="forcebanner">
+                                    <option value="Y"><?php echo $gsprache->yes;?></option>
+                                    <option value="N" <?php if($forcebanner=='N') echo 'selected="selected"';?>><?php echo $gsprache->no;?></option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputForceButton"><?php echo $sprache->forcebutton;?></label>
+                            <div class="controls">
+                                <select class="form-control" id="inputForceButton" name="forcebutton">
+                                    <option value="Y"><?php echo $gsprache->yes;?></option>
+                                    <option value="N" <?php if($forcebutton=='N') echo 'selected="selected"';?>><?php echo $gsprache->no;?></option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputForceServerTag"><?php echo $sprache->forceservertag;?></label>
+                            <div class="controls">
+                                <select class="form-control" id="inputForceServerTag" name="forceservertag">
+                                    <option value="Y"><?php echo $gsprache->yes;?></option>
+                                    <option value="N" <?php if($forceservertag=='N') echo 'selected="selected"';?>><?php echo $gsprache->no;?></option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputBackup"><?php echo $sprache->backup;?></label>
+                            <div class="controls">
+                                <select class="form-control" id="inputBackup" name="backup">
+                                    <option value="Y"><?php echo $gsprache->yes;?></option>
+                                    <option value="N" <?php if($backup=='N') echo 'selected="selected"';?>><?php echo $gsprache->no;?></option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+
+                            <label for="inputMaxtraffic"><?php echo $sprache->maxtraffic;?></label>
+
+                            <div class="input-group">
+                                <input class="form-control" id="inputMaxtraffic" type="number" name="maxtraffic" value="<?php echo $maxtraffic;?>">
+                                <span class="input-group-addon">MB</span>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+
+                            <label for="inputMaxTotalBandwidth"><?php echo $sprache->max_download_total_bandwidth;?></label>
+
+                            <div class="input-group">
+                                <input class="form-control" id="inputMaxTotalBandwidth" type="number" name="max_download_total_bandwidth" value="<?php echo $max_download_total_bandwidth;?>">
+                                <span class="input-group-addon">Byte</span>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+
+                            <label for="inputMaxUploadBandwidth"><?php echo $sprache->max_upload_total_bandwidth;?></label>
+
+                            <div class="input-group">
+                                <input class="form-control" id="inputMaxUploadBandwidth" type="number" name="max_upload_total_bandwidth" value="<?php echo $max_upload_total_bandwidth;?>">
+                                <span class="input-group-addon">Byte</span>
+                            </div>
+                        </div>
+
+                        <?php foreach(customColumns('T') as $row){ ?>
+                        <div class="form-group">
+                            <label for="inputCustom-<?php echo $row['customID'];?>"><?php echo $row['menu'];?></label>
+                            <div class="controls"><input class="form-control" id="inputCustom-<?php echo $row['customID'];?>" type="<?php echo $row['type']=='V' ? 'text' : 'number';?>" name="<?php echo $row['name'];?>" value="" maxlength="<?php echo $row['length'];?>"></div>
+                        </div>
+                        <?php }?>
+                    </div>
+
+                    <div class="box-footer">
+                        <button class="btn btn-success" id="inputEdit" type="submit"><i class="fa fa-plus-circle">&nbsp;<?php echo $gsprache->add;?></i></button>
+                    </div>
+                </form>
             </div>
-            <div class="control-group">
-                <label class="control-label" for="inputRoot"><?php echo $sprache->rootserver;?></label>
-                <div class="controls">
-                    <select id="inputRoot" name="masterserver" onchange="getdetails('serverallocation.php?d=vo&id=', this.value)">
-                        <?php foreach ($table2 as $table_row2){ ?>
-                        <option value="<?php echo $table_row2['id'];?>"><?php echo $table_row2['server'];?></option>
-                        <?php } ?>
-                    </select>
-                </div>
-            </div>
-            <div class="control-group">
-                <label class="control-label" for="inputRoot"><?php echo $sprache->usage;?></label>
-                <div id="information" class="controls">
-                    <?php if (isset($table2[0]['uslots'])) { ?>
-                    <?php echo $sprache->installedslots." ".$table2[0]['uslots']."/".$table2[0]['installedslots']."/".$table2[0]['maxslots'];?><br />
-                    <?php echo $sprache->installedserver." ".$table2[0]['installedserver']."/".$table2[0]['maxserver'];?>
-                    <?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-plus-sign icon-white"></i></button>
-                </div>
-            </div>
-        </form>
+        </div>
     </div>
-</div>
+</section>
+
+<script type="text/javascript">
+
+    $("#inputUser,#inputRoot").chosen({
+        disable_search_threshold: 3,
+        inherit_select_classes: true,
+        no_results_text: '<?php echo $gsprache->chosenNoResult;?>',
+        placeholder_text_single: '<?php echo $gsprache->chosenSelect;?>',
+        placeholder_text_multiple: '<?php echo $gsprache->chosenSelect;?>',
+        width: "100%"
+    });
+
+    function loadRootDetails () {
+        $.ajax({ url: 'ajax.php?d=voicemasterusage&id=' + $("#inputRoot").val() + '&serverID=<?php echo $id;?>', cache: false } ).done(function(html) {
+            $('#rootWrapper').html(html);
+            usedPorts($('#inputIP option:selected').val());
+        });
+    }
+
+    $('#inputRoot').on('change', function() {
+        loadRootDetails();
+    });
+
+    function usedPorts (ip) {
+        $('#portWrapper').load('ajax.php?d=voicemasterportusage&ip=' + encodeURI(ip) + '&serverID=<?php echo $id;?>');
+    }
+
+    $(function(){
+        loadRootDetails();
+    });
+</script>

web/template/default/admin/admin_voiceserver_dl.tpl

@@ -1,34 +1,50 @@
-<div class="row-fluid">
-    <div class="span12">
-        <ul class="breadcrumb">
-            <li><a href="admin.php">Home</a> <span class="divider">/</span></li>
-            <li><?php echo $gsprache->voiceserver;?> <span class="divider">/</span></li>
-            <li><?php echo $gsprache->mod;?> <span class="divider">/</span></li>
-            <li class="active"><?php echo $server;?></li>
-        </ul>
-    </div>
-</div>
-<div class="row-fluid">
-    <div class="span6">
-        <form name="form" class="form-horizontal" action="admin.php?w=vo&amp;d=dl&amp;id=<?php echo $id;?>&amp;r=vo" method="post">
-            <input type="hidden" name="token" value="<?php echo token();?>">
-            <input type="hidden" name="action" value="dl">
-            <div class="control-group">
-                <label class="control-label" for="inputSafeDelete"><?php echo $gsprache->del;?></label>
-                <div class="controls">
-                    <select id="inputSafeDelete" name="safeDelete">
-                        <option value="S"><?php echo $gsprache->delSafe;?></option>
-                        <option value="A"><?php echo $gsprache->delAny;?></option>
-                        <option value="D"><?php echo $gsprache->delDB;?></option>
-                    </select>
-                </div>
+<section class="content-header">
+    <h1><?php echo $gsprache->voiceserver;?></h1>
+    <ol class="breadcrumb">
+        <li><a href="admin.php"><i class="fa fa-home"></i> Home</a></li>
+        <li><a href="admin.php?w=vo"><i class="fa fa-microphone"></i> <?php echo $gsprache->voiceserver;?></a></li>
+        <li><?php echo $gsprache->del;?></li>
+        <li class="active"><?php echo $server;?></li>
+    </ol>
+</section>
+
+<section class="content">
+    <div class="row">
+        <div class="col-md-12">
+            <div class="box box-danger">
+
+                <form role="form" action="admin.php?w=vo&amp;d=dl&amp;id=<?php echo $id;?>&amp;r=vo" onsubmit="return confirm('<?php echo $gsprache->sure;?>');" method="post">
+
+                    <input type="hidden" name="token" value="<?php echo token();?>">
+                    <input type="hidden" name="action" value="dl">
+
+                    <div class="box-body">
+
+                        <div class="form-group">
+                            <label for="inputName"><?php echo $sprache->server;?></label>
+                            <div class="controls">
+                                <input class="form-control" id="inputName" type="text" name="name" value="<?php echo $server;?>" disabled="disabled">
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputSafeDelete"><?php echo $gsprache->del;?></label>
+                            <div class="controls">
+                                <select class="form-control" id="inputSafeDelete" name="safeDelete">
+                                    <option value="S"><?php echo $gsprache->delSafe;?></option>
+                                    <option value="A"><?php echo $gsprache->delAny;?></option>
+                                    <option value="D"><?php echo $gsprache->delDB;?></option>
+                                </select>
+                            </div>
+                        </div>
+
+                    </div>
+
+                    <div class="box-footer">
+                        <button class="btn btn-danger" id="inputDelete" type="submit"><i class="fa fa-trash-o"></i>&nbsp;<?php echo $gsprache->del;?></button>
+                    </div>
+                </form>
             </div>
-            <div class="control-group">
-                <label class="control-label" for="inputEdit"></label>
-                <div class="controls">
-                    <button class="btn btn-danger pull-left" id="inputEdit" type="submit"><i class="fa fa-trash-o"></i> <?php echo $gsprache->del;?></button>
-                </div>
-            </div>
-        </form>
+        </div>
     </div>
-</div>
+</section>

web/template/default/admin/admin_voiceserver_list.tpl

@@ -1,62 +1,58 @@
-<div class="row-fluid">
-    <div class="span12">
-        <ul class="breadcrumb">
-            <li><a href="admin.php">Home</a> <span class="divider">/</span></li>
-            <li><?php echo $gsprache->voiceserver;?> <span class="divider">/</span></li>
-            <li class="active"><?php echo $gsprache->overview;?></li>
-        </ul>
+<section class="content-header">
+    <h1><?php echo $gsprache->voiceserver;?></h1>
+    <ol class="breadcrumb">
+        <li><a href="admin.php"><i class="fa fa-home"></i> Home</a></li>
+        <li><a href="admin.php?w=vo"><i class="fa fa-microphone"></i> <?php echo $gsprache->voiceserver;?></a></li>
+        <li class="active"><?php echo $gsprache->overview;?></li>
+    </ol>
+</section>
+
+<section class="content">
+
+    <?php if((!is_numeric($licenceDetails['lVo']) or $licenceDetails['lVo']>0) and ($licenceDetails['left']>0 or !is_numeric($licenceDetails['left']))) { ?>
+    <div class="row">
+        <div class="col-md-12">
+            <?php echo $gsprache->voiceserver;?> <a href="admin.php?w=vo&amp;d=ad"><span class="btn btn-success btn-sm"><i class="fa fa-plus-circle"></i> <?php echo $gsprache->add;?></span></a>
+        </div>
     </div>
-</div>
-<?php if((!is_numeric($licenceDetails['lVo']) or $licenceDetails['lVo']>0) and ($licenceDetails['left']>0 or !is_numeric($licenceDetails['left']))) { ?>
-<div class="row-fluid">
-    <div class="span6">
-        <?php echo $gsprache->voiceserver;?> <a href="admin.php?w=vo&amp;d=ad"><span class="btn btn-primary btn-mini"><i class="icon-white icon-plus-sign"></i></span></a>
+    <?php } ?>
+
+    <hr>
+
+    <div class="row">
+        <div class="col-md-12">
+            <div class="box box-primary">
+                <div class="box-body table-responsive">
+                    <table id="dataTable" class="table table-bordered table-hover">
+                        <thead>
+                        <tr>
+                            <th><?php echo $sprache->server;?></th>
+                            <th>ID</th>
+                            <th><?php echo $gsprache->status;?></th>
+                            <th>VirtualID</th>
+                            <th><?php echo $sprache->user;?></th>
+                            <th><?php echo $sprache->slots;?></th>
+                            <th><?php echo $gsprache->jobs;?></th>
+                            <th><?php echo $gsprache->action;?></th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        </tbody>
+                        <tfoot>
+                        <tr>
+                            <th><?php echo $sprache->server;?></th>
+                            <th>ID</th>
+                            <th><?php echo $gsprache->status;?></th>
+                            <th>VirtualID</th>
+                            <th><?php echo $sprache->user;?></th>
+                            <th><?php echo $sprache->slots;?></th>
+                            <th><?php echo $gsprache->jobs;?></th>
+                            <th><?php echo $gsprache->action;?></th>
+                        </tr>
+                        </tfoot>
+                    </table>
+                </div>
+            </div>
+        </div>
     </div>
-</div>
-<?php } ?>
-<hr>
-<div class="row-fluid">
-    <div class="span11 pagination">
-        <ul>
-            <li><a href="admin.php?w=vo&amp;d=md&amp;a=<?php if(!isset($amount)) echo "20"; else echo $amount; ?>&amp;p=<?php echo $zur;?>"><i class="icon-step-backward"></i></a></li>
-            <li><a href="admin.php?w=vo&amp;o=<?php echo $o;?>&amp;a=20&amp;p=<?php echo $start; ?>">20</a></li>
-            <li><a href="admin.php?w=vo&amp;o=<?php echo $o;?>&amp;a=50&amp;p=<?php echo $start; ?>">50</a></li>
-            <li><a href="admin.php?w=vo&amp;o=<?php echo $o;?>&amp;a=100&amp;p=<?php echo $start; ?>">100</a></li>
-            <li><a href="admin.php?w=vo&amp;d=md&amp;a=<?php if(!isset($amount)) echo "20"; else echo $amount; ?>&amp;p=<?php echo $vor;?>"><i class="icon-step-forward"></i></a></li>
-        </ul>
-    </div>
-</div>
-<div class="row-fluid">
-    <div class="span11">
-        <table class="table table-bordered table-hover table-striped footable">
-            <thead>
-            <tr>
-                <th data-class="expand"><a href="admin.php?w=vo&amp;d=md&amp;a=<?php if(!isset($amount)) echo "20"; else echo $amount; ?>&amp;p=<?php echo $start;?>&amp;o=<?php if ($o=='am') { echo 'dm'; } else { echo 'am'; } ?>"><?php echo $sprache->server;?></a></th>
-                <th data-hide="phone"><a href="admin.php?w=vo&amp;d=md&amp;a=<?php if(!isset($amount)) echo "20"; else echo $amount; ?>&amp;p=<?php echo $start;?>&amp;o=<?php if ($o=='di') { echo 'ai'; } else { echo 'di'; } ?>">ID</a></th>
-                <th data-hide="phone"><a href="admin.php?w=vo&amp;d=md&amp;a=<?php if(!isset($amount)) echo "20"; else echo $amount; ?>&amp;p=<?php echo $start;?>&amp;o=<?php if ($o=='dv') { echo 'av'; } else { echo 'dv'; } ?>">VirtualID</a></th>
-                <th data-hide="phone,tablet"><a href="admin.php?w=vo&amp;d=md&amp;a=<?php if(!isset($amount)) echo "20"; else echo $amount; ?>&amp;p=<?php echo $start;?>&amp;o=<?php if ($o=='at') { echo 'dt'; } else { echo 'at'; } ?>"><?php echo $gsprache->status;?></a></th>
-                <th data-hide="phone,tablet"><a href="admin.php?w=vo&amp;d=md&amp;a=<?php if(!isset($amount)) echo "20"; else echo $amount; ?>&amp;p=<?php echo $start;?>&amp;o=<?php if ($o=='aa') { echo 'da'; } else { echo 'aa'; } ?>"><?php echo $sprache->user;?></a></th>
-                <th data-hide="phone,tablet"><a href="admin.php?w=vo&amp;d=md&amp;a=<?php if(!isset($amount)) echo "20"; else echo $amount; ?>&amp;p=<?php echo $start;?>&amp;o=<?php if ($o=='an') { echo 'dn'; } else { echo 'an'; } ?>"><?php echo $sprache->user;?></a></th>
-                <th data-hide="phone,tablet"><a href="admin.php?w=vo&amp;d=md&amp;a=<?php if(!isset($amount)) echo "20"; else echo $amount; ?>&amp;p=<?php echo $start;?>&amp;o=<?php if ($o=='ap') { echo 'dp'; } else { echo 'ap'; } ?>"><?php echo $gsprache->jobs;?></a></th>
-                <th><?php echo $gsprache->del;?></th>
-                <th><?php echo $gsprache->mod;?></th>
-            </tr>
-            </thead>
-            <tbody>
-            <?php foreach ($table as $table_row) { ?>
-            <tr class="<?php if($table_row['img']=='16_ok') echo 'success'; else if($table_row['img']=='16_bad') echo 'warning'; else echo 'error';?>">
-                <td><?php echo $table_row['server'];?></td>
-                <td><?php echo $table_row['id'];?></td>
-                <td><?php echo $table_row['virtualID'];?></td>
-                <td><i class="<?php if($table_row['active']=='Y') echo 'icon-ok'; else echo 'icon-ban-circle';?>"></i></td>
-                <td><a href="switch.php?id=<?php echo $table_row['userid'];?>"><?php echo $table_row['cname'];?></a></td>
-                <td><?php echo $table_row['names'];?></td>
-                <td><?php echo $table_row['jobPending'];?></td>
-                <td><a href="admin.php?w=vo&amp;d=dl&amp;id=<?php echo $table_row['id'];?>" ><span class="btn btn-mini btn-danger"><i class="fa fa-trash-o"></i></span></a></td>
-                <td><a href="admin.php?w=vo&amp;d=md&amp;id=<?php echo $table_row['id'];?>" ><span class="btn btn-mini btn-primary"><i class="icon-white icon-edit"></i></span></a></td>
-            </tr>
-            <?php } ?>
-            </tbody>
-        </table>
-    </div>
-</div>
+</section>

web/template/default/admin/admin_voiceserver_md.tpl

@@ -1,212 +1,238 @@
-<div class="row-fluid">
-    <div class="span12">
-        <ul class="breadcrumb">
-            <li><a href="admin.php">Home</a> <span class="divider">/</span></li>
-            <li><?php echo $gsprache->voiceserver;?> <span class="divider">/</span></li>
-            <li><?php echo $gsprache->mod;?> <span class="divider">/</span></li>
-            <li class="active"><?php echo $ip;?></li>
-        </ul>
+<section class="content-header">
+    <h1><?php echo $gsprache->voiceserver;?></h1>
+    <ol class="breadcrumb">
+        <li><a href="admin.php"><i class="fa fa-home"></i> Home</a></li>
+        <li><a href="admin.php?w=vo"><i class="fa fa-microphone"></i> <?php echo $gsprache->voiceserver;?></a></li>
+        <li><?php echo $gsprache->mod;?></li>
+        <li class="active"><?php echo $server;?></li>
+    </ol>
+</section>
+
+<section class="content">
+
+    <?php if (count($errors)>0){ ?>
+    <div class="row">
+        <div class="col-md-12">
+            <div class="alert alert-danger">
+                <button type="button" class="close" data-dismiss="alert">&times;</button>
+                <h4><?php echo $gsprache->errors;?></h4>
+                <?php echo implode(', ', $errors);?>
+            </div>
+        </div>
     </div>
-</div>
-<div class="row-fluid">
-    <div class="span6">
-        <h4><?php echo $gsprache->master." ".$sprache->usage;?></h4>
-        <dl class="dl-horizontal">
-            <dt><?php echo $sprache->installedslots;?></dt>
-            <dd><?php echo $installedslots."/".$maxslots;?></dd>
-            <dt><?php echo $sprache->installedserver;?></dt>
-            <dd><?php echo $installedserver."/".$maxserver;?></dd>
-        </dl>
+    <?php }?>
+
+    <div class="row">
+        <div class="col-md-12">
+
+            <div class="box box-primary">
+
+                <form role="form" action="admin.php?w=vo&amp;d=md&amp;id=<?php echo $id;?>&amp;r=vo" onsubmit="return confirm('<?php echo $gsprache->sure;?>');" method="post">
+
+                    <input type="hidden" name="token" value="<?php echo token();?>">
+                    <input type="hidden" name="action" value="md">
+
+                    <div class="box-body">
+
+                        <div class="form-group">
+                            <label for="inputUser"><?php echo $sprache->user;?></label>
+                            <div class="controls"><input class="form-control" id="inputUser" type="text" name="userName" value="<?php echo $userName;?>" disabled="disabled"></div>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputExternalID">External ID</label>
+                            <div class="controls"><input class="form-control" id="inputExternalID" type="text" name="externalID" value=""></div>
+                        </div>
+
+                        <div class="form-group<?php if(isset($errors['rootID'])) echo ' has-error';?>">
+                            <label for="inputRoot"><?php echo $sprache->rootserver;?></label>
+                            <div class="controls">
+                                <select class="form-control chosen-select" id="inputRoot" name="rootID">
+                                    <?php foreach ($table2 as $key=>$val){ ?>
+                                    <option value="<?php echo $key;?>"><?php echo $val;?></option>
+                                    <?php } ?>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div id="rootWrapper">
+                        </div>
+
+                        <div class="form-group<?php if(isset($errors['slots'])) echo ' has-error';?>">
+                            <label for="inputSlots"><?php echo $sprache->slots;?></label>
+                            <div class="controls"><input class="form-control" id="inputSlots" type="number" name="slots" value="<?php echo $slots;?>" min="1"></div>
+                        </div>
+
+                        <div class="form-group<?php if(isset($errors['active'])) echo ' has-error';?>">
+                            <label for="inputActive"><?php echo $sprache->active;?></label>
+                            <div class="controls">
+                                <select class="form-control" id="inputActive" name="active">
+                                    <option value="Y"><?php echo $gsprache->yes;?></option>
+                                    <option value="N" <?php if($active=='N') echo 'selected="selected"';?>><?php echo $gsprache->no;?></option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputAutorestart">Auto Restart</label>
+                            <div class="controls">
+                                <select class="form-control" id="inputAutorestart" name="autoRestart">
+                                    <option value="Y"><?php echo $gsprache->yes;?></option>
+                                    <option value="N" <?php if($autoRestart=='N') echo 'selected="selected"';?>><?php echo $gsprache->no;?></option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputLend"><?php echo $gsprache->lendserver;?></label>
+                            <div class="controls">
+                                <select class="form-control" id="inputLend" name="lendserver">
+                                    <option value="N"><?php echo $gsprache->no;?></option>
+                                    <option value="Y" <?php if($lendserver=='Y') echo 'selected="selected"';?>><?php echo $gsprache->yes;?></option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputPassword"><?php echo $sprache->password;?></label>
+                            <div class="controls">
+                                <select class="form-control" id="inputPassword" name="password" onchange="toggleID('#initialPassword',this.value);">
+                                    <option value="Y"><?php echo $gsprache->yes;?></option>
+                                    <option value="N" <?php if($password=='N') echo 'selected="selected"';?>><?php echo $gsprache->no;?></option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group" id="initialPassword">
+                            <label for="inputInitial"><?php echo $sprache->initialpassword;?></label>
+                            <div class="controls"><input class="form-control" id="inputInitial" type="text" name="initialpassword" value="<?php echo $initialpassword; ?>"></div>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputForceWelcome"><?php echo $sprache->forcewelcome;?></label>
+                            <div class="controls">
+                                <select class="form-control" id="inputForceWelcome" name="forcewelcome">
+                                    <option value="Y"><?php echo $gsprache->yes;?></option>
+                                    <option value="N" <?php if($forcewelcome=='N') echo 'selected="selected"';?>><?php echo $gsprache->no;?></option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputForceBanner"><?php echo $sprache->forcebanner;?></label>
+                            <div class="controls">
+                                <select class="form-control" id="inputForceBanner" name="forcebanner">
+                                    <option value="Y"><?php echo $gsprache->yes;?></option>
+                                    <option value="N" <?php if($forcebanner=='N') echo 'selected="selected"';?>><?php echo $gsprache->no;?></option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputForceButton"><?php echo $sprache->forcebutton;?></label>
+                            <div class="controls">
+                                <select class="form-control" id="inputForceButton" name="forcebutton">
+                                    <option value="Y"><?php echo $gsprache->yes;?></option>
+                                    <option value="N" <?php if($forcebutton=='N') echo 'selected="selected"';?>><?php echo $gsprache->no;?></option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputForceServerTag"><?php echo $sprache->forceservertag;?></label>
+                            <div class="controls">
+                                <select class="form-control" id="inputForceServerTag" name="forceservertag">
+                                    <option value="Y"><?php echo $gsprache->yes;?></option>
+                                    <option value="N" <?php if($forceservertag=='N') echo 'selected="selected"';?>><?php echo $gsprache->no;?></option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputBackup"><?php echo $sprache->backup;?></label>
+                            <div class="controls">
+                                <select class="form-control" id="inputBackup" name="backup">
+                                    <option value="Y"><?php echo $gsprache->yes;?></option>
+                                    <option value="N" <?php if($backup=='N') echo 'selected="selected"';?>><?php echo $gsprache->no;?></option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+
+                            <label for="inputMaxtraffic"><?php echo $sprache->maxtraffic;?></label>
+
+                            <div class="input-group">
+                                <input class="form-control" id="inputMaxtraffic" type="number" name="maxtraffic" value="<?php echo $maxtraffic;?>">
+                                <span class="input-group-addon">MB</span>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+
+                            <label for="inputMaxTotalBandwidth"><?php echo $sprache->max_download_total_bandwidth;?></label>
+
+                            <div class="input-group">
+                                <input class="form-control" id="inputMaxTotalBandwidth" type="number" name="max_download_total_bandwidth" value="<?php echo $max_download_total_bandwidth;?>">
+                                <span class="input-group-addon">Byte</span>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+
+                            <label for="inputMaxUploadBandwidth"><?php echo $sprache->max_upload_total_bandwidth;?></label>
+
+                            <div class="input-group">
+                                <input class="form-control" id="inputMaxUploadBandwidth" type="number" name="max_upload_total_bandwidth" value="<?php echo $max_upload_total_bandwidth;?>">
+                                <span class="input-group-addon">Byte</span>
+                            </div>
+                        </div>
+
+                        <?php foreach(customColumns('T', $id) as $row){ ?>
+                        <div class="form-group">
+                            <label for="inputCustom-<?php echo $row['customID'];?>"><?php echo $row['menu'];?></label>
+                            <div class="controls"><input class="form-control" id="inputCustom-<?php echo $row['customID'];?>" type="<?php echo $row['type']=='V' ? 'text' : 'number';?>" name="<?php echo $row['name'];?>" value="" maxlength="<?php echo $row['length'];?>"></div>
+                        </div>
+                        <?php }?>
+
+                    </div>
+
+                    <div class="box-footer">
+                        <button class="btn btn-primary" id="inputEdit" type="submit"><i class="fa fa-save">&nbsp;<?php echo $gsprache->save;?></i></button>
+                    </div>
+                </form>
+            </div>
+        </div>
     </div>
-</div>
-<div class="row-fluid">
-    <div class="span6">
-        <h4><?php echo $gsprache->voiceserver." ".$gsprache->mod;?></h4>
-        <form name="form" class="form-horizontal" action="admin.php?w=vo&amp;d=md&amp;id=<?php echo $id;?>&amp;r=vo" method="post">
-            <input type="hidden" name="token" value="<?php echo token();?>">
-            <input type="hidden" name="action" value="md">
-            <div class="control-group">
-                <label class="control-label" for="inputLendServer"><?php echo $gsprache->lendserver;?></label>
-                <div class="controls">
-                    <select id="inputLendServer" name="lendserver">
-                        <option value="N"><?php echo $gsprache->no;?></option>
-                        <option value="Y" <?php if($lendserver=='Y') echo 'selected="selected"';?>><?php echo $gsprache->yes;?></option>
-                    </select>
-                </div>
-            </div>
-            <div class="control-group">
-                <label class="control-label" for="inputInitial"><?php echo $sprache->initialpassword;?></label>
-                <div class="controls"><input id="inputInitial" type="text" name="initialpassword" value="<?php echo $initialpassword; ?>" /></div>
-            </div>
-            <div class="control-group">
-                <label class="control-label" for="inputExternalID">externalID</label>
-                <div class="controls"><input id="inputExternalID" type="text" name="externalID" value="<?php echo $externalID?>" maxlength="255"></div>
-            </div>
-            <div class="control-group">
-                <label class="control-label" for="inputActive"><?php echo $sprache->active;?></label>
-                <div class="controls">
-                    <select id="inputActive" name="active">
-                        <option value="Y"><?php echo $gsprache->yes;?></option>
-                        <option value="N" <?php if($active=='N') echo 'selected="selected"';?>><?php echo $gsprache->no;?></option>
-                    </select>
-                </div>
-            </div>
-            <div class="control-group">
-                <label class="control-label" for="inputAutoRestart">Auto Restart</label>
-                <div class="controls">
-                    <select id="inputAutoRestart" name="autoRestart">
-                        <option value="Y"><?php echo $gsprache->yes;?></option>
-                        <option value="N" <?php if($autoRestart=='N') echo 'selected="selected"';?>><?php echo $gsprache->no;?></option>
-                    </select>
-                </div>
-            </div>
-            <div class="control-group">
-                <label class="control-label" for="inputPassword"><?php echo $sprache->password;?></label>
-                <div class="controls">
-                    <select id="inputPassword" name="password">
-                        <option value="Y"><?php echo $gsprache->yes;?></option>
-                        <option value="N" <?php if($password=='N') echo 'selected="selected"';?>><?php echo $gsprache->no;?></option>
-                    </select>
-                </div>
-            </div>
-            <div class="control-group">
-                <label class="control-label" for="inputFlexSlots"><?php echo $sprache->flexSlots;?></label>
-                <div class="controls">
-                    <select id="inputFlexSlots" name="flexSlots">
-                        <option value="N"><?php echo $gsprache->no;?></option>
-                        <option value="Y" <?php if($flexSlots=='Y') echo 'selected="selected"';?>><?php echo $gsprache->yes;?></option>
-                    </select>
-                </div>
-            </div>
-            <div class="control-group">
-                <label class="control-label" for="inputinputFlexSlotsFree"><?php echo $sprache->flexSlotsFree;?></label>
-                <div class="controls"><input id="inputinputFlexSlotsFree" type="text" name="flexSlotsFree" value="<?php echo $flexSlotsFree;?>"></div>
-            </div>
-            <div class="control-group">
-                <label class="control-label" for="inputinputFlexSlotsPercent"><?php echo $sprache->flexSlotsPercent;?></label>
-                <div class="controls"><input id="inputinputFlexSlotsPercent" type="text" name="flexSlotsPercent" value="<?php echo $flexSlotsPercent;?>"></div>
-            </div>
-            <div class="control-group">
-                <label class="control-label" for="inputForceWelcome"><?php echo $sprache->forcewelcome;?></label>
-                <div class="controls">
-                    <select id="inputForceWelcome" name="forcewelcome">
-                        <option value="Y"><?php echo $gsprache->yes;?></option>
-                        <option value="N" <?php if($forcewelcome=='N') echo 'selected="selected"';?>><?php echo $gsprache->no;?></option>
-                    </select>
-                </div>
-            </div>
-            <div class="control-group">
-                <label class="control-label" for="inputForceBanner"><?php echo $sprache->forcebanner;?></label>
-                <div class="controls">
-                    <select id="inputForceBanner" name="forcebanner">
-                        <option value="Y"><?php echo $gsprache->yes;?></option>
-                        <option value="N" <?php if($forcebanner=='N') echo 'selected="selected"';?>><?php echo $gsprache->no;?></option>
-                    </select>
-                </div>
-            </div>
-            <div class="control-group">
-                <label class="control-label" for="inputForceButton"><?php echo $sprache->forcebutton;?></label>
-                <div class="controls">
-                    <select id="inputForceButton" name="forcebutton">
-                        <option value="Y"><?php echo $gsprache->yes;?></option>
-                        <option value="N" <?php if($forcebutton=='N') echo 'selected="selected"';?>><?php echo $gsprache->no;?></option>
-                    </select>
-                </div>
-            </div>
-            <div class="control-group">
-                <label class="control-label" for="inputForceServerTag"><?php echo $sprache->forceservertag;?></label>
-                <div class="controls">
-                    <select id="inputForceServerTag" name="forceservertag">
-                        <option value="Y"><?php echo $gsprache->yes;?></option>
-                        <option value="N" <?php if($forceservertag=='N') echo 'selected="selected"';?>><?php echo $gsprache->no;?></option>
-                    </select>
-                </div>
-            </div>
-            <div class="control-group">
-                <label class="control-label" for="inputBackup"><?php echo $sprache->backup;?></label>
-                <div class="controls">
-                    <select id="inputBackup" name="backup">
-                        <option value="Y"><?php echo $gsprache->yes;?></option>
-                        <option value="N" <?php if($backup=='N') echo 'selected="selected"';?>><?php echo $gsprache->no;?></option>
-                    </select>
-                </div>
-            </div>
-            <div class="control-group">
-                <label class="control-label" for="inputIP"><?php echo $sprache->ip;?></label>
-                <div class="controls">
-                    <select id="inputIP" name="ip" onchange="getdetails('serverallocation.php?&ip=', this.value)">
-                        <?php foreach($ips as $listip) { ?><?php if (isip($listip,'ip4')) echo "<option";if($listip==$ip) echo ' selected';?>><?php echo $listip;?></option><?php } ?>
-                    </select>
-                </div>
-            </div>
-            <div class="control-group">
-                <label class="control-label" for="information"><?php echo $sprache->usedports;?></label>
-                <div class="controls"><?php echo $ports;?></div>
-            </div>
-            <div class="control-group">
-                <label class="control-label" for="inputPort"><?php echo $sprache->port;?></label>
-                <div class="controls"><input id="inputPort" type="text" name="port" value="<?php echo $port;?>"></div>
-            </div>
-            <div class="control-group">
-                <label class="control-label" for="inputSlots"><?php echo $sprache->slots;?></label>
-                <div class="controls"><input id="inputSlots" type="text" name="slots" value="<?php echo $slots;?>"></div>
-            </div>
-            <div class="control-group">
-                <label class="control-label" for="inputMaxtraffic"><?php echo $sprache->maxtraffic;?></label>
-                <div class="controls"><?php echo $filetraffic;?> / <input id="inputMaxtraffic" type="text" name="maxtraffic" value="<?php echo $maxtraffic;?>"> MB</div>
-            </div>
-            <div class="control-group">
-                <label class="control-label" for="inputMaxTotalBandwidth"><?php echo $sprache->max_download_total_bandwidth;?></label>
-                <div class="controls"><input id="inputMaxTotalBandwidth" type="text" name="max_download_total_bandwidth" value="<?php echo $max_download_total_bandwidth;?>"></div>
-            </div>
-            <div class="control-group">
-                <label class="control-label" for="inputMaxUploadBandwidth"><?php echo $sprache->max_upload_total_bandwidth;?></label>
-                <div class="controls"><input id="inputMaxUploadBandwidth" type="text" name="max_upload_total_bandwidth" value="<?php echo $max_upload_total_bandwidth;?>"></div>
-            </div>
-            <div class="control-group">
-                <label class="control-label" for="inputDNS"><?php echo $sprache->dns;?></label>
-                <div class="controls"><input id="inputDNS" type="text" name="dns" value="<?php echo $dns;?>"></div>
-            </div>
-            <div class="control-group">
-                <label class="control-label" for="inputName"><?php echo $sprache->name;?></label>
-                <div class="controls"><input id="inputName" type="text" name="name" value="<?php echo $name;?>"></div>
-            </div>
-            <div class="control-group">
-                <label class="control-label" for="inputWelcome"><?php echo $sprache->welcome;?></label>
-                <div class="controls"><input id="inputWelcome" type="text" name="welcome" value="<?php echo $welcome;?>"></div>
-            </div>
-            <div class="control-group">
-                <label class="control-label" for="inputHostbannerUrl"><?php echo $sprache->hostbanner_url;?></label>
-                <div class="controls"><input id="inputHostbannerUrl" type="text" name="hostbanner_url" value="<?php echo $hostbanner_url;?>"></div>
-            </div>
-            <div class="control-group">
-                <label class="control-label" for="inputHostbannerGfxUrl"><?php echo $sprache->hostbanner_gfx_url;?></label>
-                <div class="controls"><input id="inputHostbannerGfxUrl" type="text" name="hostbanner_gfx_url" value="<?php echo $hostbanner_gfx_url;?>"></div>
-            </div>
-            <div class="control-group">
-                <label class="control-label" for="inputHostButtonTooltip"><?php echo $sprache->hostbutton_tooltip;?></label>
-                <div class="controls"><input id="inputHostButtonTooltip" type="text" name="hostbutton_tooltip" value="<?php echo $hostbutton_tooltip;?>"></div>
-            </div>
-            <div class="control-group">
-                <label class="control-label" for="inputHostButtonUrl"><?php echo $sprache->hostbutton_url;?></label>
-                <div class="controls"><input id="inputHostButtonUrl" type="text" name="hostbutton_url" value="<?php echo $hostbutton_url;?>"></div>
-            </div>
-            <div class="control-group">
-                <label class="control-label" for="inputHostButtonGfxUrl"><?php echo $sprache->hostbutton_gfx_url;?></label>
-                <div class="controls"><input id="inputHostButtonGfxUrl" type="text" name="hostbutton_gfx_url" value="<?php echo $hostbutton_gfx_url;?>"></div>
-            </div>
-            <?php foreach(customColumns('T',$id) as $row){ ?>
-            <div class="control-group">
-                <label class="control-label" for="inputCustom-<?php echo $row['customID'];?>"><?php echo $row['menu'];?></label>
-                <div class="controls"><?php echo $row['input'];?></div>
-            </div>
-            <?php }?>
-            <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>
+</section>
+
+<script type="text/javascript">
+
+    $("#inputRoot").chosen({
+        disable_search_threshold: 3,
+        inherit_select_classes: true,
+        no_results_text: '<?php echo $gsprache->chosenNoResult;?>',
+        placeholder_text_single: '<?php echo $gsprache->chosenSelect;?>',
+        placeholder_text_multiple: '<?php echo $gsprache->chosenSelect;?>',
+        width: "100%"
+    });
+
+    function loadRootDetails () {
+        $.ajax({ url: 'ajax.php?d=voicemasterusage&id=' + $("#inputRoot").val() + '&serverID=<?php echo $id;?>', cache: false } ).done(function(html) {
+            $('#rootWrapper').html(html);
+            usedPorts($('#inputIP option:selected').val());
+        });
+    }
+
+    $('#inputRoot').on('change', function() {
+        loadRootDetails();
+    });
+
+    function usedPorts (ip) {
+        $('#portWrapper').load('ajax.php?d=voicemasterportusage&ip=' + encodeURI(ip) + '&serverID=<?php echo $id;?>');
+    }
+
+    $(function(){
+        loadRootDetails();
+    });
+</script>

web/template/default/ajax/ajax_admin_voice_ports.tpl

@@ -0,0 +1,11 @@
+<div class="form-group">
+    <label><?php echo $sprache->usedports;?></label>
+    <div class="controls" id="portList">
+        <?php echo $portList;?>
+    </div>
+</div>
+
+<div class="form-group">
+    <label for="inputPortMain"><?php echo $sprache->port;?></label>
+    <div class="controls"><input class="form-control" id="inputPortMain" type="number" name="port" value="<?php echo $port;?>" min="1"></div>
+</div>

web/template/default/ajax/ajax_admin_voice_server_usage.tpl

@@ -0,0 +1,91 @@
+<div class="form-group">
+    <label for="inputServerInstalled"><?php echo $sprache->installedserver;?></label>
+    <input class="form-control" id="inputServerInstalled" type="text" name="serverInstalled" value="<?php echo $installedServer.'/'.$maxServer;?>" disabled="disabled">
+</div>
+
+<div class="form-group">
+    <label for="inputSlotsInstalled"><?php echo $sprache->installedslots;?></label>
+    <input class="form-control" id="inputSlotsInstalled" type="text" name="slotsInstalled" value="<?php echo $installedSlots.'/'.$maxSlots;?>" disabled="disabled">
+</div>
+
+<div class="form-group">
+    <label for="inputIP"><?php echo $sprache->ip;?></label>
+    <div class="controls">
+        <select class="form-control" id="inputIP" name="ip" onchange="usedPorts(this.value);">
+            <?php foreach ($ips as $v){ ?>
+            <option <?php if($v==$currentIP) echo 'selected="selected"';?>><?php echo $v;?></option>
+            <?php } ?>
+        </select>
+    </div>
+</div>
+
+<div id="portWrapper"></div>
+
+
+<div class="form-group">
+    <label for="inputDNS"><?php echo $sprache->dns;?></label>
+    <div class="controls"><input class="form-control" id="inputDNS" type="text" name="dns" value="<?php echo $dns; ?>"></div>
+</div>
+
+<div class="form-group">
+    <label for="inputName"><?php echo $sprache->name;?></label>
+    <div class="controls"><input class="form-control" id="inputName" type="text" name="name" value="<?php echo $name; ?>"></div>
+</div>
+
+<div class="form-group">
+    <label for="inputWelcome"><?php echo $sprache->welcome;?></label>
+    <div class="controls"><input class="form-control" id="inputWelcome" type="text" name="welcome" value="<?php echo $welcome; ?>"></div>
+</div>
+
+<div class="form-group">
+    <label for="inputHostbannerUrl"><?php echo $sprache->hostbanner_url;?></label>
+    <div class="controls"><input class="form-control" id="inputHostbannerUrl" type="text" name="hostbanner_url" value="<?php echo $hostbanner_url; ?>"></div>
+</div>
+
+<div class="form-group">
+    <label for="inputHostbannerGFXUrl"><?php echo $sprache->hostbanner_gfx_url;?></label>
+    <div class="controls"><input class="form-control" id="inputHostbannerGFXUrl" type="text" name="hostbanner_gfx_url" value="<?php echo $hostbanner_gfx_url; ?>"></div>
+</div>
+
+<div class="form-group">
+    <label for="inputHostbuttonTooltip"><?php echo $sprache->hostbutton_tooltip;?></label>
+    <div class="controls"><input class="form-control" id="inputHostbuttonTooltip" type="text" name="hostbutton_tooltip" value="<?php echo $hostbutton_tooltip; ?>"></div>
+</div>
+
+<div class="form-group">
+    <label for="inputHostButtonUrl"><?php echo $sprache->hostbutton_url;?></label>
+    <div class="controls"><input class="form-control" id="inputHostButtonUrl" type="text" name="hostbutton_url" value="<?php echo $hostbutton_url; ?>"></div>
+</div>
+
+<div class="form-group">
+    <label for="inputHostButtonGFXUrl"><?php echo $sprache->hostbutton_gfx_url;?></label>
+    <div class="controls"><input class="form-control" id="inputHostButtonGFXUrl" type="text" name="hostbutton_gfx_url" value="<?php echo $hostbutton_gfx_url; ?>"></div>
+</div>
+
+<div class="form-group">
+    <label for="inputFlexSlots"><?php echo $sprache->flexSlots;?></label>
+    <div class="controls">
+        <select class="form-control" id="inputFlexSlots" name="flexSlots" onchange="toggleID('#flexSlotsBox', this.value)">
+            <option value="N"><?php echo $gsprache->no;?></option>
+            <option value="Y" <?php if($flexSlots=='Y') echo 'selected="selected"';?>><?php echo $gsprache->yes;?></option>
+        </select>
+    </div>
+</div>
+
+<div id="flexSlotsBox">
+    <div class="form-group">
+        <label for="inputFlexSlotsFree"><?php echo $sprache->flexSlotsFree;?></label>
+        <div class="controls"><input class="form-control" id="inputFlexSlotsFree" type="number" name="flexSlotsFree" value="<?php echo $flexSlotsFree;?>"></div>
+    </div>
+
+    <div class="form-group">
+        <label for="inputFlexSlotsPercent"><?php echo $sprache->flexSlotsPercent;?></label>
+        <div class="controls"><input class="form-control" id="inputFlexSlotsPercent" type="number" name="flexSlotsPercent" value="<?php echo $flexSlotsPercent;?>"></div>
+    </div>
+</div>
+
+<script type="text/javascript">
+    $(function(){
+        toggleID('#flexSlotsBox', $('#inputFlexSlots').val());
+    });
+</script>