Tenant restore fix

nielsengelen · Feb 4, 2021 · 53055ed · 53055ed
1 parent 6f4d881
commit 53055ed
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/onedrive.php b/onedrive.php
@@ -199,7 +199,7 @@
 			<?php
 			if (isset($_GET['oid'])) $oid = $_GET['oid'];
 
-			if (isset($oid) && !isset($rid) && !preg_match('/tenant/', $restoretype)) {
+			if (isset($oid) && !isset($rid)) {
 				if (strtolower($authtype) !== 'mfa' && $check === false && strtolower($administrator) === 'yes') {
 					$org = $veeam->getOrganizationByID($oid);
 				}
@@ -238,7 +238,7 @@
 			}
 
 			if (!isset($_SESSION['rid'])) {
-				if (isset($oid) && !empty($oid)) {
+				if (isset($oid) && !empty($oid) && !preg_match('/tenant/', $restoretype)) {
 					$users = $veeam->getLicensedUsers($oid);
 					$repo = $veeam->getOrganizationRepository($oid);
 					$usersarray = array();

diff --git a/sharepoint.php b/sharepoint.php
@@ -238,7 +238,7 @@
 			<?php
 			if (isset($_GET['oid'])) $oid = $_GET['oid'];
 
-			if (isset($oid) && !isset($rid) && !preg_match('/tenant/', $restoretype)) {
+			if (isset($oid) && !isset($rid)) {
 				if (strtolower($authtype) !== 'mfa' && $check === false && strtolower($administrator) === 'yes') {
 					$org = $veeam->getOrganizationByID($oid);
 				}
@@ -277,7 +277,7 @@
 			}
 
 			if (!isset($_SESSION['rid'])) {
-				if (isset($oid) && !empty($oid)) {
+				if (isset($oid) && !empty($oid) && !preg_match('/tenant/', $restoretype)) {
 					$org = $veeam->getOrganizationByID($oid);
 					$repo = $veeam->getOrganizationRepository($oid);
 

diff --git a/teams.php b/teams.php
@@ -173,7 +173,7 @@
 			<?php
 			if (isset($_GET['oid'])) $oid = $_GET['oid'];
 
-			if (isset($oid) && !isset($rid) && !preg_match('/tenant/', $restoretype)) {
+			if (isset($oid) && !isset($rid)) {
 				if (strtolower($authtype) !== 'mfa' && $check === false && strtolower($administrator) === 'yes') {
 					$org = $veeam->getOrganizationByID($oid);
 				}
@@ -212,7 +212,7 @@
 			}
 
 			if (!isset($_SESSION['rid'])) {
-				if (isset($oid) && !empty($oid)) {
+				if (isset($oid) && !empty($oid) && !preg_match('/tenant/', $restoretype)) {
 					$org = $veeam->getOrganizationByID($oid);
 					$repo = $veeam->getOrganizationRepository($oid);