diff --git a/controller/Controller.class.php b/controller/Controller.class.php index 84856281..c80db364 100644 --- a/controller/Controller.class.php +++ b/controller/Controller.class.php @@ -102,12 +102,13 @@ class Controller $router->any('/dmca', 'ReportActions::executeDmca'); - $router->any('/youtube/sub', 'AcquisitionActions::executeYouTubeSub'); - $router->post('/youtube/edit', 'AcquisitionActions::executeYoutubeEdit'); - $router->post('/youtube/token', 'AcquisitionActions::executeYoutubeToken'); - $router->any('/youtube/status/{token}', 'AcquisitionActions::executeYoutubeStatus'); - $router->any('/youtube', 'AcquisitionActions::executeYouTube'); - $router->any('/youtube/status', 'AcquisitionActions::executeRedirectYoutube'); + $router->any('/youtube/sub', 'AcquisitionActions::executeYouTubeSub'); + $router->post('/youtube/edit', 'AcquisitionActions::executeYoutubeEdit'); + $router->post('/youtube/token', 'AcquisitionActions::executeYoutubeToken'); + $router->any('/youtube/status/{token}', 'AcquisitionActions::executeYoutubeStatus'); + $router->any('/youtube/status', 'AcquisitionActions::executeRedirectYoutube'); + $router->any('/youtube', 'AcquisitionActions::executeYouTube'); + $router->get('/youtube/{version}', 'AcquisitionActions::executeYouTube'); $router->get('/verify/{token}', 'AcquisitionActions::executeVerify'); diff --git a/controller/action/AcquisitionActions.class.php b/controller/action/AcquisitionActions.class.php index 3791bdfc..774d1083 100644 --- a/controller/action/AcquisitionActions.class.php +++ b/controller/action/AcquisitionActions.class.php @@ -24,17 +24,22 @@ class AcquisitionActions extends Actions Mailgun::sendYouTubeWarmLead(['email' => $email]); Session::setFlash('success', 'Thanks! We\'ll be in touch. The good kind of touch.'); - - return Controller::redirect(Request::getReferrer(), 303); + } + + public static function executeYouTube(string $version = '') + { + if(isset($_GET['error_message'])){ + $error_message = Request::encodeStringFromUser($_GET['error_message']); } - public static function executeYouTube() - { - if (isset($_GET['error_message'])) { - $error_message = Request::encodeStringFromUser($_GET['error_message']); - } + $baseTemplate = 'acquisition/youtube'; + $versionedTemplate = $baseTemplate . '-' . $version; + $template = $version && View::exists($versionedTemplate) ? $versionedTemplate : $baseTemplate; - return ['acquisition/youtube', [ + //since multiple URLs come into this page, we need to save the URL the user came in with and send them back to it + //in addition to storing here, all redirections to /youtube need to be updated to send back to the URL we capture here + + return [$template, [ 'reward' => LBRY::youtubeReward(), 'error_message' => $error_message ?? '' ]];