opensourcemirror
/
opnsense-ui_devtools
mirror of https://github.com/opnsense/ui_devtools.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Phalcon 5 / php 8.1 compatibility

This commit is contained in:
Ad Schellevis 2022-08-18 18:12:43 +02:00
parent 9657b96637
commit 555408d11e
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/.htrouter.php
View File

@ -1,6 +1,6 @@
<?php
/**
* Copyright (C) 2018 Deciso B.V.
* Copyright (C) 2018-2022 Deciso B.V.
*
* All rights reserved.
*
@ -26,6 +26,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
error_reporting(E_ALL);
// setup environment
global $DEV_WORKDIR;

9
stubs/index.php
View File

@ -1,6 +1,6 @@
<?php
/**
* Copyright (C) 2018 Deciso B.V.
* Copyright (C) 2018-2022 Deciso B.V.
*
* All rights reserved.
*
@ -27,6 +27,7 @@
*
*/
error_reporting(E_ALL);
use Phalcon\Di\FactoryDefault as FactoryDefault;
/**
* search for a themed filename or return distribution standard
@ -41,7 +42,7 @@ function view_fetch_themed_filename($url, $theme)
"/"
);
foreach ($search_pattern as $pattern) {
foreach (\Phalcon\DI\FactoryDefault::getDefault()->get('config')->application->docroot as $path) {
foreach (FactoryDefault::getDefault()->get('config')->application->docroot as $path) {
$filename = "{$path}{$pattern}{$url}";
if (file_exists($filename)) {
return str_replace("//", "/", "/ui{$pattern}{$url}");
@ -59,7 +60,7 @@ function view_fetch_themed_filename($url, $theme)
*/
function view_file_exists($filename)
{
foreach (\Phalcon\DI\FactoryDefault::getDefault()->get('config')->application->docroot as $path) {
foreach (FactoryDefault::getDefault()->get('config')->application->docroot as $path) {
// check registered document roots for existence of $filename
$root_dir = "/usr/local/opnsense/www/";
if (strpos($filename, $root_dir) === 0) {
@ -79,7 +80,7 @@ function view_file_exists($filename)
*/
function view_cache_safe($url)
{
$myview = \Phalcon\DI::getDefault()->get('view');
$myview = FactoryDefault::getDefault()->get('view');
if (!empty($myview->product_hash)) {
return "{$url}?v={$myview->product_hash}";
}