From 24468f6a2244b07e7c56eb80523bf63341f486cd Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 28 Jan 2011 09:48:04 +0100 Subject: setter/getter geƤndert damit es Konvention setGrossbuchstabe() entspricht --- application/models/BootMenu.php | 42 +++++++--------- application/models/BootMenuEntries.php | 40 +++++++++++++++ application/models/BootOs.php | 85 +++++++++++++++++++------------- application/models/Client.php | 17 +++---- application/models/Config.php | 17 +++---- application/models/Filter.php | 47 ++++++------------ application/models/FilterEntries.php | 23 +++------ application/models/FilterType.php | 11 ++--- application/models/Group.php | 17 +++---- application/models/GroupGroups.php | 11 ++--- application/models/GroupRequest.php | 39 ++++++--------- application/models/Membership.php | 23 +++------ application/models/MembershipFilters.php | 11 ++--- application/models/Person.php | 77 ++++++++++------------------- application/models/Pool.php | 23 +++------ application/models/PoolEntries.php | 11 ++--- application/models/PoolFilters.php | 11 ++--- application/models/Right.php | 17 +++---- application/models/RightRoles.php | 11 ++--- application/models/Role.php | 23 +++------ application/models/Session.php | 35 +++++-------- public/settergetter.php | 17 ++++--- 22 files changed, 268 insertions(+), 340 deletions(-) diff --git a/application/models/BootMenu.php b/application/models/BootMenu.php index 0cf0443..3b1cc41 100644 --- a/application/models/BootMenu.php +++ b/application/models/BootMenu.php @@ -43,46 +43,38 @@ class Application_Model_BootMenu } return $this; } - - - public function get_bootmenuID() + + public function getID() { - return $this->_bootmenuID; + return $this->_bootmenuID; } - - public function set_bootmenuID($_bootmenuID) + public function setID($_bootmenuID) { - $this->_bootmenuID = $_bootmenuID; + $this->_bootmenuID = $_bootmenuID; } - - public function get_membershipID() + public function getMembershipID() { - return $this->_membershipID; + return $this->_membershipID; } - - public function set_membershipID($_membershipID) + public function setMembershipID($_membershipID) { - $this->_membershipID = $_membershipID; + $this->_membershipID = $_membershipID; } - - public function get_title() + public function getTitle() { - return $this->_title; + return $this->_title; } - - public function set_title($_title) + public function setTitle($_title) { - $this->_title = $_title; + $this->_title = $_title; } - - public function get_time() + public function getTime() { - return $this->_time; + return $this->_time; } - - public function set_time($_time) + public function setTime($_time) { - $this->_time = $_time; + $this->_time = $_time; } } diff --git a/application/models/BootMenuEntries.php b/application/models/BootMenuEntries.php index 0d2b5cd..3bb05ea 100644 --- a/application/models/BootMenuEntries.php +++ b/application/models/BootMenuEntries.php @@ -38,6 +38,46 @@ class Application_Model_BootMenuEntries } return $this; } + public function getBootosID() + { + return $this->_bootosID; + } + public function setBootosID($_bootosID) + { + $this->_bootosID = $_bootosID; + } + public function getBootmenuID() + { + return $this->_bootmenuID; + } + public function setBootmenuID($_bootmenuID) + { + $this->_bootmenuID = $_bootmenuID; + } + public function getTitle() + { + return $this->_title; + } + public function setTitle($_title) + { + $this->_title = $_title; + } + public function getKcl() + { + return $this->_kcl; + } + public function setKcl($_kcl) + { + $this->_kcl = $_kcl; + } + public function getOrder() + { + return $this->_order; + } + public function setOrder($_order) + { + $this->_order = $_order; + } } diff --git a/application/models/BootOs.php b/application/models/BootOs.php index d4432d7..e97684d 100644 --- a/application/models/BootOs.php +++ b/application/models/BootOs.php @@ -48,72 +48,91 @@ class Application_Model_BootOs } - public function get_bootisoID() + public function getBootosID() { - return $this->_bootisoID; + return $this->_bootosID; } - - public function set_bootisoID($_bootisoID) + public function setBootosID($_bootosID) { - $this->_bootisoID = $_bootisoID; + $this->_bootosID = $_bootosID; } - - public function get_membershipID() + public function getConfigID() { - return $this->_membershipID; + return $this->_configID; } - - public function set_membershipID($_membershipID) + public function setConfigID($_configID) { - $this->_membershipID = $_membershipID; + $this->_configID = $_configID; } - - public function get_groupID() + public function getGroupID() { return $this->_groupID; } - - public function set_groupID($_groupID) + public function setGroupID($_groupID) { $this->_groupID = $_groupID; } - - public function get_serialnumber() + public function getTitle() { - return $this->_serialnumber; + return $this->_title; } - - public function set_serialnumber($_serialnumber) + public function setTitle($_title) { - $this->_serialnumber = $_serialnumber; + $this->_title = $_title; } - - public function get_created() + public function getDescription() + { + return $this->_description; + } + public function setDescription($_description) + { + $this->_description = $_description; + } + public function getPath_init() + { + return $this->_path_init; + } + public function setPath_init($_path_init) + { + $this->_path_init = $_path_init; + } + public function getPath_kernel() + { + return $this->_path_kernel; + } + public function setPath_kernel($_path_kernel) + { + $this->_path_kernel = $_path_kernel; + } + public function getDefaultkcl() + { + return $this->_defaultkcl; + } + public function setDefaultkcl($_defaultkcl) + { + $this->_defaultkcl = $_defaultkcl; + } + public function getCreated() { return $this->_created; } - - public function set_created($_created) + public function setCreated($_created) { $this->_created = $_created; } - - public function get_expires() + public function getExpires() { return $this->_expires; } - - public function set_expires($_expires) + public function setExpires($_expires) { $this->_expires = $_expires; } - - public function get_public() + public function getPublic() { return $this->_public; } - - public function set_public($_public) + public function setPublic($_public) { $this->_public = $_public; } diff --git a/application/models/Client.php b/application/models/Client.php index 5b0ebb0..0fb5f64 100644 --- a/application/models/Client.php +++ b/application/models/Client.php @@ -44,32 +44,27 @@ class Application_Model_Client } - public function get_clientID() + public function getClientID() { return $this->_clientID; } - - public function set_clientID($_clientID) + public function setClientID($_clientID) { $this->_clientID = $_clientID; } - - public function get_macadress() + public function getMacadress() { return $this->_macadress; } - - public function set_macadress($_macadress) + public function setMacadress($_macadress) { $this->_macadress = $_macadress; } - - public function get_hardwarehash() + public function getHardwarehash() { return $this->_hardwarehash; } - - public function set_hardwarehash($_hardwarehash) + public function setHardwarehash($_hardwarehash) { $this->_hardwarehash = $_hardwarehash; } diff --git a/application/models/Config.php b/application/models/Config.php index 2a2d503..a553c65 100644 --- a/application/models/Config.php +++ b/application/models/Config.php @@ -44,32 +44,27 @@ class Application_Model_Config } - public function get_configID() + public function getID() { return $this->_configID; } - - public function set_configID($_configID) + public function setID($_configID) { $this->_configID = $_configID; } - - public function get_membershipID() + public function getMembershipID() { return $this->_membershipID; } - - public function set_membershipID($_membershipID) + public function setMembershipID($_membershipID) { $this->_membershipID = $_membershipID; } - - public function get_shellscript() + public function getShellscript() { return $this->_shellscript; } - - public function set_shellscript($_shellscript) + public function setShellscript($_shellscript) { $this->_shellscript = $_shellscript; } diff --git a/application/models/Filter.php b/application/models/Filter.php index 5e2f5bc..0c8588c 100644 --- a/application/models/Filter.php +++ b/application/models/Filter.php @@ -49,82 +49,67 @@ class Application_Model_Filter } - public function get_filterID() + public function getID() { return $this->_filterID; } - - public function set_filterID($_filterID) + public function setID($_filterID) { $this->_filterID = $_filterID; } - - public function get_membershipID() + public function getMembershipID() { return $this->_membershipID; } - - public function set_membershipID($_membershipID) + public function setMembershipID($_membershipID) { $this->_membershipID = $_membershipID; } - - public function get_groupID() + public function getGroupID() { return $this->_groupID; } - - public function set_groupID($_groupID) + public function setGroupID($_groupID) { $this->_groupID = $_groupID; } - - public function get_bootmenuID() + public function getBootmenuID() { return $this->_bootmenuID; } - - public function set_bootmenuID($_bootmenuID) + public function setBootmenuID($_bootmenuID) { $this->_bootmenuID = $_bootmenuID; } - - public function get_title() + public function getTitle() { return $this->_title; } - - public function set_title($_title) + public function setTitle($_title) { $this->_title = $_title; } - - public function get_description() + public function getDescription() { return $this->_description; } - - public function set_description($_description) + public function setDescription($_description) { $this->_description = $_description; } - - public function get_created() + public function getCreated() { return $this->_created; } - - public function set_created($_created) + public function setCreated($_created) { $this->_created = $_created; } - - public function get_priority() + public function getPriority() { return $this->_priority; } - - public function set_priority($_priority) + public function setPriority($_priority) { $this->_priority = $_priority; } diff --git a/application/models/FilterEntries.php b/application/models/FilterEntries.php index 815133c..724560b 100644 --- a/application/models/FilterEntries.php +++ b/application/models/FilterEntries.php @@ -45,42 +45,35 @@ class Application_Model_FilterEntries } - public function get_filterID() + public function getFilterID() { return $this->_filterID; } - - public function set_filterID($_filterID) + public function setFilterID($_filterID) { $this->_filterID = $_filterID; } - - public function get_filtertypeID() + public function getFiltertypeID() { return $this->_filtertypeID; } - - public function set_filtertypeID($_filtertypeID) + public function setFiltertypeID($_filtertypeID) { $this->_filtertypeID = $_filtertypeID; } - - public function get_filtervalue() + public function getFiltervalue() { return $this->_filtervalue; } - - public function set_filtervalue($_filtervalue) + public function setFiltervalue($_filtervalue) { $this->_filtervalue = $_filtervalue; } - - public function get_filtervalue2() + public function getFiltervalue2() { return $this->_filtervalue2; } - - public function set_filtervalue2($_filtervalue2) + public function setFiltervalue2($_filtervalue2) { $this->_filtervalue2 = $_filtervalue2; } diff --git a/application/models/FilterType.php b/application/models/FilterType.php index 94a72b9..9601368 100644 --- a/application/models/FilterType.php +++ b/application/models/FilterType.php @@ -43,22 +43,19 @@ class Application_Model_FilterType } - public function get_filtertypeID() + public function getID() { return $this->_filtertypeID; } - - public function set_filtertypeID($_filtertypeID) + public function setID($_filtertypeID) { $this->_filtertypeID = $_filtertypeID; } - - public function get_filtertypename() + public function getFiltertypename() { return $this->_filtertypename; } - - public function set_filtertypename($_filtertypename) + public function setFiltertypename($_filtertypename) { $this->_filtertypename = $_filtertypename; } diff --git a/application/models/Group.php b/application/models/Group.php index 771c08b..8824098 100644 --- a/application/models/Group.php +++ b/application/models/Group.php @@ -44,32 +44,27 @@ class Application_Model_Group } - public function get_groupID() + public function getID() { return $this->_groupID; } - - public function set_groupID($_groupID) + public function setID($_groupID) { $this->_groupID = $_groupID; } - - public function get_title() + public function getTitle() { return $this->_title; } - - public function set_title($_title) + public function setTitle($_title) { $this->_title = $_title; } - - public function get_description() + public function getDescription() { return $this->_description; } - - public function set_description($_description) + public function setDescription($_description) { $this->_description = $_description; } diff --git a/application/models/GroupGroups.php b/application/models/GroupGroups.php index 31776cb..af5c43c 100644 --- a/application/models/GroupGroups.php +++ b/application/models/GroupGroups.php @@ -43,22 +43,19 @@ class Application_Model_GroupGroups } - public function get_parentID() + public function getParentID() { return $this->_parentID; } - - public function set_parentID($_parentID) + public function setParentID($_parentID) { $this->_parentID = $_parentID; } - - public function get_groupID() + public function getGroupID() { return $this->_groupID; } - - public function set_groupID($_groupID) + public function setGroupID($_groupID) { $this->_groupID = $_groupID; } diff --git a/application/models/GroupRequest.php b/application/models/GroupRequest.php index 66577a2..166bf95 100644 --- a/application/models/GroupRequest.php +++ b/application/models/GroupRequest.php @@ -45,44 +45,37 @@ class Application_Model_GroupRequest } - public function get_grouprequestID() + public function getID() { - return $this->_grouprequestID; + return $this->_grouprequestID; } - - public function set_grouprequestID($_grouprequestID) + public function setID($_grouprequestID) { - $this->_grouprequestID = $_grouprequestID; + $this->_grouprequestID = $_grouprequestID; } - - public function get_groupID() + public function getGroupID() { - return $this->_groupID; + return $this->_groupID; } - - public function set_groupID($_groupID) + public function setGroupID($_groupID) { - $this->_groupID = $_groupID; + $this->_groupID = $_groupID; } - - public function get_personID() + public function getPersonID() { - return $this->_personID; + return $this->_personID; } - - public function set_personID($_personID) + public function setPersonID($_personID) { - $this->_personID = $_personID; + $this->_personID = $_personID; } - - public function get_time() + public function getTime() { - return $this->_time; + return $this->_time; } - - public function set_time($_time) + public function setTime($_time) { - $this->_time = $_time; + $this->_time = $_time; } } diff --git a/application/models/Membership.php b/application/models/Membership.php index 6859d08..6c8bde2 100644 --- a/application/models/Membership.php +++ b/application/models/Membership.php @@ -45,42 +45,35 @@ class Application_Model_Membership } - public function get_membershipID() + public function getID() { return $this->_membershipID; } - - public function set_membershipID($_membershipID) + public function setID($_membershipID) { $this->_membershipID = $_membershipID; } - - public function get_groupID() + public function getGroupID() { return $this->_groupID; } - - public function set_groupID($_groupID) + public function setGroupID($_groupID) { $this->_groupID = $_groupID; } - - public function get_roleID() + public function getRoleID() { return $this->_roleID; } - - public function set_roleID($_roleID) + public function setRoleID($_roleID) { $this->_roleID = $_roleID; } - - public function get_personID() + public function getPersonID() { return $this->_personID; } - - public function set_personID($_personID) + public function setPersonID($_personID) { $this->_personID = $_personID; } diff --git a/application/models/MembershipFilters.php b/application/models/MembershipFilters.php index e12380d..fb6be19 100644 --- a/application/models/MembershipFilters.php +++ b/application/models/MembershipFilters.php @@ -43,22 +43,19 @@ class Application_Model_MembershipFilters } - public function get_membershipID() + public function getMembershipID() { return $this->_membershipID; } - - public function set_membershipID($_membershipID) + public function setMembershipID($_membershipID) { $this->_membershipID = $_membershipID; } - - public function get_filterID() + public function getFilterID() { return $this->_filterID; } - - public function set_filterID($_filterID) + public function setFilterID($_filterID) { $this->_filterID = $_filterID; } diff --git a/application/models/Person.php b/application/models/Person.php index ec717b9..c8a6717 100644 --- a/application/models/Person.php +++ b/application/models/Person.php @@ -54,132 +54,107 @@ class Application_Model_Person } - public function get_personID() + public function getID() { return $this->_personID; } - - public function set_personID($_personID) + public function setID($_personID) { $this->_personID = $_personID; } - - public function get_title() + public function getTitle() { return $this->_title; } - - public function set_title($_title) + public function setTitle($_title) { $this->_title = $_title; } - - public function get_name() + public function getName() { return $this->_name; } - - public function set_name($_name) + public function setName($_name) { $this->_name = $_name; } - - public function get_firstname() + public function getFirstname() { return $this->_firstname; } - - public function set_firstname($_firstname) + public function setFirstname($_firstname) { $this->_firstname = $_firstname; } - - public function get_street() + public function getStreet() { return $this->_street; } - - public function set_street($_street) + public function setStreet($_street) { $this->_street = $_street; } - - public function get_housenumber() + public function getHousenumber() { return $this->_housenumber; } - - public function set_housenumber($_housenumber) + public function setHousenumber($_housenumber) { $this->_housenumber = $_housenumber; } - - public function get_city() + public function getCity() { return $this->_city; } - - public function set_city($_city) + public function setCity($_city) { $this->_city = $_city; } - - public function get_postalcode() + public function getPostalcode() { return $this->_postalcode; } - - public function set_postalcode($_postalcode) + public function setPostalcode($_postalcode) { $this->_postalcode = $_postalcode; } - - public function get_logindate() + public function getLogindate() { return $this->_logindate; } - - public function set_logindate($_logindate) + public function setLogindate($_logindate) { $this->_logindate = $_logindate; } - - public function get_registerdate() + public function getRegisterdate() { return $this->_registerdate; } - - public function set_registerdate($_registerdate) + public function setRegisterdate($_registerdate) { $this->_registerdate = $_registerdate; } - - public function get_email() + public function getEmail() { return $this->_email; } - - public function set_email($_email) + public function setEmail($_email) { $this->_email = $_email; } - - public function get_login() + public function getLogin() { return $this->_login; } - - public function set_login($_login) + public function setLogin($_login) { $this->_login = $_login; } - - public function get_password() + public function getPassword() { return $this->_password; } - - public function set_password($_password) + public function setPassword($_password) { $this->_password = $_password; } diff --git a/application/models/Pool.php b/application/models/Pool.php index 383ae1c..53e13e2 100644 --- a/application/models/Pool.php +++ b/application/models/Pool.php @@ -45,42 +45,35 @@ class Application_Model_Pool } - public function get_poolID() + public function getID() { return $this->_poolID; } - - public function set_poolID($_poolID) + public function setID($_poolID) { $this->_poolID = $_poolID; } - - public function get_title() + public function getTitle() { return $this->_title; } - - public function set_title($_title) + public function setTitle($_title) { $this->_title = $_title; } - - public function get_description() + public function getDescription() { return $this->_description; } - - public function set_description($_description) + public function setDescription($_description) { $this->_description = $_description; } - - public function get_location() + public function getLocation() { return $this->_location; } - - public function set_location($_location) + public function setLocation($_location) { $this->_location = $_location; } diff --git a/application/models/PoolEntries.php b/application/models/PoolEntries.php index a7e70e9..d20c226 100644 --- a/application/models/PoolEntries.php +++ b/application/models/PoolEntries.php @@ -43,22 +43,19 @@ class Application_Model_PoolEntries } - public function get_poolID() + public function getPoolID() { return $this->_poolID; } - - public function set_poolID($_poolID) + public function setPoolID($_poolID) { $this->_poolID = $_poolID; } - - public function get_clientID() + public function getClientID() { return $this->_clientID; } - - public function set_clientID($_clientID) + public function setClientID($_clientID) { $this->_clientID = $_clientID; } diff --git a/application/models/PoolFilters.php b/application/models/PoolFilters.php index 504aa4f..6daf465 100644 --- a/application/models/PoolFilters.php +++ b/application/models/PoolFilters.php @@ -43,22 +43,19 @@ class Application_Model_PoolFilters } - public function get_poolID() + public function getPoolID() { return $this->_poolID; } - - public function set_poolID($_poolID) + public function setPoolID($_poolID) { $this->_poolID = $_poolID; } - - public function get_filterID() + public function getFilterID() { return $this->_filterID; } - - public function set_filterID($_filterID) + public function setFilterID($_filterID) { $this->_filterID = $_filterID; } diff --git a/application/models/Right.php b/application/models/Right.php index 250f158..ebb3430 100644 --- a/application/models/Right.php +++ b/application/models/Right.php @@ -44,32 +44,27 @@ class Application_Model_Right } - public function get_rightID() + public function getID() { return $this->_rightID; } - - public function set_rightID($_rightID) + public function setID($_rightID) { $this->_rightID = $_rightID; } - - public function get_title() + public function getTitle() { return $this->_title; } - - public function set_title($_title) + public function setTitle($_title) { $this->_title = $_title; } - - public function get_description() + public function getDescription() { return $this->_description; } - - public function set_description($_description) + public function setDescription($_description) { $this->_description = $_description; } diff --git a/application/models/RightRoles.php b/application/models/RightRoles.php index ccd62dc..d5bdd65 100644 --- a/application/models/RightRoles.php +++ b/application/models/RightRoles.php @@ -43,22 +43,19 @@ class Application_Model_RightRoles } - public function get_roleID() + public function getRoleID() { return $this->_roleID; } - - public function set_roleID($_roleID) + public function setRoleID($_roleID) { $this->_roleID = $_roleID; } - - public function get_rightID() + public function getRightID() { return $this->_rightID; } - - public function set_rightID($_rightID) + public function setRightID($_rightID) { $this->_rightID = $_rightID; } diff --git a/application/models/Role.php b/application/models/Role.php index e8812b9..d00b93f 100644 --- a/application/models/Role.php +++ b/application/models/Role.php @@ -45,42 +45,35 @@ class Application_Model_Role } - public function get_roleID() + public function getID() { return $this->_roleID; } - - public function set_roleID($_roleID) + public function setID($_roleID) { $this->_roleID = $_roleID; } - - public function get_groupID() + public function getGroupID() { return $this->_groupID; } - - public function set_groupID($_groupID) + public function setGroupID($_groupID) { $this->_groupID = $_groupID; } - - public function get_title() + public function getTitle() { return $this->_title; } - - public function set_title($_title) + public function setTitle($_title) { $this->_title = $_title; } - - public function get_description() + public function getDescription() { return $this->_description; } - - public function set_description($_description) + public function setDescription($_description) { $this->_description = $_description; } diff --git a/application/models/Session.php b/application/models/Session.php index 7d3c6a2..2820afe 100644 --- a/application/models/Session.php +++ b/application/models/Session.php @@ -47,62 +47,51 @@ class Application_Model_Session } - public function get_sessionID() + public function getID() { return $this->_sessionID; } - - public function set_sessionID($_sessionID) + public function setID($_sessionID) { $this->_sessionID = $_sessionID; } - - public function get_clientID() + public function getClientID() { return $this->_clientID; } - - public function set_clientID($_clientID) + public function setClientID($_clientID) { $this->_clientID = $_clientID; } - - public function get_bootosID() + public function getBootosID() { return $this->_bootosID; } - - public function set_bootosID($_bootosID) + public function setBootosID($_bootosID) { $this->_bootosID = $_bootosID; } - - public function get_time() + public function getTime() { return $this->_time; } - - public function set_time($_time) + public function setTime($_time) { $this->_time = $_time; } - - public function get_ip() + public function getIp() { return $this->_ip; } - - public function set_ip($_ip) + public function setIp($_ip) { $this->_ip = $_ip; } - - public function get_ip6() + public function getIp6() { return $this->_ip6; } - - public function set_ip6($_ip6) + public function setIp6($_ip6) { $this->_ip6 = $_ip6; } diff --git a/public/settergetter.php b/public/settergetter.php index 42f73ef..c9f0016 100644 --- a/public/settergetter.php +++ b/public/settergetter.php @@ -4,14 +4,14 @@ function setget($name){ $withdash = $name; $withoutdash = substr($name,1); return -' public function get'.ucfirst($withoutdash).'() - { - return $this->'.$withdash.'; - } - public function set'.ucfirst($withoutdash).'($'.$withdash.') - { - $this->'.$withdash.' = $'.$withdash.'; - } +' public function get'.ucfirst($withoutdash).'() + { + return $this->'.$withdash.'; + } + public function set'.ucfirst($withoutdash).'($'.$withdash.') + { + $this->'.$withdash.' = $'.$withdash.'; + } '; } if(isset($_POST['submit'])){ @@ -27,6 +27,7 @@ if(isset($_POST['submit'])){ else{ ?> +Jeweils ein Variablenname pro Zeile:
'>
-- cgit v1.2.3-55-g7522