From c875508687dcebf4051ef151c6a1d4b60241acff Mon Sep 17 00:00:00 2001
From: "andre.peters" <andre.peters@servercow.de>
Date: Mon, 11 Dec 2017 09:43:43 +0100
Subject: [PATCH] [Web] Remove logs from docker functions, fix debug syntax

---
 data/web/debug.php                    |  4 ++--
 data/web/inc/functions.docker.inc.php | 27 ---------------------------
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/data/web/debug.php b/data/web/debug.php
index 289aa84a..0723ba6a 100644
--- a/data/web/debug.php
+++ b/data/web/debug.php
@@ -115,7 +115,6 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
               'fail2ban-mailcow',
               'clamd-mailcow'
             );
-            }
             foreach ($container_array as $container) {
                 $container_stats = docker($container, 'info');
                 ?>
@@ -321,7 +320,8 @@ echo "var log_pagination_size = '". $LOG_PAGINATION_SIZE . "';\n";
 <script src="js/debug.js"></script>
 <?php
 require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/footer.inc.php';
-} else {
+}
+else {
 	header('Location: /');
 	exit();
 }
diff --git a/data/web/inc/functions.docker.inc.php b/data/web/inc/functions.docker.inc.php
index 7cd5ed4e..fed2e1d1 100644
--- a/data/web/inc/functions.docker.inc.php
+++ b/data/web/inc/functions.docker.inc.php
@@ -59,33 +59,6 @@ function docker($service_name, $action, $attr1 = null, $attr2 = null, $extra_hea
         return false;
       }
     break;
-    case 'logs':
-      $container_id = docker($service_name, 'get_id');
-      if (ctype_xdigit($container_id)) {
-        $lines = (empty($attr1) || !is_numeric($attr1)) ? 100 : $attr1;
-        curl_setopt($curl, CURLOPT_URL, 'http://dockerapi:8080/containers/' . $container_id . '/logs/' . $lines);
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($curl, CURLOPT_POST, 0);
-        $response = curl_exec($curl);
-        if ($response === false) {
-          $err = curl_error($curl);
-          curl_close($curl);
-          return $err;
-        }
-        else {
-          curl_close($curl);
-          if (empty($response)) {
-            return true;
-          }
-          else {
-            return json_decode($response, true);
-          }
-        }
-      }
-      else {
-        return false;
-      }
-    break;
     case 'post':
       if (!empty($attr1)) {
         $container_id = docker($service_name, 'get_id');