diff --git a/www/application/controllers/Member.php b/www/application/controllers/Member.php index aac84b9..70b932c 100644 --- a/www/application/controllers/Member.php +++ b/www/application/controllers/Member.php @@ -21,9 +21,9 @@ class Member extends Member_Controller { $data = array(); - - - $page_items = array( + + + $page_items = array( ['NOTECARD', 'Note Card', 'btn-primary'], ['VIDEOCARD', 'Video Content', 'btn-danger'], ['ACTIONITEM', 'Action Item', 'btn-secondary'], @@ -32,10 +32,10 @@ class Member extends Member_Controller { ['RESOURCES', 'Resources', 'btn-light'], ['RESEARCH', 'Research', 'btn-info'] ); - + $data['page_items'] = $page_items; - - $page_toindex = true; + + $page_toindex = true; if ($_SERVER['REQUEST_METHOD'] == 'GET') { @@ -52,47 +52,52 @@ class Member extends Member_Controller { $data['description'] = $drow->description; $data['what_page'] = $drow->page_mode; $this->renderMemberPages('view_mypage', $data); - $page_toindex = false; + $page_toindex = false; } } } - if( true == $page_toindex ){ - $this->index(); - } - - + if (true == $page_toindex) { + $this->index(); + } } - public function viewCardAddAction(){ + public function viewCardAddAction() { ///member/viewCardAddAction?proc=PROCESS&action_name="+action_name+"&member_id=" + member_id + "&limit=" + limit + "&offset=" + offset - $data =[]; - - if ($_SERVER['REQUEST_METHOD'] == 'GET') { + $data = []; + + if ($_SERVER['REQUEST_METHOD'] == 'GET') { $action_name = $this->input->get('action_name'); $member_id = $_SESSION["member_id"]; - /* if ($member_id > 0 && $page_key != '') { - //echo 'yes'; - $mysql = "SELECT * FROM members_pages WHERE member_id = " . $_SESSION["member_id"] . " AND page_key='$page_key'"; - $r = $this->db->query($mysql); - $drow = $r->row(); + /* if ($member_id > 0 && $page_key != '') { + //echo 'yes'; + $mysql = "SELECT * FROM members_pages WHERE member_id = " . $_SESSION["member_id"] . " AND page_key='$page_key'"; + $r = $this->db->query($mysql); + $drow = $r->row(); - if (isset($drow)) { - $data['title'] = $drow->title; - $data['description'] = $drow->description; - $data['what_page'] = $drow->page_mode; - $this->renderMemberPages('view_mypage', $data); - $page_toindex = false; - } - } - */ - $this->load->view('member/addpages/'.$action_name, $data); + if (isset($drow)) { + $data['title'] = $drow->title; + $data['description'] = $drow->description; + $data['what_page'] = $drow->page_mode; + $this->renderMemberPages('view_mypage', $data); + $page_toindex = false; + } + } + */ + $this->load->view('member/addpages/' . $action_name, $data); } - - - - // echo "Yes i got to the controller"; + + + + // echo "Yes i got to the controller"; } + + public function myprofile(){ + + + + } + public function configure() { // echo 'yes'; view_mypage diff --git a/www/application/libraries/Start_Controller.php b/www/application/libraries/Start_Controller.php index c02f235..21327ec 100644 --- a/www/application/libraries/Start_Controller.php +++ b/www/application/libraries/Start_Controller.php @@ -32,6 +32,7 @@ class Start_Controller extends COR_Controller { $_SESSION['member_id'] = $out["member_id"]; // $ret->id; $_SESSION['loc'] = $out["loc"]; $_SESSION['mypage'] = $out["mypage"]; + $_SESSION["top_message"] = " Welcome ".$_SESSION['firstname']; } if (!empty($_SERVER['HTTP_CLIENT_IP'])) { diff --git a/www/application/views/member/addpages/NOTECARD.php b/www/application/views/member/addpages/NOTECARD.php index 2691330..58b85be 100644 --- a/www/application/views/member/addpages/NOTECARD.php +++ b/www/application/views/member/addpages/NOTECARD.php @@ -8,22 +8,52 @@