updates raus

6 files changed, 50 insertions, 51 deletions

diff --git a/application/models/BootIso.php b/application/models/BootIso.php
index fe06947..e34c3b8 100644
--- a/application/models/BootIso.php
+++ b/application/models/BootIso.php
@@ -14,6 +14,7 @@ class Application_Model_BootIso
 {
 	protected $_bootisoID;
 	protected $_title;
+	protected $_description;
 	protected $_prebootID;
 	protected $_membershipID;
 	protected $_groupID;
@@ -162,6 +163,15 @@ class Application_Model_BootIso
 	    $this->_bootisoID = $_bootisoID;
 		return $this;
 	}
+	public function getDescription()
+	{
+		return $this->_description;
+	}
+	public function setDescription($_description)
+	{
+		$this->_description = $_description;
+		return $this;
+	}
     /**
      * Returns current data as associative array using ReflectionClass
      *
diff --git a/application/models/BootIsoMapper.php b/application/models/BootIsoMapper.php
index c58777f..6ca7ad3 100644
--- a/application/models/BootIsoMapper.php
+++ b/application/models/BootIsoMapper.php
@@ -82,7 +82,7 @@ class Application_Model_BootIsoMapper
 	public function save(Application_Model_BootIso $botiso)
 	{
 		
-		$data = array('bootisoID'=> $botiso->getID() ,'membershipID'=> $botiso->getMembershipID() ,'title'=> $botiso->getTitle(),'prebootID'=> $botiso->getPrebootID() ,'groupID'=> $botiso->getGroupID() ,'serialnumber'=> $botiso->getSerialnumber() ,'created'=> $botiso->getCreated() ,'expires'=> $botiso->getExpires() ,'public'=> $botiso->getPublic() );
+		$data = array('bootisoID'=> $botiso->getID() ,'membershipID'=> $botiso->getMembershipID() ,'title'=> $botiso->getTitle(),'prebootID'=> $botiso->getPrebootID() ,'groupID'=> $botiso->getGroupID() ,'serialnumber'=> $botiso->getSerialnumber() ,'created'=> $botiso->getCreated() ,'expires'=> $botiso->getExpires() ,'public'=> $botiso->getPublic(), 'description' => $botiso->getDescription() );
 
 		if (null === ($id = $botiso->getID()) ) {
 			unset($data['bootisoID']);
@@ -112,10 +112,10 @@ class Application_Model_BootIsoMapper
 		
 		if($botiso == null){
 			$botiso = new Application_Model_BootIso();
-			$botiso->setID($row->bootisoID)->setMembershipID($row->membershipID)->setTitle($row->title)->setPrebootID($row->prebootID)->setGroupID($row->groupID)->setSerialnumber($row->serialnumber)->setCreated($row->created)->setExpires($row->expires)->setPublic($row->public);
+			$botiso->setID($row->bootisoID)->setMembershipID($row->membershipID)->setTitle($row->title)->setPrebootID($row->prebootID)->setGroupID($row->groupID)->setSerialnumber($row->serialnumber)->setCreated($row->created)->setExpires($row->expires)->setPublic($row->public)->setDescription($row->description);
 			return $botiso;
 		}else{
-			$botiso->setID($row->bootisoID)->setMembershipID($row->membershipID)->setTitle($row->title)->setPrebootID($row->prebootID)->setGroupID($row->groupID)->setSerialnumber($row->serialnumber)->setCreated($row->created)->setExpires($row->expires)->setPublic($row->public);
+			$botiso->setID($row->bootisoID)->setMembershipID($row->membershipID)->setTitle($row->title)->setPrebootID($row->prebootID)->setGroupID($row->groupID)->setSerialnumber($row->serialnumber)->setCreated($row->created)->setExpires($row->expires)->setPublic($row->public)->setDescription($row->description);
 		}	
 	}
 
@@ -126,7 +126,7 @@ class Application_Model_BootIsoMapper
 		foreach ($resultSet as $row) {
 			$entry = new Application_Model_BootIso();
 			
-			$entry->setID($row->bootisoID)->setMembershipID($row->membershipID)->setTitle($row->title)->setPrebootID($row->prebootID)->setGroupID($row->groupID)->setSerialnumber($row->serialnumber)->setCreated($row->created)->setExpires($row->expires)->setPublic($row->public);	
+			$entry->setID($row->bootisoID)->setMembershipID($row->membershipID)->setTitle($row->title)->setPrebootID($row->prebootID)->setGroupID($row->groupID)->setSerialnumber($row->serialnumber)->setCreated($row->created)->setExpires($row->expires)->setPublic($row->public)->setDescription($row->description);	
 
 			$entries[] = $entry;
 		}
diff --git a/application/models/BootOs.php b/application/models/BootOs.php
index 9819c29..f095720 100644
--- a/application/models/BootOs.php
+++ b/application/models/BootOs.php
@@ -16,9 +16,6 @@ class Application_Model_BootOs
 	protected $_groupID;
 	protected $_membershipID;
 	protected $_title;
-	protected $_path_init;
-	protected $_path_kernel;
-	protected $_path_config;
 	protected $_defaultkcl;
 	protected $_created;
 	protected $_description;
@@ -77,15 +74,6 @@ class Application_Model_BootOs
 		$this->_bootosID = $_bootosID;
 		return $this;
 	}
-	public function getPath_config()
-	{
-		return $this->_path_config;
-	}
-	public function setPath_config($_path_config)
-	{
-		$this->_path_config = $_path_config;
-		return $this;
-	}
 	public function getGroupID()
 	{
 		return $this->_groupID;
@@ -122,24 +110,6 @@ class Application_Model_BootOs
 		$this->_description = $_description;
 		return $this;
 	}
-	public function getPath_init()
-	{
-		return $this->_path_init;
-	}
-	public function setPath_init($_path_init)
-	{
-		$this->_path_init = $_path_init;
-		return $this;
-	}
-	public function getPath_kernel()
-	{
-		return $this->_path_kernel;
-	}
-	public function setPath_kernel($_path_kernel)
-	{
-		$this->_path_kernel = $_path_kernel;
-		return $this;
-	}
 	public function getDefaultkcl()
 	{
 		return $this->_defaultkcl;
diff --git a/application/models/BootOsMapper.php b/application/models/BootOsMapper.php
index d18c55a..2bde6db 100644
--- a/application/models/BootOsMapper.php
+++ b/application/models/BootOsMapper.php
@@ -83,7 +83,7 @@ class Application_Model_BootOsMapper
 
 	public function save(Application_Model_BootOs $botos)
 	{
-		$data = array('bootosID'=> $botos->getID() ,'path_config'=> $botos->getPath_config() ,'groupID'=> $botos->getGroupID() ,'title'=> $botos->getTitle(), 'membershipID'=> $botos->getMembershipID() ,'path_init'=> $botos->getPath_init() ,'path_kernel'=> $botos->getPath_kernel() ,'defaultkcl'=> $botos->getDefaultkcl() ,'created'=> $botos->getCreated() ,'description'=> $botos->getDescription() ,'expires'=> $botos->getExpires() ,'public'=> $botos->getPublic(),'source'=> $botos->getSource(),'distro'=> $botos->getDistro(),'distroversion'=> $botos->getDistroversion(),'shortname'=> $botos->getShortname(),'share'=> $botos->getShare() );
+		$data = array('bootosID'=> $botos->getID() ,'groupID'=> $botos->getGroupID() ,'title'=> $botos->getTitle(), 'membershipID'=> $botos->getMembershipID(),'defaultkcl'=> $botos->getDefaultkcl() ,'created'=> $botos->getCreated() ,'description'=> $botos->getDescription() ,'expires'=> $botos->getExpires() ,'public'=> $botos->getPublic(),'source'=> $botos->getSource(),'distro'=> $botos->getDistro(),'distroversion'=> $botos->getDistroversion(),'shortname'=> $botos->getShortname(),'share'=> $botos->getShare() );
 		if (null === ($id = $botos->getID()) ) {
 			unset($data['bootosID']);
 			return $this->getDbTable()->insert($data);
@@ -112,10 +112,10 @@ class Application_Model_BootOsMapper
 		
 		if($botos == null){
 			$botos = new Application_Model_BootOs();
-			$botos->setID($row->bootosID)->setPath_config($row->path_config)->setGroupID($row->groupID)->setMembershipID($row->membershipID)->setTitle($row->title)->setPath_init($row->path_init)->setPath_kernel($row->path_kernel)->setDefaultkcl($row->defaultkcl)->setCreated($row->created)->setDescription($row->description)->setExpires($row->expires)->setPublic($row->public)->setSource($row->source)->setDistro($row->distro)->setDistroversion($row->distroversion)->setShortname($row->shortname)->setShare($row->share);
+			$botos->setID($row->bootosID)->setGroupID($row->groupID)->setMembershipID($row->membershipID)->setTitle($row->title)->setDefaultkcl($row->defaultkcl)->setCreated($row->created)->setDescription($row->description)->setExpires($row->expires)->setPublic($row->public)->setSource($row->source)->setDistro($row->distro)->setDistroversion($row->distroversion)->setShortname($row->shortname)->setShare($row->share);
 			return $botos;
 		}else{
-			$botos->setID($row->bootosID)->setPath_config($row->path_config)->setGroupID($row->groupID)->setMembershipID($row->membershipID)->setTitle($row->title)->setPath_init($row->path_init)->setPath_kernel($row->path_kernel)->setDefaultkcl($row->defaultkcl)->setCreated($row->created)->setDescription($row->description)->setExpires($row->expires)->setPublic($row->public)->setSource($row->source)->setDistro($row->distro)->setDistroversion($row->distroversion)->setShortname($row->shortname)->setShare($row->share);
+			$botos->setID($row->bootosID)->setGroupID($row->groupID)->setMembershipID($row->membershipID)->setTitle($row->title)->setDefaultkcl($row->defaultkcl)->setCreated($row->created)->setDescription($row->description)->setExpires($row->expires)->setPublic($row->public)->setSource($row->source)->setDistro($row->distro)->setDistroversion($row->distroversion)->setShortname($row->shortname)->setShare($row->share);
 		}	
 		
 	}
@@ -127,7 +127,7 @@ class Application_Model_BootOsMapper
 		foreach ($resultSet as $row) {
 			$entry = new Application_Model_BootOs();
 			
-			$entry->setID($row->bootosID)->setPath_config($row->path_config)->setGroupID($row->groupID)->setMembershipID($row->membershipID)->setTitle($row->title)->setPath_init($row->path_init)->setPath_kernel($row->path_kernel)->setDefaultkcl($row->defaultkcl)->setCreated($row->created)->setDescription($row->description)->setExpires($row->expires)->setPublic($row->public)->setSource($row->source)->setDistro($row->distro)->setDistroversion($row->distroversion)->setShortname($row->shortname)->setShare($row->share);	
+			$entry->setID($row->bootosID)->setGroupID($row->groupID)->setMembershipID($row->membershipID)->setTitle($row->title)->setDefaultkcl($row->defaultkcl)->setCreated($row->created)->setDescription($row->description)->setExpires($row->expires)->setPublic($row->public)->setSource($row->source)->setDistro($row->distro)->setDistroversion($row->distroversion)->setShortname($row->shortname)->setShare($row->share);	
 
 			$entries[$row->bootosID] = $entry;
 		}
diff --git a/application/models/Config.php b/application/models/Config.php
index 5e3a7eb..3b609af 100644
--- a/application/models/Config.php
+++ b/application/models/Config.php
@@ -16,7 +16,9 @@ class Application_Model_Config
 	protected $_groupID;
 	protected $_membershipID;
 	protected $_title;
-	protected $_shellscript;
+	protected $_description;
+	protected $_visible;
+	protected $_bootosID;
 	protected $_created;
 
 	public function __construct(array $options = null)
@@ -84,15 +86,6 @@ class Application_Model_Config
 		$this->_membershipID = $_membershipID;
 		return $this;
 	}
-	public function getShellscript()
-	{
-		return $this->_shellscript;
-	}
-	public function setShellscript($_shellscript)
-	{
-		$this->_shellscript = $_shellscript;
-		return $this;
-	}
 	public function getTitle()
 	{
 		return $this->_title;
@@ -111,6 +104,32 @@ class Application_Model_Config
 		$this->_created = $_created;
 		return $this;
 	}
+	public function getDescription()
+	{
+		return $this->_description;
+	}
+	public function setDescription($_description)
+	{
+		$this->_description = $_description;
+		return $this;
+	}
+	public function getVisible()
+	{
+		return $this->_visible;
+	}
+	public function setVisible($_visible)
+	{
+		$this->_visible = $_visible;
+		return $this;
+	}
+	public function getBootosID()
+	{
+		return $this->_bootosID;
+	}
+	public function setBootosID($_bootosID)
+	{
+		return $this;
+	}
 	
     /**
      * Returns current data as associative array using ReflectionClass
diff --git a/application/models/ConfigMapper.php b/application/models/ConfigMapper.php
index 526eee1..da16aa2 100644
--- a/application/models/ConfigMapper.php
+++ b/application/models/ConfigMapper.php
@@ -83,7 +83,7 @@ class Application_Model_ConfigMapper
 	public function save(Application_Model_Config $config)
 	{
 		
-		$data = array('configID'=> $config->getID() ,'groupID'=> $config->getGroupID(), 'membershipID'=> $config->getMembershipID(), 'shellscript'=> $config->getShellscript(), 'title'=> $config->getTitle() , 'created'=> $config->getCreated() );
+		$data = array('configID'=> $config->getID() ,'groupID'=> $config->getGroupID(), 'membershipID'=> $config->getMembershipID(), 'title'=> $config->getTitle() , 'created'=> $config->getCreated(), 'description' => $config->getDescription(), 'visible' => $config->getVisible(), 'bootosID' => $config->getBootosID() );
 
 		if (null === ($id = $config->getID()) ) {
 			unset($data['configID']);
@@ -117,7 +117,7 @@ class Application_Model_ConfigMapper
 
 		$row = $result->current();
 		
-		$config->setID($row->configID)->setGroupID($row->groupID)->setMembershipID($row->membershipID)->setCreated($row->created)->setShellscript($row->shellscript)->setTitle($row->title);
+		$config->setID($row->configID)->setGroupID($row->groupID)->setMembershipID($row->membershipID)->setCreated($row->created)->setTitle($row->title)->setDescription($row->description)->setVisible($row->Visible)->setBootosID($row->bootosID);
 		if($return){		
 			return $config;
 		}
@@ -130,7 +130,7 @@ class Application_Model_ConfigMapper
 		foreach ($resultSet as $row) {
 			$entry = new Application_Model_Config();
 			
-			$entry->setID($row->configID)->setGroupID($row->groupID)->setMembershipID($row->membershipID)->setCreated($row->created)->setShellscript($row->shellscript)->setTitle($row->title);	
+			$entry->setID($row->configID)->setGroupID($row->groupID)->setMembershipID($row->membershipID)->setCreated($row->created)->setTitle($row->title)->setDescription($row->description)->setVisible($row->Visible)->setBootosID($row->bootosID);	
 
 			$entries[] = $entry;
 		}