Merge branch 'master' into 'devbyspi'

# Conflicts:
#   Layout/default/Device/Detail.php
#   Layout/default/Device/Form.php
#   Layout/default/Device/Index.php
#   application/Device/DeviceController.php
#   application/Device/DeviceModel.php
#   public/assets/css/datatables-std.css

application/Device/DeviceController.php

@@ -95,7 +95,7 @@ class DeviceController extends mfBaseController
         $data = [];
         $data['name'] = trim($r->name);
         $data['devicetype_id'] = $r->devicetype_id;
-        if (trim($r->pop_id) == "0") {
+        if (trim($r->pop_id)=="0") {
             $data['pop_id'] = NULL;
         } else {
             $data['pop_id'] = $r->pop_id;
@@ -181,6 +181,32 @@ class DeviceController extends mfBaseController
             }
             $this->redirect($returnUrl, $returnAction, $returnVariables, $returnAnker);
         }
+        $returnUrl="Device";
+        $returnAction = "Index";
+        $returnVariables = array();
+        $returnAnker = "";
+        if ($this->request->returnto) {
+
+            if (strpos($this->request->returnto, "-") !== false) {
+                $urls = explode('-', $this->request->returnto);
+                $urlCounter = 0;
+                $returnUrlGen = "";
+                foreach ($urls as $url) {
+                    if ($urlCounter > 0) {
+                        $returnUrlGen .= "/";
+                    }
+                    $returnUrlGen .= ucfirst($url);
+                    $urlCounter++;
+                }
+                $returnAction = "";
+                $returnVariables['id'] = $id;
+                $returnUrl = $returnUrlGen;
+            } else {
+                $returnUrl = ucfirst($this->request->returnto);
+
+            }
+        }
+
 
         if ($mode == "edit") {
             $this->layout()->setFlash("Device erfolgreich geändert", "success");
@@ -190,62 +216,4 @@ class DeviceController extends mfBaseController
         $this->redirect($returnUrl, $returnAction, $returnVariables, $returnAnker);
     }
 
-    protected function apiAction()
-    {
-        if (!$this->me->is(["Admin"])) {
-            $this->redirect("Dashboard");
-        }
-        $do = $this->request->do;
-        $format = $this->request->format;
-        $filename = $this->request->filename;
-        $id = $this->request->id;
-        $ip = $this->request->ip;
-
-        $data = [];
-
-        switch ($do) {
-            case "getconfig":
-                $return = $this->getConfig($id, $format, $filename);
-                break;
-            case "createconfig":
-                $return = $this->createConfig($ip);
-                break;
-            default:
-                $return = false;
-        }
-
-    }
-
-    private function getConfig($id, $format, $filename)
-    {
-        $configDownload = DeviceModel::getconifgdownload($id, $format);
-//
-
-//        header('Content-Type: application/octet-stream');
-        header('Content-Type: text/plain');
-        header('Content-disposition: attachment; filename="' . $filename . '"');
-        echo $configDownload;
-
-        exit;
-    }
-
-    private function createConfig($ip)
-    {
-        $r = $this->request;
-        $id = $r->id;
-        $createConfig = DeviceModel::configcreate($ip);
-        if ($createConfig->success==="true")
-        {
-            $this->layout()->setFlash("Backup wurde erfolgreich erstellt", "success");
-        }
-        else
-        {
-            $this->layout()->setFlash("Backup konnte nicht erstellt werden. <b>Fehler</b>: ".$createConfig->error, "error");
-        }
-        $returnUrl = "Device";
-        $returnAction = "Detail";
-        $returnVariables['id'] = $id;
-        return $this->redirect($returnUrl, $returnAction, $returnVariables, $returnAnker);
-    }
-
 }

application/Device/DeviceModel.php

@@ -108,8 +108,8 @@ class DeviceModel
         $db = FronkDB::singleton();
         $where = self::getSqlFilter($filter);
         $res = $db->select("Device", "*", "$where ORDER BY name");
-        if ($db->num_rows($res)) {
-            while ($data = $db->fetch_object($res)) {
+        if($db->num_rows($res)) {
+            while($data = $db->fetch_object($res)) {
                 $items[] = new Device($data);
             }
         }
@@ -121,9 +121,9 @@ class DeviceModel
         $where = "1=1 ";
 
         //var_dump($filter);exit;
-        if (array_key_exists("pop_id", $filter)) {
+        if(array_key_exists("pop_id", $filter)) {
             $popid = $filter['pop_id'];
-            if (is_numeric($popid)) {
+            if(is_numeric($popid)) {
                 $where .= " AND pop_id=$popid";
             }
         }