diff --git a/jubabox/src/core/jubabox_api.cc b/jubabox/src/core/jubabox_api.cc index 4524884..442fc52 100644 --- a/jubabox/src/core/jubabox_api.cc +++ b/jubabox/src/core/jubabox_api.cc @@ -135,16 +135,20 @@ PHP_METHOD(JubaBox, jubabox_api) CVars::iterator i; int j = 0; const int out_size = output.size(); // 200 - const int out_value_size = 200; - char out_key[out_value_size], out_value[out_value_size]; + //const int out_value_size = 200; + //char out_key[out_value_size], out_value[out_value_size]; for ( i=output.begin(); i != output.end() && jfirst.c_str(), i->second.c_str() ); - strsafecpy( out_key, i->first.c_str(), out_value_size ); - strsafecpy( out_value, i->second.c_str(), out_value_size ); - add_assoc_string( param_out, out_key, out_value, true ); + //logfmt( logINFO, "RET: %s=%s", i->first.c_str(), i->second.c_str() ); + //strsafecpy( out_key, i->first.c_str(), out_value_size ); + //strsafecpy( out_value, i->second.c_str(), out_value_size ); + //add_assoc_string( param_out, out_key, out_value, true ); + const char *k = i->first.c_str(); + char *v = estrdup(i->second.c_str()); + logfmt( logINFO, "RET: %s=%s", k, v ); + add_assoc_string( param_out, k, v, true ); } RETURN_LONG(retval); diff --git a/wwwjuba/application/controllers/Page.php b/wwwjuba/application/controllers/Page.php index f31f57a..d4b7f05 100644 --- a/wwwjuba/application/controllers/Page.php +++ b/wwwjuba/application/controllers/Page.php @@ -6,7 +6,8 @@ class Page extends Member_Controller { public function index() { - $this->load->view('members/view_page'); + //$this->load->view('members/view_page'); + $this->renderMemberPage("view_page"); } public function email(){ diff --git a/wwwjuba/application/core/JUB_Controller.php b/wwwjuba/application/core/JUB_Controller.php index 9b5aea4..360349c 100644 --- a/wwwjuba/application/core/JUB_Controller.php +++ b/wwwjuba/application/core/JUB_Controller.php @@ -62,6 +62,12 @@ class JUB_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 renderPracticePage($page_name, $data) { $this->load->view('secure/view_practice_header', $data); $this->load->view('secure/' . $page_name, $data); diff --git a/wwwjuba/application/views/members/view_page.php b/wwwjuba/application/views/members/view_page.php index 4cd6be6..9da0373 100644 --- a/wwwjuba/application/views/members/view_page.php +++ b/wwwjuba/application/views/members/view_page.php @@ -1,216 +1,5 @@ - - - - - - - - - - - - JubaBox-[userpage] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
-
-
- -
-
- - - -
- - -
-
- - - -
+ +
@@ -650,44 +439,4 @@
-
-
- - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file +