diff --git a/adminwww/application/controllers/Dash.php b/adminwww/application/controllers/Dash.php
index 44d8409..b5da8a7 100644
--- a/adminwww/application/controllers/Dash.php
+++ b/adminwww/application/controllers/Dash.php
@@ -4,71 +4,51 @@ defined('BASEPATH') OR exit('No direct script access allowed');
class Dash extends Admin_Controller {
- public $template = array(
- 'table_open' => "
",
- 'thead_open' => '',
- 'thead_close' => '',
- 'heading_row_start' => '',
- 'heading_row_end' => '
',
- 'heading_cell_start' => '',
- 'heading_cell_end' => ' | ',
- 'tbody_open' => '',
- 'tbody_close' => '',
- 'row_start' => '',
- 'row_end' => '
',
- 'cell_start' => '',
- 'cell_end' => ' | ',
- 'row_alt_start' => '',
- 'row_alt_end' => '
',
- 'cell_alt_start' => '',
- 'cell_alt_end' => ' | ',
- 'table_close' => '
',
- );
-
public function index() {
$this->load->helper('url');
$data = array();
- $this->load->library('table');
- $this->table->set_template($this->template);
+ $this->load->library('table');
+ $this->table->set_template($this->template);
- $data['recent_members'] = "";
- $mysql = "SELECT id,username,firstname,lastname,added::date,loc,last_login,acc_link FROM members ORDER by id DESC LIMIT 15";
- $query = $this->db->query($mysql);
- //$this->table->set_heading( array('data' => 'ID', 'style' => 'width:50px'),'Email', 'Firstname', 'Lastname','Last Login','Location', array('data' => 'ACTION', 'style' => 'width:40px'), array('data' => 'Select', 'style' => 'width:40px'));
- $data['recent_members'] = $this->table->generate($query);
+ $data['recent_members'] = "";
+ $mysql = "SELECT '' AS View"
+ . " ,username,firstname,lastname,added::date,loc,last_login,acc_link FROM members ORDER by id DESC LIMIT 15";
+ $query = $this->db->query($mysql);
+ $this->table->set_heading(array('data' => 'View', 'style' => 'width:50px'), 'Username', 'Firstname', 'Lastname', 'Added', 'Location', 'Last Login', array('data' => 'Folder', 'style' => 'width:40px'));
+ $data['recent_members'] = $this->table->generate($query);
- $mysql="SELECT '' AS View,name,username,email,added,last_login from practice ORDER BY id DESC LIMIT 7";
- $data['recent_practice'] = "";
- $query = $this->db->query($mysql);
- //$this->table->set_heading( array('data' => 'ID', 'style' => 'width:50px'),'Email', 'Firstname', 'Lastname','Last Login','Location', array('data' => 'ACTION', 'style' => 'width:40px'), array('data' => 'Select', 'style' => 'width:40px'));
- $data['recent_practice'] = $this->table->generate($query);
+ $mysql = "SELECT '' AS View,name,username,email,added,last_login from practice ORDER BY id DESC LIMIT 7";
+ $data['recent_practice'] = "";
+ $query = $this->db->query($mysql);
+ $this->table->set_heading(array('data' => 'View', 'style' => 'width:50px'),'Practice Name', 'Username', 'Email', 'Added','Last logn');
+ $data['recent_practice'] = $this->table->generate($query);
- $mysql="SELECT '' AS process,
+
+ // Pending practice data
+ $mysql = "SELECT '' AS process,
'' AS semail,
status,
practice_name,username,email,added::date from practice_pending ORDER BY id DESC LIMIT 7";
- $data['pending_practice'] = "";
- $query = $this->db->query($mysql);
- //$this->table->set_heading( array('data' => 'ID', 'style' => 'width:50px'),'Email', 'Firstname', 'Lastname','Last Login','Location', array('data' => 'ACTION', 'style' => 'width:40px'), array('data' => 'Select', 'style' => 'width:40px'));
- $data['pending_practice'] = $this->table->generate($query);
+ $data['pending_practice'] = "";
+ $query = $this->db->query($mysql);
+ $this->table->set_heading(array('data' => 'Process', 'style' => 'width:50px'), 'Resend Email', 'Status', 'Practice Name', 'Username', 'Email', array('data' => 'Date Added', 'style' => 'width:40px'));
+ $data['pending_practice'] = $this->table->generate($query);
- $this->renderAdminPage('view_dash', $data);
-
+ $this->renderAdminPage('view_dash', $data);
}
-
- public function pendingpractice(){
+ public function pendingpractice() {
$data = array();
$data["page_title"] = "Pending Practice";
$this->load->library('table');
$this->table->set_template($this->template);
- $mysql="SELECT '' AS process,
+ $mysql = "SELECT '' AS process,
'' AS semail,
status,
practice_name,username,email,added::date from practice_pending ORDER BY id DESC LIMIT 20";
@@ -79,7 +59,7 @@ class Dash extends Admin_Controller {
$this->renderAdminPage('view_pendingpractice', $data);
}
- public function pendingusers(){
+ public function pendingusers() {
$data = array();
$data["page_title"] = "Pending Members";
$this->load->library('table');
@@ -90,14 +70,12 @@ class Dash extends Admin_Controller {
//$this->table->set_heading( array('data' => 'ID', 'style' => 'width:50px'),'Email', 'Firstname', 'Lastname','Last Login','Location', array('data' => 'ACTION', 'style' => 'width:40px'), array('data' => 'Select', 'style' => 'width:40px'));
$data['recent_members'] = $this->table->generate($query);
$this->renderAdminPage('view_pendingusers', $data);
-
}
-
protected function renderAdminPage($page_name, $data) {
- $this->load->view('template/secure_header', $data);
- $this->load->view('admin/' . $page_name, $data);
- $this->load->view('template/secure_footer', $data);
+ $this->load->view('template/secure_header', $data);
+ $this->load->view('admin/' . $page_name, $data);
+ $this->load->view('template/secure_footer', $data);
}
}
diff --git a/adminwww/application/libraries/Admin_Controller.php b/adminwww/application/libraries/Admin_Controller.php
index 91b9280..89426d4 100644
--- a/adminwww/application/libraries/Admin_Controller.php
+++ b/adminwww/application/libraries/Admin_Controller.php
@@ -4,7 +4,7 @@ class Admin_Controller extends MCORE_Controller {
public $template = array(
'table_open' => "",
- 'thead_open' => '',
+ 'thead_open' => '',
'thead_close' => '',
'heading_row_start' => '',
'heading_row_end' => '
',