chrisparana / TeamDynamix-Slackbot001-U

app/SlashCommandHandlers/Jobs/SearchTDTicketJob.php

Indentation +12 added lines, -12 removed lines

@@ -104,10 +104,10 @@
 
         if ($opencount > 0) {
           $this
-             ->respondToSlack("

Spacing +11 added lines, -11 removed lines

@@ -15,7 +15,7 @@ 
     public function handle()
     {
         $build = \Tremby\LaravelGitVersion\GitVersionHelper::getVersion();
-        if( env('TD_SANDBOX') == 'TRUE') {
+        if (env('TD_SANDBOX') == 'TRUE') {
           $env = 'sandbox';
         }
         else {
@@ -23,37 +23,37 @@ 
         }
 
         $userSession = TDsession::where('s_user_id', $this->request->userId)->first();
-        if($userSession != null ) {
+        if ($userSession != null) {
           Log::info('CP_SearchTDTicketJob: Found user session.');
-          if($userSession->td_token){
-            $TDinstance = new CP_TDinstance( env('TD_BEID'), env('TD_WEBSERVICESKEY'), env('TD_URLROOT'), env('TD_APPID'), $env, (string)$userSession->td_token );
+          if ($userSession->td_token) {
+            $TDinstance = new CP_TDinstance(env('TD_BEID'), env('TD_WEBSERVICESKEY'), env('TD_URLROOT'), env('TD_APPID'), $env, (string)$userSession->td_token);
             Log::info('CP_SearchTDTicketJob: CP_TDinstance initialized with existing JWT.');
           }
           else {
-            $TDinstance = new CP_TDinstance( env('TD_BEID'), env('TD_WEBSERVICESKEY'), env('TD_URLROOT'), env('TD_APPID'), $env );
+            $TDinstance = new CP_TDinstance(env('TD_BEID'), env('TD_WEBSERVICESKEY'), env('TD_URLROOT'), env('TD_APPID'), $env);
             Log::info('CP_SearchTDTicketJob: CP_TDinstance initialized with new JWT.');
           }
 
           Log::info('CP_SearchTDTicketJob: Updating existing CP_TDsession s_token and td_token.');
-          $userSession->s_token =  $this->request->token;
+          $userSession->s_token = $this->request->token;
           $userSession->td_token = $TDinstance;
           $userSession->save();
         }
         else {
           Log::info('CP_SearchTDTicketJob: No user session.');
           Log::info('CP_SearchTDTicketJob: Creating new user session.');
-          $TDinstance = new CP_TDinstance( env('TD_BEID'), env('TD_WEBSERVICESKEY'), env('TD_URLROOT'), env('TD_APPID'), $env );
+          $TDinstance = new CP_TDinstance(env('TD_BEID'), env('TD_WEBSERVICESKEY'), env('TD_URLROOT'), env('TD_APPID'), $env);
           Log::info('CP_SearchTDTicketJob: New CP_TDinstance initialized.');
           $userSession = new TDsession;
           Log::info('CP_SearchTDTicketJob: New CP_TDsession initialized.');
           Log::info('CP_SearchTDTicketJob: Updating CP_TDsession s_token and td_token.');
           $userSession->s_user_id = $this->request->userId;
-          $userSession->s_token =  $this->request->token;
+          $userSession->s_token = $this->request->token;
           $userSession->td_token = $TDinstance;
           $userSession->save();
         }
 
-        if($TDinstance->checkToken()){
+        if ($TDinstance->checkToken()) {
           Log::info('CP_SearchTDTicketJob: There is a token.');
           $auth = true;
           $tickets = $TDinstance->searchTicketsName($this->request->text);
@@ -69,12 +69,12 @@ 
         if (!count($tickets) && $auth) {
             return $this->respondToSlack("

Braces +7 added lines, -14 removed lines

@@ -17,8 +17,7 @@ 
         $build = \Tremby\LaravelGitVersion\GitVersionHelper::getVersion();
         if( env('TD_SANDBOX') == 'TRUE') {
           $env = 'sandbox';
-        }
-        else {
+        } else {
           $env = 'prod';
         }
 
@@ -28,8 +27,7 @@ 
           if($userSession->td_token){
             $TDinstance = new CP_TDinstance( env('TD_BEID'), env('TD_WEBSERVICESKEY'), env('TD_URLROOT'), env('TD_APPID'), $env, (string)$userSession->td_token );
             Log::info('CP_SearchTDTicketJob: CP_TDinstance initialized with existing JWT.');
-          }
-          else {
+          } else {
             $TDinstance = new CP_TDinstance( env('TD_BEID'), env('TD_WEBSERVICESKEY'), env('TD_URLROOT'), env('TD_APPID'), $env );
             Log::info('CP_SearchTDTicketJob: CP_TDinstance initialized with new JWT.');
           }
@@ -38,8 +36,7 @@ 
           $userSession->s_token =  $this->request->token;
           $userSession->td_token = $TDinstance;
           $userSession->save();
-        }
-        else {
+        } else {
           Log::info('CP_SearchTDTicketJob: No user session.');
           Log::info('CP_SearchTDTicketJob: Creating new user session.');
           $TDinstance = new CP_TDinstance( env('TD_BEID'), env('TD_WEBSERVICESKEY'), env('TD_URLROOT'), env('TD_APPID'), $env );
@@ -58,8 +55,7 @@ 
           $auth = true;
           $tickets = $TDinstance->searchTicketsName($this->request->text);
           $userSession->increment('td_searches');
-        }
-        else {
+        } else {
           Log::info('CP_SearchTDTicketJob: No token.');
           $auth = false;
           $tickets = null;
@@ -68,8 +64,7 @@ 
         $opencount = 0;
         if (!count($tickets) && $auth) {
             return $this->respondToSlack("

app/SlashCommandHandlers/Jobs/ShowTDTicketJob.php

Indentation +11 added lines, -11 removed lines

@@ -90,17 +90,17 @@
           $attachmentFields[] = AttachmentField::create('Date Opened', $date)->displaySideBySide();
 
             $this
-               ->respondToSlack("

Spacing +12 added lines, -12 removed lines

@@ -15,7 +15,7 @@ 
     {
         $build = \Tremby\LaravelGitVersion\GitVersionHelper::getVersion();
 
-        if( env('TD_SANDBOX') == 'TRUE') {
+        if (env('TD_SANDBOX') == 'TRUE') {
           $env = 'sandbox';
         }
         else {
@@ -23,37 +23,37 @@ 
         }
 
         $userSession = TDsession::where('s_user_id', $this->request->userId)->first();
-        if($userSession != null ) {
+        if ($userSession != null) {
           Log::info('CP_ShowTDTicketJob: Found user session.');
-          if($userSession->td_token){
-            $TDinstance = new CP_TDinstance( env('TD_BEID'), env('TD_WEBSERVICESKEY'), env('TD_URLROOT'), env('TD_APPID'), $env, (string)$userSession->td_token );
+          if ($userSession->td_token) {
+            $TDinstance = new CP_TDinstance(env('TD_BEID'), env('TD_WEBSERVICESKEY'), env('TD_URLROOT'), env('TD_APPID'), $env, (string)$userSession->td_token);
             Log::info('CP_ShowTDTicketJob: CP_TDinstance initialized with existing JWT.');
           }
           else {
-            $TDinstance = new CP_TDinstance( env('TD_BEID'), env('TD_WEBSERVICESKEY'), env('TD_URLROOT'), env('TD_APPID'), $env );
+            $TDinstance = new CP_TDinstance(env('TD_BEID'), env('TD_WEBSERVICESKEY'), env('TD_URLROOT'), env('TD_APPID'), $env);
             Log::info('CP_ShowTDTicketJob: CP_TDinstance initialized with new JWT.');
           }
 
           Log::info('CP_ShowTDTicketJob: Updating existing CP_TDsession s_token and td_token.');
-          $userSession->s_token =  $this->request->token;
+          $userSession->s_token = $this->request->token;
           $userSession->td_token = $TDinstance;
           $userSession->save();
         }
         else {
           Log::info('CP_ShowTDTicketJob: No user session.');
           Log::info('CP_ShowTDTicketJob: Creating new user session.');
-          $TDinstance = new CP_TDinstance( env('TD_BEID'), env('TD_WEBSERVICESKEY'), env('TD_URLROOT'), env('TD_APPID'), $env );
+          $TDinstance = new CP_TDinstance(env('TD_BEID'), env('TD_WEBSERVICESKEY'), env('TD_URLROOT'), env('TD_APPID'), $env);
           Log::info('CP_ShowTDTicketJob: New CP_TDinstance initialized.');
           $userSession = new TDsession;
           Log::info('CP_ShowTDTicketJob: New CP_TDsession initialized.');
           Log::info('CP_ShowTDTicketJob: Updating CP_TDsession s_token and td_token.');
           $userSession->s_user_id = $this->request->userId;
-          $userSession->s_token =  $this->request->token;
+          $userSession->s_token = $this->request->token;
           $userSession->td_token = $TDinstance;
           $userSession->save();
         }
 
-        if($TDinstance->checkToken()){
+        if ($TDinstance->checkToken()) {
           Log::info('CP_ShowTDTicketJob: There is a token.');
           $auth = true;
           $ticket = $TDinstance->ticket($this->request->text);
@@ -65,14 +65,14 @@ 
         }
 
 
-        if($ticket && $auth) {
+        if ($ticket && $auth) {
           $date = date('F jS, Y', strtotime($ticket['CreatedDate']));
           $ticketURL = (string)$TDinstance->rootAppsUrl() . "Tickets/TicketDet?TicketID=" . $ticket['ID'];
           $assets = $TDinstance->searchAssets($ticket['ID']);
           $assetnames = "No Assets";
           $userSession->increment('td_tickets');
 
-          if(count($assets)){
+          if (count($assets)) {
             $assetnames = '';
             foreach ($assets as $asset) {
                 $assetnames = $assetnames . $asset['Name'] . ', ';
@@ -102,7 +102,7 @@ 
                ->displayResponseToEveryoneOnChannel()
                ->send();
         }
-        elseif(!$ticket && $auth) {
+        elseif (!$ticket && $auth) {
           $this->respondToSlack("

Braces +6 added lines, -12 removed lines

@@ -17,8 +17,7 @@ 
 
         if( env('TD_SANDBOX') == 'TRUE') {
           $env = 'sandbox';
-        }
-        else {
+        } else {
           $env = 'prod';
         }
 
@@ -28,8 +27,7 @@ 
           if($userSession->td_token){
             $TDinstance = new CP_TDinstance( env('TD_BEID'), env('TD_WEBSERVICESKEY'), env('TD_URLROOT'), env('TD_APPID'), $env, (string)$userSession->td_token );
             Log::info('CP_ShowTDTicketJob: CP_TDinstance initialized with existing JWT.');
-          }
-          else {
+          } else {
             $TDinstance = new CP_TDinstance( env('TD_BEID'), env('TD_WEBSERVICESKEY'), env('TD_URLROOT'), env('TD_APPID'), $env );
             Log::info('CP_ShowTDTicketJob: CP_TDinstance initialized with new JWT.');
           }
@@ -38,8 +36,7 @@ 
           $userSession->s_token =  $this->request->token;
           $userSession->td_token = $TDinstance;
           $userSession->save();
-        }
-        else {
+        } else {
           Log::info('CP_ShowTDTicketJob: No user session.');
           Log::info('CP_ShowTDTicketJob: Creating new user session.');
           $TDinstance = new CP_TDinstance( env('TD_BEID'), env('TD_WEBSERVICESKEY'), env('TD_URLROOT'), env('TD_APPID'), $env );
@@ -57,8 +54,7 @@ 
           Log::info('CP_ShowTDTicketJob: There is a token.');
           $auth = true;
           $ticket = $TDinstance->ticket($this->request->text);
-        }
-        else {
+        } else {
           Log::info('CP_ShowTDTicketJob: No token.');
           $auth = false;
           $ticket = null;
@@ -101,11 +97,9 @@ 
                )
                ->displayResponseToEveryoneOnChannel()
                ->send();
-        }
-        elseif(!$ticket && $auth) {
+        } elseif(!$ticket && $auth) {
           $this->respondToSlack("

app/SlashCommandHandlers/ShowTDTicket.php

Spacing +3 added lines, -3 removed lines

@@ -21,9 +21,9 @@ 
     {
         Log::info('CP_ShowTDTicket: canHandle method called.');
         Log::info('CP_ShowTDTicket: Request type is ' . gettype($request) . '.');
-        if($request->command) {
+        if ($request->command) {
           Log::info('CP_ShowTDTicket: Given command ' . $request->command . '.');
-          if($request->text == 'help' || $request->text == 'Help') {
+          if ($request->text == 'help' || $request->text == 'Help') {
             Log::info('CP_ShowTDTicket: User is requesting help. Stepping aside.');
             return false;
           }
@@ -46,7 +46,7 @@ 
      */
     public function handle(Request $request): Response
     {
-        if(is_numeric($request->text)) {
+        if (is_numeric($request->text)) {
           $this->dispatch(new ShowTDTicketJob());
           return $this->respondToSlack("One moment please…");
         }

Braces +2 added lines, -4 removed lines

@@ -28,8 +28,7 @@ 
             return false;
           }
           return true;
-        }
-        else {
+        } else {
           Log::info('CP_ShowTDTicket: Not given a command, canHandle returning false.');
           return false;
         }
@@ -49,8 +48,7 @@ 
         if(is_numeric($request->text)) {
           $this->dispatch(new ShowTDTicketJob());
           return $this->respondToSlack("One moment please…");
-        }
-        else {
+        } else {
           $this->dispatch(new SearchTDTicketJob());
           return $this->respondToSlack("One moment please…");
         }

app/Traits/Encryptable.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 
         if (in_array($key, $this->encryptable)) {
           try {
-            if($value){
+            if ($value) {
               $value = Crypt::decrypt($value);
             }
           } catch (DecryptException $e) {
@@ -26,7 +26,7 @@ 
     public function setAttribute($key, $value)
     {
         if (in_array($key, $this->encryptable)) {
-          if($value) {
+          if ($value) {
             $value = Crypt::encrypt($value);
           }
         }

app/Http/Controllers/SlackButtonController.php

Spacing +8 added lines, -8 removed lines

@@ -11,13 +11,13 @@ 
       Log::info('CP_SlackButtonController: processBtn method called.');
       Log::info('CP_SlackButtonController: Request type is ' . gettype($request) . '.');
       $data = json_decode($request['payload']);
-      if($data) {
+      if ($data) {
         Log::info('CP_SlackButtonController: Controller was given data.');
       }
       else {
         Log::info('CP_SlackButtonController: Controller was called, but no data given.');
       }
-      if($data->token == env('SLACK_SLASH_COMMAND_VERIFICATION_TOKEN')) {
+      if ($data->token == env('SLACK_SLASH_COMMAND_VERIFICATION_TOKEN')) {
         Log::info('CP_SlackButtonController: Token verified. Proceeding.');
         $this->buttonResponse($data);
       }
@@ -28,16 +28,16 @@ 
 
     private function buttonResponse($data) {
       Log::info('CP_SlackButtonController: buttonResponse method called.');
-      $ch = curl_init( $data->response_url );
+      $ch = curl_init($data->response_url);
       $payload = '{"text":"One moment please…"}';
-      curl_setopt( $ch, CURLOPT_POSTFIELDS, $payload );
-      curl_setopt( $ch, CURLOPT_HTTPHEADER, array('Content-Type:application/json'));
-      curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true );
+      curl_setopt($ch, CURLOPT_POSTFIELDS, $payload);
+      curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type:application/json'));
+      curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
       $result = curl_exec($ch);
       curl_close($ch);
 
       $userSession = TDsession::where('s_user_id', $data->user->id)->first();
-      if($userSession != null ) {
+      if ($userSession != null) {
         Log::info('CP_SlackButtonController: Found user session.');
         $userSession->increment('s_showtickets');
       }
@@ -48,7 +48,7 @@ 
         Log::info('CP_SlackButtonController: New CP_TDsession initialized.');
         Log::info('CP_SlackButtonController: Updating CP_TDsession s_user_id and s_token.');
         $userSession->s_user_id = $data->user->id;
-        $userSession->s_token =  $data->token;
+        $userSession->s_token = $data->token;
         $userSession->save();
 
         $userSession->increment('s_showtickets');

Braces +3 added lines, -6 removed lines

@@ -13,15 +13,13 @@ 
       $data = json_decode($request['payload']);
       if($data) {
         Log::info('CP_SlackButtonController: Controller was given data.');
-      }
-      else {
+      } else {
         Log::info('CP_SlackButtonController: Controller was called, but no data given.');
       }
       if($data->token == env('SLACK_SLASH_COMMAND_VERIFICATION_TOKEN')) {
         Log::info('CP_SlackButtonController: Token verified. Proceeding.');
         $this->buttonResponse($data);
-      }
-      else {
+      } else {
         Log::info('CP_SlackButtonController: Token did not pass verification.');
       }
     }
@@ -40,8 +38,7 @@ 
       if($userSession != null ) {
         Log::info('CP_SlackButtonController: Found user session.');
         $userSession->increment('s_showtickets');
-      }
-      else {
+      } else {
         Log::info('CP_SlackButtonController: No user session.');
         Log::info('CP_SlackButtonController: Creating new user session.');
         $userSession = new TDsession;

app/Providers/AppServiceProvider.php

Indentation +2 added lines, -2 removed lines

@@ -14,8 +14,8 @@
      */
     public function boot()
     {
-		//Fix Syntax error or access violation: 1071 Specified key was too long; max key length is 767 bytes
-       // Schema::defaultStringLength(191);
+    //Fix Syntax error or access violation: 1071 Specified key was too long; max key length is 767 bytes
+        // Schema::defaultStringLength(191);
     }
 
     /**

app/Providers/RouteServiceProvider.php

Indentation +5 added lines, -5 removed lines

@@ -52,8 +52,8 @@ 
     protected function mapWebRoutes()
     {
         Route::middleware('web')
-             ->namespace($this->namespace)
-             ->group(base_path('routes/web.php'));
+              ->namespace($this->namespace)
+              ->group(base_path('routes/web.php'));
     }
 
     /**
@@ -66,8 +66,8 @@ 
     protected function mapApiRoutes()
     {
         Route::prefix('api')
-             ->middleware('api')
-             ->namespace($this->namespace)
-             ->group(base_path('routes/api.php'));
+              ->middleware('api')
+              ->namespace($this->namespace)
+              ->group(base_path('routes/api.php'));
     }
 }

app/Classes/CP_TDinstance.php

Spacing +16 added lines, -16 removed lines

@@ -17,8 +17,8 @@ 
     public function __construct() {
       $a = func_get_args();
       $i = func_num_args();
-      if (method_exists($this,$f='__construct'.$i)) {
-          call_user_func_array(array($this,$f),$a);
+      if (method_exists($this, $f = '__construct' . $i)) {
+          call_user_func_array(array($this, $f), $a);
       }
     }
 
@@ -64,17 +64,17 @@ 
       }
     }
 
-    private function authorize($b, $w, $u){
+    private function authorize($b, $w, $u) {
       Log::info('CP_TDauth: authorize method called.');
       Log::info('CP_TDauth: authorize requesting at [' . $u . 'auth/loginadmin].');
-      $ch = curl_init( $u . 'auth/loginadmin');
-      $payload = json_encode( array( "BEID" => $b, "WebServicesKey" => $w ) );
-      curl_setopt( $ch, CURLOPT_POSTFIELDS, $payload );
-      curl_setopt( $ch, CURLOPT_HTTPHEADER, array('Content-Type:application/json'));
-      curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true );
+      $ch = curl_init($u . 'auth/loginadmin');
+      $payload = json_encode(array("BEID" => $b, "WebServicesKey" => $w));
+      curl_setopt($ch, CURLOPT_POSTFIELDS, $payload);
+      curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type:application/json'));
+      curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
       $bearer = curl_exec($ch);
       curl_close($ch);
-      if(!$bearer) {
+      if (!$bearer) {
         Log::info('CP_TDauth: Authorization failed.');
       }
       else {
@@ -88,7 +88,7 @@ 
 
     public function checkToken() {
       Log::info('CP_TDauth: checkToken method called.');
-      if($this->authstring) {
+      if ($this->authstring) {
         if (($this->expires - time()) <= 10) {
           $this->authorize($this->BEID, $this->WebServicesKey, $this->urlroot);
           Log::info('CP_TDauth: Token was expired. Replaced with new token.');
@@ -124,8 +124,8 @@ 
     Log::info('CP_TDinstance: connect method called.');
     $this->checkToken();
     $ch = curl_init($this->urlroot . $point);
-    curl_setopt( $ch, CURLOPT_HTTPHEADER, array('Content-Type:application/json', $this->authstring));
-    curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true );
+    curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type:application/json', $this->authstring));
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
     if ($type == 'post') {
       Log::info('CP_TDinstance: connect method POST.');
       curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
@@ -161,12 +161,12 @@ 
     Log::info('CP_TDinstance: searchTicketsName method called.');
     $flag = $this->flagCheck($search);
 
-    if(!$flag) {
+    if (!$flag) {
       $people = $this->searchPeople($search);
       foreach ($people as $person) {
         $uids[] = $person['UID'];
       }
-      if(isset($uids)) {
+      if (isset($uids)) {
         $tickets = $this->searchResponsibility($uids);
         return $tickets;
       }
@@ -175,7 +175,7 @@ 
       }
     }
     else {
-      if($flag = '-r') {
+      if ($flag = '-r') {
         $data = array("RequestorNameSearch" => substr($search, 0, -3));
         $data_string = json_encode($data);
         $tickets = $this->connect('post', $this->appid . '/tickets/search', $data_string);
@@ -206,7 +206,7 @@ 
 
   public function searchResponsibility($search) {
     Log::info('CP_TDinstance: searchResponsibility method called.');
-    if (! is_array($search)) {
+    if (!is_array($search)) {
       $search = array((string)$search);
     }
     $ResponsibilityUids = $search;

Braces +9 added lines, -18 removed lines

@@ -56,8 +56,7 @@ 
         Log::info('CP_TDauth: Setup for production.');
         $this->urlroot = $u . 'TDWebApi/api/';
         $this->appsroot = $u . 'TDNext/Apps/';
-      }
-      elseif ($e == 'sandbox') {
+      } elseif ($e == 'sandbox') {
         Log::info('CP_TDauth: Setup for sandbox.');
         $this->urlroot = $u . 'SBTDWebApi/api/';
         $this->appsroot = $u . 'SBTDNext/Apps/';
@@ -76,8 +75,7 @@ 
       curl_close($ch);
       if(!$bearer) {
         Log::info('CP_TDauth: Authorization failed.');
-      }
-      else {
+      } else {
         Log::info('CP_TDauth: Authorization successful.');
         list($JWTheader, $JWTpayload, $JWTsig) = explode('.', $bearer);
         $this->auth = $bearer;
@@ -92,14 +90,12 @@ 
         if (($this->expires - time()) <= 10) {
           $this->authorize($this->BEID, $this->WebServicesKey, $this->urlroot);
           Log::info('CP_TDauth: Token was expired. Replaced with new token.');
-        }
-        else {
+        } else {
           $remain = $this->expires - time();
           Log::info('CP_TDauth: Token ok, time remaining: ' . $remain);
         }
         return true;
-      }
-      else {
+      } else {
         Log::info('CP_TDauth: No token.');
         return false;
       }
@@ -130,8 +126,7 @@ 
       Log::info('CP_TDinstance: connect method POST.');
       curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
       curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
-    }
-    else {
+    } else {
       Log::info('CP_TDinstance: connect method GET.');
     }
     $result = curl_exec($ch);
@@ -145,8 +140,7 @@ 
       $flag = substr($check, 1, 2);
       Log::info('CP_TDinstance: flagCheck given flag ' . $flag);
       return $flag;
-    }
-    else {
+    } else {
       return null;
     }
   }
@@ -169,19 +163,16 @@ 
       if(isset($uids)) {
         $tickets = $this->searchResponsibility($uids);
         return $tickets;
-      }
-      else {
+      } else {
         return null;
       }
-    }
-    else {
+    } else {
       if($flag = '-r') {
         $data = array("RequestorNameSearch" => substr($search, 0, -3));
         $data_string = json_encode($data);
         $tickets = $this->connect('post', $this->appid . '/tickets/search', $data_string);
         return $tickets;
-      }
-      else {
+      } else {
         return null;
       }
     }