dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- improved error handling for PHP Runtime errors

Browse Source 
- upgraded [_Raphaël_](https://dmitrybaranovskiy.github.io/raphael) js lib `v2.1.2` → `v2.2.8`
This commit is contained in:
Mark Friedrich
2019-07-20 17:19:33 +02:00
parent 17851804e7
commit 6cd25021bc
19 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/main/controller/controller.php
View File

@@ -764,17 +764,27 @@ class Controller {
$return->error[] = $error;
echo json_encode($return);
}else{
// non AJAX (e.g. GET/POST)
// recursively clear existing output buffers
while(ob_get_level()){
ob_end_clean();
}
$f3->set('tplPageTitle', 'ERROR - ' . $error->code);
// set error data for template rendering
$error->redirectUrl = $this->getRouteUrl();
$f3->set('errorData', $error);
// 4xx/5xx error -> set error page template
if( preg_match('/^4[0-9]{2}$/', $error->code) ){
// 4xx error -> render error page
$f3->set('tplPageContent', Config::getPathfinderData('STATUS.4XX') );
}elseif( preg_match('/^5[0-9]{2}$/', $error->code) ){
$f3->set('tplPageContent', Config::getPathfinderData('STATUS.5XX'));
}
// stop script - die(); after this fkt is done
// -> unload() fkt is still called
$f3->set('HALT', true);
}
}

13
app/main/lib/db/SQL.php
View File

@@ -76,4 +76,17 @@ class SQL extends \DB\SQL {
);
}
}
/**
* @see https://fatfreeframework.com/3.6/sql#exec
* @param array|string $cmds
* @param null $args
* @param int $ttl
* @param bool $log (we use false as default parameter)
* @param bool $stamp
* @return array|FALSE|int
*/
function exec($cmds, $args = null, $ttl = 0, $log = false, $stamp = false) {
return parent::exec($cmds, $args, $ttl, $log, $stamp);
}
}

2
js/app.js
View File

@@ -41,7 +41,7 @@ requirejs.config({
mousewheel: 'lib/jquery.mousewheel.min', // v3.1.13 Mousewheel - https://github.com/jquery/jquery-mousewheel
xEditable: 'lib/bootstrap-editable.min', // v1.5.1 X-editable - in placed editing
morris: 'lib/morris.min', // v0.5.1 Morris.js - graphs and charts
raphael: 'lib/raphael-min', // v2.1.2 Raphaël - required for morris (dependency)
raphael: 'lib/raphael.min', // v2.2.8 Raphaël - required for morris - https://dmitrybaranovskiy.github.io/raphael
bootbox: 'lib/bootbox.min', // v4.4.0 Bootbox.js - custom dialogs - http://bootboxjs.com
easyPieChart: 'lib/jquery.easypiechart.min', // v2.1.6 Easy Pie Chart - HTML 5 pie charts - http://rendro.github.io/easy-pie-chart
peityInlineChart: 'lib/jquery.peity.min', // v3.2.1 Inline Chart - http://benpickles.github.io/peity/

2
js/app/admin.js
View File

@@ -69,7 +69,7 @@ define([
Util.initDefaultBootboxConfig();
// hide splash loading animation
$('.' + config.splashOverlayClass).hideSplashOverlay();
$('.' + config.splashOverlayClass + '[data-status="ok"]').hideSplashOverlay();
setPageObserver();

2
js/app/key.js
View File

@@ -14,7 +14,7 @@ define([
mapMove: {
group: 'map',
label: 'Move map section',
keyNames: ['drag', 'move']
keyNames: ['space', 'drag']
},
// signature ----------------------------------------------------------------------------------------
signatureSelect: {

2
js/app/login.js
View File

@@ -798,7 +798,7 @@ define([
});
// hide splash loading animation
$('.' + config.splashOverlayClass).hideSplashOverlay();
$('.' + config.splashOverlayClass + '[data-status="ok"]').hideSplashOverlay();
// init server status information
initServerStatus();

2
js/app/setup.js
View File

@@ -350,7 +350,7 @@ define([
Util.showVersionInfo();
// hide splash loading animation ------------------------------------------------------------------------------
$('.' + config.splashOverlayClass).hideSplashOverlay();
$('.' + config.splashOverlayClass + '[data-status="ok"]').hideSplashOverlay();
setPageObserver();

3
js/lib/raphael-min.js vendored
View File

File diff suppressed because one or more lines are too long

1
js/lib/raphael.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
public/js/v1.5.2/app.js
View File

@@ -41,7 +41,7 @@ requirejs.config({
mousewheel: 'lib/jquery.mousewheel.min', // v3.1.13 Mousewheel - https://github.com/jquery/jquery-mousewheel
xEditable: 'lib/bootstrap-editable.min', // v1.5.1 X-editable - in placed editing
morris: 'lib/morris.min', // v0.5.1 Morris.js - graphs and charts
raphael: 'lib/raphael-min', // v2.1.2 Raphaël - required for morris (dependency)
raphael: 'lib/raphael.min', // v2.2.8 Raphaël - required for morris - https://dmitrybaranovskiy.github.io/raphael
bootbox: 'lib/bootbox.min', // v4.4.0 Bootbox.js - custom dialogs - http://bootboxjs.com
easyPieChart: 'lib/jquery.easypiechart.min', // v2.1.6 Easy Pie Chart - HTML 5 pie charts - http://rendro.github.io/easy-pie-chart
peityInlineChart: 'lib/jquery.peity.min', // v3.2.1 Inline Chart - http://benpickles.github.io/peity/

2
public/js/v1.5.2/app/admin.js
View File

@@ -69,7 +69,7 @@ define([
Util.initDefaultBootboxConfig();
// hide splash loading animation
$('.' + config.splashOverlayClass).hideSplashOverlay();
$('.' + config.splashOverlayClass + '[data-status="ok"]').hideSplashOverlay();
setPageObserver();

2
public/js/v1.5.2/app/key.js
View File

@@ -14,7 +14,7 @@ define([
mapMove: {
group: 'map',
label: 'Move map section',
keyNames: ['drag', 'move']
keyNames: ['space', 'drag']
},
// signature ----------------------------------------------------------------------------------------
signatureSelect: {

2
public/js/v1.5.2/app/login.js
View File

@@ -798,7 +798,7 @@ define([
});
// hide splash loading animation
$('.' + config.splashOverlayClass).hideSplashOverlay();
$('.' + config.splashOverlayClass + '[data-status="ok"]').hideSplashOverlay();
// init server status information
initServerStatus();

2
public/js/v1.5.2/app/setup.js
View File

@@ -350,7 +350,7 @@ define([
Util.showVersionInfo();
// hide splash loading animation ------------------------------------------------------------------------------
$('.' + config.splashOverlayClass).hideSplashOverlay();
$('.' + config.splashOverlayClass + '[data-status="ok"]').hideSplashOverlay();
setPageObserver();

3
public/js/v1.5.2/lib/raphael-min.js vendored
View File

File diff suppressed because one or more lines are too long

1
public/js/v1.5.2/lib/raphael.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
public/templates/layout/splash.html
View File

@@ -1,4 +1,4 @@
<div class="pf-splash">
<div class="pf-splash" data-status="ok">
<div class="pf-color-line"></div>
<div class="pf-splash-title">
<h1>PATHFINDER - System Mapping Tool</h1>

2
public/templates/status/4xx.html
View File

@@ -1,4 +1,4 @@
<div class="pf-splash pf-splash-warning">
<div class="pf-splash pf-splash-warning" data-status="warning">
<div class="pf-color-line warning"></div>
<div class="pf-splash-title">
<h1>

2
public/templates/status/5xx.html
View File

@@ -1,4 +1,4 @@
<div class="pf-splash pf-splash-error">
<div class="pf-splash pf-splash-error" data-status="error">
<div class="pf-color-line danger"></div>
<div class="pf-splash-title">
<h1>