#30 new bootsrap 3 theme

Jobs/API Block including: Jobs, API settings, External authentication, User import Small fix for admin addons
2025-02-20 11:23:28 +08:00 · 2014-09-20 21:04:33 +02:00 · 2014-09-20 21:04:33 +02:00 · 10b5684e5c
commit 10b5684e5c
parent 37a2777257
20 changed files with 512 additions and 540 deletions
--- a/web/ajax.php
+++ b/web/ajax.php
@ -78,6 +78,11 @@ if ($ui->smallletters('w', 9, 'get') == 'datatable') {

        require_once(EASYWIDIR . '/stuff/ajax/datatable_userlog.php');

+    // Job log
+    } else if ($ui->smallletters('d', 6, 'get') =='joblog' and isset($admin_id) and isset($reseller_id) and isset($resellerLockupID) and $pa['jobs']) {
+
+        require_once(EASYWIDIR . '/stuff/ajax/datatable_joblog.php');
+
    // App server
    } else if ($ui->smallletters('d', 9, 'get') =='appserver' and isset($admin_id) and isset($reseller_id) and isset($resellerLockupID) and $pa['roots']) {

--- a/web/stuff/admin/api_external_auth.php
+++ b/web/stuff/admin/api_external_auth.php
@ -41,14 +41,15 @@ if ($main != 1 or !isset($admin_id) or (isset($admin_id) and !$pa['apiSettings']
    header('Location: admin.php');
    die('No acces');
 }
+
 include(EASYWIDIR . '/stuff/keyphrasefile.php');
+
 $sprache = getlanguagefile('api',$user_language,$reseller_id);
+
 $loguserid = $admin_id;
 $logusername = getusername($admin_id);
 $logusertype = 'admin';
-$loguserid = $admin_id;
-$logusername = getusername($admin_id);
-$logusertype = 'admin';
+
 if ($reseller_id == 0) {
    $logreseller = 0;
    $logsubuser = 0;
@ -66,9 +67,13 @@ if ($reseller_id == 0) {
        $lookupID = $admin_id;
    }
 }
+
 if ($ui->w('action', 4, 'post') and !token(true)) {
+
    $template_file = $spracheResponse->token;
+
 } else if ($ui->smallletters('action',2, 'post') == 'md'){
+
    $query = $sql->prepare("SELECT COUNT(`active`) AS `amount` FROM `api_external_auth` LIMIT 1");
    $query->execute();
    $amount = $query->fetchColumn();
@ -84,13 +89,16 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
    $loguseraction="%mod% API external auth";
    $insertlog->execute();
    $template_file = $spracheResponse->table_add;
+
 } else {
+
    $active = '';
    $user = '';
    $pwd = '';
    $ssl = '';
    $domain = '';
-    $file='auth.php';
+    $file = 'auth.php';
+
    $query = $sql->prepare("SELECT `active`,`ssl`,`user`,`domain`,AES_DECRYPT(`pwd`,?) AS `decryptedPWD`,`file` FROM `api_external_auth` WHERE `resellerID`=? LIMIT 1");
    $query->execute(array($aeskey,$lookupID));
    foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
@ -101,5 +109,6 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
        $domain = $row['domain'];
        $file = $row['file'];
    }
+
    $template_file = 'admin_api_external_auth_settings.tpl';
 }
--- a/web/stuff/admin/api_import_users.php
+++ b/web/stuff/admin/api_import_users.php
@ -201,52 +201,10 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
        }
    }
 } else {
-    $table = array();
-    $query = $sql->prepare("SELECT COUNT(`importID`) AS `amount` FROM `api_import` WHERE `resellerID`=?");
-    $query->execute(array($reseller_id));
-    $colcount = $query->fetchColumn();
-    if ($start>$colcount) {
-        $start = $colcount-$amount;
-        if ($start<0) {
-            $start = 0;
-        }
-    }
-    $next = $start+$amount;
-    if ($colcount>$next) {
-        $vor = $start+$amount;
-    } else {
-        $vor = $start;
-    }
-    $back = $start - $amount;
-    if ($back>=0){
-        $zur = $start - $amount;
-    } else {
-        $zur = $start;
-    }
-    $o = $ui->st('o', 'get');
-    if ($ui->st('o', 'get') == 'da') {
-        $orderby = '`active` DESC';
-    } else if ($ui->st('o', 'get') == 'aa') {
-        $orderby = '`active` ASC';
-    } else if ($ui->st('o', 'get') == 'dd') {
-        $orderby = '`domain` DESC';
-    } else if ($ui->st('o', 'get') == 'ad') {
-        $orderby = '`domain` ASC';
-    } else if ($ui->st('o', 'get') == 'dl') {
-        $orderby = '`lastID` DESC';
-    } else if ($ui->st('o', 'get') == 'al') {
-        $orderby = '`lastID` ASC';
-    } else if ($ui->st('o', 'get') == 'dc') {
-        $orderby = '`lastCheck` DESC';
-    } else if ($ui->st('o', 'get') == 'ac') {
-        $orderby = '`lastCheck` ASC';
-    } else if ($ui->st('o', 'get') == 'di') {
-        $orderby = '`importID` DESC';
-    } else {
-        $orderby = '`importID` ASC';
-    }
-    $query = $sql->prepare("SELECT * FROM `api_import` WHERE `resellerID`=? ORDER BY $orderby LIMIT $start,$amount");
+
+    $query = $sql->prepare("SELECT * FROM `api_import` WHERE `resellerID`=?");
    $query->execute(array($reseller_id));
+
    foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
        if ($row['active'] == 'Y') {
            $imgName = '16_ok';
@ -255,36 +213,13 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
            $imgName = '16_bad';
            $imgAlt = 'Inactive';
        }
-        if ($row['ssl'] == 'Y') {
-            $ssl='https://';
-        } else {
-            $ssl='http://';
-        }
+
+        $ssl = ($row['ssl'] == 'Y') ? 'https://' : 'http://';
+
        $table[] = array('id' => $row['importID'], 'img' => $imgName,'alt' => $imgAlt,'domain' => $ssl.$row['domain']. '/' . $row['file'], 'lastID' => $row['lastID'], 'lastCheck' => $row['lastCheck'], 'active' => $row['active']);
    }
-    $pageamount = ceil($colcount / $amount);
-    $link='<a href="admin.php?w=ui&amp;o='.$o.'&amp;a=';
-    if (!isset($amount)) {
-        $link .="20";
-    } else {
-        $link .= $amount;
-    }
-    if ($start==0) {
-        $link .= '&p=0" class="bold">1</a>';
-    } else {
-        $link .= '&p=0">1</a>';
-    }
-    $pages[] = $link;
-    $i = 2;
-    while ($i<=$pageamount) {
-        $selectpage = ($i - 1) * $amount;
-        if ($start==$selectpage) {
-            $pages[] = '<a href="admin.php?w=ui&amp;o='.$o.'&amp;a=' . $amount . '&p=' . $selectpage . '" class="bold">' . $i . '</a>';
-        } else {
-            $pages[] = '<a href="admin.php?w=ui&amp;o='.$o.'&amp;a=' . $amount . '&p=' . $selectpage . '">' . $i . '</a>';
-        }
-        $i++;
-    }
-    $pages=implode(', ',$pages);
+
+    configureDateTables('-1', '2, "desc"');
+
    $template_file = 'admin_api_import_users_list.tpl';
 }
--- a/web/stuff/admin/jobs_list.php
+++ b/web/stuff/admin/jobs_list.php
@ -49,9 +49,13 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
    $template_file = $spracheResponse->token;

 } else if ($ui->w('action', 4, 'post') == 'dl' and !$ui->id('id', 19, 'get')) {
+
    $i = 0;
-    if ($ui->id('id',30, 'post')) {
-        foreach ($ui->id('id',30, 'post') as $id) {
+
+    if ($ui->id('id', 19, 'post')) {
+
+        foreach ($ui->id('id', 19, 'post') as $id) {
+
            if ($reseller_id == 0) {
                $delete = $sql->prepare("DELETE FROM `jobs` WHERE `jobID`=? LIMIT 1");
                $delete->execute(array($id));
@ -59,168 +63,16 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
                $delete = $sql->prepare("DELETE FROM `jobs` WHERE `jobID`=? AND `resellerID`=? LIMIT 1");
                $delete->execute(array($id, $reseller_id));
            }
+
            $i++;
        }
    }
-    $template_file = $i . ' ' . $gsprache->jobs.' deleted';
-} else if ($ui->id('id', 19, 'get')) {
-    if ($reseller_id == 0) {
-        $query = $sql->prepare("SELECT `text` FROM `mail_log` WHERE `id`=? LIMIT 1");
-        $query->execute(array($ui->id('id', 19, 'get')));
-    } else if ($reseller_id != 0 and $admin_id != $reseller_id) {
-        $query = $sql->prepare("SELECT `text` FROM `mail_log` WHERE `id`=? AND `resellerid`=? LIMIT 1");
-        $query->execute(array($ui->id('id', 19, 'get'), $admin_id));
-    } else {
-        $query = $sql->prepare("SELECT `text` FROM `mail_log` WHERE `id`=? AND `resellerid`=? LIMIT 1");
-        $query->execute(array($ui->id('id', 19, 'get'), $reseller_id));
-    }
-    foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
-        $text= @gzuncompress($row['text']);
-    }
-    $template_file = $text;
+
+    $template_file = $i . ' ' . $gsprache->jobs . ' deleted';

 } else {

-    $table = array();
-
-    $o = $ui->st('o', 'get');
-
-    $type = array('de' => $gsprache->dedicated, 'ds' => 'TS3 DNS', 'gs' => $gsprache->gameserver, 'wv' => $gsprache->webspace, 'my' => 'MySQL', 'us' => $gsprache->user, 'vo' => $gsprache->voiceserver, 'vs' => $gsprache->virtual);
-
-    if ($ui->st('o', 'get') == 'dn') {
-        $orderby = '`name` DESC';
-    } else if ($ui->st('o', 'get') == 'an') {
-        $orderby = '`name` ASC';
-    } else if ($ui->st('o', 'get') == 'ds') {
-        $orderby = '`status` DESC';
-    } else if ($ui->st('o', 'get') == 'as') {
-        $orderby = '`status` ASC';
-    } else if ($ui->st('o', 'get') == 'dt') {
-        $orderby = '`type` DESC';
-    } else if ($ui->st('o', 'get') == 'at') {
-        $orderby = '`type` ASC';
-    } else if ($ui->st('o', 'get') == 'da') {
-        $orderby = '`api` DESC';
-    } else if ($ui->st('o', 'get') == 'aa') {
-        $orderby = '`api` ASC';
-    } else if ($ui->st('o', 'get') == 'dc') {
-        $orderby = '`action` DESC';
-    } else if ($ui->st('o', 'get') == 'ac') {
-        $orderby = '`action` ASC';
-    } else if ($ui->st('o', 'get') == 'dd') {
-        $orderby = '`date` DESC';
-    } else if ($ui->st('o', 'get') == 'ad') {
-        $orderby = '`date` ASC';
-    } else if ($ui->st('o', 'get') == 'dn') {
-        $orderby = '`name` DESC';
-    } else if ($ui->st('o', 'get') == 'an') {
-        $orderby = '`name` ASC';
-    } else if ($ui->st('o', 'get') == 'du') {
-        $orderby = '`userID` DESC';
-    } else if ($ui->st('o', 'get') == 'au') {
-        $orderby = '`userID` ASC';
-    } else if ($ui->st('o', 'get') == 'ai') {
-        $orderby = '`jobID` ASC';
-    } else {
-        $o = 'di';
-        $orderby = '`jobID` DESC';
-    }
-
-    $where = ($reseller_id == 0) ? '' : 'WHERE `resellerID`=?';
-
-    if ($reseller_id == 0) {
-        $query = $sql->prepare("SELECT * FROM `jobs` $where ORDER BY $orderby LIMIT $start,$amount");
-        $query->execute();
-    } else {
-        $query = $sql->prepare("SELECT * FROM `jobs` $where ORDER BY $orderby LIMIT $start,$amount");
-        $query->execute(array($reseller_id));
-    }
-
-    foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
-
-        $date = ($user_language == 'de') ? date('Y-d-m H:m:s', strtotime($row['date'])) : $row['date'];
-        $api = ($row['api'] == 'A') ? $gsprache->yes : $gsprache->no;
-
-        if ($row['status'] == null or $row['status']==4) {
-            $imgName = '16_ok';
-            $imgAlt='Running';
-        } else if ($row['status']==1) {
-            $imgName = '16_bad';
-            $imgAlt='Error';
-        } else if ($row['status']==2) {
-            $imgName='16_notice';
-            $imgAlt='Canceled';
-        } else if ($row['status']==3) {
-            $imgName='16_check';
-            $imgAlt='Done';
-        }
-
-        if ($row['action'] == 'ad') {
-            $action = $gsprache->add;
-        } else if ($row['action'] == 'dl') {
-            $action = $gsprache->del;
-        } else if ($row['action'] == 'md') {
-            $action = $gsprache->mod;
-        } else if ($row['action'] == 'st') {
-            $action = 'Stop';
-        } else if ($row['action'] == 're') {
-            $action = '(Re)Start';
-        } else if ($row['action'] == 'rp') {
-            $action = 'Remove PXE from DHCP';
-        } else if ($row['action'] == 'ri') {
-            $action = '(Re)Install';
-        } else if ($row['action'] == 'rc') {
-            $action = 'Recovery Mode';
-        } else {
-            $action = '';
-        }
-
-        $table[] = array('jobID' => $row['jobID'], 'date' => $date,'name' => $row['name'], 'api' => $api,'status' => $row['status'], 'img' => $imgName,'alt' => $imgAlt,'userID' => $row['userID'], 'type' => $type[$row['type']], 'action' => $action);
-    }
-
-    $next = $start + $amount;
-
-    if ($reseller_id == 0) {
-        $query = $sql->prepare("SELECT COUNT(`jobID`) AS `amount` FROM `jobs`");
-        $query->execute();
-    } else {
-        $query = $sql->prepare("SELECT COUNT(`jobID`) AS `amount` FROM `jobs` WHERE `resellerID`=?");
-        $query->execute(array($reseller_id));
-    }
-
-    $colcount = $query->fetchColumn();
-
-    $vor = ($colcount > $next) ? $start + $amount : $start;
-    $back = $start - $amount;
-    $zur = ($back >= 0) ? $start - $amount : $start;
-    $pageamount = ceil($colcount / $amount);
-
-    $link='<a href="admin.php?w=jb&amp;o=' . $o . '&amp;a=';
-    if (!isset($amount)) {
-        $link .="20";
-    } else {
-        $link .= $amount;
-    }
-
-    if ($start==0) {
-        $link .= '&amp;p=0" class="bold">1</a>';
-    } else {
-        $link .= '&amp;p=0">1</a>';
-    }
-
-    $pages[] = $link;
-    $i = 2;
-    while ($i<=$pageamount) {
-        $selectpage = ($i - 1) * $amount;
-        if ($start==$selectpage) {
-            $pages[] = '<a href="admin.php?w=jb&amp;o=' . $o . '&amp;a=' . $amount . '&amp;p=' . $selectpage . '" class="bold">' . $i . '</a>';
-        } else {
-            $pages[] = '<a href="admin.php?w=jb&amp;o=' . $o . '&amp;a=' . $amount . '&amp;p=' . $selectpage . '">' . $i . '</a>';
-        }
-        $i++;
-    }
-
-    $pages = implode(', ', $pages);
+    configureDateTables('-1', '0, "desc"', 'ajax.php?w=datatable&d=joblog');

    $template_file = 'admin_jobs_list.tpl';
 }
--- a/web/stuff/ajax/datatable_appmasterserver.php
+++ b/web/stuff/ajax/datatable_appmasterserver.php
@ -50,7 +50,6 @@ $query->execute(array($resellerLockupID));
 $array['iTotalRecords'] = $query->fetchColumn();

 if ($sSearch) {
-
    $query = $sql->prepare("SELECT COUNT(r.`id`) AS `amount` FROM `rserverdata` AS r WHERE r.`active`='Y' AND r.`resellerid`=:resellerID AND (r.`id` LIKE :search OR r.`ip` LIKE :search OR r.`description` LIKE :search OR EXISTS(SELECT 1 FROM `rservermasterg` AS m INNER JOIN `servertypes` s ON s.`id`=m.`servertypeid` WHERE m.`serverid`=r.`id` AND s.`shorten` LIKE :search))");
    $query->execute(array(':resellerID' => $resellerLockupID, ':search' => '%' . $sSearch . '%'));
    $array['iTotalDisplayRecords'] = $query->fetchColumn();
@ -74,7 +73,7 @@ $query3 = $sql->prepare("SELECT r.`id`,s.`steamgame`,s.`updates`,d.`updates` AS
 $query4 = $sql->prepare("UPDATE `rservermasterg` SET `installing`='N',`updating`='N' WHERE `id`=? LIMIT 1");

 if ($sSearch) {
-    $query = $sql->prepare("SELECT `id`,`ip`,`description` FROM `rserverdata` AS r WHERE `active`='Y' AND `resellerid`=:resellerID AND (`id` LIKE :search OR `ip` LIKE :search OR `description` LIKE :search OR EXISTS(SELECT 1 FROM `rservermasterg` AS m INNER JOIN `servertypes` s ON s.`id`=m.`servertypeid` WHERE m.`serverid`=r.`id` AND s.`shorten` LIKE :search)) ORDER BY $orderBy LIMIT {$iDisplayStart},{$iDisplayLength}");
+    $query = $sql->prepare("SELECT `id`,`ip`,`description` FROM `rserverdata` AS r WHERE `active`='Y' AND `resellerid`=:resellerID AND (`id` LIKE :search OR `ip` LIKE :search OR `description` LIKE :search OR EXISTS (SELECT 1 FROM `rservermasterg` AS m INNER JOIN `servertypes` s ON s.`id`=m.`servertypeid` WHERE m.`serverid`=r.`id` AND s.`shorten` LIKE :search)) ORDER BY $orderBy LIMIT {$iDisplayStart},{$iDisplayLength}");
    $query->execute(array(':resellerID' => $resellerLockupID, ':search' => '%' . $sSearch . '%'));
 } else {
    $query = $sql->prepare("SELECT `id`,`ip`,`description` FROM `rserverdata` WHERE `active`='Y' AND `resellerid`=? ORDER BY $orderBy LIMIT {$iDisplayStart},{$iDisplayLength}");
--- a/web/stuff/ajax/datatable_joblog.php
+++ b/web/stuff/ajax/datatable_joblog.php
@ -0,0 +1,109 @@
+<?php
+
+/**
+ * File: datatable_joblog.php.
+ * Author: Ulrich Block
+ * Date: 20.09.14
+ * Contact: <ulrich.block@easy-wi.com>
+ *
+ * This file is part of Easy-WI.
+ *
+ * Easy-WI is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Easy-WI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Easy-WI.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Diese Datei ist Teil von Easy-WI.
+ *
+ * Easy-WI ist Freie Software: Sie koennen es unter den Bedingungen
+ * der GNU General Public License, wie von der Free Software Foundation,
+ * Version 3 der Lizenz oder (nach Ihrer Wahl) jeder spaeteren
+ * veroeffentlichten Version, weiterverbreiten und/oder modifizieren.
+ *
+ * Easy-WI wird in der Hoffnung, dass es nuetzlich sein wird, aber
+ * OHNE JEDE GEWAEHELEISTUNG, bereitgestellt; sogar ohne die implizite
+ * Gewaehrleistung der MARKTFAEHIGKEIT oder EIGNUNG FUER EINEN BESTIMMTEN ZWECK.
+ * Siehe die GNU General Public License fuer weitere Details.
+ *
+ * Sie sollten eine Kopie der GNU General Public License zusammen mit diesem
+ * Programm erhalten haben. Wenn nicht, siehe <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('AJAXINCLUDED')) {
+    die('Do not access directly!');
+}
+
+$sprache = getlanguagefile('api', $user_language, $reseller_id);
+
+$placeholders = array('de', 'ds', 'gs', 'wv', 'my', 'us', 'vo', 'vs');
+$replace = array($gsprache->dedicated, 'TS3 DNS', $gsprache->gameserver, $gsprache->webspace, 'MySQL', $gsprache->user, $gsprache->voiceserver, $gsprache->virtual);
+
+$placeholders2 = array('ad', 'dl', 'md', 'st', 're', 'rp', 'ri', 'rc');
+$replace2 = array($gsprache->add, $gsprache->del, $gsprache->mod, 'Stop', '(Re)Start', 'Remove PXE from DHCP', $gsprache->reinstall, 'Recovery Mode');
+
+if ($sSearch) {
+    $sSearch = str_replace($replace, $placeholders, str_replace($replace2, $placeholders2, $sSearch));
+}
+
+if ($reseller_id == 0) {
+    $query = $sql->prepare("SELECT COUNT(1) AS `amount` FROM `jobs`");
+    $query->execute();
+} else {
+    $query = $sql->prepare("SELECT COUNT(1) AS `amount` FROM `jobs` WHERE `resellerID`=?");
+    $query->execute(array($resellerLockupID));
+}
+$array['iTotalRecords'] = $query->fetchColumn();
+
+if ($sSearch) {
+
+    if ($reseller_id == 0) {
+        $query = $sql->prepare("SELECT COUNT(1) AS `amount` FROM `jobs` WHERE `date` LIKE :search OR `action` LIKE :search OR `name` LIKE :search OR `type` LIKE :search");
+        $query->execute(array(':search' => '%' . $sSearch . '%'));
+    } else {
+        $query = $sql->prepare("SELECT COUNT(1) AS `amount` FROM `jobs` WHERE `resellerID`=:resellerid AND (`date` LIKE :search OR `action` LIKE :search OR `name` LIKE :search OR `type` LIKE :search)");
+        $query->execute(array(':search' => '%' . $sSearch . '%', ':resellerid' => $resellerLockupID));
+    }
+
+    $array['iTotalDisplayRecords'] = $query->fetchColumn();
+} else {
+    $array['iTotalDisplayRecords'] = $array['iTotalRecords'];
+}
+
+$orderFields = array(0 => '`date`', 1 => '`action`', 2 => '`status`', 3 => '`name`', 4 => '`type`');
+
+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 = '`date` DESC';
+}
+
+if ($sSearch) {
+    if ($reseller_id == 0) {
+        $query = $sql->prepare("SELECT * FROM `jobs` WHERE `date` LIKE :search OR `action` LIKE :search OR `name` LIKE :search OR `type` LIKE :search ORDER BY {$orderBy} LIMIT {$iDisplayStart},{$iDisplayLength}");
+        $query->execute(array(':search' => '%' . $sSearch . '%'));
+    } else {
+        $query = $sql->prepare("SELECT * FROM `jobs` WHERE `resellerID`=:resellerid AND (`date` LIKE :search OR `action` LIKE :search OR `name` LIKE :search OR `type` LIKE :search) ORDER BY {$orderBy} LIMIT {$iDisplayStart},{$iDisplayLength}");
+        $query->execute(array(':search' => '%' . $sSearch . '%', ':resellerid' => $resellerLockupID));
+    }
+} else {
+    if ($reseller_id == 0) {
+        $query = $sql->prepare("SELECT * FROM `jobs` ORDER BY {$orderBy} LIMIT {$iDisplayStart},{$iDisplayLength}");
+        $query->execute();
+    } else {
+        $query = $sql->prepare("SELECT * FROM `jobs` WHERE `resellerID`=? ORDER BY {$orderBy} LIMIT {$iDisplayStart},{$iDisplayLength}");
+        $query->execute(array($resellerLockupID));
+    }
+}
+foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
+    $array['aaData'][] = array($row['date'], str_replace($placeholders2, $replace2, $row['action']), returnButton($template_to_use, 'ajax_admin_show_status.tpl', '', '', $row['status'], ''), $row['name'], str_replace($placeholders, $replace, $row['type']), returnButton($template_to_use, 'ajax_admin_form_input.tpl', '', '', $row['jobID'], ''));
+}
--- a/web/template/adminlte/admin/admin_addons_add.tpl
+++ b/web/template/adminlte/admin/admin_addons_add.tpl
@ -2,7 +2,7 @@
    <h1><?php echo $sprache->heading_addons;?></h1>
    <ol class="breadcrumb">
        <li><a href="userpanel.php"><i class="fa fa-home"></i> Home</a></li>
-        <li><a href="admin.php?w=ad"><?php echo $gsprache->addons;?></a></li>
+        <li><a href="admin.php?w=ad"><?php echo $gsprache->addon;?></a></li>
        <li class="active"><?php echo $gsprache->add;?></li>
    </ol>
 </section>
--- a/web/template/adminlte/admin/admin_addons_dl.tpl
+++ b/web/template/adminlte/admin/admin_addons_dl.tpl
@ -2,7 +2,7 @@
    <h1><?php echo $sprache->heading_addons;?></h1>
    <ol class="breadcrumb">
        <li><a href="userpanel.php"><i class="fa fa-home"></i> Home</a></li>
-        <li><a href="admin.php?w=ad"><?php echo $gsprache->addons;?></a></li>
+        <li><a href="admin.php?w=ad"><?php echo $gsprache->addon;?></a></li>
        <li><?php echo $gsprache->del;?></li>
        <li class="active"><?php echo $menudescription;?></li>
    </ol>
--- a/web/template/adminlte/admin/admin_addons_list.tpl
+++ b/web/template/adminlte/admin/admin_addons_list.tpl
@ -2,7 +2,7 @@
    <h1><?php echo $sprache->heading_addons;?></h1>
    <ol class="breadcrumb">
        <li><a href="userpanel.php"><i class="fa fa-home"></i> Home</a></li>
-        <li><?php echo $gsprache->addons;?></li>
+        <li><?php echo $gsprache->addon;?></li>
        <li class="active"><?php echo $gsprache->overview;?></li>
    </ol>
 </section>
--- a/web/template/adminlte/admin/admin_addons_md.tpl
+++ b/web/template/adminlte/admin/admin_addons_md.tpl
@ -2,7 +2,7 @@
    <h1><?php echo $sprache->heading_addons;?></h1>
    <ol class="breadcrumb">
        <li><a href="admin.php"><i class="fa fa-home"></i> Home</a></li>
-        <li><a href="admin.php?w=ad"><?php echo $sprache->heading_addons;?></a></li>
+        <li><a href="admin.php?w=ad"><?php echo $gsprache->addon;?></a></li>
        <li><?php echo $gsprache->mod;?></li>
        <li class="active"><?php echo $menudescription;?></li>
    </ol>
--- a/web/template/adminlte/admin/admin_api_external_auth_settings.tpl
+++ b/web/template/adminlte/admin/admin_api_external_auth_settings.tpl
@ -7,54 +7,60 @@
    </ol>
 </section>

-<!-- Main Content -->
-<section class="content">

-    <div class="box box-info">
-        <div class="box-body">
-            <form role="form" action="admin.php?w=aa&amp;r=aa" 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="form-group">
-                    <label for="inputActiveExternal"><?php echo $sprache->activeExternal;?></label>
-                        <select class="form-control" id="inputActiveExternal" name="active">
-                            <option value="N"><?php echo $gsprache->no;?></option>
-                            <option value="Y" <?php if ($active=="Y") echo 'selected="selected"'; ?>><?php echo $gsprache->yes;?></option>
-                        </select>
-                </div>
-                
-                <div class="form-group">
-                    <label for="inputUser"><?php echo $sprache->user;?></label>
-                        <input class="form-control" id="inputUser" type="text" name="user" value="<?php echo $user;?>" maxlength="255" required>
-                </div>
-                
-                <div class="form-group">
-                    <label for="inputPwd"><?php echo $sprache->pwd;?></label>
-                        <input class="form-control" id="inputPwd" type="text" name="pwd" value="<?php echo $pwd;?>" maxlength="100" required>
-                </div>
-                
-                <div class="form-group">
-                    <label for="inputSSL"><?php echo $sprache->ssl;?></label>
-                        <select class="form-control" id="inputSSL" name="ssl">
-                            <option value="N"><?php echo $gsprache->no;?></option>
-                            <option value="Y" <?php if ($ssl=="Y") echo 'selected="selected"'; ?>><?php echo $gsprache->yes;?></option>
-                        </select>
-                </div>
-                
-                <div class="form-group">
-                    <label for="inputDomain"><?php echo $sprache->domain;?></label>
-                        <input class="form-control" id="inputDomain" type="text" name="domain" value="<?php echo $domain;?>" required>
-                </div>
-                
-                <div class="form-group">
-                    <label for="inputFile"><?php echo $sprache->file;?></label>
-                        <input class="form-control" id="inputFile" type="text" name="file" value="<?php echo $file;?>" required>
-                </div>
-                
-                    <label for="inputEdit"></label>
+<section class="content">
+    <div class="row">
+        <div class="col-md-11">
+            <div class="box box-info">
+
+                <form role="form" action="admin.php?w=aa&amp;r=aa" 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="inputActiveExternal"><?php echo $sprache->activeExternal;?></label>
+                            <select class="form-control" id="inputActiveExternal" name="active">
+                                <option value="N"><?php echo $gsprache->no;?></option>
+                                <option value="Y" <?php if ($active=="Y") echo 'selected="selected"'; ?>><?php echo $gsprache->yes;?></option>
+                            </select>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputUser"><?php echo $sprache->user;?></label>
+                            <input class="form-control" id="inputUser" type="text" name="user" value="<?php echo $user;?>" maxlength="255" required>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputPwd"><?php echo $sprache->pwd;?></label>
+                            <input class="form-control" id="inputPwd" type="text" name="pwd" value="<?php echo $pwd;?>" maxlength="100" required>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputSSL"><?php echo $sprache->ssl;?></label>
+                            <select class="form-control" id="inputSSL" name="ssl">
+                                <option value="N"><?php echo $gsprache->no;?></option>
+                                <option value="Y" <?php if ($ssl=="Y") echo 'selected="selected"'; ?>><?php echo $gsprache->yes;?></option>
+                            </select>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputDomain"><?php echo $sprache->domain;?></label>
+                            <input class="form-control" id="inputDomain" type="text" name="domain" value="<?php echo $domain;?>" required>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputFile"><?php echo $sprache->file;?></label>
+                            <input class="form-control" id="inputFile" type="text" name="file" value="<?php echo $file;?>" required>
+                        </div>
+                    </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>
-                        <input type="hidden" name="action" value="md">
-            </form>
+                    </div>
+                </form>
+            </div>
        </div>
    </div>
 </section>
--- a/web/template/adminlte/admin/admin_api_import_users_add.tpl
+++ b/web/template/adminlte/admin/admin_api_import_users_add.tpl
@ -7,69 +7,74 @@
    </ol>
 </section>

-<!-- Main Content -->
 <section class="content">
+    <div class="row">
+        <div class="col-md-11">
+            <div class="box box-success">

-    <div class="box box-info">
-        <div class="box-body">
-            <form role="form" action="admin.php?w=ui&amp;d=ad&amp;r=ui" 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="form-group">
-                    <label for="inputActive"><?php echo $gsprache->active;?></label>
-                        <select class="form-control" id="inputActive" name="active">
-                            <option value="Y"><?php echo $gsprache->yes;?></option>
-                            <option value="N"><?php echo $gsprache->no;?></option>
-                        </select>
-                </div>
-                
-                <div class="form-group">
-                    <label for="inputSSL"><?php echo $sprache->ssl;?></label>
-                        <select class="form-control" id="inputSSL" name="ssl">
-                            <option value="Y"><?php echo $gsprache->yes;?></option>
-                            <option value="N"><?php echo $gsprache->no;?></option>
-                        </select>
-                </div>
-                
-                <div class="form-group">
-                    <label for="inputDomain"><?php echo $sprache->domain;?></label>
-                        <input class="form-control" id="inputDomain" type="text" name="domain" value="" required>
-                </div>
-                
-                <div class="form-group">
-                    <label for="inputFile"><?php echo $sprache->file;?></label>
-                        <input class="form-control" id="inputFile" type="text" name="file" value="" required>
-                </div>
-                
-                <div class="form-group">
-                    <label for="inputToken">Token</label>
-                        <input class="form-control" id="inputToken" type="text" name="accessToken" value="" required>
-                </div>
-                
-                <div class="form-group">
-                    <label for="inputFetchUpdates"><?php echo $sprache->fetchUpdates;?></label>
-                        <select class="form-control" id="inputFetchUpdates" name="fetchUpdates">
-                            <option value="Y"><?php echo $gsprache->yes;?></option>
-                            <option value="N"><?php echo $gsprache->no;?></option>
-                        </select>
-                </div>
-                
-                <div class="form-group">
-                    <label for="inputChunkSize">chunkSize</label>
-                        <input class="form-control" id="inputChunkSize" type="number" name="chunkSize" value="" maxlength="19" required>
-                </div>
-                
-                <div class="form-group">
-                    <label class="control-label" for="inputGroupID"><?php echo $sprache->groupID;?></label>
-                        <select class="form-control" id="inputGroupID" name="groupID">
-                            <?php foreach ($groupIDS as $k=>$v){ ?><option value="<?php echo $k;?>"><?php echo $v;?></option><?php } ?>
-                        </select>
-                </div>
-                
-                    <label for="inputEdit"></label>
-                        <button class="btn btn-primary" id="inputEdit" type="submit"><i class="fa fa-save">&nbsp;<?php echo $gsprache->save;?></i></button>
-            </form>
+                <form role="form" action="admin.php?w=ui&amp;d=ad&amp;r=ui" 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="inputActive"><?php echo $gsprache->active;?></label>
+                            <select class="form-control" id="inputActive" name="active">
+                                <option value="Y"><?php echo $gsprache->yes;?></option>
+                                <option value="N"><?php echo $gsprache->no;?></option>
+                            </select>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputSSL"><?php echo $sprache->ssl;?></label>
+                            <select class="form-control" id="inputSSL" name="ssl">
+                                <option value="Y"><?php echo $gsprache->yes;?></option>
+                                <option value="N"><?php echo $gsprache->no;?></option>
+                            </select>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputDomain"><?php echo $sprache->domain;?></label>
+                            <input class="form-control" id="inputDomain" type="text" name="domain" value="" required>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputFile"><?php echo $sprache->file;?></label>
+                            <input class="form-control" id="inputFile" type="text" name="file" value="" required>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputToken">Token</label>
+                            <input class="form-control" id="inputToken" type="text" name="accessToken" value="" required>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputFetchUpdates"><?php echo $sprache->fetchUpdates;?></label>
+                            <select class="form-control" id="inputFetchUpdates" name="fetchUpdates">
+                                <option value="Y"><?php echo $gsprache->yes;?></option>
+                                <option value="N"><?php echo $gsprache->no;?></option>
+                            </select>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputChunkSize">chunkSize</label>
+                            <input class="form-control" id="inputChunkSize" type="number" name="chunkSize" value="" maxlength="19" required>
+                        </div>
+
+                        <div class="form-group">
+                            <label class="control-label" for="inputGroupID"><?php echo $sprache->groupID;?></label>
+                            <select class="form-control" id="inputGroupID" name="groupID">
+                                <?php foreach ($groupIDS as $k=>$v){ ?><option value="<?php echo $k;?>"><?php echo $v;?></option><?php } ?>
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="box-footer">
+                        <button class="btn btn-success" id="inputEdit" type="submit"><i class="fa fa-plus-circle">&nbsp;<?php echo $gsprache->save;?></i></button>
+                    </div>
+                </form>
+            </div>
        </div>
    </div>
 </section>
--- a/web/template/adminlte/admin/admin_api_import_users_dl.tpl
+++ b/web/template/adminlte/admin/admin_api_import_users_dl.tpl
@ -8,20 +8,28 @@
    </ol>
 </section>

-<!-- Main Content -->
 <section class="content">
+    <div class="row">
+        <div class="col-md-11">
+            <div class="box box-danger">

-    <div class="box box-info">
-        <div class="box-body">
+                <form role="form" action="admin.php?w=ui&amp;d=dl&amp;id=<?php echo $id;?>&amp;r=ui" onsubmit="return confirm('<?php echo $gsprache->sure; ?>');" method="post">

-            <form role="form" action="admin.php?w=ui&amp;d=dl&amp;id=<?php echo $id;?>&amp;r=ui" 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="form-group">
-                    <label class="control-label" for="inputEdit"><?php echo $sprache->domain.' '.$ssl.$domain;?></label>
-                </div>
-                    <button class="btn btn-danger pull-left" id="inputEdit" type="submit"><i class="fa fa-trash-o"></i> <?php echo $gsprache->del;?></button>
-            </form>
+                    <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="inputDomain"><?php echo $sprache->domain;?></label>
+                            <input class="form-control" id="inputDomain" type="text" name="domain" value="<?php echo $ssl.$domain;?>" disabled="disabled">
+                        </div>
+                    </div>
+
+                    <div class="box-footer">
+                        <button class="btn btn-danger" id="inputEdit" type="submit"><i class="fa fa-trash-o"></i> <?php echo $gsprache->del;?></button>
+                    </div>
+                </form>
+            </div>
        </div>
    </div>
 </section>
--- a/web/template/adminlte/admin/admin_api_import_users_list.tpl
+++ b/web/template/adminlte/admin/admin_api_import_users_list.tpl
@ -7,50 +7,57 @@
    </ol>
 </section>

-<!-- Main Content -->
 <section class="content">

-	<?php echo $gsprache->userImport;?> <a href="admin.php?w=ui&amp;d=ad"><span class="btn-primary btn-sm"><i class="fa fa-plus"></i></span></a>
-    
-    <div class="box-footer clearfix">
-        <ul class="pagination pagination-sm no-margin pull-right">
-            <li><a href="admin.php?w=ui&amp;o=<?php echo $o;?>&amp;a=<?php if(!isset($amount)) echo "20"; else echo $amount; ?>&p=<?php echo $zur;?>"><i class="fa fa-step-backward"></i></a></li>
-            <li><a href="admin.php?w=ui&amp;o=<?php echo $o;?>&amp;a=20&amp;p=<?php echo $start; ?>">20</a></li>
-            <li><a href="admin.php?w=ui&amp;o=<?php echo $o;?>&amp;a=50&amp;p=<?php echo $start; ?>">50</a></li>
-            <li><a href="admin.php?w=ui&amp;o=<?php echo $o;?>&amp;a=100&amp;p=<?php echo $start; ?>">100</a></li>
-            <li><a href="admin.php?w=ui&amp;o=<?php echo $o;?>&amp;a=<?php if(!isset($amount)) echo "20"; else echo $amount; ?>&p=<?php echo $vor;?>"><i class="fa fa-step-forward"></i></a></li>
-        </ul>
+    <div class="row">
+        <div class="col-md-11">
+            <?php echo $gsprache->userImport;?> <a href="admin.php?w=ui&amp;d=ad"><span class="btn-success btn-sm"><i class="fa fa-plus-circle"></i> <?php echo $gsprache->add;?></span></a>
+        </div>
    </div>
-    <br/>
+    <hr>

-    <div class="box box-info">
-        <div class="box-body table-responsive no-padding">
-            <table class="table table-bordered table-hover footable">
-                <thead>
-                <tr>
-                    <th data-class="expand"><a href="admin.php?w=ui&amp;a=<?php if(!isset($amount)) echo "20"; else echo $amount; ?>&p=<?php echo $start;?>&amp;o=<?php if ($o=='an') { echo 'dn'; } else { echo 'an'; } ?>"><?php echo $sprache->domain;?></a></th>
-                    <th data-hide="phone,tablet"><a href="admin.php?w=ui&amp;a=<?php if(!isset($amount)) echo "20"; else echo $amount; ?>&p=<?php echo $start;?>&amp;o=<?php if ($o=='aa') { echo 'da'; } else { echo 'aa'; } ?>"><?php echo $gsprache->active;?></a></th>
-                    <th data-hide="phone,tablet"><a href="admin.php?w=ui&amp;a=<?php if(!isset($amount)) echo "20"; else echo $amount; ?>&p=<?php echo $start;?>&amp;o=<?php if ($o=='ai') { echo 'di'; } else { echo 'ai'; } ?>">ID</a></th>
-                    <th data-hide="phone,tablet"><a href="admin.php?w=ui&amp;a=<?php if(!isset($amount)) echo "20"; else echo $amount; ?>&p=<?php echo $start;?>&amp;o=<?php if ($o=='at') { echo 'dt'; } else { echo 'at'; } ?>"><?php echo $sprache->lastCheck;?></a></th>
-                    <th data-hide="phone,tablet"><a href="admin.php?w=ui&amp;a=<?php if(!isset($amount)) echo "20"; else echo $amount; ?>&p=<?php echo $start;?>&amp;o=<?php if ($o=='at') { echo 'dt'; } else { echo 'at'; } ?>"><?php echo $sprache->lastExternalID;?></a></th>
-                    <th><?php echo $gsprache->del;?></th>
-                    <th><?php echo $gsprache->mod;?></th>
-                </tr>
-                </thead>
-                <tbody>
-                <?php foreach ($table as $table_row) { ?>
-                <tr>
-                    <td><?php echo $table_row['domain'];?></td>
-                    <td><i class="<?php if($table_row['active']=='Y') echo 'fa fa-check'; else echo 'fa fa-ban';?>"></i></td>
-                    <td><?php echo $table_row['id'];?></td>
-                    <td><?php echo $table_row['lastCheck'];?></td>
-                    <td><?php echo $table_row['lastID'];?></td>
-                    <td><a href="admin.php?w=ui&amp;d=dl&amp;id=<?php echo $table_row['id'];?>"><span class="btn-sm btn-danger"><i class="fa fa-trash-o"></i></span></a></td>
-                    <td><a href="admin.php?w=ui&amp;d=md&amp;id=<?php echo $table_row['id'];?>"><span class="btn-sm btn-primary"><i class="fa fa-edit"></i></span></a></td>
-                </tr>
-                <?php } ?>
-                </tbody>
-            </table>
+    <div class="row">
+        <div class="col-md-11">
+            <div class="box box-info">
+                <div class="box-body">
+                    <div class="table-responsive">
+                        <table id="dataTable" class="table table-bordered table-striped">
+                            <thead>
+                            <tr>
+                                <th><?php echo $sprache->domain;?></th>
+                                <th><?php echo $gsprache->active;?></th>
+                                <th>ID</th>
+                                <th><?php echo $sprache->lastCheck;?></th>
+                                <th><?php echo $gsprache->action;?></th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            <?php foreach ($table as $table_row) { ?>
+                            <tr>
+                                <td><?php echo $table_row['domain'];?></td>
+                                <td><i class="<?php if($table_row['active']=='Y') echo 'fa fa-check'; else echo 'fa fa-ban';?>"></i></td>
+                                <td><?php echo $table_row['id'];?></td>
+                                <td><?php echo $table_row['lastCheck'];?></td>
+                                <td>
+                                    <a href="admin.php?w=ui&amp;d=dl&amp;id=<?php echo $table_row['id'];?>"><span class="btn-sm btn-danger"><i class="fa fa-trash-o"></i><?php echo $gsprache->del;?></span></a>
+                                    <a href="admin.php?w=ui&amp;d=md&amp;id=<?php echo $table_row['id'];?>"><span class="btn-sm btn-primary"><i class="fa fa-edit"></i><?php echo $gsprache->mod;?></span></a>
+                                </td>
+                            </tr>
+                            <?php } ?>
+                            </tbody>
+                            <tfoot>
+                            <tr>
+                                <th><?php echo $sprache->domain;?></th>
+                                <th><?php echo $gsprache->active;?></th>
+                                <th>ID</th>
+                                <th><?php echo $sprache->lastCheck;?></th>
+                                <th><?php echo $gsprache->action;?></th>
+                            </tr>
+                            </tfoot>
+                        </table>
+                    </div>
+                </div>
+            </div>
        </div>
    </div>
 </section>
--- a/web/template/adminlte/admin/admin_api_import_users_md.tpl
+++ b/web/template/adminlte/admin/admin_api_import_users_md.tpl
@ -8,74 +8,84 @@
    </ol>
 </section>

-<!-- Main Content -->
+
 <section class="content">
+    <div class="row">
+        <div class="col-md-11">
+            <div class="box box-info">

-    <div class="col-md-6">	
-        <div class="box box-info">	
-            <div class="box-body">
-                <dl>
-                    <dt><?php echo $sprache->lastExternalID;?></dt>
-                    <dd><?php echo $lastID;?></dd>
-                    <dt><?php echo $sprache->lastCheck;?></dt>
-                    <dd><?php echo $lastCheck;?></dd>
-                </dl>
-            </div>
-        </div>
-    </div>
-
-    <div class="col-md-6">	
-        <div class="box box-info">	
-            <div class="box-body">
                <form role="form" action="admin.php?w=ui&amp;d=md&amp;id=<?php echo $id;?>&amp;r=ui" 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="form-group">
-                        <label for="inputActive"><?php echo $gsprache->active;?></label>
+
+                    <div class="box-body">
+
+                        <div class="form-group">
+                            <label for="inputLastExternalID"><?php echo $sprache->lastExternalID;?></label>
+                            <input class="form-control" id="inputLastExternalID" type="text" name="lastExternalID" value="<?php echo $lastID;?>" disabled="disabled">
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputLastCheck"><?php echo $sprache->lastCheck;?></label>
+                            <input class="form-control" id="inputLastCheck" type="text" name="lastCheck" value="<?php echo $lastCheck;?>" disabled="disabled">
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputActive"><?php echo $gsprache->active;?></label>
                            <select class="form-control" id="inputActive" name="active">
                                <option value="N"><?php echo $gsprache->no;?></option>
                                <option value="Y" <?php if ($active=="Y") echo 'selected="selected"'; ?>><?php echo $gsprache->yes;?></option>
                            </select>
-                    </div>
-                    <div class="form-group">
-                        <label for="inputSSL"><?php echo $sprache->ssl;?></label>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputSSL"><?php echo $sprache->ssl;?></label>
                            <select class="form-control" id="inputSSL" name="ssl">
                                <option value="N"><?php echo $gsprache->no;?></option>
                                <option value="Y" <?php if ($ssl=="Y") echo 'selected="selected"'; ?>><?php echo $gsprache->yes;?></option>
                            </select>
-                    </div>
-                    <div class="form-group">
-                        <label for="inputDomain"><?php echo $sprache->domain;?></label>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputDomain"><?php echo $sprache->domain;?></label>
                            <input class="form-control" id="inputDomain" type="text" name="domain" value="<?php echo $domain;?>" required>
-                    </div>
-                    <div class="form-group">
-                        <label for="inputFile"><?php echo $sprache->file;?></label>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputFile"><?php echo $sprache->file;?></label>
                            <input class="form-control" id="inputFile" type="text" name="file" value="<?php echo $file;?>" required>
-                    </div>
-                    <div class="form-group">
-                        <label for="inputToken">Token</label>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputToken">Token</label>
                            <input class="form-control" id="inputToken" type="text" name="accessToken" value="<?php echo $token;?>" required>
-                    </div>
-                    <div class="form-group">
-                        <label for="inputFetchUpdates"><?php echo $sprache->fetchUpdates;?></label>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputFetchUpdates"><?php echo $sprache->fetchUpdates;?></label>
                            <select class="form-control" id="inputFetchUpdates" name="fetchUpdates">
                                <option value="N"><?php echo $gsprache->no;?></option>
                                <option value="Y" <?php if ($fetchUpdates=="Y") echo 'selected="selected"'; ?>><?php echo $gsprache->yes;?></option>
                            </select>
-                    </div>
-                    <div class="form-group">
-                        <label for="inputChunkSize">chunkSize</label>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputChunkSize">chunkSize</label>
                            <input class="form-control" id="inputChunkSize" type="number" name="chunkSize" value="<?php echo $chunkSize;?>" maxlength="19" required>
-                    </div>
-                    <div class="form-group">
-                        <label class="control-label" for="inputGroupID"><?php echo $sprache->groupID;?></label>
+                        </div>
+
+                        <div class="form-group">
+                            <label class="control-label" for="inputGroupID"><?php echo $sprache->groupID;?></label>
                            <select class="form-control" id="inputGroupID" name="groupID">
                                <?php foreach ($groupIDS as $k=>$v){ ?><option value="<?php echo $k;?>" <?php if ($groupID==$k) echo 'selected="selected"'; ?>><?php echo $v;?></option><?php } ?>
                            </select>
+                        </div>
+                    </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>
-        
-                        <label for="inputEdit"></label>
-                            <button class="btn btn-primary btn-sm" id="inputEdit" type="submit"><i class="fa fa-save">&nbsp;<?php echo $gsprache->save;?></i></button>
                </form>
            </div>
        </div>
--- a/web/template/adminlte/admin/admin_api_settings.tpl
+++ b/web/template/adminlte/admin/admin_api_settings.tpl
@ -6,49 +6,77 @@
    </ol>
 </section>

-<!-- Main Content -->
 <section class="content">
+    <div class="row">
+        <div class="col-md-11">
+            <div class="box box-info">

-    <div class="box box-info">	
-        <div class="box-body">
-            <form role="form" action="admin.php?w=ap&amp;r=ap" onsubmit="return confirm('<?php echo $gsprache->sure; ?>');" method="post">
-                <input type="hidden" name="token" value="<?php echo token();?>">
-                <div class="form-group">
-                    <label for="inputActive"><?php echo $sprache->active;?></label>
-                        <select class="form-control" id="inputActive" name="active">
-                            <option value="N"><?php echo $gsprache->no;?></option>
-                            <option value="Y" <?php if ($active=="Y") echo 'selected="selected"'; ?>><?php echo $gsprache->yes;?></option>
-                        </select>
-                </div>
-                
-                <div class="form-group">
-                    <label for="inputUser"><?php echo $sprache->user;?></label>
-                        <input class="form-control" id="inputUser" type="text" name="user" value="<?php echo $user?>" maxlength="255" required>
-                </div>
-                
-                <div class="form-group">
-                    <label for="inputPwd"><?php echo $sprache->pwd;?></label>
-                        <input class="form-control" id="inputPwd" type="text" name="pwd" value="<?php echo $pwd?>" maxlength="255" required>
-                </div>
-                
-                <div class="form-group">
-                    <label for="inputIPs"><?php echo $sprache->ipAdd;?></label>
-                        <span class="btn-sm btn-primary" onclick="AddInput(this.form,'ips','ip[]')"><i class="fa fa-plus"></i></span>
-                </div>
-                
-                <div id="ips">
-                    <?php foreach($ips as $ip) { ?>
-                    <div id="<?php echo $ip?>" class="control-group">
-                        <label for="inputIPs-<?php echo $ip?>">IP</label>
-                            <input id="inputIPs-<?php echo $ip?>" type="text" name="ip[]" value="<?php echo $ip?>" maxlength="15" required> <span class="btn-sm btn-danger" onclick="Remove('<?php echo $ip?>')"><i class="fa fa-trash-o"></i></span>
+                <form role="form" action="admin.php?w=ap&amp;r=ap" 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="inputActive"><?php echo $sprache->active;?></label>
+                            <select class="form-control" id="inputActive" name="active">
+                                <option value="N"><?php echo $gsprache->no;?></option>
+                                <option value="Y" <?php if ($active=="Y") echo 'selected="selected"'; ?>><?php echo $gsprache->yes;?></option>
+                            </select>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputUser"><?php echo $sprache->user;?></label>
+                            <input class="form-control" id="inputUser" type="text" name="user" value="<?php echo $user?>" maxlength="255" required>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputPwd"><?php echo $sprache->pwd;?></label>
+                            <input class="form-control" id="inputPwd" type="text" name="pwd" value="<?php echo $pwd?>" maxlength="255" required>
+                        </div>
+
+                        <div id="ips">
+                            <?php foreach($ips as $ip) { ?>
+                            <div id="<?php echo $ip?>">
+                                <div class="input-group">
+                                    <span class="input-group-addon">IP</span>
+                                    <input class="form-control" id="inputIPs-<?php echo $ip?>" type="text" name="ip[]" value="<?php echo $ip?>" maxlength="15" required>
+                                    <span class="input-group-btn">
+                                        <button class="btn btn-danger" type="button" onclick="Remove('<?php echo $ip?>')"><i class="fa fa-trash-o"></i></button>
+                                    </span>
+                                </div>
+                                <br>
+                            </div>
+                            <?php } ?>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="inputIPs"></label>
+                            <button class="btn btn-sm btn-success" type="button" onclick="AddInput(this.form,'ips','ip[]')"><i class="fa fa-plus-circle"> <?php echo $sprache->ipAdd;?></i></button>
+                        </div>
                    </div>
-                    <?php } ?>
-                </div>
-    
-                    <label for="inputEdit"></label>
+
+                    <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>
-                        <input type="hidden" name="action" value="md">
-            </form>
+                    </div>
+                </form>
+            </div>
        </div>
    </div>
-</section>
+</section>
+
+<script type="text/javascript">
+    function AddInput (Form,Target,Name) {
+        var theTarget = document.getElementById(Target);
+        var IPCount = document.getElementsByName(Name).length;
+        var newDiv = document.createElement('div');
+        IPCount++;
+        newDiv.setAttribute('id',IPCount);
+        newDiv.innerHTML += '<div id="'+IPCount+'"><div class="input-group"><span class="input-group-addon">IP</span><input class="form-control" id="inputIPs-'+ IPCount +'" type="text" name="ip[]" value="" maxlength="15" required> <span class="input-group-btn"><button class="btn btn-danger" type="button" onclick="Remove('+ IPCount +')"><i class="fa fa-trash-o"></i></span></div><br></div>';
+        theTarget.appendChild(newDiv);
+    }
+    function Remove (ID) {
+        var toBeRemoved = document.getElementById(ID);
+        toBeRemoved.parentNode.removeChild(toBeRemoved);
+    }
+</script>
--- a/web/template/adminlte/admin/admin_jobs_list.tpl
+++ b/web/template/adminlte/admin/admin_jobs_list.tpl
@ -6,64 +6,54 @@
    </ol>
 </section>

-<!-- Main Content -->
 <section class="content">
+    <div class="row">
+        <div class="col-md-11">
+            <div class="box box-info">
+                <form method="post" action="admin.php?w=jb&amp;r=jb" onsubmit="return confirm('<?php echo $gsprache->sure;?>');">

-    <div class="box-footer clearfix">
-        <ul class="pagination pagination-sm no-margin pull-right">
-            <li><a href="admin.php?w=ib&amp;a=<?php if(!isset($amount)) echo "20"; else echo $amount; ?>&amp;p=<?php echo $zur; ?>"><i class="fa fa-step-backward"></i></a></li>
-            <li><a href="admin.php?w=ib&amp;o=<?php echo $o; ?>&amp;a=20&amp;p=<?php echo $start; ?>">20</a></li>
-            <li><a href="admin.php?w=ib&amp;a=50&amp;o=<?php echo $o; ?>&amp;p=<?php echo $start; ?>">50</a></li>
-            <li><a href="admin.php?w=ib&amp;a=100&amp;o=<?php echo $o; ?>&amp;p=<?php echo $start; ?>">100</a></li>
-            <li><a href="admin.php?w=ib&amp;a=<?php if(!isset($amount)) echo "20"; else echo $amount; ?>&amp;p=<?php echo $vor; ?>"><i class="fa fa-step-forward"></i></a></li>
-        </ul>
-    </div>
-    <br/>
-    <div class="box box-info">
-        <div class="box-body table-responsive no-padding">
-        <form method="post" action="admin.php?w=jb&amp;r=jb" onsubmit="return confirm('<?php echo $gsprache->sure;?>');">
-            <input type="hidden" name="token" value="<?php echo token();?>">
-            <input type="hidden" name="action" value="dl">
-                <table class="table table-bordered table-hover">
-                    <thead>
-                    <tr>
-                        <th data-class="expand"><a href="admin.php?w=jb&amp;a=<?php if(!isset($amount)) echo "20"; else echo $amount; ?>&amp;o=<?php if ($o=='ac') { echo 'dc'; } else { echo 'ac'; } ?>"><?php echo $sprache->action;?></a></th>
-                        <th><a href="admin.php?w=jb&amp;a=<?php if(!isset($amount)) echo "20"; else echo $amount; ?>&amp;o=<?php if ($o=='as') { echo 'ds'; } else { echo 'as'; } ?>"><?php echo $sprache->status;?></a></th>
-                        <th data-hide="phone"><a href="admin.php?w=jb&amp;a=<?php if(!isset($amount)) echo "20"; else echo $amount; ?>&amp;o=<?php if ($o=='ai') { echo 'di'; } else { echo 'ai'; } ?>">jobID:</a></th>
-                        <th data-hide="phone,tablet"><a href="admin.php?w=jb&amp;a=<?php if(!isset($amount)) echo "20"; else echo $amount; ?>&amp;o=<?php if ($o=='at') { echo 'dt'; } else { echo 'at'; } ?>"><?php echo $sprache->type;?></a></th>
-                        <th data-hide="phone,tablet"><a href="admin.php?w=jb&amp;a=<?php if(!isset($amount)) echo "20"; else echo $amount; ?>&amp;o=<?php if ($o=='au') { echo 'du'; } else { echo 'au'; } ?>">userID</a></th>
-                        <th data-hide="phone,tablet"><a href="admin.php?w=jb&amp;a=<?php if(!isset($amount)) echo "20"; else echo $amount; ?>&amp;o=<?php if ($o=='an') { echo 'dn'; } else { echo 'an'; } ?>"><?php echo $sprache->name;?></a></th>
-                        <th data-hide="phone,tablet"><a href="admin.php?w=jb&amp;a=<?php if(!isset($amount)) echo "20"; else echo $amount; ?>&amp;o=<?php if ($o=='ad') { echo 'dd'; } else { echo 'ad'; } ?>"><?php echo $sprache->date;?></a></th>
-                        <th data-hide="phone,tablet"><a href="admin.php?w=jb&amp;a=<?php if(!isset($amount)) echo "20"; else echo $amount; ?>&amp;o=<?php if ($o=='aa') { echo 'da'; } else { echo 'aa'; } ?>"><?php echo $gsprache->api;?></a></th>
-                        <th><?php echo $gsprache->del;?></th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <?php foreach ($table as $table_row) { ?>
-                    <tr class="<?php if($table_row['status']==null) echo 'info'; else if($table_row['status']==1) echo 'danger'; else if($table_row['status']==2) echo 'warning'; else echo 'success';?>">
-                        <td><?php echo $table_row['action']; ?></td>
-                        <td><i class="<?php if($table_row['status']==null) echo 'fa fa-refresh'; else if($table_row['status']==1) echo 'fa fa-ban'; else if($table_row['status']==2) echo 'fa fa-warning'; else echo 'fa fa-ok';?>"></i></td>
-                        <td><?php echo $table_row['jobID']; ?></td>
-                        <td><?php echo $table_row['type']; ?></td>
-                        <td><?php echo $table_row['userID']; ?></td>
-                        <td><?php echo $table_row['name']; ?></td>
-                        <td><?php echo $table_row['date']; ?></td>
-                        <td><?php echo $table_row['api']; ?></td>
-                        <td><input type="checkbox" name="id[]" value="<?php echo $table_row['jobID'];?>"></td>
-                    </tr>
-                    <?php } ?>
-                    </tbody>
-                </table>
-                <div class="form-group">
-                	<div class="checkbox">
-                    <label class="checkbox inline" for="checkAll"><?php echo $sprache->all;?></label>
-                        <input id="checkAll" type="checkbox"  value="yes" onclick="checkall(this.checked,'id[]')">
-                	</div>
-                </div>
+                    <input type="hidden" name="token" value="<?php echo token();?>">
+                    <input type="hidden" name="action" value="dl">

-    </div>
-</div>
-                    <label class="control-label" for="inputDelete"></label>
+                    <div class="box-body table-responsive">
+                        <div class="">
+                            <table id="dataTable" class="table table-bordered table-hover">
+                                <thead>
+                                <tr>
+                                    <th><?php echo $sprache->date;?></a></th>
+                                    <th><?php echo $sprache->action;?></a></th>
+                                    <th><?php echo $sprache->status;?></a></th>
+                                    <th><?php echo $sprache->name;?></a></th>
+                                    <th><?php echo $sprache->type;?></a></th>
+                                    <th><?php echo $gsprache->del;?></th>
+                                </tr>
+                                </thead>
+                                <tfoot>
+                                <tr>
+                                    <th><?php echo $sprache->date;?></a></th>
+                                    <th><?php echo $sprache->action;?></a></th>
+                                    <th><?php echo $sprache->status;?></a></th>
+                                    <th><?php echo $sprache->name;?></a></th>
+                                    <th><?php echo $sprache->type;?></a></th>
+                                    <th><?php echo $gsprache->del;?></th>
+                                </tr>
+                                </tfoot>
+                            </table>
+                        </div>
+
+                        <div class="checkbox">
+                            <label>
+                                <input id="checkAll" type="checkbox"  value="yes" onclick="checkall(this.checked,'id[]')">
+                                <?php echo $sprache->all;?>
+                            </label>
+                        </div>
+                    </div>
+
+                    <div class="box-footer">
                        <button class="btn btn-danger" id="inputDelete" type="submit"><i class="fa fa-trash-o"></i> <?php echo $gsprache->del;?></button>
-        </form>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
 </section>
--- a/web/template/adminlte/ajax/ajax_admin_form_input.tpl
+++ b/web/template/adminlte/ajax/ajax_admin_form_input.tpl
@ -0,0 +1 @@
+<input type="checkbox" name="id[]" value="<?php echo $id;?>">
--- a/web/template/adminlte/ajax/ajax_admin_show_status.tpl
+++ b/web/template/adminlte/ajax/ajax_admin_show_status.tpl
@ -0,0 +1,9 @@
+<?php if($id==null){ ?>
+<span class="btn btn-primary btn-sm"><i class="fa fa-refresh"></i></span>
+<?php }else if($id==1){ ?>
+<span class="btn btn-danger btn-sm"><i class="fa fa-ban"></i></span>
+<?php }else if($id==2){ ?>
+<span class="btn btn-warning btn-sm"><i class="fa fa-exclamation-triangle"></i></span>
+<?php }else{ ?>
+<span class="btn btn-success btn-sm"><i class="fa fa-check-circle"></i></span>
+<?php } ?>
--- a/web/template/default/user/userpanel_tickets_list.tpl
+++ b/web/template/default/user/userpanel_tickets_list.tpl
@ -6,7 +6,6 @@
    </ol>
 </section>

-<!-- Main Content -->
 <section class="content">
    <div class="row">
        <div class="col-md-11">
				`@ -0,0 +1 @@`
				`<input type="checkbox" name="id[]" value="<?php echo $id;?>">`