Pārlūkot izejas kodu

add sabnzbd pause icon again
fix tautulli cookie set as non httponly
fix password edit on plex login if not matching

causefx 7 gadi atpakaļ
vecāks
revīzija
1bc321b0e5
3 mainītis faili ar 14 papildinājumiem un 19 dzēšanām
  1. 3 1
      api/functions/api-functions.php
  2. 1 1
      api/functions/sso-functions.php
  3. 10 17
      js/functions.js

+ 3 - 1
api/functions/api-functions.php

@@ -84,7 +84,9 @@ function login($array)
 			if ($result['username']) {
 				$userExists = true;
 				$username = $result['username'];
-				$passwordMatches = (password_verify($password, $result['password'])) ? true : false;
+				if ($passwordMatches == false) {
+					$passwordMatches = (password_verify($password, $result['password'])) ? true : false;
+				}
 			}
 			if ($userExists) {
 				//does org password need to be updated

+ 1 - 1
api/functions/sso-functions.php

@@ -15,7 +15,7 @@ function ssoCheck($username, $password, $token = null)
 		$tautulliToken = getTautulliToken($username, $password, $token);
 		if ($tautulliToken) {
 			foreach ($tautulliToken as $key => $value) {
-				coookie('set', 'tautulli_token_' . $value['uuid'], $value['token'], $GLOBALS['rememberMeDays'], false);
+				coookie('set', 'tautulli_token_' . $value['uuid'], $value['token'], $GLOBALS['rememberMeDays']);
 			}
 		}
 	}

+ 10 - 17
js/functions.js

@@ -4093,6 +4093,15 @@ function buildDownloaderItem(array, source, type='none'){
     var history = '';
 	switch (source) {
 		case 'sabnzbd':
+            if(array.content.queueItems.queue.paused){
+                var state = `<a href="#"><span class="downloader mouse" data-source="sabnzbd" data-action="resume" data-target="main"><i class="fa fa-play"></i></span></a>`;
+                var active = 'grayscale';
+            }else{
+                var state = `<a href="#"><span class="downloader mouse" data-source="sabnzbd" data-action="pause" data-target="main"><i class="fa fa-pause"></i></span></a>`;
+                var active = '';
+            }
+            $('.sabnzbd-downloader-action').html(state);
+
             if(array.content.queueItems.queue.slots.length == 0){
                 queue = '<tr><td class="max-texts" lang="en">Nothing in queue</td></tr>';
             }
@@ -4394,18 +4403,6 @@ function buildDownloader(source){
 	//console.log(historyItems);
 	//console.log(downloader);
 	if(queue){
-		/*switch (source) {
-			case 'sabnzbd':
-				if(queueItems.queue.paused){
-					state = `<span class="downloader mouse" data-source="sabnzbd" data-action="resume" data-target="main"><i class="fa fa-play"></i></span>`;
-					active = 'grayscale';
-				}else{
-					state = `<span class="downloader mouse" data-source="sabnzbd" data-action="pause" data-target="main"><i class="fa fa-pause"></i></span>`;
-				}
-				break;
-			default:
-
-		}*/
 		menu += `
 			<li role="presentation" class="active" onclick="homepageDownloader('`+source+`')"><a href="#`+source+`-queue" aria-controls="home" role="tab" data-toggle="tab" aria-expanded="true"><span class="visible-xs"><i class="ti-download"></i></span><span class="hidden-xs">`+queueButton+`</span></a></li>
 			`;
@@ -4489,15 +4486,11 @@ function buildDownloaderCombined(source){
             var history = false;
 
     }
-
     var mainMenu = `<ul class="nav customtab nav-tabs combinedMenuList" role="tablist">`;
     var addToMainMenu = `<li role="presentation" class="`+active+`"><a onclick="homepageDownloader('`+source+`')" href="#combined-`+source+`" aria-controls="home" role="tab" data-toggle="tab" aria-expanded="true"><span class=""><img src="./plugins/images/tabs/`+source+`.png" class="homepageImageTitle"></span></a></li>`;
     var listing = '';
-
     var headerAlt = '';
     var header = '';
-
-
     var menu = `<ul class="nav customtab nav-tabs m-t-5" role="tablist">`;
     if(queue){
         menu += `
@@ -4529,7 +4522,7 @@ function buildDownloaderCombined(source){
 		</div>
 		`;
     }
-    menu += '</ul><div class="clearfix"></div>';
+    menu += '<li class="'+source+'-downloader-action"></li></ul><div class="clearfix"></div>';
     menu = ((queue) && (history)) ? menu : '';
     var listingMain = '<div role="tabpanel" class="tab-pane fade '+active+' in" id="combined-'+source+'">'+menu+'<div class="tab-content m-t-0 listingSingle">'+listing+'</div></div>';
     mainMenu += (first) ? addToMainMenu + '</ul>' : '';