From 5941bc2f894510e63f624d2b908e36bcecc8e414 Mon Sep 17 00:00:00 2001 From: "Timothy J. Warren" Date: Wed, 13 Aug 2014 22:19:00 -0400 Subject: [PATCH] Code style fixes --- application/controllers/account.php | 4 +++- application/controllers/calendar.php | 2 ++ application/controllers/category.php | 9 ++++++--- application/controllers/friend.php | 21 ++++++++++++++------- application/controllers/group.php | 5 ++++- application/controllers/login.php | 4 +++- application/controllers/task.php | 13 +++++++++++-- application/libraries/Page.php | 1 + 8 files changed, 44 insertions(+), 15 deletions(-) diff --git a/application/controllers/account.php b/application/controllers/account.php index bcae238..90f4c2f 100755 --- a/application/controllers/account.php +++ b/application/controllers/account.php @@ -51,7 +51,9 @@ class Account extends MY_Controller { } else { - $data['err'] = $val; + $data = [ + 'err' => $val + ]; $this->page->build('account/password', $data); } } diff --git a/application/controllers/calendar.php b/application/controllers/calendar.php index 8e77ff3..61bf111 100755 --- a/application/controllers/calendar.php +++ b/application/controllers/calendar.php @@ -58,6 +58,8 @@ class Calendar extends MY_Controller { $local_time = time(); + $data = array(); + $data['month'] = $_months[(int)$month].' '.$year; $data['calendar'] = array(); $data['today'] = getdate(); diff --git a/application/controllers/category.php b/application/controllers/category.php index 6b36cef..472393f 100755 --- a/application/controllers/category.php +++ b/application/controllers/category.php @@ -13,7 +13,6 @@ class Category extends MY_Controller { parent::__construct(); $this->page->set_foot_js_group('js'); $this->page->set_title('Categories'); - } /** @@ -29,7 +28,9 @@ class Category extends MY_Controller { */ public function category_list() { - $data['category'] = $this->todo->get_category_list(); + $data = [ + 'category' => $this->todo->get_category_list() + ]; $this->page->set_title("Category List"); $this->page->build('task/cat_list', $data); } @@ -51,7 +52,9 @@ class Category extends MY_Controller { */ public function edit($cat_id) { - $data['cat'] = $this->todo->get_category((int) $cat_id); + $data = [ + 'cat' => $this->todo->get_category((int) $cat_id) + ]; $this->page->set_title("Edit Category"); $this->page->build('task/cat_add', $data); } diff --git a/application/controllers/friend.php b/application/controllers/friend.php index bf4eeb3..67bf594 100755 --- a/application/controllers/friend.php +++ b/application/controllers/friend.php @@ -32,8 +32,9 @@ class Friend extends MY_Controller { */ public function friend_list() { - $data = array(); - $data['friend_list'] = $this->friend_model->get_friends(); + $data = [ + 'friend_list' => $this->friend_model->get_friends() + ]; $this->page->set_title('Friends List'); $this->page->build('friend/list', $data); } @@ -43,7 +44,9 @@ class Friend extends MY_Controller { */ public function find() { - $data['results'] = null; + $data = [ + 'results' => NULL + ]; $this->page->set_title('Find Friends'); $this->page->build('friend/search', $data); } @@ -62,7 +65,7 @@ class Friend extends MY_Controller { */ public function accept_request() { - $aid = xss_clean($this->input->post('aid')); + $aid = $this->input->post('aid', TRUE); $this->output->set_output($this->friend_model->accept_request($aid)); } @@ -71,7 +74,7 @@ class Friend extends MY_Controller { */ public function reject_request() { - $rid = xss_clean($this->input->post('rid')); + $rid = $this->input->post('rid', TRUE); $this->output->set_output($this->friend_model->reject_request($rid)); } @@ -80,7 +83,9 @@ class Friend extends MY_Controller { */ public function requests() { - $data['request_list'] = $this->friend_model->get_requests(); + $data = [ + 'request_list' => $this->friend_model->get_requests() + ]; $this->page->set_title('Friend Reqests'); $this->page->build('friend/requests', $data); } @@ -90,7 +95,9 @@ class Friend extends MY_Controller { */ public function ajax_search() { - $data['results'] = $this->friend_model->find_friends(); + $data = [ + 'results' => $this->friend_model->find_friends() + ]; $this->load->view('friend/ajax_search', $data); } diff --git a/application/controllers/group.php b/application/controllers/group.php index 5155bdb..a4ce389 100755 --- a/application/controllers/group.php +++ b/application/controllers/group.php @@ -29,7 +29,9 @@ class Group extends MY_Controller{ */ public function group_list() { - $data['group'] = $this->todo->get_group_list((int) $this->session->userdata('uid')); + $data = [ + 'group' => $this->todo->get_group_list((int) $this->session->userdata('uid')) + ]; $this->page->set_title("Group List"); $this->page->build('friend/group_list', $data); } @@ -83,6 +85,7 @@ class Group extends MY_Controller{ $friends_array[] = $a['user_id']; } + $data = array(); $data['group_name'] = $this->todo->get_group_name_by_id($group_id); $data['friends'] = $this->todo->get_friend_list(); $data['selected_friends'] = $friends_array; diff --git a/application/controllers/login.php b/application/controllers/login.php index 4d7f897..edc9cc4 100755 --- a/application/controllers/login.php +++ b/application/controllers/login.php @@ -38,7 +38,9 @@ class Login extends MY_Controller { */ public function do_login() { - $data['err'] = array(); + $data = [ + 'err' => array() + ]; if($this->input->post('login_sub') != FALSE) { diff --git a/application/controllers/task.php b/application/controllers/task.php index 96d6722..9e57f69 100755 --- a/application/controllers/task.php +++ b/application/controllers/task.php @@ -36,6 +36,8 @@ class Task extends MY_Controller { { $this->page->set_title("Shared Tasks"); $tasks = $this->task_model->get_shared_task_list(); + + $data = array(); $data['task_list'] = $tasks; $data['list_type'] = "shared"; @@ -51,6 +53,8 @@ class Task extends MY_Controller { { $this->page->set_title("View Tasks"); $tasks = $this->task_model->get_task_list(); + + $data = array(); $data['task_list'] = $tasks; $data['list_type'] = 'active'; @@ -84,6 +88,7 @@ class Task extends MY_Controller { $this->pagination->initialize($config); + $data = array(); $data['task_list'] = $tasks; $data['list_type'] = 'archived'; $data['pagination'] = $this->pagination->create_links(); @@ -100,6 +105,8 @@ class Task extends MY_Controller { { $this->page->set_title("Overdue Tasks"); $tasks = $this->task_model->get_overdue_task_list(); + + $data = array(); $data['task_list'] = $tasks; $data['list_type'] = 'overdue'; @@ -272,8 +279,10 @@ class Task extends MY_Controller { */ public function get_task_comments() { - $task_id = $this->input->get('task_id'); - $data['comments'] = $this->task_model->get_task_comments($task_id); + $task_id = (int) $this->input->get('task_id'); + $data = [ + 'comments' => $this->task_model->get_task_comments($task_id) + ]; $this->load->view('task/comments_view', $data); } diff --git a/application/libraries/Page.php b/application/libraries/Page.php index b1b85e3..b040f00 100755 --- a/application/libraries/Page.php +++ b/application/libraries/Page.php @@ -287,6 +287,7 @@ class Page { */ public function set_message($type, $message, $return = FALSE) { + $data = array(); $data['stat_type'] = $type; $data['message'] = $message;