Bläddra i källkod

minify custom.js
edited nzbget to allow no username and password

causefx 8 år sedan
förälder
incheckning
45a09495cd
4 ändrade filer med 19 tillägg och 7 borttagningar
  1. 16 4
      api/functions/homepage-connect-functions.php
  2. 1 1
      index.php
  3. 2 2
      js/custom.js
  4. 0 0
      js/custom.min.js

+ 16 - 4
api/functions/homepage-connect-functions.php

@@ -641,7 +641,11 @@ function nzbgetConnect()
 {
 	if ($GLOBALS['homepageNzbgetEnabled'] && !empty($GLOBALS['nzbgetURL']) && qualifyRequest($GLOBALS['homepageNzbgetAuth'])) {
 		$url = qualifyURL($GLOBALS['nzbgetURL']);
-		$url = $url . '/' . $GLOBALS['nzbgetUsername'] . ':' . decrypt($GLOBALS['nzbgetPassword']) . '/jsonrpc/listgroups';
+		if (!empty($GLOBALS['nzbgetUsername']) && !empty($GLOBALS['nzbgetPassword'])) {
+			$url = $url . '/' . $GLOBALS['nzbgetUsername'] . ':' . decrypt($GLOBALS['nzbgetPassword']) . '/jsonrpc/listgroups';
+		} else {
+			$url = $url . '/jsonrpc/listgroups';
+		}
 		try {
 			$options = (localURL($url)) ? array('verify' => false) : array();
 			$response = Requests::get($url, array(), $options);
@@ -652,7 +656,11 @@ function nzbgetConnect()
 			writeLog('error', 'NZBGet Connect Function - Error: ' . $e->getMessage(), 'SYSTEM');
 		};
 		$url = qualifyURL($GLOBALS['nzbgetURL']);
-		$url = $url . '/' . $GLOBALS['nzbgetUsername'] . ':' . decrypt($GLOBALS['nzbgetPassword']) . '/jsonrpc/history';
+		if (!empty($GLOBALS['nzbgetUsername']) && !empty($GLOBALS['nzbgetPassword'])) {
+			$url = $url . '/' . $GLOBALS['nzbgetUsername'] . ':' . decrypt($GLOBALS['nzbgetPassword']) . '/jsonrpc/history';
+		} else {
+			$url = $url . '/jsonrpc/history';
+		}
 		try {
 			$options = (localURL($url)) ? array('verify' => false) : array();
 			$response = Requests::get($url, array(), $options);
@@ -1811,9 +1819,13 @@ function testAPIConnection($array)
 			}
 			break;
 		case 'nzbget':
-			if (!empty($GLOBALS['nzbgetURL']) && !empty($GLOBALS['nzbgetUsername']) && !empty($GLOBALS['nzbgetPassword'])) {
+			if (!empty($GLOBALS['nzbgetURL'])) {
 				$url = qualifyURL($GLOBALS['nzbgetURL']);
-				$url = $url . '/' . $GLOBALS['nzbgetUsername'] . ':' . decrypt($GLOBALS['nzbgetPassword']) . '/jsonrpc/listgroups';
+				if (!empty($GLOBALS['nzbgetUsername']) && !empty($GLOBALS['nzbgetPassword'])) {
+					$url = $url . '/' . $GLOBALS['nzbgetUsername'] . ':' . decrypt($GLOBALS['nzbgetPassword']) . '/jsonrpc/listgroups';
+				} else {
+					$url = $url . '/jsonrpc/listgroups';
+				}
 				try {
 					$options = (localURL($url)) ? array('verify' => false) : array();
 					$response = Requests::get($url, array(), $options);

+ 1 - 1
index.php

@@ -171,7 +171,7 @@
 <script src="js/simplebar.js"></script>
 <script src="https://apis.google.com/js/client.js?onload=googleApiClientReady"></script>
 <script src="js/functions.js?v=<?php echo $GLOBALS['installedVersion']; ?>"></script>
-<script src="js/custom.js?v=<?php echo $GLOBALS['installedVersion']; ?>"></script>
+<script src="js/custom.min.js?v=<?php echo $GLOBALS['installedVersion']; ?>"></script>
 <?php echo pluginFiles('js'); ?>
 </body>
 

+ 2 - 2
js/custom.js

@@ -1280,7 +1280,7 @@ $(document).on("click", ".getPlexMachineSSO", function () {
                             machines += '<option value="'+machine+'">'+name+'</option>';
                         }
                     });
-                    var listing = `<select class="form-control" id="ssoPlexMachineSelector" data-type="select">`+machines+`</select>`;
+                    var listing = '<select class="form-control" id="ssoPlexMachineSelector" data-type="select">'+machines+'</select>';
                     $('.ssoPlexMachineListing').html(listing);
                 } else {
                     $('.ssoPlexTokenMessage').text(xhr.statusText);
@@ -1365,7 +1365,7 @@ $(document).on("click", ".getPlexMachineAuth", function () {
                             machines += '<option value="'+machine+'">'+name+'</option>';
                         }
                     });
-                    var listing = `<select class="form-control" id="authPlexMachineSelector" data-type="select">`+machines+`</select>`;
+                    var listing = '<select class="form-control" id="authPlexMachineSelector" data-type="select">'+machines+'</select>';
                     $('.authPlexMachineListing').html(listing);
                 } else {
                     $('.authPlexTokenMessage').text(xhr.statusText);

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
js/custom.min.js


Vissa filer visades inte eftersom för många filer har ändrats