diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 000000000..17df6db3a --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,22 @@ + +###### Organizr Version: V 1.x +###### Branch: Master/Develop +###### WebSever: Nginx/Apache +###### Operating System: Windows/MacOS/Ubuntu +
+ +##### Problem Description: + + +
+ +##### Reproduction Steps: + + +
+ +#### Errors on screen? If so paste here: + +``` + +``` diff --git a/.gitignore b/.gitignore index e9888ccba..ede3f8d63 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,6 @@ backups/* backups/ backups test*.php +tracy/ +logs/ +debug.php diff --git a/chat/connect.php b/chat/connect.php index ae828fb25..7f94dad30 100644 --- a/chat/connect.php +++ b/chat/connect.php @@ -1,7 +1,7 @@ busyTimeout(5000); +$db->busyTimeout(60000); $db->exec("PRAGMA journal_mode = wal;"); -?> \ No newline at end of file +?> diff --git a/chat/refreshmessages.php b/chat/refreshmessages.php index 6b2d732a7..03d6fc808 100644 --- a/chat/refreshmessages.php +++ b/chat/refreshmessages.php @@ -1,11 +1,4 @@ array('Bad Request', 'The server cannot or will not process the request due to an apparent client error.', 'sowwy'), 401 => array('Unauthorized', 'You do not have access to this page.', 'sowwy'), diff --git a/functions.php b/functions.php index a6e274183..1eb8ed6af 100755 --- a/functions.php +++ b/functions.php @@ -2,8 +2,10 @@ // =================================== // Define Version - define('INSTALLEDVERSION', '1.6'); + define('INSTALLEDVERSION', '1.601'); // =================================== +$debugOrganizr = true; +if($debugOrganizr == true && file_exists('debug.php')){ require_once('debug.php'); } use Kryptonit3\Sonarr\Sonarr; use Kryptonit3\SickRage\SickRage; //homepage order @@ -2607,36 +2609,39 @@ function nzbgetConnect($list = 'listgroups') { function sabnzbdConnect($list = 'queue') { $url = qualifyURL(SABNZBDURL); - $api = file_get_contents($url.'/api?mode='.$list.'&output=json&apikey='.SABNZBDKEY); + $api = @file_get_contents($url.'/api?mode='.$list.'&output=json&apikey='.SABNZBDKEY); $api = json_decode($api, true); $gotNZB = array(); + if (is_array($api) || is_object($api)){ + foreach ($api[$list]['slots'] AS $child) { + if($list == "queue"){ $downloadName = $child['filename']; $downloadCategory = $child['cat']; $downloadPercent = (($child['mb'] - $child['mbleft']) / $child['mb']) * 100; $progressBar = "progress-bar-striped active"; } + if($list == "history"){ $downloadName = $child['name']; $downloadCategory = $child['category']; $downloadPercent = "100"; $progressBar = ""; } + $downloadStatus = $child['status']; - foreach ($api[$list]['slots'] AS $child) { - if($list == "queue"){ $downloadName = $child['filename']; $downloadCategory = $child['cat']; $downloadPercent = (($child['mb'] - $child['mbleft']) / $child['mb']) * 100; $progressBar = "progress-bar-striped active"; } - if($list == "history"){ $downloadName = $child['name']; $downloadCategory = $child['category']; $downloadPercent = "100"; $progressBar = ""; } - $downloadStatus = $child['status']; - - $gotNZB[] = ' - '.$downloadName.' - '.$downloadStatus.' - '.$downloadCategory.' - '.$child['size'].' - -
-
-

'.round($downloadPercent).'%

- '.$downloadPercent.'% Complete + $gotNZB[] = ' + '.$downloadName.' + '.$downloadStatus.' + '.$downloadCategory.' + '.$child['size'].' + +
+
+

'.round($downloadPercent).'%

+ '.$downloadPercent.'% Complete +
-
- - '; - } + + '; + } - if ($gotNZB) { - return implode('',$gotNZB); - } else { - return '

No Results

'; + if ($gotNZB) { + return implode('',$gotNZB); + } else { + return '

No Results

'; + } + }else{ + writeLog("error", "SABNZBD ERROR: could not connect - check URL and/or check token - if HTTPS, is cert valid"); } } diff --git a/index.php b/index.php index 618590a01..d995d2ebe 100755 --- a/index.php +++ b/index.php @@ -1733,7 +1733,23 @@ function notify(notifyString, notifyIcon, notifyType, notifyLength, notifyLayout $name = str_replace(array(':', '\\', '/', '*'), 'x', $ping); if(strpos($type, 'image') !== false){ $style = "margin-top:28px"; }else{ $style = ""; }?> var pingTab = function() { - $("ping[class^='ping-']").load("ajax.php?a=get-ping&url=&style="); + //$("ping[class^='ping-']").load("ajax.php?a=get-ping&url=&style="); + $.ajax({ + url: 'ajax.php?a=get-ping&url=&style=', + timeout: 10000, + type: 'GET', + success: function(response) { + var getDiv = response; + if (typeof getDiv !== 'undefined') { + $("ping[class^='ping-']").html($(getDiv).prop('outerHTML')); + }else{ + console.log('ping- data was not sufficent or is offline'); + } + }, + error: function(jqXHR, textStatus, errorThrown) { + console.error('ping- could not be updated'); + } + }); }; // Initial Loads pingTab(); diff --git a/user.php b/user.php index 1d7caecff..422bad076 100755 --- a/user.php +++ b/user.php @@ -491,7 +491,8 @@ function authenticate_user($username, $operation) }else{ setcookie("cookiePassword", COOKIEPASSWORD, time() + (86400 * 7), "/", DOMAIN); - return true; + //return true; + return false; }