From 330c7b825efad3369b2cca4f796dde84dbb0c312 Mon Sep 17 00:00:00 2001 From: Alexander Fuhr Date: Wed, 24 Jun 2015 15:34:24 +0200 Subject: [PATCH] xMember: Delete the absolete Member classes --- application/controllers/ObjectController.php | 69 ------------------- .../forms/IcingaHostGroupMemberForm.php | 24 ------- .../forms/IcingaServiceGroupMemberForm.php | 24 ------- .../forms/IcingaUserGroupMemberForm.php | 24 ------- .../tables/IcingaHostGroupMemberTable.php | 54 --------------- .../tables/IcingaServiceGroupMemberTable.php | 54 --------------- .../tables/IcingaUserGroupMemberTable.php | 54 --------------- .../Objects/IcingaHostGroupMember.php | 27 -------- .../Objects/IcingaServiceGroupMember.php | 27 -------- .../Objects/IcingaUserGroupMember.php | 27 -------- 10 files changed, 384 deletions(-) delete mode 100644 application/forms/IcingaHostGroupMemberForm.php delete mode 100644 application/forms/IcingaServiceGroupMemberForm.php delete mode 100644 application/forms/IcingaUserGroupMemberForm.php delete mode 100644 application/tables/IcingaHostGroupMemberTable.php delete mode 100644 application/tables/IcingaServiceGroupMemberTable.php delete mode 100644 application/tables/IcingaUserGroupMemberTable.php delete mode 100644 library/Director/Objects/IcingaHostGroupMember.php delete mode 100644 library/Director/Objects/IcingaServiceGroupMember.php delete mode 100644 library/Director/Objects/IcingaUserGroupMember.php diff --git a/application/controllers/ObjectController.php b/application/controllers/ObjectController.php index cf4a6ca3..ec1529e2 100644 --- a/application/controllers/ObjectController.php +++ b/application/controllers/ObjectController.php @@ -56,29 +56,6 @@ class Director_ObjectController extends ActionController $this->render('form'); } - public function hostgroupmemberAction() - { - $this->view->form = $this->loadForm('icingaHostGroupMember') - ->setDb($this->db()) - ->setSuccessUrl('director/list/hostgroupmembers'); - - if (($host_id = $this->params->get('host_id')) - && ($hostgroup_id = $this->params->get('hostgroup_id')) - ) { - $this->view->form->loadObject( - array( - 'host_id' => $host_id, - 'hostgroup_id' => $hostgroup_id, - ) - ); - $this->view->title = $this->translate('Modify Icinga Hostgroup Member'); - } else { - $this->view->title = $this->translate('Add new Icinga Hostgroup Member'); - } - $this->view->form->handleRequest(); - $this->render('form'); - } - public function serviceAction() { $this->view->form = $this->loadForm('icingaService') @@ -111,29 +88,6 @@ class Director_ObjectController extends ActionController $this->render('form'); } - public function servicegroupmemberAction() - { - $this->view->form = $this->loadForm('icingaServiceGroupMember') - ->setDb($this->db()) - ->setSuccessUrl('director/list/servicegroupmembers'); - - if (($service_id = $this->params->get('service_id')) - && ($servicegroup_id = $this->params->get('servicegroup_id')) - ) { - $this->view->form->loadObject( - array( - 'service_id' => $service_id, - 'servicegroup_id' => $servicegroup_id, - ) - ); - $this->view->title = $this->translate('Modify Icinga Servicegroup Member'); - } else { - $this->view->title = $this->translate('Add new Icinga Servicegroup Member'); - } - $this->view->form->handleRequest(); - $this->render('form'); - } - public function servicevarAction() { $this->view->form = $this->loadForm('icingaServiceVar') @@ -218,29 +172,6 @@ class Director_ObjectController extends ActionController $this->render('form'); } - public function usergroupmemberAction() - { - $this->view->form = $this->loadForm('icingaUserGroupMember') - ->setDb($this->db()) - ->setSuccessUrl('director/list/usergroupmembers'); - - if (($user_id = $this->params->get('user_id')) - && ($usergroup_id = $this->params->get('usergroup_id')) - ) { - $this->view->form->loadObject( - array( - 'user_id' => $user_id, - 'usergroup_id' => $usergroup_id, - ) - ); - $this->view->title = $this->translate('Modify Icinga Usergroup Member'); - } else { - $this->view->title = $this->translate('Add new Icinga Usergroup Member'); - } - $this->view->form->handleRequest(); - $this->render('form'); - } - public function endpointAction() { $this->view->form = $this->loadForm('icingaEndpoint') diff --git a/application/forms/IcingaHostGroupMemberForm.php b/application/forms/IcingaHostGroupMemberForm.php deleted file mode 100644 index d8647a70..00000000 --- a/application/forms/IcingaHostGroupMemberForm.php +++ /dev/null @@ -1,24 +0,0 @@ -addElement('select', 'hostgroup_id', array( - 'label' => $this->translate('Hostgroup'), - 'description' => $this->translate('The name of the hostgroup') - )); - - $this->addElement('select', 'host_id', array( - 'label' => $this->translate('Host'), - 'description' => $this->translate('The name of the host') - )); - } -} diff --git a/application/forms/IcingaServiceGroupMemberForm.php b/application/forms/IcingaServiceGroupMemberForm.php deleted file mode 100644 index bfdbee55..00000000 --- a/application/forms/IcingaServiceGroupMemberForm.php +++ /dev/null @@ -1,24 +0,0 @@ -addElement('select', 'servicegroup_id', array( - 'label' => $this->translate('Servicegroup'), - 'description' => $this->translate('The name of the servicegroup') - )); - - $this->addElement('select', 'service_id', array( - 'label' => $this->translate('Service'), - 'description' => $this->translate('The name of the service') - )); - } -} diff --git a/application/forms/IcingaUserGroupMemberForm.php b/application/forms/IcingaUserGroupMemberForm.php deleted file mode 100644 index d25b2b6a..00000000 --- a/application/forms/IcingaUserGroupMemberForm.php +++ /dev/null @@ -1,24 +0,0 @@ -addElement('select', 'usergroup_id', array( - 'label' => $this->translate('Usergroup'), - 'description' => $this->translate('The name of the usergroup') - )); - - $this->addElement('select', 'user_id', array( - 'label' => $this->translate('User'), - 'description' => $this->translate('The name of the user') - )); - } -} diff --git a/application/tables/IcingaHostGroupMemberTable.php b/application/tables/IcingaHostGroupMemberTable.php deleted file mode 100644 index cbeb9f11..00000000 --- a/application/tables/IcingaHostGroupMemberTable.php +++ /dev/null @@ -1,54 +0,0 @@ - 'hg.id', - 'host_id' => 'h.id', - 'hostgroup' => 'hg.object_name', - 'host' => 'h.object_name' - ); - } - - protected function getActionUrl($row) - { - return $this->url('director/object/hostgroupmember', array( - 'hostgroup_id' => $row->hostgroup_id, - 'host_id' => $row->host_id, - )); - } - - public function getTitles() - { - $view = $this->view(); - return array( - 'hostgroup' => $view->translate('Hostgroup'), - 'host' => $view->translate('Member'), - ); - } - - public function fetchData() - { - $db = $this->connection()->getConnection(); - $query = $db->select()->from( - array('hg' => 'icinga_hostgroup'), - $this->getColumns() - )->join( - array('hgh' => 'icinga_hostgroup_host'), - 'hgh.hostgroup_id = hg.id', - array() - )->join( - array('h' => 'icinga_host'), - 'hgh.host_id = h.id', - array() - ); - - return $db->fetchAll($query); - } -} diff --git a/application/tables/IcingaServiceGroupMemberTable.php b/application/tables/IcingaServiceGroupMemberTable.php deleted file mode 100644 index 5e32b420..00000000 --- a/application/tables/IcingaServiceGroupMemberTable.php +++ /dev/null @@ -1,54 +0,0 @@ - 'sg.id', - 'service_id' => 's.id', - 'servicegroup' => 'sg.object_name', - 'service' => 's.object_name' - ); - } - - protected function getActionUrl($row) - { - return $this->url('director/object/servicegroupmember', array( - 'servicegroup_id' => $row->servicegroup_id, - 'service_id' => $row->service_id, - )); - } - - public function getTitles() - { - $view = $this->view(); - return array( - 'servicegroup' => $view->translate('Servicegroup'), - 'service' => $view->translate('Member'), - ); - } - - public function fetchData() - { - $db = $this->connection()->getConnection(); - $query = $db->select()->from( - array('sg' => 'icinga_servicegroup'), - $this->getColumns() - )->join( - array('sgs' => 'icinga_servicegroup_service'), - 'sgs.servicegroup_id = sg.id', - array() - )->join( - array('s' => 'icinga_service'), - 'sgs.service_id = s.id', - array() - ); - - return $db->fetchAll($query); - } -} diff --git a/application/tables/IcingaUserGroupMemberTable.php b/application/tables/IcingaUserGroupMemberTable.php deleted file mode 100644 index 83aa5aa5..00000000 --- a/application/tables/IcingaUserGroupMemberTable.php +++ /dev/null @@ -1,54 +0,0 @@ - 'ug.id', - 'user_id' => 'u.id', - 'usergroup' => 'ug.object_name', - 'user' => 'u.object_name' - ); - } - - protected function getActionUrl($row) - { - return $this->url('director/object/usergroupmember', array( - 'usergroup_id' => $row->usergroup_id, - 'user_id' => $row->user_id, - )); - } - - public function getTitles() - { - $view = $this->view(); - return array( - 'usergroup' => $view->translate('Usergroup'), - 'user' => $view->translate('Member'), - ); - } - - public function fetchData() - { - $db = $this->connection()->getConnection(); - $query = $db->select()->from( - array('ug' => 'icinga_usergroup'), - $this->getColumns() - )->join( - array('ugu' => 'icinga_usergroup_user'), - 'ugu.usergroup_id = ug.id', - array() - )->join( - array('u' => 'icinga_user'), - 'ugu.user_id = u.id', - array() - ); - - return $db->fetchAll($query); - } -} diff --git a/library/Director/Objects/IcingaHostGroupMember.php b/library/Director/Objects/IcingaHostGroupMember.php deleted file mode 100644 index b0ffcbea..00000000 --- a/library/Director/Objects/IcingaHostGroupMember.php +++ /dev/null @@ -1,27 +0,0 @@ - null, - 'host_id' => null, - ); - - public function onInsert() - { - } - - public function onUpdate() - { - } - - public function onDelete() - { - } -} \ No newline at end of file diff --git a/library/Director/Objects/IcingaServiceGroupMember.php b/library/Director/Objects/IcingaServiceGroupMember.php deleted file mode 100644 index 10389600..00000000 --- a/library/Director/Objects/IcingaServiceGroupMember.php +++ /dev/null @@ -1,27 +0,0 @@ - null, - 'service_id' => null, - ); - - public function onInsert() - { - } - - public function onUpdate() - { - } - - public function onDelete() - { - } -} \ No newline at end of file diff --git a/library/Director/Objects/IcingaUserGroupMember.php b/library/Director/Objects/IcingaUserGroupMember.php deleted file mode 100644 index 7b757b74..00000000 --- a/library/Director/Objects/IcingaUserGroupMember.php +++ /dev/null @@ -1,27 +0,0 @@ - null, - 'user_id' => null, - ); - - public function onInsert() - { - } - - public function onUpdate() - { - } - - public function onDelete() - { - } -} \ No newline at end of file