From 820212587b8b3c6c7a183ef16a70fc999f896ec8 Mon Sep 17 00:00:00 2001 From: Ulrich Block Date: Sun, 25 Jan 2015 10:23:59 +0100 Subject: [PATCH] #30 new template - Cleanup - Voice master --- web/ajax.php | 7 +- web/js/default/easy-wi.js | 22 + web/stuff/admin/voice_master.php | 118 +--- web/stuff/ajax/datatable_appserver.php | 4 +- .../ajax/datatable_voicemasterserver.php | 87 +++ web/stuff/methods/class_app.php | 12 +- .../default/admin/admin_addons_add.tpl | 32 +- .../default/admin/admin_addons_md.tpl | 32 +- web/template/default/admin/admin_eac.tpl | 26 +- .../default/admin/admin_feeds_add.tpl | 26 +- web/template/default/admin/admin_feeds_md.tpl | 26 +- .../default/admin/admin_images_add.tpl | 34 +- .../default/admin/admin_images_md.tpl | 34 +- .../default/admin/admin_modules_ad.tpl | 10 +- .../default/admin/admin_modules_md.tpl | 10 +- .../default/admin/admin_roots_add.tpl | 46 +- .../default/admin/admin_roots_list.tpl | 6 +- web/template/default/admin/admin_roots_md.tpl | 54 +- web/template/default/admin/admin_settings.tpl | 26 +- .../admin/admin_settings_columns_add.tpl | 26 +- .../admin/admin_settings_columns_md.tpl | 26 +- .../default/admin/admin_settings_email.tpl | 26 +- .../default/admin/admin_settings_imprint.tpl | 26 +- .../admin/admin_social_provider_add.tpl | 8 +- .../admin/admin_social_provider_md.tpl | 8 +- web/template/default/admin/admin_user_add.tpl | 40 +- .../default/admin/admin_user_groups_add.tpl | 26 +- .../default/admin/admin_user_groups_md.tpl | 26 +- .../admin/admin_voicemasterserver_add.tpl | 532 ++++++++++-------- .../admin/admin_voicemasterserver_add2.tpl | 274 +++++---- .../admin/admin_voicemasterserver_dl.tpl | 75 ++- .../admin/admin_voicemasterserver_list.tpl | 139 ++--- .../admin/admin_voicemasterserver_md.tpl | 479 +++++++++------- .../global_gserver_file_template_add.tpl | 6 +- .../global_gserver_file_template_md.tpl | 6 +- .../user/userpanel_gserver_backup_md.tpl | 10 +- .../default/user/userpanel_gserver_fdl_es.tpl | 35 +- .../default/user/userpanel_gserver_fdl_eu.tpl | 8 +- .../default/user/userpanel_gserver_md.tpl | 26 +- .../user/userpanel_gserver_migration.tpl | 26 +- .../user/userpanel_voiceserver_ban_ad.tpl | 26 +- 41 files changed, 1037 insertions(+), 1429 deletions(-) create mode 100644 web/stuff/ajax/datatable_voicemasterserver.php diff --git a/web/ajax.php b/web/ajax.php index 992cdb94..a6e5094d 100644 --- a/web/ajax.php +++ b/web/ajax.php @@ -132,11 +132,16 @@ if ($ui->smallletters('w', 9, 'get') == 'datatable') { require_once(EASYWIDIR . '/stuff/ajax/datatable_appserver.php'); - // App server + // Admins, reseller and user } else if ($ui->smallletters('d', 4, 'get') == 'user' and isset($admin_id) and isset($reseller_id) and isset($resellerLockupID) and ($pa['user'] or $pa['user_users'] or $pa['userPassword'])) { require_once(EASYWIDIR . '/stuff/ajax/datatable_user.php'); + // Voice master + } else if ($ui->smallletters('d', 17, 'get') == 'voicemasterserver' and isset($admin_id) and isset($reseller_id) and isset($resellerLockupID) and $pa['voicemasterserver']) { + + require_once(EASYWIDIR . '/stuff/ajax/datatable_voicemasterserver.php'); + // Code wise it seems odd, but this way we can get plausible userIDs for following queries up front without having to repeat ourselves } else { diff --git a/web/js/default/easy-wi.js b/web/js/default/easy-wi.js index 9870b7dc..503ef8d9 100644 --- a/web/js/default/easy-wi.js +++ b/web/js/default/easy-wi.js @@ -106,4 +106,26 @@ function textdrop(id) { } else { document.getElementById(id).style.display = ""; } +} + +window.onDomReady = initReady; + +function initReady(fn) { + if(document.addEventListener) { + document.addEventListener("DOMContentLoaded", fn, false); + } else { + document.onreadystatechange = function() { + readyState(fn); + } + } +} + +function readyState(func) { + if(document.readyState == "interactive" || document.readyState == "complete") { + func(); + } +} + +window.onDomReady(onReady); function onReady() { + SwitchShowHideRows('init_ready'); } \ No newline at end of file diff --git a/web/stuff/admin/voice_master.php b/web/stuff/admin/voice_master.php index 826a24c1..bb9d6318 100644 --- a/web/stuff/admin/voice_master.php +++ b/web/stuff/admin/voice_master.php @@ -853,10 +853,11 @@ if ($ui->w('action',4, 'post') and !token(true)) { if (!$ui->w('action', 3, 'post')) { - $query = $sql->prepare("SELECT `ssh2ip`,`rootid`,`type` FROM `voice_masterserver` WHERE `id`=? AND `resellerid`=? LIMIT 1"); + $query = $sql->prepare("SELECT `ssh2ip`,`description`,`rootid`,`type` FROM `voice_masterserver` WHERE `id`=? AND `resellerid`=? LIMIT 1"); $query->execute(array($id, $reseller_id)); while ($row = $query->fetch(PDO::FETCH_ASSOC)) { $ip = $row['ssh2ip']; + $description = $row['description']; $type = $row['type']; if ($ip==null) { @@ -883,6 +884,7 @@ if ($ui->w('action',4, 'post') and !token(true)) { } } if ($query->rowCount() > 0) { + $query = $sql->prepare("DELETE FROM `voice_masterserver` WHERE `id`=? AND `resellerid`=? LIMIT 1"); $query->execute(array($id, $reseller_id)); $query = $sql->prepare("DELETE FROM `voice_server` WHERE `masterserver`=? AND `resellerid`=?"); @@ -901,117 +903,7 @@ if ($ui->w('action',4, 'post') and !token(true)) { } else { - $table = array(); - $o = $ui->st('o', 'get'); + configureDateTables('-1', '1, "asc"', 'ajax.php?w=datatable&d=voicemasterserver'); - if ($ui->st('o', 'get') == 'da') { - $orderby = 'm.`active` DESC'; - } else if ($ui->st('o', 'get') == 'aa') { - $orderby = 'm.`active` ASC'; - } else if ($ui->st('o', 'get') == 'pn') { - $orderby = 'm.`ssh2ip` DESC'; - } else if ($ui->st('o', 'get') == 'pn') { - $orderby = 'm.`ssh2ip` ASC'; - } else if ($ui->st('o', 'get') == 'dt') { - $orderby = 'm.`type` DESC'; - } else if ($ui->st('o', 'get') == 'at') { - $orderby = 'm.`type` ASC'; - } else if ($ui->st('o', 'get') == 'ds') { - $orderby = '`installedserver` DESC'; - } else if ($ui->st('o', 'get') == 'as') { - $orderby = '`installedserver` ASC'; - } else if ($ui->st('o', 'get') == 'dl') { - $orderby = '`installedslots` DESC'; - } else if ($ui->st('o', 'get') == 'al') { - $orderby = '`installedslots` ASC'; - } else if ($ui->st('o', 'get') == 'dd') { - $orderby = 'm.`defaultdns` DESC'; - } else if ($ui->st('o', 'get') == 'ad') { - $orderby = 'm.`defaultdns` ASC'; - } else if ($ui->st('o', 'get') == 'di') { - $orderby = 'm.`id` DESC'; - } else { - $orderby = 'm.`id` ASC'; - $o = 'ai'; - } - - $query = $sql->prepare("SELECT COUNT(`id`) AS `amount` FROM `voice_masterserver` WHERE `resellerid`=?"); - $query->execute(array($reseller_id)); - $colcount = $query->fetchColumn(); - - if ($start > $colcount) { - $start = $colcount - $amount; - if ($start < 0){ - $start = 0; - } - } - - // https://github.com/easy-wi/developer/issues/36 managedServer,managedForID added - $query = $sql->prepare("SELECT m.*,COUNT(s.`id`) AS `installedserver`,SUM(s.`slots`) AS `installedslots`,SUM(s.`usedslots`) AS `uslots` FROM `voice_masterserver` m LEFT JOIN `voice_server` s ON m.`id`=s.`masterserver` WHERE (m.`resellerid`=? OR m.`managedForID`=?) GROUP BY m.`id` ORDER BY $orderby LIMIT $start, $amount"); - $query2 = $sql->prepare("SELECT `ip` FROM `rserverdata` WHERE `id`=? AND `resellerid`=? LIMIT 1"); - $query3 = $sql->prepare("SELECT `id`,`active`,`uptime`,`queryName`,CONCAT(`ip`,':',`port`) AS `address` FROM `voice_server` WHERE `masterserver`=? AND `resellerid`=?"); - $query->execute(array($reseller_id, $admin_id)); - while ($row = $query->fetch(PDO::FETCH_ASSOC)) { - $id = $row['id']; - - if ($id != null) { - - $vs = array(); - - if ($row['type'] == 'ts3') { - $type = $sprache->ts3; - } - - if ($row['active'] == 'Y' and $rSA['down_checks'] > $row['notified']) { - $imgName = '16_ok'; - $imgAlt='ok'; - } else if ($row['active'] == 'Y' and $rSA['down_checks'] <= $row['notified']) { - $imgName = '16_error'; - $imgAlt='crashed'; - } else { - $imgName = '16_bad'; - $imgAlt='inactive'; - } - - if ($row['ssh2ip'] == null) { - $query2->execute(array($row['rootid'], $row['resellerid'])); - $ip = $query2->fetchColumn(); - } else { - $ip = $row['ssh2ip']; - } - - $defaultdns=($row['usedns'] == 'Y') ? $row['defaultdns'] : null; - $installedslots=($row['installedslots'] == null) ? 0 : $row['installedslots']; - $uslots=($row['uslots'] == null) ? 0 : $row['uslots']; - $query3->execute(array($id, $row['resellerid'])); - while ($row3 = $query3->fetch(PDO::FETCH_ASSOC)) { - - if ($row3['active'] == 'N' or $row3['uptime'] == 1) { - $vsStatus = 2; - } else if ($row3['active'] == 'Y' and $row3['uptime'] < 1) { - $vsStatus = 3; - } else { - $vsStatus = 1; - } - - $vs[] = array('id' => $row3['id'], 'address' => $row3['address'], 'name' => $row3['queryName'], 'status' => $vsStatus); - } - - $table[] = array('id' => $id,'active' => $row['active'], 'managedServer' => $row['managedServer'], 'img' => $imgName,'alt' => $imgAlt,'ip' => $ip, 'type' => $type, 'defaultdns' => $defaultdns, 'installedserver' => $row['installedserver'] . '/' . $row['maxserver'], 'installedslots' => $uslots . '/' . $installedslots . '/' . $row['maxslots'], 'server' => $vs); - } - } - $next = $start+$amount; - $vor=($colcount>$next) ? $start + $amount : $start; - $back = $start - $amount; - $zur = ($back >= 0) ? $start - $amount : $start; - $pageamount = ceil($colcount / $amount); - $pages[] = '1' : '&p=0">1'; - $i = 2; - while ($i<=$pageamount) { - $selectpage = ($i - 1) * $amount; - $pages[] = '' . $i . ''; - $i++; - } - $pages = implode(', ', $pages); - $template_file = "admin_voicemasterserver_list.tpl"; + $template_file = 'admin_voicemasterserver_list.tpl'; } \ No newline at end of file diff --git a/web/stuff/ajax/datatable_appserver.php b/web/stuff/ajax/datatable_appserver.php index 1a1d6170..2479e184 100644 --- a/web/stuff/ajax/datatable_appserver.php +++ b/web/stuff/ajax/datatable_appserver.php @@ -64,7 +64,7 @@ if ($sSearch) { $array['iTotalDisplayRecords'] = $array['iTotalRecords']; } -$orderFields = array(0 => 'r.`ip`', 1 => 'r.`id`', 2 => 'r.`active`', 3 => 'r.`os`', 4 => '`gameserver_amount`', 5 => '`gameserver_ram`', 6 => 'r.`description`'); +$orderFields = array(0 => 'r.`ip`', 1 => 'r.`id`', 2 => 'r.`active`', 3 => 'r.`description`', 4 => '`gameserver_amount`', 5 => '`gameserver_ram`'); if (isset($orderFields[$iSortCol]) and is_array($orderFields[$iSortCol])) { $orderBy = implode(' ' . $sSortDir . ', ', $orderFields[$iSortCol]) . ' ' . $sSortDir; @@ -93,5 +93,5 @@ if ($sSearch) { } while ($row = $query->fetch(PDO::FETCH_ASSOC)) { - $array['aaData'][] = array($row['ip'], $row['id'], ($row['active'] == 'Y') ? (string) $gsprache->yes : (string) $gsprache->no, ($row['os'] == 'L') ? 'Linux' : 'Windows', (int) $row['gameserver_amount'] . '/' . (int) $row['maxserver'], (int) $row['gameserver_ram'] . '/' . (int) $row['ram'], $row['description'], returnButton($template_to_use, 'ajax_admin_buttons_ri.tpl', 'ro', 'ri', $row['id'], $gsprache->reinstall) . ' ' . returnButton($template_to_use, 'ajax_admin_buttons_dl.tpl', 'ro', 'dl', $row['id'], $gsprache->del) . ' ' . returnButton($template_to_use, 'ajax_admin_buttons_md.tpl', 'ro', 'md', $row['id'], $gsprache->mod)); + $array['aaData'][] = array($row['ip'], $row['id'], ($row['active'] == 'Y') ? (string) $gsprache->yes : (string) $gsprache->no, $row['description'], (int) $row['gameserver_amount'] . '/' . (int) $row['maxserver'], (int) $row['gameserver_ram'] . '/' . (int) $row['ram'], returnButton($template_to_use, 'ajax_admin_buttons_ri.tpl', 'ro', 'ri', $row['id'], $gsprache->reinstall) . ' ' . returnButton($template_to_use, 'ajax_admin_buttons_dl.tpl', 'ro', 'dl', $row['id'], $gsprache->del) . ' ' . returnButton($template_to_use, 'ajax_admin_buttons_md.tpl', 'ro', 'md', $row['id'], $gsprache->mod)); } \ No newline at end of file diff --git a/web/stuff/ajax/datatable_voicemasterserver.php b/web/stuff/ajax/datatable_voicemasterserver.php new file mode 100644 index 00000000..27e993ac --- /dev/null +++ b/web/stuff/ajax/datatable_voicemasterserver.php @@ -0,0 +1,87 @@ + + * + * 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 . + * + * 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 . + */ + +if (!defined('AJAXINCLUDED')) { + die('Do not access directly!'); +} + +$sprache = getlanguagefile('voice', $user_language, $resellerLockupID); + +$query = $sql->prepare("SELECT COUNT(1) AS `amount` FROM `voice_masterserver` WHERE `resellerid`=? OR `managedForID`=?"); +$query->execute(array($resellerLockupID, $resellerLockupID)); + +$array['iTotalRecords'] = $query->fetchColumn(); + +if ($sSearch) { + + $query = $sql->prepare("SELECT COUNT(1) AS `amount` FROM `voice_masterserver` WHERE (`resellerid`=:reseller_id OR `managedForID`=:reseller_id) AND (`ssh2ip` LIKE :search OR `id` LIKE :search OR `description` LIKE :search)"); + $query->execute(array(':search' => '%' . $sSearch . '%', ':reseller_id' => $resellerLockupID)); + $array['iTotalDisplayRecords'] = $query->fetchColumn(); + +} else { + $array['iTotalDisplayRecords'] = $array['iTotalRecords']; +} + +$orderFields = array(0 => '`ssh2ip`', 1 => 'm.`id`', 2 => 'm.`active`', 3 => '`description`', 4 => '`installedserver`', 5 => '`installedslots`'); + +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 = 'm.`id` DESC'; +} + +if ($sSearch) { + $query = $sql->prepare("SELECT m.*,COUNT(s.`id`) AS `installedserver`,SUM(s.`slots`) AS `installedslots`,SUM(s.`usedslots`) AS `uslots` FROM `voice_masterserver` AS m LEFT JOIN `voice_server` s ON m.`id`=s.`masterserver` WHERE (m.`resellerid`=:reseller_id OR m.`managedForID`=:reseller_id) AND (m.`ssh2ip` LIKE :search OR m.`id` LIKE :search OR m.`description` LIKE :search) GROUP BY m.`id` ORDER BY $orderBy LIMIT {$iDisplayStart},{$iDisplayLength}"); + $query->execute(array(':search' => '%' . $sSearch . '%', ':reseller_id' => $resellerLockupID)); +} else { + $query = $sql->prepare("SELECT m.*,COUNT(s.`id`) AS `installedserver`,SUM(s.`slots`) AS `installedslots`,SUM(s.`usedslots`) AS `uslots` FROM `voice_masterserver` AS m LEFT JOIN `voice_server` s ON m.`id`=s.`masterserver` WHERE (m.`resellerid`=? OR m.`managedForID`=?) GROUP BY m.`id` ORDER BY $orderBy LIMIT {$iDisplayStart},{$iDisplayLength}"); + $query->execute(array($resellerLockupID, $resellerLockupID)); +} + +while ($row = $query->fetch(PDO::FETCH_ASSOC)) { + + $installedslots = ($row['installedslots'] == null) ? 0 : $row['installedslots']; + + $aaDataArray = array($row['ssh2ip'], $row['id'], ($row['active'] == 'Y') ? (string) $gsprache->yes : (string) $gsprache->no, $row['description'], $row['installedserver'] . '/' . $row['maxserver'], $installedslots . '/' . $row['maxslots']); + $aaDataArray[] = ($row['managedServer'] == 'N' or $reseller_id == 0) ? returnButton($template_to_use, 'ajax_admin_buttons_ri.tpl', 'vm', 'ri', $row['id'], $sprache->import) . ' ' . returnButton($template_to_use, 'ajax_admin_buttons_dl.tpl', 'vm', 'dl', $row['id'], $gsprache->del) . ' ' . returnButton($template_to_use, 'ajax_admin_buttons_md.tpl', 'vm', 'md', $row['id'], $gsprache->mod) : ''; + + $array['aaData'][] = $aaDataArray; +} \ No newline at end of file diff --git a/web/stuff/methods/class_app.php b/web/stuff/methods/class_app.php index ac111a46..9dddaa6c 100644 --- a/web/stuff/methods/class_app.php +++ b/web/stuff/methods/class_app.php @@ -1286,7 +1286,7 @@ class AppServer { $script .= 'FILESFOUND=(`find ' . $serverDir . ' -type f'; if (count($this->appMasterServerDetails['configBinaries']) > 0) { - $script .= ' -name "*.' . implode('" -o -name "*.', $this->appMasterServerDetails['configBinaries']) . '"'; + $script .= '\( -iname "*.' . implode('" -or -iname "*.', $this->appMasterServerDetails['configBinaries']) . '" \)'; } if (count($this->appMasterServerDetails['configFiles']) > 0) { @@ -1303,7 +1303,7 @@ class AppServer { } if ($this->appMasterServerDetails['configBadTime'] > 0 and count($this->appMasterServerDetails['configBadFiles']) > 0) { - $script .= '${IONICE}find ' . $serverDir . ' -type f -name "*.' . implode('" -o -name "*.', $this->appMasterServerDetails['configBadFiles']) . '" -mtime +' . $this->appMasterServerDetails['configBadTime'] . ' -delete' . "\n"; + $script .= '${IONICE}find ' . $serverDir . ' -type f \( -iname "*.' . implode('" -or -iname "*.', $this->appMasterServerDetails['configBadFiles']) . '" \) -mtime +' . $this->appMasterServerDetails['configBadTime'] . ' -delete' . "\n"; } if ($this->appMasterServerDetails['configDemoTime'] > 0) { @@ -1511,6 +1511,8 @@ class AppServer { $script = ''; + $script .= 'cp -sr ' . $masterAddonFolder . '* $GAMEDIR/ > /dev/null 2>&1' . "\n"; + if ($type == 'addon') { $script = 'find -type f | grep -i -E -w \'(xml|cfg|con|conf|config|gam|ini|txt|vdf|smx|sp|ext|sma|amxx|lua|json)$\' | sed \'s/\.\///g\' | while read FILE; do' . "\n"; $script .= 'FOLDER=`dirname $FILE`' . "\n"; @@ -1532,14 +1534,10 @@ class AppServer { $script .= 'if [ "$FOLDER" != "cfg/mani_admin_plugin" ]; then cp ' . $masterAddonFolder . '$FILE $GAMEDIR/$FILE; fi' . "\n"; $script .= 'elif [ ! -f $GAMEDIR/$FILE -a ! -f "$GAMEDIR/$FOLDER/disabled/$FILENAME" ]; then' . "\n"; $script .= 'cp ' . $masterAddonFolder . '$FILE $GAMEDIR/$FILE' . "\n"; - $script .= 'elif [ -a ! -f $GAMEDIR/$FILE ]; then' . "\n"; - $script .= 'cp ' . $masterAddonFolder . '$FILE $GAMEDIR/$FILE' . "\n"; $script .= 'fi' . "\n"; $script .= 'done' . "\n"; } - $script .= 'cp -sr ' . $masterAddonFolder . '* $GAMEDIR/ > /dev/null 2>&1' . "\n"; - return $script; } @@ -1660,7 +1658,7 @@ class AppServer { // Check for to be removed folders if (count($folders) > 0) { - $script .= 'find -mindepth 1 -name "' . implode('" -o -name "', $folders) . '" -print0 | xargs -0 rm -rf' . "\n"; + $script .= 'find -mindepth 1 \( -iname "' . implode('" -or -iname "', $folders) . '"\) -print0 | xargs -0 rm -rf' . "\n"; } return $script; diff --git a/web/template/default/admin/admin_addons_add.tpl b/web/template/default/admin/admin_addons_add.tpl index a6f357b9..1be53ab1 100644 --- a/web/template/default/admin/admin_addons_add.tpl +++ b/web/template/default/admin/admin_addons_add.tpl @@ -86,7 +86,7 @@ -
+
-
+
-
+
-
+
@@ -75,7 +75,7 @@
-
+
-
+
@@ -281,7 +281,7 @@
-
+
@@ -321,30 +321,6 @@
- - - \ No newline at end of file + \ No newline at end of file diff --git a/web/template/default/admin/admin_roots_list.tpl b/web/template/default/admin/admin_roots_list.tpl index d5aad594..ec5ddcdc 100644 --- a/web/template/default/admin/admin_roots_list.tpl +++ b/web/template/default/admin/admin_roots_list.tpl @@ -28,10 +28,9 @@ haupt_ip;?> ID active;?> - os;?> + desc;?> maxserver;?> Ram - desc;?> action;?> @@ -40,10 +39,9 @@ haupt_ip;?> ID active;?> - os;?> + desc;?> maxserver;?> Ram - desc;?> action;?> diff --git a/web/template/default/admin/admin_roots_md.tpl b/web/template/default/admin/admin_roots_md.tpl index b8830884..1b49a54d 100644 --- a/web/template/default/admin/admin_roots_md.tpl +++ b/web/template/default/admin/admin_roots_md.tpl @@ -62,7 +62,7 @@
-
+
+
@@ -94,20 +94,20 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -148,7 +148,7 @@
-
+
@@ -43,7 +43,7 @@
-
+
-
+
diff --git a/web/template/default/admin/admin_social_provider_md.tpl b/web/template/default/admin/admin_social_provider_md.tpl index 5c2c9184..599874b9 100644 --- a/web/template/default/admin/admin_social_provider_md.tpl +++ b/web/template/default/admin/admin_social_provider_md.tpl @@ -33,7 +33,7 @@
-
+
@@ -54,14 +54,14 @@
-
+
-
+
diff --git a/web/template/default/admin/admin_user_add.tpl b/web/template/default/admin/admin_user_add.tpl index a7ce3e19..a7a3c693 100644 --- a/web/template/default/admin/admin_user_add.tpl +++ b/web/template/default/admin/admin_user_add.tpl @@ -39,7 +39,7 @@
-
+
@@ -147,14 +147,14 @@
-
+
-
+
-
+
@@ -218,7 +218,7 @@
-
+
@@ -365,28 +365,4 @@
- - - \ No newline at end of file + \ No newline at end of file diff --git a/web/template/default/admin/admin_user_groups_add.tpl b/web/template/default/admin/admin_user_groups_add.tpl index 730c6b01..c08aec18 100644 --- a/web/template/default/admin/admin_user_groups_add.tpl +++ b/web/template/default/admin/admin_user_groups_add.tpl @@ -701,28 +701,4 @@
- - - \ No newline at end of file + \ No newline at end of file diff --git a/web/template/default/admin/admin_user_groups_md.tpl b/web/template/default/admin/admin_user_groups_md.tpl index df47b78d..4ec30d9c 100644 --- a/web/template/default/admin/admin_user_groups_md.tpl +++ b/web/template/default/admin/admin_user_groups_md.tpl @@ -704,28 +704,4 @@
- - - \ No newline at end of file + \ No newline at end of file diff --git a/web/template/default/admin/admin_voicemasterserver_add.tpl b/web/template/default/admin/admin_voicemasterserver_add.tpl index 680f006f..efc8345b 100644 --- a/web/template/default/admin/admin_voicemasterserver_add.tpl +++ b/web/template/default/admin/admin_voicemasterserver_add.tpl @@ -1,243 +1,295 @@ -
-
-
    -
  • Home /
    • -
  • voiceserver." ".$gsprache->master;?> /
    • -
  • add;?>
    • -
+
+

voiceserver.' '.$gsprache->master;?>

+
    +
  1. Home
    2. +
  2. voiceserver;?>
    3. +
  3. voiceserver.' '.$gsprache->master;?>
    4. +
  4. add;?>
    5. +
+
+ +
+ + 0){ ?> +
+
+
+ +

errors;?>

+ +
+
-
-0){ ?> -
- -

errors;?>

- -
- -
-
-
- - -
- -
+ + +
+
+
+ + + + + + +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+ + + +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
-
- -
- -
-
-
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
- -
-
-
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
- -
-
- -
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
- -
-
-
- -
-
-
- -
-
-
- -
- -
-
-
- -
- -
-
- +
-
\ No newline at end of file + \ No newline at end of file diff --git a/web/template/default/admin/admin_voicemasterserver_add2.tpl b/web/template/default/admin/admin_voicemasterserver_add2.tpl index b52585c6..d14d2ed9 100644 --- a/web/template/default/admin/admin_voicemasterserver_add2.tpl +++ b/web/template/default/admin/admin_voicemasterserver_add2.tpl @@ -1,126 +1,152 @@ -
-
-
    -
  • Home /
    • -
  • voiceserver." ".$gsprache->master;?> /
    • -
  • add.'/'.$sprache->import;?>
    • -
+
+

voiceserver.' '.$gsprache->master;?>

+
    +
  1. Home
    2. +
  2. voiceserver;?>
    3. +
  3. voiceserver.' '.$gsprache->master;?>
    4. +
  4. add.'/'.$sprache->import;?>
    5. +
+
+ +
+
+
+ +
+ + + + +
+ + 0){ ?> + $values) { ?> + + +
+ + + + + + +
+ +
+ +
+
+ +
+ +
+ +
+
+ + + +
+ +
+
+ +
+ +
+
+ + + +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ + + noVoiceServer;?> + + +
+ +
+ +
+
+
-
-
-
- - - - - 0){ ?> - $values) { ?> -
- - - - -
- -
- -
-
-
- -
- -
-
- -
- -
-
-
- -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
-
- -
-
- - noVoiceServer;?> - -
- -
- -
-
-
-
\ No newline at end of file + \ No newline at end of file diff --git a/web/template/default/admin/admin_voicemasterserver_dl.tpl b/web/template/default/admin/admin_voicemasterserver_dl.tpl index dd99bdd6..0bb9bdfb 100644 --- a/web/template/default/admin/admin_voicemasterserver_dl.tpl +++ b/web/template/default/admin/admin_voicemasterserver_dl.tpl @@ -1,32 +1,47 @@ -
-
- -
-
-
-
-
-
ssh_ip;?>
-
-
-
-
-
-
- - - -
- -
- -
+
+

voiceserver.' '.$gsprache->master;?>

+
    +
  1. Home
    2. +
  2. voiceserver;?>
    3. +
  3. voiceserver.' '.$gsprache->master;?>
    4. +
  4. del;?>
    5. +
    6. +
+
+ +
+
+
+
+ + + + + + +
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
- +
-
\ No newline at end of file + \ No newline at end of file diff --git a/web/template/default/admin/admin_voicemasterserver_list.tpl b/web/template/default/admin/admin_voicemasterserver_list.tpl index 3d7f9789..be8dfb19 100644 --- a/web/template/default/admin/admin_voicemasterserver_list.tpl +++ b/web/template/default/admin/admin_voicemasterserver_list.tpl @@ -1,88 +1,55 @@ -
-
-
    -
  • Home /
    • -
  • voiceserver." ".$gsprache->master;?> /
    • -
  • overview;?>
    • -
+
+

voiceserver.' '.$gsprache->master;?>

+
    +
  1. Home
    2. +
  2. voiceserver;?>
    3. +
  3. voiceserver.' '.$gsprache->master;?>
    4. +
  4. overview;?>
    5. +
+
+ +
+ +
+
+ voice.' '.$gsprache->master;?> add;?> +
-
-
-
- voiceserver." ".$gsprache->master;?> + +
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
ssh_ip;?>IDactive;?>description;?>installedserver;?>installedslots;?>action;?>
ssh_ip;?>IDactive;?>description;?>installedserver;?>installedslots;?>action;?>
+
+
+
-
-
-
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
&p=&o=">ssh_ip;?>&p=&o=">ID&p=&o=">type;?>&p=&o=">installedserver;?>&p=&o=">installedslots;?>&p=&o=">defaultdns;?>import;?>del;?>mod;?>
- - -
-
-
\ No newline at end of file + \ No newline at end of file diff --git a/web/template/default/admin/admin_voicemasterserver_md.tpl b/web/template/default/admin/admin_voicemasterserver_md.tpl index 3f3d111b..bcd2afef 100644 --- a/web/template/default/admin/admin_voicemasterserver_md.tpl +++ b/web/template/default/admin/admin_voicemasterserver_md.tpl @@ -1,218 +1,269 @@ -
-
- +
+

voiceserver.' '.$gsprache->master;?>

+
    +
  1. Home
    2. +
  2. voiceserver;?>
    3. +
  3. voiceserver.' '.$gsprache->master;?>
    4. +
  4. mod;?>
    5. +
    6. +
+
+ +
+ + 0){ ?> +
+
+
+ +

errors;?>

+ +
+
-
-0){ ?> -
- -

errors;?>

- -
- -
-
-
- - -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
-
- -
- -
-
-
- -
-
- -
- -
-
-
- -
-
-
- -
-
-
- -
- -
-
-
- -
-
-
- -
- + + +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+ + + +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ + + +
+ +
+
+ + + +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
- -
+
+ +
+ +
+
-
- -
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
- -
- -
-
- -
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
- -
-
-
- -
-
-
- -
-
-
- -
- -
-
- -
- -
- -
-
- +
-
\ No newline at end of file + \ No newline at end of file diff --git a/web/template/default/global_gserver_file_template_add.tpl b/web/template/default/global_gserver_file_template_add.tpl index 52414e87..75afc2a5 100644 --- a/web/template/default/global_gserver_file_template_add.tpl +++ b/web/template/default/global_gserver_file_template_add.tpl @@ -41,12 +41,12 @@ -
+
-
+
-
+
diff --git a/web/template/default/global_gserver_file_template_md.tpl b/web/template/default/global_gserver_file_template_md.tpl index aa45d13c..67aa0da9 100644 --- a/web/template/default/global_gserver_file_template_md.tpl +++ b/web/template/default/global_gserver_file_template_md.tpl @@ -40,12 +40,12 @@ -
+
-
+
-
+
diff --git a/web/template/default/user/userpanel_gserver_backup_md.tpl b/web/template/default/user/userpanel_gserver_backup_md.tpl index 0076ce50..3f62de7e 100644 --- a/web/template/default/user/userpanel_gserver_backup_md.tpl +++ b/web/template/default/user/userpanel_gserver_backup_md.tpl @@ -27,27 +27,27 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/web/template/default/user/userpanel_gserver_fdl_es.tpl b/web/template/default/user/userpanel_gserver_fdl_es.tpl index 019b8ad0..85ed24f7 100644 --- a/web/template/default/user/userpanel_gserver_fdl_es.tpl +++ b/web/template/default/user/userpanel_gserver_fdl_es.tpl @@ -50,22 +50,22 @@
-
+
-
+
-
+
-
+
@@ -83,29 +83,4 @@
- - - - \ No newline at end of file + \ No newline at end of file diff --git a/web/template/default/user/userpanel_gserver_fdl_eu.tpl b/web/template/default/user/userpanel_gserver_fdl_eu.tpl index c518a5b8..561f6818 100644 --- a/web/template/default/user/userpanel_gserver_fdl_eu.tpl +++ b/web/template/default/user/userpanel_gserver_fdl_eu.tpl @@ -46,22 +46,22 @@
-
+
-
+
-
+
-
+
diff --git a/web/template/default/user/userpanel_gserver_md.tpl b/web/template/default/user/userpanel_gserver_md.tpl index 2d148bde..ad86a46d 100644 --- a/web/template/default/user/userpanel_gserver_md.tpl +++ b/web/template/default/user/userpanel_gserver_md.tpl @@ -154,28 +154,4 @@
- - - \ No newline at end of file + \ No newline at end of file diff --git a/web/template/default/user/userpanel_gserver_migration.tpl b/web/template/default/user/userpanel_gserver_migration.tpl index d12ccd3e..8a10c40b 100644 --- a/web/template/default/user/userpanel_gserver_migration.tpl +++ b/web/template/default/user/userpanel_gserver_migration.tpl @@ -108,28 +108,4 @@
- - - \ No newline at end of file + \ No newline at end of file diff --git a/web/template/default/user/userpanel_voiceserver_ban_ad.tpl b/web/template/default/user/userpanel_voiceserver_ban_ad.tpl index 721516b7..9465d287 100644 --- a/web/template/default/user/userpanel_voiceserver_ban_ad.tpl +++ b/web/template/default/user/userpanel_voiceserver_ban_ad.tpl @@ -79,28 +79,4 @@
- - - \ No newline at end of file + \ No newline at end of file