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/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/error.php b/error.php index e96358924..ae27ef833 100755 --- a/error.php +++ b/error.php @@ -39,7 +39,7 @@ $$key = $value; } //error stuff -$requested = (isset($_SERVER['HTTPS']) ? "https" : "http") . "://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]"; +$requested = $_SERVER['REQUEST_URI']; $codes = array( 400 => 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/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();