update plex api endpoint for users

added machineid check for plex friends
updated tautulli logo

api/functions/auth-functions.php

@@ -64,7 +64,7 @@ function checkPlexUser($username)
 {
 	try {
 		if (!empty($GLOBALS['plexToken'])) {
-			$url = 'https://plex.tv/pms/friends/all';
+			$url = 'https://plex.tv/api/users';
 			$headers = array(
 				'X-Plex-Token' => $GLOBALS['plexToken'],
 			);
@@ -76,7 +76,9 @@ function checkPlexUser($username)
 					$usernameLower = strtolower($username);
 					foreach ($userXML as $child) {
 						if (isset($child['username']) && strtolower($child['username']) == $usernameLower || isset($child['email']) && strtolower($child['email']) == $usernameLower) {
-							return true;
+							if ((string)$child->Server['machineIdentifier'] == $GLOBALS['plexID']) {
+								return true;
+							}
 						}
 					}
 				}
@@ -93,7 +95,7 @@ function allPlexUsers($newOnly = false)
 {
 	try {
 		if (!empty($GLOBALS['plexToken'])) {
-			$url = 'https://plex.tv/pms/friends/all';
+			$url = 'https://plex.tv/api/users';
 			$headers = array(
 				'X-Plex-Token' => $GLOBALS['plexToken'],
 			);
@@ -104,7 +106,7 @@ function allPlexUsers($newOnly = false)
 				if (is_array($userXML) || is_object($userXML)) {
 					$results = array();
 					foreach ($userXML as $child) {
-						if (((string)$child['username'] !== '') && ((string)$child['email'] !== '')) {
+						if (((string)$child['restricted'] == '0')) {
 							if ($newOnly) {
 								$taken = usernameTaken((string)$child['username'], (string)$child['email']);
 								if (!$taken) {
@@ -116,7 +118,7 @@ function allPlexUsers($newOnly = false)
 							} else {
 								$results[] = array(
 									'username' => (string)$child['username'],
-									'email' => (string)$child['email']
+									'email' => (string)$child['email'],
 								);
 							}
 							

api/functions/sso-functions.php

@@ -22,7 +22,7 @@ function ssoCheck($username, $password, $token = null)
 	return true;
 }
 
-function getOmbiToken($username, $password)
+function getOmbiToken($username, $password, $token = null)
 {
 	try {
 		$url = $GLOBALS['ombiURL'] . '/api/v1/Token';
@@ -34,7 +34,7 @@ function getOmbiToken($username, $password)
 		$data = array(
 			"username" => $username,
 			"password" => $password,
-			"rememberMe" => "true",
+			"rememberMe" => "true"
 		);
 		$options = (localURL($url)) ? array('verify' => false) : array();
 		$response = Requests::post($url, $headers, json_encode($data), $options);