Bladeren bron

Merge pull request #2 from alexdcrane/patch-1

Use dir for include
FusionPBX 2 jaren geleden
bovenliggende
commit
986b18057c
2 gewijzigde bestanden met toevoegingen van 3 en 11 verwijderingen
  1. 2 6
      device_log_edit.php
  2. 1 5
      device_logs.php

+ 2 - 6
device_log_edit.php

@@ -1,6 +1,6 @@
 <?php
 <?php
 /*
 /*
-	Copyright (c) 2019-2022 Mark J Crane <[email protected]>
+	Copyright (c) 2019-2023 Mark J Crane <[email protected]>
 	
 	
 	Redistribution and use in source and binary forms, with or without
 	Redistribution and use in source and binary forms, with or without
 	modification, are permitted provided that the following conditions
 	modification, are permitted provided that the following conditions
@@ -26,12 +26,8 @@
 	SUCH DAMAGE.
 	SUCH DAMAGE.
 */
 */
 
 
-//set the include path
-	$conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE);
-	set_include_path(parse_ini_file($conf[0])['document.root']);
-
 //includes files
 //includes files
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 	require_once "resources/check_auth.php";
 
 
 //check permissions
 //check permissions

+ 1 - 5
device_logs.php

@@ -26,12 +26,8 @@
 	SUCH DAMAGE.
 	SUCH DAMAGE.
 */
 */
 
 
-//set the include path
-	$conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE);
-	set_include_path(parse_ini_file($conf[0])['document.root']);
-
 //includes files
 //includes files
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 	require_once "resources/check_auth.php";
 	require_once "resources/paging.php";
 	require_once "resources/paging.php";