From 15c4c1af24d6f1763352954992d3d85ff0d025dc Mon Sep 17 00:00:00 2001 From: Paolo Date: Fri, 16 Mar 2018 15:22:34 +0100 Subject: [PATCH] - Removed application/core/VileSci_Controller.php - Controllers now don't extend VileSci_Controller but FHC_Controller --- application/controllers/crm/Statusgrund.php | 2 +- .../controllers/organisation/Studiengang2.php | 167 ------------------ .../controllers/organisation/Studienjahr.php | 2 +- .../organisation/Studiensemester.php | 2 +- application/controllers/system/Filters.php | 2 +- application/controllers/system/Login.php | 2 +- application/controllers/system/Messages.php | 2 +- application/controllers/system/Navigation.php | 2 +- application/controllers/system/UDF.php | 2 +- application/controllers/system/Vorlage.php | 2 +- .../system/aufnahme/PrestudentMultiAssign.php | 2 +- .../controllers/system/extensions/Manager.php | 2 +- .../system/infocenter/InfoCenter.php | 2 +- application/core/VileSci_Controller.php | 14 -- 14 files changed, 12 insertions(+), 193 deletions(-) delete mode 100644 application/controllers/organisation/Studiengang2.php delete mode 100644 application/core/VileSci_Controller.php diff --git a/application/controllers/crm/Statusgrund.php b/application/controllers/crm/Statusgrund.php index c751d24d4..0557fde9a 100644 --- a/application/controllers/crm/Statusgrund.php +++ b/application/controllers/crm/Statusgrund.php @@ -2,7 +2,7 @@ if (! defined("BASEPATH")) exit("No direct script access allowed"); -class Statusgrund extends VileSci_Controller +class Statusgrund extends FHC_Controller { public function __construct() { diff --git a/application/controllers/organisation/Studiengang2.php b/application/controllers/organisation/Studiengang2.php deleted file mode 100644 index 600a1d17b..000000000 --- a/application/controllers/organisation/Studiengang2.php +++ /dev/null @@ -1,167 +0,0 @@ -load->model('organisation/studiengang_model'); - $this->load->library('form_validation'); - } - - public function index() - { - $keyword = ''; - $this->load->library('pagination'); - - $config['base_url'] = base_url() . 'studiengang/index/'; - $config['total_rows'] = $this->studiengang_model->total_rows(); - $config['per_page'] = 10; - $config['uri_segment'] = 3; - $config['suffix'] = '.html'; - $config['first_url'] = base_url() . 'studiengang.html'; - $this->pagination->initialize($config); - - $start = $this->uri->segment(3, 0); - $studiengang = $this->studiengang_model->index_limit($config['per_page'], $start); - - $data = array( - 'studiengang_data' => $studiengang, - 'keyword' => $keyword, - 'pagination' => $this->pagination->create_links(), - 'total_rows' => $config['total_rows'], - 'start' => $start, - ); - - $this->load->view('tbl_studiengang_list', $data); - } - - public function search() - { - $keyword = $this->uri->segment(3, $this->input->post('keyword', TRUE)); - $this->load->library('pagination'); - - if ($this->uri->segment(2)=='search') { - $config['base_url'] = base_url() . 'studiengang/search/' . $keyword; - } else { - $config['base_url'] = base_url() . 'studiengang/index/'; - } - - $config['total_rows'] = $this->studiengang_model->search_total_rows($keyword); - $config['per_page'] = 10; - $config['uri_segment'] = 4; - $config['suffix'] = '.html'; - $config['first_url'] = base_url() . 'studiengang/search/'.$keyword.'.html'; - $this->pagination->initialize($config); - - $start = $this->uri->segment(4, 0); - $studiengang = $this->studiengang_model->search_index_limit($config['per_page'], $start, $keyword); - - $data = array( - 'studiengang_data' => $studiengang, - 'keyword' => $keyword, - 'pagination' => $this->pagination->create_links(), - 'total_rows' => $config['total_rows'], - 'start' => $start, - ); - $this->load->view('tbl_studiengang_list', $data); - } - - public function read($id) - { - $row = $this->studiengang_model->get_by_id($id); - if ($row) { - $data = array( - ); - $this->load->view('tbl_studiengang_read', $data); - } else { - $this->session->set_flashdata('message', 'Record Not Found'); - redirect(site_url('studiengang')); - } - } - - public function create() - { - $data = array( - 'button' => 'Create', - 'action' => site_url('studiengang/create_action'), - ); - $this->load->view('tbl_studiengang_form', $data); - } - - public function create_action() - { - $this->_rules(); - - if ($this->form_validation->run() == FALSE) { - $this->create(); - } else { - $data = array( - ); - - $this->studiengang_model->insert($data); - $this->session->set_flashdata('message', 'Create Record Success'); - redirect(site_url('studiengang')); - } - } - - public function update($id) - { - $row = $this->studiengang_model->get_by_id($id); - - if ($row) { - $data = array( - 'button' => 'Update', - 'action' => site_url('studiengang/update_action'), - ); - $this->load->view('tbl_studiengang_form', $data); - } else { - $this->session->set_flashdata('message', 'Record Not Found'); - redirect(site_url('studiengang')); - } - } - - public function update_action() - { - $this->_rules(); - - if ($this->form_validation->run() == FALSE) { - $this->update($this->input->post('', TRUE)); - } else { - $data = array( - ); - - $this->studiengang_model->update($this->input->post('', TRUE), $data); - $this->session->set_flashdata('message', 'Update Record Success'); - redirect(site_url('studiengang')); - } - } - - public function delete($id) - { - $row = $this->studiengang_model->get_by_id($id); - - if ($row) { - $this->studiengang_model->delete($id); - $this->session->set_flashdata('message', 'Delete Record Success'); - redirect(site_url('studiengang')); - } else { - $this->session->set_flashdata('message', 'Record Not Found'); - redirect(site_url('studiengang')); - } - } - - public function _rules() - { - - $this->form_validation->set_rules('', '', 'trim'); - $this->form_validation->set_error_delimiters('', ''); - } - -}; - -/* End of file Studiengang.php */ -/* Location: ./application/controllers/Studiengang.php */ diff --git a/application/controllers/organisation/Studienjahr.php b/application/controllers/organisation/Studienjahr.php index 8c98a4c8b..027c0bf8f 100644 --- a/application/controllers/organisation/Studienjahr.php +++ b/application/controllers/organisation/Studienjahr.php @@ -5,7 +5,7 @@ if (!defined("BASEPATH")) exit("No direct script access allowed"); /** * Studienjahr controller for listing, editing and removing a Studienjahr */ -class Studienjahr extends VileSci_Controller +class Studienjahr extends FHC_Controller { /** diff --git a/application/controllers/organisation/Studiensemester.php b/application/controllers/organisation/Studiensemester.php index 5707bba4a..7b48dbbc4 100644 --- a/application/controllers/organisation/Studiensemester.php +++ b/application/controllers/organisation/Studiensemester.php @@ -5,7 +5,7 @@ if (!defined("BASEPATH")) exit("No direct script access allowed"); /** * Studiensemester controller for listing, editing and removing a Studiensemester */ -class Studiensemester extends VileSci_Controller +class Studiensemester extends FHC_Controller { /** diff --git a/application/controllers/system/Filters.php b/application/controllers/system/Filters.php index cda080a46..759f9c56b 100644 --- a/application/controllers/system/Filters.php +++ b/application/controllers/system/Filters.php @@ -5,7 +5,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); /** * */ -class Filters extends VileSci_Controller +class Filters extends FHC_Controller { const SESSION_NAME = 'FILTER'; diff --git a/application/controllers/system/Login.php b/application/controllers/system/Login.php index c6da0de0b..27e8ea409 100644 --- a/application/controllers/system/Login.php +++ b/application/controllers/system/Login.php @@ -1,7 +1,7 @@