Merge pull request #1573 from causefx/v2-develop

V2 develop

api/classes/organizr.class.php

@@ -60,7 +60,7 @@ class Organizr
 	
 	// ===================================
 	// Organizr Version
-	public $version = '2.1.183';
+	public $version = '2.1.184';
 	// ===================================
 	// Quick php Version check
 	public $minimumPHP = '7.2';

api/config/default.php

@@ -453,8 +453,8 @@ return array(
 	'organizrSignoutMenuLink' => true,
 	'organizrFeatureRequestLink' => true,
 	'breezometerToken' => 'd95ab607392d4fa5bf64bb26a5cb2a06',
-	'customForgotPasswordText' => '',
-	'disableRecoverPassword' => false,
+	'customForgotPassText' => '',
+	'disableRecoverPass' => false,
 	'expandCategoriesByDefault' => false,
 	'ignoredNewsIds' => array(),
 	'homepageTraktEnabled' => false,

api/functions/oauth.php

@@ -8,6 +8,8 @@ trait OAuthFunctions
 			'clientId' => $this->config['traktClientId'],
 			'clientSecret' => $this->config['traktClientSecret'],
 			'redirectUri' => $this->getServerPath() . 'api/v2/oauth/trakt'
+		], [
+			'httpClient' => new GuzzleHttp\Client(['verify' => getCert()]),
 		]);
 		if (!isset($_GET['code'])) {
 			$authUrl = $provider->getAuthorizationUrl();

api/functions/sso-functions.php

@@ -10,7 +10,7 @@ trait SSOFunctions
 			'overseerr' => 'username',
 			'tautulli' => 'username'
 		);
-		return $userobj[$map[$app]];
+		return (gettype($userobj) == 'string') ? $userobj : $userobj[$map[$app]];
 	}
 	
 	public function ssoCheck($userobj, $password, $token = null)

js/functions.js

@@ -2759,7 +2759,7 @@ function buildInternalContainer(name,url,type, split = null){
 function buildMenuList(name,url,type,icon,ping=null,category_id = null,group_id = null){
     var ping = (ping !== null) ? `<small class="menu-`+cleanClass(ping)+`-ping-ms hidden-xs label label-rouded label-inverse pull-right pingTime hidden">
 </small><div class="menu-`+cleanClass(ping)+`-ping" data-tab-name="`+name+`" data-previous-state=""></div>` : '';
-	return `<li class="allTabsList" id="menu-`+cleanClass(name)+`" data-tab-name="`+cleanClass(name)+`" type="`+type+`" data-group-id="`+group_id+`" data-category-id="`+category_id+`" data-url="`+url+`"><a class="waves-effect"  onclick="tabActions(event,'`+cleanClass(name)+`',`+type+`);" onauxclick="tabActions(event,'`+cleanClass(name)+`',`+type+`);">`+iconPrefix(icon)+`<span class="hide-menu elip sidebar-tabName">`+name+`</span>`+ping+`</a></li>`;
+	return `<li class="allTabsList" id="menu-`+cleanClass(name)+`" data-tab-name="`+cleanClass(name)+`" type="`+type+`" data-group-id="`+group_id+`" data-category-id="`+category_id+`" data-url="`+url+`"><a class="waves-effect"  href="javascript:void(0)" onclick="tabActions(event,'`+cleanClass(name)+`',`+type+`);" onauxclick="tabActions(event,'`+cleanClass(name)+`',`+type+`);">`+iconPrefix(icon)+`<span class="hide-menu elip sidebar-tabName">`+name+`</span>`+ping+`</a></li>`;
 }
 function tabProcess(arrayItems) {
 	var iFrameList = '';

js/version.json

@@ -327,5 +327,12 @@
     "new": "Trakt to homepage items|blackberry themes icon selector|option to dismiss important messages|help button and about section to sonarr|updated frameworks for phpmailer - slim - pusher - adldap2 - slimpr|Change layout for backers",
     "fixed": "Content wrapper causing obstructed view of tab content (#1567)|disable recover password|height for select2 boxes",
     "notes": "We are now using FeatureUpvote - icon located on bottom side bar|Please join our discord if you have any issues|Please report bugs in GitHub issues page"
+  },
+  "2.1.184": {
+    "date": "2021-02-01 20:10",
+    "title": "HOTFIX",
+    "new": "",
+    "fixed": "Missing variable",
+    "notes": "This is a quick hotfix"
   }
 }