Features Netzbau-> Dateiablage und Stammdaten->Pops hinzugefügt

application/Api/v1/AddressdbApicontroller.php

@@ -12,7 +12,7 @@ class AddressdbApicontroller extends mfBaseApicontroller {
     
     $this->addRoute("/addressdb/findAddress", "find", "GET");
     $this->addRoute("/addressdb/findAddress", "find", "POST");
-    $this->addRoute("/addressdb/findStreet", "findStreet", "GET");
+        $this->addRoute("/addressdb/findStreet", "findStreet", "GET");
     $this->addRoute("/addressdb/findStreet", "findStreet", "POST");
     $this->addRoute("/addressdb/findZip", "findZip", "GET");
     $this->addRoute("/addressdb/findZip", "findZip", "POST");

application/Device/Device.php

@@ -0,0 +1,41 @@
+<?php
+
+class Device extends mfBaseModel
+{
+    private $editor;
+    private $creator;
+    private $devicetype;
+    private $pop;
+
+    public function getProperty($name)
+    {
+        if ($this->$name == null) {
+
+            if (!$this->id) {
+                return null;
+            }
+
+            if ($name == "creator") {
+                $this->creator = new User($this->create_by);
+                return $this->creator;
+            }
+
+            if ($name == "editor") {
+                $this->editor = new User($this->edit_by);
+                return $this->editor;
+            }
+
+            $classname = ucfirst($name);
+            $idfield = $name . "_id";
+            $this->$name = new $classname($this->$idfield);
+
+            if ($this->$name->id) {
+                return $this->$name;
+            } else {
+                return null;
+            }
+        }
+
+        return $this->$name;
+    }
+}

application/Device/DeviceController.php

@@ -0,0 +1,149 @@
+<?php
+
+class DeviceController extends mfBaseController
+{
+
+    protected function init()
+    {
+        $this->needlogin = true;
+        $me = new User();
+        $me->loadMe();
+        $this->me = $me;
+        $this->layout()->set("me", $me);
+
+        if (!$me->is(["Admin"])) {
+            $this->redirect("Dashboard");
+        }
+    }
+
+    protected function indexAction()
+    {
+
+        $this->layout()->setTemplate("Device/Index");
+        $devices = DeviceModel::getAll();
+        $this->layout()->set("devices", $devices);
+
+    }
+
+
+    protected function detailAction()
+    {
+        $id = $this->request->id;
+
+        if (!is_numeric($id) || !$id) {
+            $this->layout()->setFlash("Gerät nicht gefunden", "error");
+            $this->redirect("Device");
+        }
+
+        $device = new Device($id);
+        if ($device->id != $id) {
+            $this->layout()->setFlash("Gerät nicht gefunden", "error");
+            $this->redirect("Device");
+        }
+
+        $this->layout()->setTemplate("Device/Detail");
+        $devices = DeviceModel::getOne($id);
+        $this->layout()->set("devices", $devices);
+
+    }
+
+    protected function addAction()
+    {
+        $this->layout()->setTemplate("Device/Form");
+        $this->layout()->set("devicetypes", DevicetypeModel::getAll());
+        $this->layout()->set("pops", PopModel::getAll());
+
+    }
+
+    protected function editAction()
+    {
+        $id = $this->request->id;
+
+        if (!is_numeric($id) || !$id) {
+            $this->layout()->setFlash("Gerät nicht gefunden", "error");
+            $this->redirect("Device");
+        }
+
+        $device = new Device($id);
+        if ($device->id != $id) {
+            $this->layout()->setFlash("Gerät nicht gefunden", "error");
+            $this->redirect("Device");
+        }
+
+        $this->layout()->set("device", $device);
+        return $this->addAction();
+    }
+
+    protected function saveAction()
+    {
+        $r = $this->request;
+        $id = $r->id;
+        //var_dump($r->get());exit;
+        if (is_numeric($id) && $id > 0) {
+            $mode = "edit";
+            $device = new Device($id);
+            if (!$device->id) {
+                $this->layout()->setFlash("Gerät nicht gefunden", "error");
+                $this->redirect("Device");
+            }
+        } else {
+            $mode = "add";
+        }
+
+        $data = [];
+        $data['name'] = trim($r->name);
+        $data['devicetype_id'] = $r->devicetype_id;
+
+        if (empty(trim($r->pop_id))) {
+            $data['pop_id'] = NULL;
+        } else {
+            $data['pop_id'] = $r->pop_id;
+        }
+
+        $data['ip'] = $r->ip;
+        $data['mac'] = $r->mac;
+        $data['serial'] = $r->serial;
+        $data['comment'] = $r->comment;
+        $ipv4_validation_regex = "/^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/";
+
+        if (!$data['name']) {
+            $this->layout()->setFlash("Name darf nicht leer sein", "error");
+            $this->redirect("Device");
+        }
+
+        if (!$data['ip']) {
+            $this->layout()->setFlash("IP-Adresse darf nicht leer sein", "error");
+            $this->redirect("Device");
+        } else if (!preg_match($ipv4_validation_regex, trim($data['ip']))) {
+            $this->layout()->setFlash("IP-Adresse ist nicht gültig", "error");
+            $this->redirect("Device");
+        }
+
+
+//        var_dump($_FILES);
+//        var_dump($upload);
+//        exit;
+
+
+        if ($mode == "edit") {
+            $device->update($data);
+
+        } else {
+            $device = DeviceModel::create($data);
+        }
+//        var_dump($device);
+//        exit;
+        $id = $device->save();
+
+        if (!$id) {
+            $this->layout()->setFlash("Gerät konnte nicht angelegt werden", "error");
+            $this->redirect("Device");
+        }
+        if ($mode == "edit") {
+            $this->layout()->setFlash("Geräte erfolgreich geändert", "success");
+        } else if ($mode = "add") {
+            $this->layout()->setFlash("Geräte erfolgreich angelegt", "success");
+        }
+        $this->redirect("Device");
+    }
+}

application/Device/DeviceModel.php

@@ -0,0 +1,128 @@
+<?php
+
+class DeviceModel
+{
+    public $name = null;
+    public $ip = null;
+    public $mac = null;
+    public $serial= null;
+    public $comment= null;
+    public $devicetype_id = null;
+    public $pop_id = null;
+
+
+    public $create_by = null;
+    public $edit_by = null;
+    public $create = null;
+    public $edit = null;
+
+    public static function find($data) {
+
+    }
+
+    public static function create(Array $data) {
+        $model = new Device();
+
+        foreach($data as $field => $value) {
+            if(property_exists(get_called_class(), $field)) {
+                if(substr($field, 0, 5) == "vlan_" && !$value) {
+                    $model->$field = null;
+                    continue;
+                }
+                $model->$field = $value;
+            }
+        }
+
+        $me = mfValuecache::singleton()->get("me");
+        if(!$me) {
+            $me = new User();
+            $me->loadMe();
+            mfValuecache::singleton()->set("me", $me);
+        }
+
+        if($model->create_by === null) {
+            $model->create_by = $me->id;
+        }
+        if($model->edit_by === null) {
+            $model->edit_by = $me->id;
+        }
+
+        return $model;
+    }
+
+    public static function getOne($id) {
+        if(!is_numeric($id) || !$id) {
+            throw new Exception("Invalid number", 400);
+        }
+        $item = [];
+        $db = FronkDB::singleton();
+
+        $res = $db->select("Device", "*", "id=$id LIMIT 1");
+        if($db->num_rows($res)) {
+            $data = $db->fetch_object($res);
+            $item = new Device($data);
+        }
+        return $item;
+    }
+
+    public static function getAll() {
+        $items = [];
+
+        $db = FronkDB::singleton();
+
+        $res = $db->select("Device", "*");
+        if($db->num_rows($res)) {
+            while($data = $db->fetch_object($res)) {
+                $items[] = new Device($data);
+            }
+        }
+        return $items;
+
+    }
+
+    public static function getFirst() {
+        $db = FronkDB::singleton();
+
+        $where = self::getSqlFilter($filter);
+        $res = $db->select("Device", "*", "$where ORDER BY name, network_id");
+        if($db->num_rows($res)) {
+            $data = $db->fetch_object($res);
+            $item = new Device($data);
+            if($item->id) {
+                return $item;
+            } else {
+                return null;
+            }
+        }
+        return null;
+    }
+
+    public static function search($filter) {
+        $items = [];
+        $db = FronkDB::singleton();
+
+        $where = self::getSqlFilter($filter);
+        $res = $db->select("Device", "*", "$where ORDER BY name, network_id");
+        if($db->num_rows($res)) {
+            while($data = $db->fetch_object($res)) {
+                $items[] = new Device($data);
+            }
+        }
+        return $items;
+    }
+
+    private static function getSqlFilter($filter) {
+        $where = "1=1 ";
+
+        //var_dump($filter);exit;
+        if(array_key_exists("network_id", $filter)) {
+            $networkid = $filter['network_id'];
+            if(is_numeric($networkid)) {
+                $where .= " AND network_id=$networkid";
+            }
+        }
+
+        //var_dump($filter, $where);exit;
+        return $where;
+    }
+}

application/Devicemanufactor/Devicemanufactor.php

@@ -0,0 +1,39 @@
+<?php
+
+class Devicemanufactor extends mfBaseModel
+{
+    private $editor;
+    private $creator;
+
+    public function getProperty($name) {
+        if($this->$name == null) {
+
+            if(!$this->id) {
+                return null;
+            }
+
+            if($name == "creator") {
+                $this->creator = new User($this->create_by);
+                return $this->creator;
+            }
+
+            if($name == "editor") {
+                $this->editor = new User($this->edit_by);
+                return $this->editor;
+            }
+
+            $classname = ucfirst($name);
+            $idfield = $name."_id";
+            $this->$name = new $classname($this->$idfield);
+
+            if($this->$name->id) {
+                return $this->$name;
+            } else {
+                return null;
+            }
+        }
+
+        return $this->$name;
+    }
+
+}

application/Devicemanufactor/DevicemanufactorController.php

@@ -0,0 +1,122 @@
+<?php
+
+class DevicemanufactorController extends mfBaseController
+{
+
+    protected function init()
+    {
+        $this->needlogin = true;
+        $me = new User();
+        $me->loadMe();
+        $this->me = $me;
+        $this->layout()->set("me", $me);
+
+        if (!$me->is(["Admin"])) {
+            $this->redirect("Dashboard");
+        }
+    }
+
+    protected function indexAction()
+    {
+
+        $this->layout()->setTemplate("Devicemanufactor/Index");
+        $devicemanufactors = DevicemanufactorModel::getAll();
+        $this->layout()->set("devicemanufactors", $devicemanufactors);
+
+    }
+
+    protected function addAction()
+    {
+        $this->layout()->setTemplate("Devicemanufactor/Form");
+
+    }
+
+    protected function editAction()
+    {
+        $id = $this->request->id;
+
+        if (!is_numeric($id) || !$id) {
+            $this->layout()->setFlash("Gerätehersteller nicht gefunden", "error");
+            $this->redirect("Devicemanufactor");
+        }
+
+        $devicemanufactors = new Devicemanufactor($id);
+        if ($devicemanufactors->id != $id) {
+            $this->layout()->setFlash("Gerätehersteller nicht gefunden", "error");
+            $this->redirect("Devicemanufactor");
+        }
+
+        $this->layout()->set("devicemanufactors", $devicemanufactors);
+        return $this->addAction();
+    }
+
+    protected function saveAction()
+    {
+        $r = $this->request;
+        $id = $r->id;
+        //var_dump($r->get());exit;
+        if (is_numeric($id) && $id > 0) {
+            $mode = "edit";
+            $devicemanufactor = new Devicemanufactor($id);
+            if (!$devicemanufactor->id) {
+                $this->layout()->setFlash("Gerätehersteller nicht gefunden", "error");
+                $this->redirect("Devicemanufactor");
+            }
+        } else {
+            $mode = "add";
+        }
+
+        $data = [];
+        $data['name'] = trim($r->name);
+
+
+        if (!$data['name']) {
+            $this->layout()->setFlash("Name darf nicht leer sein", "error");
+            $this->redirect("Devicemanufactor");
+        }
+
+
+//        var_dump($_FILES);
+//        var_dump($upload);
+//        exit;
+
+
+        if ($mode == "edit") {
+            $devicemanufactor->update($data);
+
+        } else {
+            $devicemanufactor = DevicemanufactorModel::create($data);
+        }
+//        var_dump($filestore);
+//        exit;
+        $id = $devicemanufactor->save();
+
+        if (!$id) {
+            $this->layout()->setFlash("Gerätehersteller konnte nicht angelegt werden", "error");
+            $this->redirect("Devicemanufactor");
+        }
+        if ($fsh) {
+            $fsh->save();
+        }
+        if ($mode == "edit") {
+            $this->layout()->setFlash("Gerätehersteller erfolgreich geändert", "success");
+        } else if ($mode = "add") {
+            $this->layout()->setFlash("Gerätehersteller erfolgreich angelegt", "success");
+        }
+        $this->redirect("Devicemanufactor");
+    }
+
+    protected function deleteAction()
+    {
+        $id = $this->request->id;
+        $devicemanufactor = new Devicemanufactor($id);
+        if (!$devicemanufactor->id || $devicemanufactor->id != $id) {
+            $this->layout()->setFlash("Gerätehersteller nicht gefunden.", "error");
+            $this->redirect("Devicemanufactor");
+        }
+
+        $devicemanufactor->delete();
+        $this->redirect("Devicemanufactor");
+    }
+
+}

application/Devicemanufactor/DevicemanufactorModel.php

@@ -0,0 +1,122 @@
+<?php
+
+class DevicemanufactorModel {
+    public $name = null;
+
+
+    public $create_by = null;
+    public $edit_by = null;
+    public $create = null;
+    public $edit = null;
+
+    public static function find($data) {
+
+    }
+
+    public static function create(Array $data) {
+        $model = new Devicemanufactor();
+
+        foreach($data as $field => $value) {
+            if(property_exists(get_called_class(), $field)) {
+                if(substr($field, 0, 5) == "vlan_" && !$value) {
+                    $model->$field = null;
+                    continue;
+                }
+                $model->$field = $value;
+            }
+        }
+
+        $me = mfValuecache::singleton()->get("me");
+        if(!$me) {
+            $me = new User();
+            $me->loadMe();
+            mfValuecache::singleton()->set("me", $me);
+        }
+
+        if($model->create_by === null) {
+            $model->create_by = $me->id;
+        }
+        if($model->edit_by === null) {
+            $model->edit_by = $me->id;
+        }
+
+        return $model;
+    }
+
+    public static function getOne($id) {
+        if(!is_numeric($id) || !$id) {
+            throw new Exception("Invalid number", 400);
+        }
+        $item = [];
+        $db = FronkDB::singleton();
+
+        $res = $db->select("Devicemanufactor", "*", "id=$id LIMIT 1");
+        if($db->num_rows($res)) {
+            $data = $db->fetch_object($res);
+            $item = new Devicemanufactor($data);
+        }
+        return $item;
+    }
+
+    public static function getAll() {
+        $items = [];
+
+        $db = FronkDB::singleton();
+
+        $res = $db->select("Devicemanufactor", "*", "1=1 ORDER by name");
+        if($db->num_rows($res)) {
+            while($data = $db->fetch_object($res)) {
+                $items[] = new Devicemanufactor($data);
+            }
+        }
+        return $items;
+
+    }
+
+    public static function getFirst() {
+        $db = FronkDB::singleton();
+
+        $where = self::getSqlFilter($filter);
+        $res = $db->select("Devicemanufactor", "*", "$where ORDER BY name, network_id");
+        if($db->num_rows($res)) {
+            $data = $db->fetch_object($res);
+            $item = new Devicemanufactor($data);
+            if($item->id) {
+                return $item;
+            } else {
+                return null;
+            }
+        }
+        return null;
+    }
+
+    public static function search($filter) {
+        $items = [];
+        $db = FronkDB::singleton();
+
+        $where = self::getSqlFilter($filter);
+        $res = $db->select("Devicemanufactor", "*", "$where ORDER BY name, network_id");
+        if($db->num_rows($res)) {
+            while($data = $db->fetch_object($res)) {
+                $items[] = new Devicemanufactor($data);
+            }
+        }
+        return $items;
+    }
+
+    private static function getSqlFilter($filter) {
+        $where = "1=1 ";
+
+        //var_dump($filter);exit;
+        if(array_key_exists("network_id", $filter)) {
+            $networkid = $filter['network_id'];
+            if(is_numeric($networkid)) {
+                $where .= " AND network_id=$networkid";
+            }
+        }
+
+        //var_dump($filter, $where);exit;
+        return $where;
+    }
+
+}

application/Devicetype/Devicetype.php

@@ -0,0 +1,41 @@
+<?php
+
+class Devicetype extends mfBaseModel
+{
+    private $editor;
+    private $creator;
+    private $devicemanufactor;
+
+    public function getProperty($name)
+    {
+        if ($this->$name == null) {
+
+            if (!$this->id) {
+                return null;
+            }
+
+            if ($name == "creator") {
+                $this->creator = new User($this->create_by);
+                return $this->creator;
+            }
+
+            if ($name == "editor") {
+                $this->editor = new User($this->edit_by);
+                return $this->editor;
+            }
+
+            $classname = ucfirst($name);
+            $idfield = $name . "_id";
+            $this->$name = new $classname($this->$idfield);
+
+            if ($this->$name->id) {
+                return $this->$name;
+            } else {
+                return null;
+            }
+        }
+
+        return $this->$name;
+    }
+
+}

application/Devicetype/DevicetypeController.php

@@ -0,0 +1,138 @@
+<?php
+
+class DevicetypeController extends mfBaseController
+{
+
+    protected function init()
+    {
+        $this->needlogin = true;
+        $me = new User();
+        $me->loadMe();
+        $this->me = $me;
+        $this->layout()->set("me", $me);
+
+        if (!$me->is(["Admin"])) {
+            $this->redirect("Dashboard");
+        }
+    }
+
+    protected function indexAction()
+    {
+
+        $this->layout()->setTemplate("Devicetype/Index");
+        $devicetypes = DevicetypeModel::getAll();
+        $this->layout()->set("devicetypes", $devicetypes);
+
+    }
+
+    protected function addAction()
+    {
+        $this->layout()->setTemplate("Devicetype/Form");
+        $this->layout()->set("devicemanufactors", DevicemanufactorModel::getAll());
+
+    }
+
+    protected function editAction()
+    {
+        $id = $this->request->id;
+
+        if (!is_numeric($id) || !$id) {
+            $this->layout()->setFlash("Gerätetyp nicht gefunden", "error");
+            $this->redirect("Devicetype");
+        }
+
+        $devicetypes = new Devicetype($id);
+        if ($devicetypes->id != $id) {
+            $this->layout()->setFlash("Gerätetyp nicht gefunden", "error");
+            $this->redirect("Devicetype");
+        }
+
+        $this->layout()->set("devicetypes", $devicetypes);
+        return $this->addAction();
+    }
+
+    protected function saveAction()
+    {
+        $r = $this->request;
+        $id = $r->id;
+        //var_dump($r->get());exit;
+        if (is_numeric($id) && $id > 0) {
+            $mode = "edit";
+            $devicetype = new Devicetype($id);
+            if (!$devicetype->id) {
+                $this->layout()->setFlash("Gerätehersteller nicht gefunden", "error");
+                $this->redirect("Devicetype");
+            }
+        } else {
+            $mode = "add";
+        }
+        var_dump($r);
+        echo $r->price;
+
+        if (!$r->price) {
+            $price = "0.00";
+            echo "empty";
+        } else {
+            $price = $r->price;
+        }
+        if (!$r->power) {
+            $power = "0.00";
+        } else {
+            $power = $r->power;
+        }
+
+        $data = [];
+        $data['name'] = trim($r->name);
+        $data['devicemanufactor_id'] = $r->devicemanufactor_id;
+        $data['price'] = $price;
+        $data['power'] = $power;
+
+        if (!$data['name']) {
+            $this->layout()->setFlash("Name darf nicht leer sein", "error");
+            $this->redirect("Devicetype");
+        }
+
+
+//        var_dump($_FILES);
+//        var_dump($upload);
+//        exit;
+
+
+        if ($mode == "edit") {
+            $devicetype->update($data);
+
+        } else {
+            $devicetype = DevicetypeModel::create($data);
+        }
+//        var_dump($filestore);
+//        exit;
+        $id = $devicetype->save();
+
+        if (!$id) {
+            $this->layout()->setFlash("Gerätehersteller konnte nicht angelegt werden", "error");
+            $this->redirect("Devicetype");
+        }
+
+        if ($mode == "edit") {
+            $this->layout()->setFlash("Gerätehersteller erfolgreich geändert", "success");
+        } else if ($mode = "add") {
+            $this->layout()->setFlash("Gerätehersteller erfolgreich angelegt", "success");
+        }
+        $this->redirect("Devicetype");
+    }
+
+
+    protected function deleteAction()
+    {
+        $id = $this->request->id;
+        $devicetype = new Devicetype($id);
+        if (!$devicetype->id || $devicetype->id != $id) {
+            $this->layout()->setFlash("Gerätehersteller nicht gefunden.", "error");
+            $this->redirect("Devicetype");
+        }
+
+        $devicetype->delete();
+        $this->redirect("Devicetype");
+    }
+
+}

application/Devicetype/DevicetypeModel.php

@@ -0,0 +1,125 @@
+<?php
+
+class DevicetypeModel {
+    public $name = null;
+    public $power = null;
+    public $price = null;
+    public $devicemanufactor_id = null;
+
+
+    public $create_by = null;
+    public $edit_by = null;
+    public $create = null;
+    public $edit = null;
+
+    public static function find($data) {
+
+    }
+
+    public static function create(Array $data) {
+        $model = new Devicetype();
+
+        foreach($data as $field => $value) {
+            if(property_exists(get_called_class(), $field)) {
+                if(substr($field, 0, 5) == "vlan_" && !$value) {
+                    $model->$field = null;
+                    continue;
+                }
+                $model->$field = $value;
+            }
+        }
+
+        $me = mfValuecache::singleton()->get("me");
+        if(!$me) {
+            $me = new User();
+            $me->loadMe();
+            mfValuecache::singleton()->set("me", $me);
+        }
+
+        if($model->create_by === null) {
+            $model->create_by = $me->id;
+        }
+        if($model->edit_by === null) {
+            $model->edit_by = $me->id;
+        }
+
+        return $model;
+    }
+
+    public static function getOne($id) {
+        if(!is_numeric($id) || !$id) {
+            throw new Exception("Invalid number", 400);
+        }
+        $item = [];
+        $db = FronkDB::singleton();
+
+        $res = $db->select("Devicetype", "*", "id=$id LIMIT 1");
+        if($db->num_rows($res)) {
+            $data = $db->fetch_object($res);
+            $item = new Devicetype($data);
+        }
+        return $item;
+    }
+
+    public static function getAll() {
+        $items = [];
+
+        $db = FronkDB::singleton();
+
+        $res = $db->select("Devicetype", "*");
+        if($db->num_rows($res)) {
+            while($data = $db->fetch_object($res)) {
+                $items[] = new Devicetype($data);
+            }
+        }
+        return $items;
+
+    }
+
+    public static function getFirst() {
+        $db = FronkDB::singleton();
+
+        $where = self::getSqlFilter($filter);
+        $res = $db->select("Devicetype", "*", "$where ORDER BY name, network_id");
+        if($db->num_rows($res)) {
+            $data = $db->fetch_object($res);
+            $item = new Devicetype($data);
+            if($item->id) {
+                return $item;
+            } else {
+                return null;
+            }
+        }
+        return null;
+    }
+
+    public static function search($filter) {
+        $items = [];
+        $db = FronkDB::singleton();
+
+        $where = self::getSqlFilter($filter);
+        $res = $db->select("Devicetype", "*", "$where ORDER BY name, network_id");
+        if($db->num_rows($res)) {
+            while($data = $db->fetch_object($res)) {
+                $items[] = new Devicetype($data);
+            }
+        }
+        return $items;
+    }
+
+    private static function getSqlFilter($filter) {
+        $where = "1=1 ";
+
+        //var_dump($filter);exit;
+        if(array_key_exists("network_id", $filter)) {
+            $networkid = $filter['network_id'];
+            if(is_numeric($networkid)) {
+                $where .= " AND network_id=$networkid";
+            }
+        }
+
+        //var_dump($filter, $where);exit;
+        return $where;
+    }
+
+}

application/Pop/PopController.php

@@ -26,6 +26,27 @@ class PopController extends mfBaseController
 
     }
 
+    protected function detailAction()
+    {
+        $id = $this->request->id;
+
+        if (!is_numeric($id) || !$id) {
+            $this->layout()->setFlash("pop nicht gefunden", "error");
+            $this->redirect("Pop");
+        }
+
+        $device = new Device($id);
+        if ($device->id != $id) {
+            $this->layout()->setFlash("Pop nicht gefunden", "error");
+            $this->redirect("Pop");
+        }
+
+        $this->layout()->setTemplate("Pop/Detail");
+        $pops = PopModel::getOne($id);
+        $this->layout()->set("pops", $pops);
+
+    }
+
     protected function addAction()
     {
         $this->layout()->setTemplate("Pop/Form");

application/Pop/PopModel.php

@@ -71,7 +71,7 @@ class PopModel {
     
     $db = FronkDB::singleton();
     
-    $res = $db->select("Pop", "*");
+    $res = $db->select("Pop", "*","1=1 ORDER by name");
     if($db->num_rows($res)) {
       while($data = $db->fetch_object($res)) {
         $items[] = new Pop($data);