perm deleted devices are no more catalogued

2 files changed, 2 insertions, 2 deletions

diff --git a/h-source/Application/Controllers/DownloadController.php b/h-source/Application/Controllers/DownloadController.php
index 879bded..2fcacfa 100644
--- a/h-source/Application/Controllers/DownloadController.php
+++ b/h-source/Application/Controllers/DownloadController.php
@@ -163,7 +163,7 @@ class DownloadController extends BaseController
 	{
 		header ("Content-Type:text/xml");
 
-		$res = $this->m['HardwareModel']->clear()->select()->where($whereArray)->orderBy("type,hardware.id_hard")->send();
+		$res = $this->m['HardwareModel']->clear()->select()->where($whereArray)->aWhere(array("cleared"=>"no"))->orderBy("type,hardware.id_hard")->send();
 
 		$data['xml'] = $this->getXml($res);
 
diff --git a/h-source/Application/Controllers/GenericController.php b/h-source/Application/Controllers/GenericController.php
index ed36952..8ab98ba 100644
--- a/h-source/Application/Controllers/GenericController.php
+++ b/h-source/Application/Controllers/GenericController.php
@@ -432,7 +432,7 @@ class GenericController extends BaseController
 		
 		$data['tree'] = $this->controller;
 		
-		$this->mod->aWhere(array("deleted"=>"no"));
+		$this->mod->aWhere(array("deleted"=>"no","cleared"=>"no"));
 		
 		$this->mod->popupBuild();
 		$popup = $this->mod->popupArray;