Merge pull request #1194 from causefx/v2-develop

V2 develop

.github/FUNDING.yml

@@ -0,0 +1,9 @@
+# These are supported funding model platforms
+
+github: causefx 
+patreon: organizr
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+custom: # Replace with a single custom sponsorship URL

api/functions/auth-functions.php

@@ -172,7 +172,7 @@ function plugin_auth_plex($username, $password)
 			$json = json_decode($response->body, true);
 			if ((is_array($json) && isset($json['user']) && isset($json['user']['username'])) && strtolower($json['user']['username']) == $usernameLower || strtolower($json['user']['email']) == $usernameLower) {
 				//writeLog("success", $json['user']['username']." was logged into organizr using plex credentials");
-				if ((!empty($GLOBALS['plexAdmin']) && (strtolower($GLOBALS['plexAdmin']) == strtolower($json['user']['username'])) || (strtolower($GLOBALS['plexAdmin']) == strtolower($json['user']['email']))) || checkPlexUser($json['user']['username'])) {
+				if ((!empty($GLOBALS['plexAdmin']) && (strtolower($GLOBALS['plexAdmin']) == strtolower($json['user']['username']) || strtolower($GLOBALS['plexAdmin']) == strtolower($json['user']['email']))) || checkPlexUser($json['user']['username'])) {
 					return array(
 						'username' => $json['user']['username'],
 						'email' => $json['user']['email'],

api/functions/homepage-connect-functions.php

@@ -1606,6 +1606,7 @@ function getRadarrCalendar($array, $number, $url)
 			foreach ($child['images'] as $image) {
 				if ($image['coverType'] == "banner" || $image['coverType'] == "fanart") {
 					$url = rtrim($url, '/'); //remove trailing slash
+					$url = $url . '/api';
 					$imageUrl = $image['url'];
 					$urlParts = explode("/", $url);
 					$imageParts = explode("/", $image['url']);
@@ -1613,7 +1614,7 @@ function getRadarrCalendar($array, $number, $url)
 						unset($imageParts[1]);
 						$imageUrl = implode("/", $imageParts);
 					}
-					$banner = $url . $imageUrl;
+					$banner = $url . $imageUrl . '?apikey=' . $GLOBALS['radarrToken'];
 				}
 			}
 			if ($banner !== "/plugins/images/cache/no-np.png") {

api/functions/organizr-functions.php

@@ -1,4 +1,17 @@
 <?php
+function checkPlexAdminFilled()
+{
+	if ($GLOBALS['plexAdmin'] == '') {
+		return false;
+	} else {
+		if ((strpos($GLOBALS['plexAdmin'], '@') !== false)) {
+			return 'email';
+		} else {
+			return 'username';
+		}
+	}
+}
+
 function organizrSpecialSettings()
 {
 	$refreshSearch = "Refresh";
@@ -39,6 +52,8 @@ function organizrSpecialSettings()
 				'cookie' => isset($_COOKIE['mpt']) ? true : false,
 				'machineID' => (strlen($GLOBALS['plexID']) == 40) ? true : false,
 				'token' => ($GLOBALS['plexToken'] !== '') ? true : false,
+				'plexAdmin' => checkPlexAdminFilled(),
+				'strict' => ($GLOBALS['plexStrictFriends']) ? true : false,
 				'oAuthEnabled' => ($GLOBALS['plexoAuth']) ? true : false,
 				'backend' => ($GLOBALS['authBackend'] == 'plex') ? true : false,
 			),
@@ -1585,6 +1600,11 @@ function checkoAuth()
 	return ($GLOBALS['plexoAuth'] && $GLOBALS['authType'] !== 'internal') ? true : false;
 }
 
+function checkoAuthOnly()
+{
+	return ($GLOBALS['plexoAuth'] && $GLOBALS['authType'] == 'external') ? true : false;
+}
+
 function showoAuth()
 {
 	$buttons = '';

api/functions/static-globals.php

@@ -1,7 +1,7 @@
 <?php
 // ===================================
 // Organizr Version
-$GLOBALS['installedVersion'] = '2.0.225';
+$GLOBALS['installedVersion'] = '2.0.235';
 // ===================================
 // Quick php Version check
 $GLOBALS['minimumPHP'] = '7.1.3';

api/pages/login.php

@@ -1,7 +1,8 @@
 <?php
 if (file_exists('config' . DIRECTORY_SEPARATOR . 'config.php')) {
 	$hideOrganizrLogin = (checkoAuth()) ? 'collapse' : 'collapse in';
-	$hideOrganizrLoginHeader = (checkoAuth()) ? '' : 'hidden';
+	$hideOrganizrLoginHeader = (checkoAuthOnly()) ? 'hidden' : '';
+	$hideOrganizrLoginHeader2 = (checkoAuth()) ? '' : 'hidden';
 	$pageLogin = '
 <script>
 if(activeInfo.settings.login.rememberMe){
@@ -41,7 +42,7 @@ if(activeInfo.settings.login.rememberMe){
         <div class="panel-group" id="login-panels" data-type="accordion" aria-multiselectable="true" role="tablist">
 	        <!-- ORGANIZR LOGIN -->
 	        <div class="panel">
-	            <div class="panel-heading bg-org ' . $hideOrganizrLoginHeader . '" id="organizr-login-heading" role="tab">
+	            <div class="panel-heading bg-org ' . $hideOrganizrLoginHeader . ' ' . $hideOrganizrLoginHeader2 . '" id="organizr-login-heading" role="tab">
 	            	<a class="panel-title collapsed" data-toggle="collapse" href="#organizr-login-collapse" data-parent="#login-panels" aria-expanded="false" aria-controls="organizr-login-collapse">
                         <img class="lazyload loginTitle" data-src="plugins/images/organizr/logo-no-border.png"> &nbsp;
                         <span class="text-uppercase fw300" lang="en">Login with Organizr</span>

js/langpack/pt[Portuguese].json

@@ -30,7 +30,7 @@
         "About": "Sobre",
         "Organizr Logs": "Registros do Organizr",
         "Main Settings": "Configurações Principais",
-        "Updates": "Updates",
+        "Updates": "Atualizar",
         "Logs": "Registros",
         "Main": "Principal",
         "Plugins": "Plugins",
@@ -210,7 +210,7 @@
         "I Want to Help": "Eu Quero Ajudar",
         "Head on over to POEditor and help us translate Organizr into your language": "Vá até POEditor e nos ajude a traduzir o Organizr para o seu idioma",
         "Want to help translate?": "Quer ajudar a traduzir?",
-        "Single Sign-On": "Single Sign-On",
+        "Single Sign-On": "Login Único (SSO)",
         "Coming Soon...": "Em breve...",
         "Homepage Order": "Ordem da Página Inicial",
         "Homepage Items": "Itens da Página Inicial",

js/version.json

@@ -180,5 +180,12 @@
     "new": "Support for custom GA Tracking code|Manual update checker",
     "fixed": "Download file function|2FA if using Password Manager|Calendar Localization|Emby local Auth|Sonarr JSON issue|Typos",
     "notes": "Disabled Emby Connect due to Emby|Made Debug error false by default|Updated language translations|Added more default tab images|Please report bugs in GitHub issues page"
+  },
+  "2.0.235": {
+    "date": "2019-06-07 19:30",
+    "title": "Small Weekly Update",
+    "new": "Plex Admin and Strict info to debug area",
+    "fixed": "Radarr image problem if Radarr Auth is on|Plex login for admin using username and pass for SSO|Powershell update script|Login screen for oAuth only as backend",
+    "notes": "Please report bugs in GitHub issues page|Updated language translations|Added more default tab images"
   }
 }

scripts/windows-update.bat

@@ -58,7 +58,7 @@ ECHO #############################
 ECHO.
 ECHO.
 ECHO Download In Progress...
-powershell -command "$clnt = new-object System.Net.WebClient; $clnt.DownloadFile(\"%org_url%\", \"organizr.zip\")"
+powershell -command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $clnt = new-object System.Net.WebClient; $clnt.DownloadFile(\"%org_url%\", \"organizr.zip\")"
 ECHO.
 
 ECHO Extraction In Progress...