yuvaraj-mudaliar / fusionmate

app/controllers/ChatController.php

Spacing +4 added lines, -4 removed lines

@@ -31,16 +31,16 @@ 
 
         $viewData = array();
 
-        if(Input::has('conversation')) {
+        if (Input::has('conversation')) {
             $viewData['current_conversation'] = $this->conversationRepository->getByName(Input::get('conversation'));
         } else {
             $viewData['current_conversation'] = Auth::user()->conversations()->first();
         }
 
-        if($viewData['current_conversation']) {
+        if ($viewData['current_conversation']) {
             Session::set('current_conversation', $viewData['current_conversation']->name);
     
-            foreach($viewData['current_conversation']->messages_notifications as $notification) {
+            foreach ($viewData['current_conversation']->messages_notifications as $notification) {
                 $notification->read = true;
                 $notification->save();
             }
@@ -48,7 +48,7 @@ 
        
         $users = $this->userRepository->getAllExcept(Auth::user()->id);
 
-        foreach($users as $key => $user) {
+        foreach ($users as $key => $user) {
             $viewData['recipients'][$user->id] = $user->username;
         }
         

app/controllers/VideoChatController.php

Indentation +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 class VideoChatController extends AuthController {
    
    
-     public function video() {
+        public function video() {
         if (Auth::user()) {
 
           

app/controllers/profile_pic_controllers/UserProfileController.php

Indentation +14 added lines, -14 removed lines

@@ -11,8 +11,8 @@ 
                 $userDetailsArray = array();
                 $userDetailsArray = $value;
             }
-           // print_r($userDetailsArray);
-             $data['userDetailsArray']=$userDetailsArray;
+            // print_r($userDetailsArray);
+                $data['userDetailsArray']=$userDetailsArray;
             return View::make('layouts/profile')->with("userDetailsArray", $userDetailsArray);
         }
 
@@ -43,7 +43,7 @@ 
             , 'last_name' => Input::get('last_name'), 'email' => Input::get('email'), 'contact' => Input::get('contact')
                 )
         );
-          return Redirect::to('/view_profile/'.Auth::user()->id);
+            return Redirect::to('/view_profile/'.Auth::user()->id);
     }
 
     public function updateProfilePicture() {
@@ -69,7 +69,7 @@ 
             // Redirect with a helpful message to inform the user that 
             // the provided file was not an adequate type
 //            return Redirect::back()->withErrors(['Error: The provided file was not an image', 'Error: The provided file was not an image']);
-             return Redirect::back()->withErrors($validator);
+                return Redirect::back()->withErrors($validator);
             //print_r('Error: The provided file was not an image');
             // return Redirect::to('/')->with('message', 'Error: The provided file was not an image');
         } else {
@@ -97,12 +97,12 @@ 
         return Redirect::route('main');
     }
     
-     public function updatePassword() {
-          $input = Input::all();
-           $rules = array(
-                       'current_password' => 'required',
+        public function updatePassword() {
+            $input = Input::all();
+            $rules = array(
+                        'current_password' => 'required',
 
-             'password' => 'required|min:6|regex:/^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{1,}$/',
+                'password' => 'required|min:6|regex:/^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{1,}$/',
         'password_confirm' => 'required|same:password'
         );
            
@@ -111,19 +111,19 @@ 
         // Check to see if validation fails or passes
         if ($validator->fails()) {
          
-             return Redirect::back()->withErrors($validator);
+                return Redirect::back()->withErrors($validator);
         } else {
-         $password=  Hash::make(Input::get('new_password'));
+            $password=  Hash::make(Input::get('new_password'));
         DB::table('users')->where('id', Auth::user()->id)->update(array(
                 'password' => $password
                     )
             );
         }
-          return Redirect::to('/settings/');
+            return Redirect::to('/settings/');
     }
     
     function deactivateAccount(){
-         if (Auth::user()) {            
+            if (Auth::user()) {            
         $loggedInUser=Auth::user()->id;
         $userProfile = DB::table('users')->select('profile_pic')->where('id', Auth::user()->id)->get();
         foreach ($userProfile as $key => $value) {
@@ -139,7 +139,7 @@ 
         $affected = DB::table('users')->where('id', '=', $loggedInUser)->delete();
 //        @unlink('fusionmate/public/plugins/userUploads/' . $userDetailsArray['profile_pic']);
             return Redirect::route('main');
-         }
+            }
                  
 
              

Spacing +4 added lines, -4 removed lines

@@ -12,7 +12,7 @@ 
                 $userDetailsArray = $value;
             }
            // print_r($userDetailsArray);
-             $data['userDetailsArray']=$userDetailsArray;
+             $data['userDetailsArray'] = $userDetailsArray;
             return View::make('layouts/profile')->with("userDetailsArray", $userDetailsArray);
         }
 
@@ -113,7 +113,7 @@ 
          
              return Redirect::back()->withErrors($validator);
         } else {
-         $password=  Hash::make(Input::get('new_password'));
+         $password = Hash::make(Input::get('new_password'));
         DB::table('users')->where('id', Auth::user()->id)->update(array(
                 'password' => $password
                     )
@@ -122,9 +122,9 @@ 
           return Redirect::to('/settings/');
     }
     
-    function deactivateAccount(){
+    function deactivateAccount() {
          if (Auth::user()) {            
-        $loggedInUser=Auth::user()->id;
+        $loggedInUser = Auth::user()->id;
         $userProfile = DB::table('users')->select('profile_pic')->where('id', Auth::user()->id)->get();
         foreach ($userProfile as $key => $value) {
                 $userDetailsArray = $value;

app/controllers/auth_controllers/AuthController.php

Indentation +10 added lines, -10 removed lines

@@ -53,20 +53,20 @@ 
 
        
         if(Input::get('token')!=''){
-			 $rules = array(
-			'email' => 'required|email',
-			'password' => 'required|min:6|regex:/^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{1,}$/'
-		);
-         $messages = array(
+                $rules = array(
+            'email' => 'required|email',
+            'password' => 'required|min:6|regex:/^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{1,}$/'
+        );
+            $messages = array(
             'password.regex' => 'The password must containt atleast 1 Upper Case letters[A-Z],1 Lower Case Letter[a-z],1 numeric letter [0-9] and 1 special character.',
            
         );}
         else{
-			 $rules = array(
+                $rules = array(
             'email' => 'required|email',
             'password' => 'required'
         );
-          $messages = array(
+            $messages = array(
             'password.regex' => 'Invalid Username/Password',
            
         );   
@@ -98,7 +98,7 @@ 
                     DB::table('team_channel_users')->insert(
                             ['team_channel_name_id' => $result['team_id'], 'user_id' => $id]
                     );
-                     //delete token from database before creating invited account
+                        //delete token from database before creating invited account
                     DB::table('invitation_token')->where('token', '=', $token)->delete();
                     $this->teamRepository->updateNewMemberJoinNotification($result['team_id'],$id);
                 }
@@ -135,10 +135,10 @@ 
                             ), 200);
         }
         else{
-             $errorMsg = array(
+                $errorMsg = array(
             'errormsg' => 'Invalid Email or Password'
         );
-             return Response::json(array(
+                return Response::json(array(
                 'success' => false,
                 'errors' => $errorMsg, 
                 400

Spacing +12 added lines, -12 removed lines

@@ -52,7 +52,7 @@ 
 //        ));
 
        
-        if(Input::get('token')!=''){
+        if (Input::get('token') != '') {
 			 $rules = array(
 			'email' => 'required|email',
 			'password' => 'required|min:6|regex:/^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{1,}$/'
@@ -60,8 +60,8 @@ 
          $messages = array(
             'password.regex' => 'The password must containt atleast 1 Upper Case letters[A-Z],1 Lower Case Letter[a-z],1 numeric letter [0-9] and 1 special character.',
            
-        );}
-        else{
+        ); }
+        else {
 			 $rules = array(
             'email' => 'required|email',
             'password' => 'required'
@@ -73,7 +73,7 @@ 
         }
         
 
-        $validator = Validator::make(Input::all(), $rules,$messages);
+        $validator = Validator::make(Input::all(), $rules, $messages);
 
         if ($validator->fails()) {
             return Response::json(array(
@@ -86,9 +86,9 @@ 
             if ($token != '') {
                
                 $result = DB::table('invitation_token')->where('token', '=', $token)->first();
-                if (count($result)>0) {//token was valid and was deleted
+                if (count($result) > 0) {//token was valid and was deleted
                     //Create invited account
-                    $userInfo=explode('@',$result['email']);
+                    $userInfo = explode('@', $result['email']);
                     $id = DB::table('users')->insertGetId(
                             ['first_name' => $userInfo[0], 'last_name' => '', 'email' => $result['email'], 'password' => Hash::make(Input::get('password'))]
                     );
@@ -100,9 +100,9 @@ 
                     );
                      //delete token from database before creating invited account
                     DB::table('invitation_token')->where('token', '=', $token)->delete();
-                    $this->teamRepository->updateNewMemberJoinNotification($result['team_id'],$id);
+                    $this->teamRepository->updateNewMemberJoinNotification($result['team_id'], $id);
                 }
-                else{
+                else {
                     return Response::json(array(
                 'success' => false,
                 'errors' => "Invalid Request", 
@@ -134,7 +134,7 @@ 
                         'success' => true
                             ), 200);
         }
-        else{
+        else {
              $errorMsg = array(
             'errormsg' => 'Invalid Email or Password'
         );
@@ -192,7 +192,7 @@ 
 
             foreach ($teamMembers as $memeber) {
                 //Publish data to redis
-                $channelId = $memeber["id"] . "_" . $values["team_channel_id"];
+                $channelId = $memeber["id"]."_".$values["team_channel_id"];
 
                 $teamChannelId = $values["team_channel_id"];
                 $data = array(
@@ -204,8 +204,8 @@ 
         }
     }
 
-    public function updateTimeZone(){
-        $tzName=Input::get('tz');
+    public function updateTimeZone() {
+        $tzName = Input::get('tz');
         
         
         storeUserTimeZone($tzName);

Braces +3 added lines, -6 removed lines

@@ -60,8 +60,7 @@ 
          $messages = array(
             'password.regex' => 'The password must containt atleast 1 Upper Case letters[A-Z],1 Lower Case Letter[a-z],1 numeric letter [0-9] and 1 special character.',
            
-        );}
-        else{
+        );} else{
 			 $rules = array(
             'email' => 'required|email',
             'password' => 'required'
@@ -101,8 +100,7 @@ 
                      //delete token from database before creating invited account
                     DB::table('invitation_token')->where('token', '=', $token)->delete();
                     $this->teamRepository->updateNewMemberJoinNotification($result['team_id'],$id);
-                }
-                else{
+                } else{
                     return Response::json(array(
                 'success' => false,
                 'errors' => "Invalid Request", 
@@ -133,8 +131,7 @@ 
             return Response::json(array(
                         'success' => true
                             ), 200);
-        }
-        else{
+        } else{
              $errorMsg = array(
             'errormsg' => 'Invalid Email or Password'
         );

app/controllers/auth_controllers/RegisterController.php

Indentation +10 added lines, -10 removed lines

@@ -4,12 +4,12 @@ 
 
     public function registerUser() {
         
-         $input = Input::only(array(
-             'firstName',
-             'lastName',
+            $input = Input::only(array(
+                'firstName',
+                'lastName',
             'email',
             'password',
-             'role'
+                'role'
         ));
 
          
@@ -20,12 +20,12 @@ 
             'password' => 'required|min:6|regex:/^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{1,}$/',
             'role' => 'required'
         );
- $messages = array(
+    $messages = array(
             'password.regex' => 'The password must containt atleast 1 Upper Case letters[A-Z],1 Lower Case Letter[a-z],1 numeric letter [0-9] and 1 special character.',
            
         );
         $validator = Validator::make($input, $rules,$messages);
- $messages = $validator->messages();
+    $messages = $validator->messages();
         if($validator->fails()) {
           
             return Response::json(array(
@@ -41,8 +41,8 @@ 
         DB::table('user_roles')->insert(
                 ['user_id' => $id, 'role_id' => Input::get('role')]
         );
-      $channelId=  Hash::make(Input::get('password'));
-       DB::table('channels')->insert(
+        $channelId=  Hash::make(Input::get('password'));
+        DB::table('channels')->insert(
                 ['channel_name' => $channelId, 'author_id' => $id]
         );
         if (Auth::attempt(array('email' => Input::get('email'), 'password' => Input::get('password')),true)) {
@@ -62,12 +62,12 @@ 
             Session::put('profilePic', Auth::user()->profile_pic);
             Session::put('role', $role['role_id']);
             Session::put('channelId', $channelName['id']);
-           return Response::json(array(
+            return Response::json(array(
                         'success' => "ok"
                             ), 200);
            
         }
-              return Response::json(array(
+                return Response::json(array(
                         'success' => "notok"
                             ), 400);
       

Spacing +5 added lines, -5 removed lines

@@ -24,9 +24,9 @@ 
             'password.regex' => 'The password must containt atleast 1 Upper Case letters[A-Z],1 Lower Case Letter[a-z],1 numeric letter [0-9] and 1 special character.',
            
         );
-        $validator = Validator::make($input, $rules,$messages);
+        $validator = Validator::make($input, $rules, $messages);
  $messages = $validator->messages();
-        if($validator->fails()) {
+        if ($validator->fails()) {
           
             return Response::json(array(
                 'success' => false,
@@ -36,16 +36,16 @@ 
         }
        
         $id = DB::table('users')->insertGetId(
-                ['first_name' => Input::get('firstName'),'last_name' => Input::get('lastName'),'email' => Input::get('email'), 'password' => Hash::make(Input::get('password'))]
+                ['first_name' => Input::get('firstName'), 'last_name' => Input::get('lastName'), 'email' => Input::get('email'), 'password' => Hash::make(Input::get('password'))]
         );
         DB::table('user_roles')->insert(
                 ['user_id' => $id, 'role_id' => Input::get('role')]
         );
-      $channelId=  Hash::make(Input::get('password'));
+      $channelId = Hash::make(Input::get('password'));
        DB::table('channels')->insert(
                 ['channel_name' => $channelId, 'author_id' => $id]
         );
-        if (Auth::attempt(array('email' => Input::get('email'), 'password' => Input::get('password')),true)) {
+        if (Auth::attempt(array('email' => Input::get('email'), 'password' => Input::get('password')), true)) {
 
             /* Store basic information in session of logged in user  */
             $role = DB::table('roles')

app/controllers/notifications_controllers/NotificationController.php

Indentation +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
             $unReadMessages = DB::table('messages')
                             ->select(DB::raw('count(from_user_id) as fromCount'), 'personal_conversations.*','team_channels.id as team_id', 'messages.*', 'users_from.first_name as from_first_name', 'users_from.first_name as from_last_name')
                             ->leftJoin('personal_conversations', 'messages.id', '=', 'personal_conversations.message_id')
-                               ->leftJoin('team_channels', 'team_channels.id', '=', 'personal_conversations.team_channel_id')
+                                ->leftJoin('team_channels', 'team_channels.id', '=', 'personal_conversations.team_channel_id')
                             ->leftJoin('users as users_from', 'users_from.id', '=', 'personal_conversations.from_user_id')
                             ->where('personal_conversations.read_status', '=', 1)
                             ->where('personal_conversations.to_user_id', '=', Auth::user()->id)->groupBy('from_user_id')->orderBy('messages.id', 'desc')->get();
@@ -38,7 +38,7 @@ 
                             ->leftJoin('team_channels', 'team_channels.id', '=', 'invitation_notification.team_id')
                             ->leftJoin('users', 'users.id', '=', 'invitation_notification.new_user')
                             ->where('invitation_notification.team_user', '=', Auth::user()->id)
-                             ->where('invitation_notification.new_user', '!=', Auth::user()->id)
+                                ->where('invitation_notification.new_user', '!=', Auth::user()->id)
                             ->where('invitation_notification.read_status', '=', 1)
                             ->groupBy('invitation_notification.new_user')
                             ->orderBy('invitation_notification.created_at', 'desc')->get();

Spacing +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@ 
          */
         if ($type == "messages") {
             $unReadMessages = DB::table('messages')
-                            ->select(DB::raw('count(from_user_id) as fromCount'), 'personal_conversations.*','team_channels.id as team_id', 'messages.*', 'users_from.first_name as from_first_name', 'users_from.first_name as from_last_name')
+                            ->select(DB::raw('count(from_user_id) as fromCount'), 'personal_conversations.*', 'team_channels.id as team_id', 'messages.*', 'users_from.first_name as from_first_name', 'users_from.first_name as from_last_name')
                             ->leftJoin('personal_conversations', 'messages.id', '=', 'personal_conversations.message_id')
                                ->leftJoin('team_channels', 'team_channels.id', '=', 'personal_conversations.team_channel_id')
                             ->leftJoin('users as users_from', 'users_from.id', '=', 'personal_conversations.from_user_id')
@@ -64,7 +64,7 @@ 
                 }
                 break;
             case "general":
-                $teamId = explode("_",Input::get('teamId'));
+                $teamId = explode("_", Input::get('teamId'));
                 
                 DB::table('team_conversations_read_status')
                         ->where('user_id', Auth::user()->id)
@@ -73,7 +73,7 @@ 
                 break;
             
                 case "join":
-                $teamId = explode("_",Input::get('teamId'));
+                $teamId = explode("_", Input::get('teamId'));
                 
                 DB::table('invitation_notification')
                         ->where('team_user', Auth::user()->id)

app/controllers/ConversationUserController.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
         $conversations = array();
 
-        if($conversations_users) {
+        if ($conversations_users) {
             $conversations = Conversation::whereIn('id', $conversations_users)->get();
         }
 

app/controllers/Register.php

Indentation +7 added lines, -7 removed lines

@@ -3,12 +3,12 @@ 
 class Register extends \BaseController {
 
     public function registerUser() {
-         $input = Input::only(array(
-             'firstName',
-             'lastName',
+            $input = Input::only(array(
+                'firstName',
+                'lastName',
             'email',
             'password',
-             'role'
+                'role'
         ));
 
          
@@ -21,7 +21,7 @@ 
         );
 
         $validator = Validator::make($input, $rules);
- $messages = $validator->messages();
+    $messages = $validator->messages();
         if($validator->fails()) {
           
             return Response::json(array(
@@ -37,8 +37,8 @@ 
         DB::table('user_roles')->insert(
                 ['user_id' => $id, 'role_id' => Input::get('role')]
         );
-      $channelId=  Hash::make(Input::get('password'));
-       DB::table('channels')->insert(
+        $channelId=  Hash::make(Input::get('password'));
+        DB::table('channels')->insert(
                 ['channel_name' => $channelId, 'author_id' => $id]
         );
             return View::make('templates/greeting')->with('message', "Account created successfully.You can now log in.Have a great day!");

Spacing +3 added lines, -3 removed lines

@@ -22,7 +22,7 @@ 
 
         $validator = Validator::make($input, $rules);
  $messages = $validator->messages();
-        if($validator->fails()) {
+        if ($validator->fails()) {
           
             return Response::json(array(
                 'success' => false,
@@ -32,12 +32,12 @@ 
         }
        
         $id = DB::table('users')->insertGetId(
-                ['first_name' => Input::get('firstName'),'last_name' => Input::get('lastName'),'email' => Input::get('email'), 'password' => Hash::make(Input::get('password'))]
+                ['first_name' => Input::get('firstName'), 'last_name' => Input::get('lastName'), 'email' => Input::get('email'), 'password' => Hash::make(Input::get('password'))]
         );
         DB::table('user_roles')->insert(
                 ['user_id' => $id, 'role_id' => Input::get('role')]
         );
-      $channelId=  Hash::make(Input::get('password'));
+      $channelId = Hash::make(Input::get('password'));
        DB::table('channels')->insert(
                 ['channel_name' => $channelId, 'author_id' => $id]
         );

app/controllers/task_controllers/TaskController.php

Indentation +13 added lines, -13 removed lines

@@ -39,11 +39,11 @@ 
                 return View::make('templates/greeting')->with('info', $result);
         }
         
-         /**
-         *  @function creates task
+            /**
+             *  @function creates task
           @param null
           @return null
-         */
+             */
         public function create_task() {
                 $result = $this->taskRepository->createTask();
                 return $result;
@@ -82,21 +82,21 @@ 
                 return $result;
         }
         
-          /**
-         *  @function filter dashboard data
+            /**
+             *  @function filter dashboard data
           @param null
           @return array dashboard data
-         */
+             */
         public function filter_dashboard() {
                 $result = $this->taskRepository->filterDashboard();
                 return $result;
         }
         
-          /**
-         *  @function filter grid data
+            /**
+             *  @function filter grid data
           @param null
           @return array grid data
-         */
+             */
         public function filter_grid() {
                 $page = \Input::get('current');
                 $rowCount = \Input::get('rowCount');
@@ -104,14 +104,14 @@ 
                 $total='';
                 $result = $this->taskRepository->filterGrid();
                 foreach($result as $values){
-                       $rows[]=array('un_id'=>$values['un_id'],
+                        $rows[]=array('un_id'=>$values['un_id'],
                             'priority_name'=>$values['priority_name'],
                             'status_name'=>$values['status_name'],
                             'tracker'=>$values['tracker'],
                             'assignee'=>$values['first_name']." ".$values['last_name'],
                             'created_at'=>$values['created_at'],
                             'start_date'=>$values['start_date'],
-                             'end_date'=>$values['end_date']) ;
+                                'end_date'=>$values['end_date']) ;
                 }
                 $data=array('current'=>$page,'rowCount'=>$rowCount,'rows'=>$rows,'total'=>count($rows));
                 return json_encode($data);
@@ -141,10 +141,10 @@ 
         }
         
         
-          /**  @function list of previous updates on a task
+            /**  @function list of previous updates on a task
           @param task parent id
           @return html view
-         */
+             */
         public function get_project_teams() {
                 $result=$this->taskRepository->getProjectTeams(Input::get('projectId'));
                 $data='';

Spacing +23 added lines, -23 removed lines

@@ -24,7 +24,7 @@ 
                 $trackers = $this->taskRepository->getTracker();
                 $status = $this->taskRepository->getStatus();
                 $priotities = $this->taskRepository->getPriorities();
-                $data     = array("teams" => $teams, "projects" => $projects,"trackers"=>$trackers,"status"=>$status,"priorities"=>$priotities);
+                $data     = array("teams" => $teams, "projects" => $projects, "trackers"=>$trackers, "status"=>$status, "priorities"=>$priotities);
               
                 return View::make('templates/task/dashboard')->with('data', $data);
         }
@@ -56,20 +56,20 @@ 
           @return null
          */
         public function get_members() {
-                $enTeamId=Input::get("teamId");
-                $teamId=$this->teamRepository->getTeamDecodedId($enTeamId);
+                $enTeamId = Input::get("teamId");
+                $teamId = $this->teamRepository->getTeamDecodedId($enTeamId);
                 $members = $this->teamRepository->getMembers($teamId);
                 /*
                  * Prepare html select options
                  */
                 
-                $data='';
-                $data.="<option value=''>Select User</option>";
-                foreach($members as $values){
-                        $memDetail=explode("_",$values);
-                        $data.="<option value=".$memDetail[2].">".$memDetail[0]." ".$memDetail[1]."</option>";
+                $data = '';
+                $data .= "<option value=''>Select User</option>";
+                foreach ($members as $values) {
+                        $memDetail = explode("_", $values);
+                        $data .= "<option value=".$memDetail[2].">".$memDetail[0]." ".$memDetail[1]."</option>";
                 }
-                return trim($data,'"');
+                return trim($data, '"');
         }
         
         /**
@@ -101,19 +101,19 @@ 
                 $page = \Input::get('current');
                 $rowCount = \Input::get('rowCount');
                 
-                $total='';
+                $total = '';
                 $result = $this->taskRepository->filterGrid();
-                foreach($result as $values){
-                       $rows[]=array('un_id'=>$values['un_id'],
+                foreach ($result as $values) {
+                       $rows[] = array('un_id'=>$values['un_id'],
                             'priority_name'=>$values['priority_name'],
                             'status_name'=>$values['status_name'],
                             'tracker'=>$values['tracker'],
                             'assignee'=>$values['first_name']." ".$values['last_name'],
                             'created_at'=>$values['created_at'],
                             'start_date'=>$values['start_date'],
-                             'end_date'=>$values['end_date']) ;
+                             'end_date'=>$values['end_date']);
                 }
-                $data=array('current'=>$page,'rowCount'=>$rowCount,'rows'=>$rows,'total'=>count($rows));
+                $data = array('current'=>$page, 'rowCount'=>$rowCount, 'rows'=>$rows, 'total'=>count($rows));
                 return json_encode($data);
         }
         
@@ -127,7 +127,7 @@ 
                 $priotities = $this->taskRepository->getPriorities();
                 $taskData = $this->taskRepository->getTaskData();
                 $members = $this->teamRepository->getMembers($taskData['team_id']);
-                $data     = array("trackers"=>$trackers,"status"=>$status,"priorities"=>$priotities,'members'=>$members,'task_data'=>$taskData);
+                $data     = array("trackers"=>$trackers, "status"=>$status, "priorities"=>$priotities, 'members'=>$members, 'task_data'=>$taskData);
                 return View::make('templates/task/create_task_modal')->with('data', $data);
         }
         
@@ -136,8 +136,8 @@ 
           @return html view
          */
         public function recent_updates($parent_task_id) {
-                $result=$this->taskRepository->getUpdates($parent_task_id);
-                return View::make('templates/task/recent_task_updates')->with("result",$result);
+                $result = $this->taskRepository->getUpdates($parent_task_id);
+                return View::make('templates/task/recent_task_updates')->with("result", $result);
         }
         
         
@@ -146,13 +146,13 @@ 
           @return html view
          */
         public function get_project_teams() {
-                $result=$this->taskRepository->getProjectTeams(Input::get('projectId'));
-                $data='';
-                $data.="<option value=''>Select Team</option>";
-                foreach($result as $teamDetail){
+                $result = $this->taskRepository->getProjectTeams(Input::get('projectId'));
+                $data = '';
+                $data .= "<option value=''>Select Team</option>";
+                foreach ($result as $teamDetail) {
                        
-                        $data.="<option value=".$teamDetail['team_channel_id'].">".$teamDetail['channel_view_name']."</option>";
+                        $data .= "<option value=".$teamDetail['team_channel_id'].">".$teamDetail['channel_view_name']."</option>";
                 }
-                return trim($data,'"');
+                return trim($data, '"');
         }
 }
\ No newline at end of file