Skip to content

Commit

Permalink
Fix PDF export and plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
daniel-lerch committed May 12, 2020
1 parent f77e293 commit 3de4264
Show file tree
Hide file tree
Showing 27 changed files with 25 additions and 2 deletions.
22 changes: 22 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Listen for XDebug",
"type": "php",
"request": "launch",
"port": 9000
},
{
"name": "Launch currently open script",
"type": "php",
"request": "launch",
"program": "${file}",
"cwd": "${fileDirname}",
"port": 9000
}
]
}
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
3 changes: 2 additions & 1 deletion inc/hooks.inc
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* Copyright notice
*
* (c) 2003-2015 Renzo Lauper (renzo@churchtool.org)
* (c) 2019-2020 Daniel Lerch
* All rights reserved
*
* This script is part of the kOOL project. The kOOL project is
Expand Down Expand Up @@ -132,7 +133,7 @@ function hook_get_by_type($type) {

//Dateiname nur gemäss BASE_PATH erlauben
$full_path = realpath($temp);
if(substr($full_path, 0, strlen($BASE_PATH."plugins")) != ($BASE_PATH."plugins")) {
if(substr($full_path, 0, strlen($BASE_PATH."plugins")) != realpath($BASE_PATH."plugins")) {
trigger_error("Not allowed Hook-File: ".$temp, E_USER_ERROR);
exit;
}
Expand Down
2 changes: 1 addition & 1 deletion inc/ko.inc
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ if(defined('DEBUG') && DEBUG) {

//Set default $BASE_PATH from current location (necessary during first installation)
if (empty($BASE_PATH)) $BASE_PATH = dirname(__DIR__);
if (substr($BASE_PATH) != '/') $BASE_PATH .= '/';
if (substr($BASE_PATH, -1) != '/') $BASE_PATH .= '/';

//Hooks (Plugins)
include($BASE_PATH."inc/hooks.inc");
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.

0 comments on commit 3de4264

Please sign in to comment.