From 6f263b25318cca744efb7a1d669cdde60bb0cc3c Mon Sep 17 00:00:00 2001
From: Maxime St-Pierre <me@maximest-pierre.me>
Date: Sun, 25 Mar 2018 14:20:45 -0400
Subject: [PATCH] fix redirect and array index

---
 controller/action/AcquisitionActions.class.php | 18 +++++++++++++++---
 view/template/acquisition/youtube_status.php   |  4 ++--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/controller/action/AcquisitionActions.class.php b/controller/action/AcquisitionActions.class.php
index 5bb6575c..fda2d7d6 100644
--- a/controller/action/AcquisitionActions.class.php
+++ b/controller/action/AcquisitionActions.class.php
@@ -30,9 +30,13 @@ class AcquisitionActions extends Actions
 
   public static function executeYouTube()
   {
+    if(isset($_GET['error_message'])){
+      $error_message = Request::encodeStringFromUser($_GET['error_message']);
+    }
+
     return ['acquisition/youtube', [
         'reward' => LBRY::youtubeReward(),
-        'error_message' => Request::encodeStringFromUser($_GET['error_message']) ?? null
+        'error_message' => $error_message ?? ''
     ]];
   }
 
@@ -48,10 +52,18 @@ class AcquisitionActions extends Actions
 
   public static function executeYoutubeStatus(string $token)
   {
+    if(isset($_GET['error_message'])){
+      $error_message = Request::encodeStringFromUser($_GET['error_message']);
+    }
+
+    $data = LBRY::statusYoutube($token);
+    if ($data['success'] == false){
+      Controller::redirect('/youtube?error=true&error_message=' . $data['error']);
+    }
     return ['acquisition/youtube_status', [
         'token' => $token,
-        'status_token' => LBRY::statusYoutube($token),
-        'error_message' => Request::encodeStringFromUser($_GET['error_message']) ?? null
+        'status_token' => $data,
+        'error_message' => $error_message ?? ''
     ]];
   }
 
diff --git a/view/template/acquisition/youtube_status.php b/view/template/acquisition/youtube_status.php
index 5dcbce04..7d62c022 100644
--- a/view/template/acquisition/youtube_status.php
+++ b/view/template/acquisition/youtube_status.php
@@ -35,7 +35,7 @@
                         </li>
                     </ul>
                 </div>
-                
+
                 <div class="blocks">
                     <div class="block">
                         <p>Your Sync Status<br>
@@ -101,4 +101,4 @@
                 </form>
             </div>
         </div>
-</main>
\ No newline at end of file
+</main>