diff --git a/www/application/controllers/Auth.php b/www/application/controllers/Auth.php index 6d1bd2d..1cdb958 100644 --- a/www/application/controllers/Auth.php +++ b/www/application/controllers/Auth.php @@ -35,19 +35,8 @@ class Auth extends Start_Controller { $this->load->view('auth/view_foot'); } - private function renderAuthPages($pagename, $data) { - $this->load->view('auth/view_head'); - $this->load->view('auth/' . $pagename, $data); - $this->load->view('auth/view_foot'); - return 0; - } - private function renderMemberPages($pagename, $data) { - $this->load->view('member/view_securehead'); - $this->load->view('member/' . $pagename, $data); - $this->load->view('member/view_securefoot'); - return 0; - } + } diff --git a/www/application/controllers/Member.php b/www/application/controllers/Member.php index 09a9fc0..386a6eb 100644 --- a/www/application/controllers/Member.php +++ b/www/application/controllers/Member.php @@ -2,7 +2,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -class Member extends CI_Controller { +class Member extends Member_Controller { public function index() { @@ -14,12 +14,7 @@ class Member extends CI_Controller { $data = array(); $this->renderMemberPages('view_mycalendar', $data); } - private function renderMemberPages($pagename, $data) { - $this->load->view('member/view_securehead'); - $this->load->view('member/' . $pagename, $data); - $this->load->view('member/view_securefoot'); - return 0; - } + } diff --git a/www/application/core/COR_Controller.php b/www/application/core/COR_Controller.php index 5ab952d..49300ca 100644 --- a/www/application/core/COR_Controller.php +++ b/www/application/core/COR_Controller.php @@ -61,22 +61,21 @@ class COR_Controller extends CI_Controller { return "
" . $theMessage . "
"; } - protected function renderMemberPage($page_name, $data = array()) { - $this->load->view('templ/member_header', $data); - $this->load->view('members/' . $page_name, $data); - $this->load->view('templ/member_footer', $data); + protected function renderMemberPages($pagename, $data) { + $this->load->view('member/view_securehead'); + $this->load->view('member/' . $pagename, $data); + $this->load->view('member/view_securefoot'); + return 0; + } + + protected function renderAuthPages($pagename, $data) { + + $this->load->view('auth/view_head'); + $this->load->view('auth/' . $pagename, $data); + $this->load->view('auth/view_foot'); + return 0; } - protected function renderPracticePage($page_name, $data) { - $this->load->view('secure/view_practice_header', $data); - $this->load->view('secure/' . $page_name, $data); - $this->load->view('secure/view_practice_footer', $data); - } - - protected function renderAdminPage($page_name, $data) { - $this->load->view('admin/view_admin_header', $data); - $this->load->view('admin/' . $page_name, $data); - $this->load->view('admin/view_admin_footer', $data); - } + } diff --git a/www/application/libraries/Member_Controller.php b/www/application/libraries/Member_Controller.php index 6d090ef..a59ba12 100644 --- a/www/application/libraries/Member_Controller.php +++ b/www/application/libraries/Member_Controller.php @@ -2,7 +2,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -class Member_Controller extends JUB_Controller { +class Member_Controller extends COR_Controller { public $data = array();