summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--application/models/BootIsoMapper.php2
-rw-r--r--application/models/BootMenuEntriesMapper.php2
-rw-r--r--application/models/BootMenuMapper.php2
-rw-r--r--application/models/BootOsMapper.php2
-rw-r--r--application/models/ClientMapper.php2
-rw-r--r--application/models/ConfigMapper.php2
-rw-r--r--application/models/FilterEntriesMapper.php2
-rw-r--r--application/models/FilterMapper.php8
-rw-r--r--application/models/FilterTypeMapper.php2
-rw-r--r--application/models/GroupGroupsMapper.php2
-rw-r--r--application/models/GroupMapper.php2
-rw-r--r--application/models/GroupRequestMapper.php2
-rw-r--r--application/models/MembershipFiltersMapper.php2
-rw-r--r--application/models/MembershipMapper.php2
-rw-r--r--application/models/Person.php10
-rw-r--r--application/models/PersonMapper.php6
-rw-r--r--application/models/PoolEntriesMapper.php2
-rw-r--r--application/models/PoolFiltersMapper.php2
-rw-r--r--application/models/PoolMapper.php2
-rw-r--r--application/models/RightMapper.php2
-rw-r--r--application/models/RightRolesMapper.php2
-rw-r--r--application/models/RoleMapper.php2
-rw-r--r--application/models/SessionMapper.php2
-rw-r--r--createDefaultMapper/mappertemplate2
-rw-r--r--droppbs.sql22
25 files changed, 57 insertions, 31 deletions
diff --git a/application/models/BootIsoMapper.php b/application/models/BootIsoMapper.php
index da7c44f..559f41e 100644
--- a/application/models/BootIsoMapper.php
+++ b/application/models/BootIsoMapper.php
@@ -23,7 +23,7 @@ class Application_Model_BootIsoMapper
public function getDbTable()
{
if (null === $this->_dbTable) {
- $this->setDbTable('Application_Model_DbTable_Person');
+ $this->setDbTable('Application_Model_DbTable_BootIso');
}
return $this->_dbTable;
diff --git a/application/models/BootMenuEntriesMapper.php b/application/models/BootMenuEntriesMapper.php
index 21f4185..6ef11e3 100644
--- a/application/models/BootMenuEntriesMapper.php
+++ b/application/models/BootMenuEntriesMapper.php
@@ -23,7 +23,7 @@ class Application_Model_BootMenuEntriesMapper
public function getDbTable()
{
if (null === $this->_dbTable) {
- $this->setDbTable('Application_Model_DbTable_Person');
+ $this->setDbTable('Application_Model_DbTable_BootMenuEntries');
}
return $this->_dbTable;
diff --git a/application/models/BootMenuMapper.php b/application/models/BootMenuMapper.php
index ead35e3..9d6ec1b 100644
--- a/application/models/BootMenuMapper.php
+++ b/application/models/BootMenuMapper.php
@@ -23,7 +23,7 @@ class Application_Model_BootMenuMapper
public function getDbTable()
{
if (null === $this->_dbTable) {
- $this->setDbTable('Application_Model_DbTable_Person');
+ $this->setDbTable('Application_Model_DbTable_BootMenu');
}
return $this->_dbTable;
diff --git a/application/models/BootOsMapper.php b/application/models/BootOsMapper.php
index aab25d8..87d4d6c 100644
--- a/application/models/BootOsMapper.php
+++ b/application/models/BootOsMapper.php
@@ -23,7 +23,7 @@ class Application_Model_BootOsMapper
public function getDbTable()
{
if (null === $this->_dbTable) {
- $this->setDbTable('Application_Model_DbTable_Person');
+ $this->setDbTable('Application_Model_DbTable_BootOs');
}
return $this->_dbTable;
diff --git a/application/models/ClientMapper.php b/application/models/ClientMapper.php
index 9d2b0de..dda9f12 100644
--- a/application/models/ClientMapper.php
+++ b/application/models/ClientMapper.php
@@ -23,7 +23,7 @@ class Application_Model_ClientMapper
public function getDbTable()
{
if (null === $this->_dbTable) {
- $this->setDbTable('Application_Model_DbTable_Person');
+ $this->setDbTable('Application_Model_DbTable_Client');
}
return $this->_dbTable;
diff --git a/application/models/ConfigMapper.php b/application/models/ConfigMapper.php
index 0066e64..6cd5f67 100644
--- a/application/models/ConfigMapper.php
+++ b/application/models/ConfigMapper.php
@@ -23,7 +23,7 @@ class Application_Model_ConfigMapper
public function getDbTable()
{
if (null === $this->_dbTable) {
- $this->setDbTable('Application_Model_DbTable_Person');
+ $this->setDbTable('Application_Model_DbTable_Config');
}
return $this->_dbTable;
diff --git a/application/models/FilterEntriesMapper.php b/application/models/FilterEntriesMapper.php
index ab837db..af90d78 100644
--- a/application/models/FilterEntriesMapper.php
+++ b/application/models/FilterEntriesMapper.php
@@ -23,7 +23,7 @@ class Application_Model_FilterEntriesMapper
public function getDbTable()
{
if (null === $this->_dbTable) {
- $this->setDbTable('Application_Model_DbTable_Person');
+ $this->setDbTable('Application_Model_DbTable_FilterEntries');
}
return $this->_dbTable;
diff --git a/application/models/FilterMapper.php b/application/models/FilterMapper.php
index db1db69..41ae3c7 100644
--- a/application/models/FilterMapper.php
+++ b/application/models/FilterMapper.php
@@ -61,13 +61,7 @@ class Application_Model_FilterMapper
foreach ($resultSet as $row) {
$entry = new Application_Model_Filter();
- $entry->setID($row->filterID)->setMembershipID($row->membershipID)
- ->setGroupID($row->groupID)
- ->setBootmenuID($row->bootmenuID)
- ->setTitle($row->title)
- ->setDescription($row->description)
- ->setCreated($row->created)
- ->setPriority($row->priority);
+ $entry->setID($row->filterID)->setMembershipID($row->membershipID)->setGroupID($row->groupID)->setBootmenuID($row->bootmenuID)->setTitle($row->title)->setDescription($row->description)->setCreated($row->created)->setPriority($row->priority);
$entries[] = $entry;
}
diff --git a/application/models/FilterTypeMapper.php b/application/models/FilterTypeMapper.php
index 4c68112..c1f3635 100644
--- a/application/models/FilterTypeMapper.php
+++ b/application/models/FilterTypeMapper.php
@@ -23,7 +23,7 @@ class Application_Model_FilterTypeMapper
public function getDbTable()
{
if (null === $this->_dbTable) {
- $this->setDbTable('Application_Model_DbTable_Person');
+ $this->setDbTable('Application_Model_DbTable_FilterType');
}
return $this->_dbTable;
diff --git a/application/models/GroupGroupsMapper.php b/application/models/GroupGroupsMapper.php
index e91bc7b..dce6a5a 100644
--- a/application/models/GroupGroupsMapper.php
+++ b/application/models/GroupGroupsMapper.php
@@ -23,7 +23,7 @@ class Application_Model_GroupGroupsMapper
public function getDbTable()
{
if (null === $this->_dbTable) {
- $this->setDbTable('Application_Model_DbTable_Person');
+ $this->setDbTable('Application_Model_DbTable_GroupGroups');
}
return $this->_dbTable;
diff --git a/application/models/GroupMapper.php b/application/models/GroupMapper.php
index ddc8afb..5ad6c64 100644
--- a/application/models/GroupMapper.php
+++ b/application/models/GroupMapper.php
@@ -23,7 +23,7 @@ class Application_Model_GroupMapper
public function getDbTable()
{
if (null === $this->_dbTable) {
- $this->setDbTable('Application_Model_DbTable_Person');
+ $this->setDbTable('Application_Model_DbTable_Group');
}
return $this->_dbTable;
diff --git a/application/models/GroupRequestMapper.php b/application/models/GroupRequestMapper.php
index 14ba480..8ffd88e 100644
--- a/application/models/GroupRequestMapper.php
+++ b/application/models/GroupRequestMapper.php
@@ -23,7 +23,7 @@ class Application_Model_GroupRequestMapper
public function getDbTable()
{
if (null === $this->_dbTable) {
- $this->setDbTable('Application_Model_DbTable_Person');
+ $this->setDbTable('Application_Model_DbTable_GroupRequest');
}
return $this->_dbTable;
diff --git a/application/models/MembershipFiltersMapper.php b/application/models/MembershipFiltersMapper.php
index f4199cd..5c1fa29 100644
--- a/application/models/MembershipFiltersMapper.php
+++ b/application/models/MembershipFiltersMapper.php
@@ -23,7 +23,7 @@ class Application_Model_MembershipFiltersMapper
public function getDbTable()
{
if (null === $this->_dbTable) {
- $this->setDbTable('Application_Model_DbTable_Person');
+ $this->setDbTable('Application_Model_DbTable_MembershipFilters');
}
return $this->_dbTable;
diff --git a/application/models/MembershipMapper.php b/application/models/MembershipMapper.php
index ac81aba..fbbe279 100644
--- a/application/models/MembershipMapper.php
+++ b/application/models/MembershipMapper.php
@@ -23,7 +23,7 @@ class Application_Model_MembershipMapper
public function getDbTable()
{
if (null === $this->_dbTable) {
- $this->setDbTable('Application_Model_DbTable_Person');
+ $this->setDbTable('Application_Model_DbTable_Membership');
}
return $this->_dbTable;
diff --git a/application/models/Person.php b/application/models/Person.php
index 8eb96bb..9a44657 100644
--- a/application/models/Person.php
+++ b/application/models/Person.php
@@ -15,6 +15,7 @@ class Application_Model_Person
protected $_email;
protected $_login;
protected $_password;
+ protected $_password_salt;
public function __construct(array $options = null)
{
@@ -171,5 +172,14 @@ class Application_Model_Person
$this->_password = $_password;
return $this;
}
+ public function setPasswordSalt($_password_salt)
+ {
+ $this->_password_salt = $_password_salt;
+ return $this;
+ }
+ public function getPasswordSalt($_password_salt)
+ {
+ return $this->_password_salt;
+ }
}
diff --git a/application/models/PersonMapper.php b/application/models/PersonMapper.php
index 5612e4c..13385ca 100644
--- a/application/models/PersonMapper.php
+++ b/application/models/PersonMapper.php
@@ -32,7 +32,7 @@ class Application_Model_PersonMapper
public function save(Application_Model_Person $person)
{
- $data = array('personID'=> $person->getID() ,'title'=> $person->getTitle() ,'name'=> $person->getName() ,'firstname'=> $person->getFirstname() ,'street'=> $person->getStreet() ,'housenumber'=> $person->getHousenumber() ,'city'=> $person->getCity() ,'postalcode'=> $person->getPostalcode() ,'logindate'=> $person->getLogindate() ,'registerdate'=> $person->getRegisterdate() ,'email'=> $person->getEmail() ,'login'=> $person->getLogin() ,'password'=> $person->getPassword() );
+ $data = array('personID'=> $person->getID() ,'title'=> $person->getTitle() ,'name'=> $person->getName() ,'firstname'=> $person->getFirstname() ,'street'=> $person->getStreet() ,'housenumber'=> $person->getHousenumber() ,'city'=> $person->getCity() ,'postalcode'=> $person->getPostalcode() ,'logindate'=> $person->getLogindate() ,'registerdate'=> $person->getRegisterdate() ,'email'=> $person->getEmail() ,'login'=> $person->getLogin() ,'password'=> $person->getPassword() ,'password'=> $person->getPassword() );
if (null === ($id = $person->getID()) ) {
unset($data['id']);
@@ -51,7 +51,7 @@ class Application_Model_PersonMapper
$row = $result->current();
- $person->setID($row->personID)->setTitle($row->title)->setName($row->name)->setFirstname($row->firstname)->setStreet($row->street)->setHousenumber($row->housenumber)->setCity($row->city)->setPostalcode($row->postalcode)->setLogindate($row->logindate)->setRegisterdate($row->registerdate)->setEmail($row->email)->setLogin($row->login)->setPassword($row->password);
+ $person->setID($row->personID)->setTitle($row->title)->setName($row->name)->setFirstname($row->firstname)->setStreet($row->street)->setHousenumber($row->housenumber)->setCity($row->city)->setPostalcode($row->postalcode)->setLogindate($row->logindate)->setRegisterdate($row->registerdate)->setEmail($row->email)->setLogin($row->login)->setPassword($row->password)->setPasswordSalt($row->password_salt);
}
public function fetchAll()
@@ -61,7 +61,7 @@ class Application_Model_PersonMapper
foreach ($resultSet as $row) {
$entry = new Application_Model_Person();
- $entry->setID($row->personID)->setTitle($row->title)->setName($row->name)->setFirstname($row->firstname)->setStreet($row->street)->setHousenumber($row->housenumber)->setCity($row->city)->setPostalcode($row->postalcode)->setLogindate($row->logindate)->setRegisterdate($row->registerdate)->setEmail($row->email)->setLogin($row->login)->setPassword($row->password);
+ $entry->setID($row->personID)->setTitle($row->title)->setName($row->name)->setFirstname($row->firstname)->setStreet($row->street)->setHousenumber($row->housenumber)->setCity($row->city)->setPostalcode($row->postalcode)->setLogindate($row->logindate)->setRegisterdate($row->registerdate)->setEmail($row->email)->setLogin($row->login)->setPassword($row->password)->setPasswordSalt($row->password_salt);
$entries[] = $entry;
}
diff --git a/application/models/PoolEntriesMapper.php b/application/models/PoolEntriesMapper.php
index 832d71e..77bd34c 100644
--- a/application/models/PoolEntriesMapper.php
+++ b/application/models/PoolEntriesMapper.php
@@ -23,7 +23,7 @@ class Application_Model_PoolEntriesMapper
public function getDbTable()
{
if (null === $this->_dbTable) {
- $this->setDbTable('Application_Model_DbTable_Person');
+ $this->setDbTable('Application_Model_DbTable_PoolEntries');
}
return $this->_dbTable;
diff --git a/application/models/PoolFiltersMapper.php b/application/models/PoolFiltersMapper.php
index 49920af..88ffe97 100644
--- a/application/models/PoolFiltersMapper.php
+++ b/application/models/PoolFiltersMapper.php
@@ -23,7 +23,7 @@ class Application_Model_PoolFiltersMapper
public function getDbTable()
{
if (null === $this->_dbTable) {
- $this->setDbTable('Application_Model_DbTable_Person');
+ $this->setDbTable('Application_Model_DbTable_PoolFilters');
}
return $this->_dbTable;
diff --git a/application/models/PoolMapper.php b/application/models/PoolMapper.php
index 2cca913..f889330 100644
--- a/application/models/PoolMapper.php
+++ b/application/models/PoolMapper.php
@@ -23,7 +23,7 @@ class Application_Model_PoolMapper
public function getDbTable()
{
if (null === $this->_dbTable) {
- $this->setDbTable('Application_Model_DbTable_Person');
+ $this->setDbTable('Application_Model_DbTable_Pool');
}
return $this->_dbTable;
diff --git a/application/models/RightMapper.php b/application/models/RightMapper.php
index 608a23a..3ffe5f5 100644
--- a/application/models/RightMapper.php
+++ b/application/models/RightMapper.php
@@ -23,7 +23,7 @@ class Application_Model_RightMapper
public function getDbTable()
{
if (null === $this->_dbTable) {
- $this->setDbTable('Application_Model_DbTable_Person');
+ $this->setDbTable('Application_Model_DbTable_Right');
}
return $this->_dbTable;
diff --git a/application/models/RightRolesMapper.php b/application/models/RightRolesMapper.php
index edcfca4..afd5c26 100644
--- a/application/models/RightRolesMapper.php
+++ b/application/models/RightRolesMapper.php
@@ -23,7 +23,7 @@ class Application_Model_RightRolesMapper
public function getDbTable()
{
if (null === $this->_dbTable) {
- $this->setDbTable('Application_Model_DbTable_Person');
+ $this->setDbTable('Application_Model_DbTable_RightRoles');
}
return $this->_dbTable;
diff --git a/application/models/RoleMapper.php b/application/models/RoleMapper.php
index 7f341fe..2b1d658 100644
--- a/application/models/RoleMapper.php
+++ b/application/models/RoleMapper.php
@@ -23,7 +23,7 @@ class Application_Model_RoleMapper
public function getDbTable()
{
if (null === $this->_dbTable) {
- $this->setDbTable('Application_Model_DbTable_Person');
+ $this->setDbTable('Application_Model_DbTable_Role');
}
return $this->_dbTable;
diff --git a/application/models/SessionMapper.php b/application/models/SessionMapper.php
index 6d476a8..c4187bd 100644
--- a/application/models/SessionMapper.php
+++ b/application/models/SessionMapper.php
@@ -23,7 +23,7 @@ class Application_Model_SessionMapper
public function getDbTable()
{
if (null === $this->_dbTable) {
- $this->setDbTable('Application_Model_DbTable_Person');
+ $this->setDbTable('Application_Model_DbTable_Session');
}
return $this->_dbTable;
diff --git a/createDefaultMapper/mappertemplate b/createDefaultMapper/mappertemplate
index 0c36949..62de1eb 100644
--- a/createDefaultMapper/mappertemplate
+++ b/createDefaultMapper/mappertemplate
@@ -23,7 +23,7 @@ class Application_Model_MAPPER
public function getDbTable()
{
if (null === $this->_dbTable) {
- $this->setDbTable('Application_Model_DbTable_Person');
+ $this->setDbTable('Application_Model_DbTable_MODEL');
}
return $this->_dbTable;
diff --git a/droppbs.sql b/droppbs.sql
new file mode 100644
index 0000000..76cb448
--- /dev/null
+++ b/droppbs.sql
@@ -0,0 +1,22 @@
+DROP TABLE pbs_bootiso;
+DROP TABLE pbs_bootmenuentries;
+DROP TABLE pbs_filterentries;
+DROP TABLE pbs_groupgroups;
+DROP TABLE pbs_grouprequest;
+DROP TABLE pbs_membershipfilters;
+DROP TABLE pbs_poolentries;
+DROP TABLE pbs_poolfilters;
+DROP TABLE pbs_rightroles;
+DROP TABLE pbs_session;
+DROP TABLE pbs_client;
+DROP TABLE pbs_filtertype;
+DROP TABLE pbs_filter;
+DROP TABLE pbs_role;
+DROP TABLE pbs_right;
+DROP TABLE pbs_pool;
+DROP TABLE pbs_person;
+DROP TABLE pbs_bootos;
+DROP TABLE pbs_bootmenu;
+DROP TABLE pbs_config;
+DROP TABLE pbs_group;
+DROP TABLE pbs_membership; \ No newline at end of file