Merge pull request #1585 from Criptos/master

redirectUri at userLogin
WWBN · Mar 22, 2019 · 8ec236a · 8ec236a
2 parents 87cc54c + c879543
commit 8ec236a
Show file tree

Hide file tree

Showing 4 changed files with 773 additions and 3 deletions.
diff --git a/.classic.htaccess.swp b/.classic.htaccess.swp
diff --git a/objects/login.json.php b/objects/login.json.php
@@ -26,6 +26,13 @@
 
 error_log("Start Login Request");
 
+error_log("redirectUri: ".$_POST['redirectUri']);
+
+if(!preg_match("|^".$global['webSiteRootURL']."|", $_POST['redirectUri']))
+$_POST['redirectUri']=$global['webSiteRootURL'];
+
+error_log("sane redirectUri: ".$_POST['redirectUri']);
+
 use Hybridauth\Hybridauth;
 use Hybridauth\HttpClient;
 
@@ -141,6 +148,8 @@
 $object->isAdmin = User::isAdmin();
 $object->canUpload = User::canUpload();
 $object->canComment = User::canComment();
+$object->redirectUri=$_POST['redirectUri'];
+
 if (empty($advancedCustomUser->userCanNotChangeCategory) || User::isAdmin()) {
  $object->categories = Category::getAllCategories(true);
 }else{