瀏覽代碼

Use magic constant dir (#6711)

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__

* use magic constant __DIR__ to load only functions.php

* replace spaces with tab character

* update dirname command to use levels instead of nesting

* use magic constant __DIR__

* update dirname command to use levels instead of nesting

* Update access_control_edit.php

* Update access_control_import.php

* Update access_controls.php

* Update dnd.php

* Update access_controls_reload.php

* Update call_center_agents.php

* Update call_center_agents.php

* Update fax_queue.php

* Update login.php

* Update pdo.php

* Update pdo_vm.php

* Update switch.php

* Update index.php

* Update css.php

* Update v_mailto.php

* Update fax_to_email.php

---------

Co-authored-by: FusionPBX <[email protected]>
frytimo 2 年之前
父節點
當前提交
4178c97cb8
共有 57 個文件被更改,包括 76 次插入295 次删除
  1. 1 5
      core/dashboard/dashboard.php
  2. 1 5
      core/dashboard/dashboard_edit.php
  3. 2 3
      core/dashboard/index.php
  4. 1 5
      core/databases/database_edit.php
  5. 1 5
      core/databases/databases.php
  6. 1 5
      core/default_settings/default_setting_edit.php
  7. 1 5
      core/default_settings/default_setting_toggle.php
  8. 1 5
      core/default_settings/default_settings.php
  9. 1 5
      core/default_settings/default_settings_reload.php
  10. 1 5
      core/domain_settings/domain_setting_edit.php
  11. 1 5
      core/domain_settings/domain_settings.php
  12. 1 5
      core/domains/domain_edit.php
  13. 1 5
      core/domains/domain_json.php
  14. 1 5
      core/domains/domains.php
  15. 1 5
      core/groups/group_edit.php
  16. 1 5
      core/groups/group_member_add.php
  17. 1 5
      core/groups/group_members.php
  18. 1 5
      core/groups/group_permissions.php
  19. 1 5
      core/groups/groups.php
  20. 1 5
      core/groups/permissions_copy.php
  21. 2 2
      core/groups/permissions_default.php
  22. 11 25
      core/install/install.php
  23. 1 5
      core/menu/menu.php
  24. 1 5
      core/menu/menu_edit.php
  25. 2 6
      core/menu/menu_item_edit.php
  26. 1 5
      core/menu/menu_item_list.php
  27. 1 5
      core/menu/menu_item_move_down.php
  28. 1 5
      core/menu/menu_item_move_up.php
  29. 1 1
      core/menu/menu_reload.php
  30. 1 1
      core/menu/menu_restore_default.php
  31. 1 5
      core/notifications/notification_edit.php
  32. 1 5
      core/upgrade/index.php
  33. 2 10
      core/upgrade/upgrade_domains.php
  34. 1 5
      core/upgrade/upgrade_schema.php
  35. 1 5
      core/user_logs/user_log_edit.php
  36. 1 5
      core/user_logs/user_logs.php
  37. 1 5
      core/user_settings/user_dashboard.php
  38. 1 5
      core/user_settings/user_setting_edit.php
  39. 1 5
      core/user_settings/user_setting_set.php
  40. 1 5
      core/user_settings/user_settings.php
  41. 1 5
      core/users/user_edit.php
  42. 1 5
      core/users/user_imports.php
  43. 2 3
      core/users/user_json.php
  44. 1 5
      core/users/users.php
  45. 2 6
      index.php
  46. 1 5
      login.php
  47. 1 5
      logout.php
  48. 2 2
      resources/check_auth.php
  49. 1 5
      resources/classes/events.php
  50. 2 6
      resources/fonts/web_font_loader.php
  51. 1 5
      resources/footer.php
  52. 1 5
      resources/header.php
  53. 1 5
      resources/login.php
  54. 1 4
      resources/pdo.php
  55. 2 6
      resources/pdo_vm.php
  56. 1 5
      resources/uuid.php
  57. 1 5
      themes/default/css.php

+ 1 - 5
core/dashboard/dashboard.php

@@ -21,12 +21,8 @@
 	the Initial Developer. All Rights Reserved.
 */
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 
 //check permissions

+ 1 - 5
core/dashboard/dashboard_edit.php

@@ -22,12 +22,8 @@
 	the Initial Developer. All Rights Reserved.
 */
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 
 //check permissions

+ 2 - 3
core/dashboard/index.php

@@ -24,9 +24,8 @@
 	Mark J Crane <[email protected]>
 */
 
-//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
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 
 //if config.conf file does not exist then redirect to the install page
 	if (file_exists("/usr/local/etc/fusionpbx/config.conf")){

+ 1 - 5
core/databases/database_edit.php

@@ -24,12 +24,8 @@
 	Mark J Crane <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 
 //check permissions

+ 1 - 5
core/databases/databases.php

@@ -24,12 +24,8 @@
 	Mark J Crane <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 	require_once "resources/paging.php";
 

+ 1 - 5
core/default_settings/default_setting_edit.php

@@ -24,12 +24,8 @@
  Mark J Crane <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 
 //check permissions

+ 1 - 5
core/default_settings/default_setting_toggle.php

@@ -24,12 +24,8 @@
  Mark J Crane <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 
 //check permissions

+ 1 - 5
core/default_settings/default_settings.php

@@ -24,12 +24,8 @@
 	Mark J Crane <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 
 //check permissions

+ 1 - 5
core/default_settings/default_settings_reload.php

@@ -24,12 +24,8 @@
  Mark J Crane <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 
 //check permissions

+ 1 - 5
core/domain_settings/domain_setting_edit.php

@@ -24,12 +24,8 @@
  Mark J Crane <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 
 //check permissions

+ 1 - 5
core/domain_settings/domain_settings.php

@@ -24,12 +24,8 @@
 	Mark J Crane <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 
 //check permissions

+ 1 - 5
core/domains/domain_edit.php

@@ -25,12 +25,8 @@
  Luis Daniel Lucio Quiroz <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 
 //check permissions

+ 1 - 5
core/domains/domain_json.php

@@ -24,12 +24,8 @@
 	Mark J Crane <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 	
 //check permissions

+ 1 - 5
core/domains/domains.php

@@ -24,12 +24,8 @@
 	Mark J Crane <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 	require_once "resources/paging.php";
 

+ 1 - 5
core/groups/group_edit.php

@@ -24,12 +24,8 @@
 	Mark J Crane <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 
 //check permissions

+ 1 - 5
core/groups/group_member_add.php

@@ -24,12 +24,8 @@
 	Mark J Crane <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 
 //check permissions

+ 1 - 5
core/groups/group_members.php

@@ -24,12 +24,8 @@
 	Mark J Crane <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 
 //check permissions

+ 1 - 5
core/groups/group_permissions.php

@@ -24,12 +24,8 @@
 	Mark J Crane <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 
 //check permissions

+ 1 - 5
core/groups/groups.php

@@ -24,12 +24,8 @@
 	Mark J Crane <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 	require_once "resources/paging.php";
 

+ 1 - 5
core/groups/permissions_copy.php

@@ -24,12 +24,8 @@
 	Sérgio Reis <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 
 //check permissions

+ 2 - 2
core/groups/permissions_default.php

@@ -31,7 +31,7 @@
 		set_include_path(parse_ini_file($conf[0])['document.root']);
 
 		//includes files
-		require_once "resources/require.php";
+		require_once dirname(__DIR__, 2) . "/resources/require.php";
 		require_once "resources/check_auth.php";
 		if (permission_exists('group_edit')) {
 			//access granted
@@ -59,4 +59,4 @@
 		return;
 	}
 
-?>
+?>

+ 11 - 25
core/install/install.php

@@ -128,30 +128,16 @@
 //process and save the data
 	if (count($_POST) > 0) {
 		foreach($_POST as $key => $value) {
-			//$_SESSION['install'][$key] = $value;
-			if ($key == 'admin_username') {
-				$_SESSION['install'][$key] = $value;
-			}
-			if ($key == 'admin_password') {
-				$_SESSION['install'][$key] = $value;
-			}
-			if ($key == 'domain_name') {
-				$_SESSION['install'][$key] = $value;
-			}
-			if ($key == 'database_host') {
-				$_SESSION['install'][$key] = $value;
-			}
-			if ($key == 'database_port') {
-				$_SESSION['install'][$key] = $value;
-			}
-			if ($key == 'database_name') {
-				$_SESSION['install'][$key] = $value;
-			}
-			if ($key == 'database_username') {
-				$_SESSION['install'][$key] = $value;
-			}
-			if ($key == 'database_password') {
-				$_SESSION['install'][$key] = $value;
+			switch($key) {
+				case 'admin_username':
+				case 'admin_password':
+				case 'domain_name':
+				case 'database_host':
+				case 'database_port':
+				case 'database_name':
+				case 'database_username':
+				case 'database_password':
+					$_SESSION['install'][$key] = $value;
 			}
 		}
 		if ($_REQUEST["step"] == "install") {
@@ -187,7 +173,7 @@
 			$output = shell_exec('cd '.$_SERVER["DOCUMENT_ROOT"].' && php /var/www/fusionpbx/core/upgrade/upgrade_schema.php');
 
 			//includes - this includes the config.php
-			require_once "resources/require.php";
+			require_once dirname(__DIR__, 2) . "/resources/require.php";
 
 			//get the domain name
 			$domain_name = $_SESSION['install']['domain_name'];

+ 1 - 5
core/menu/menu.php

@@ -24,12 +24,8 @@
 	Mark J Crane <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 
 //check permissions

+ 1 - 5
core/menu/menu_edit.php

@@ -24,12 +24,8 @@
 	Mark J Crane <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 
 //check permissions

+ 2 - 6
core/menu/menu_item_edit.php

@@ -24,12 +24,8 @@
 	Mark J Crane <[email protected]>
 */
 
-//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;
-	require_once "resources/require.php";
+//includes files
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 
 //check permissions

+ 1 - 5
core/menu/menu_item_list.php

@@ -24,12 +24,8 @@
 	Mark J Crane <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 
 //check permissions

+ 1 - 5
core/menu/menu_item_move_down.php

@@ -24,12 +24,8 @@
 	Mark J Crane <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 
 //check permissions

+ 1 - 5
core/menu/menu_item_move_up.php

@@ -23,12 +23,8 @@
 	Contributor(s):
 	Mark J Crane <[email protected]>
 */
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 
 //check permissions

+ 1 - 1
core/menu/menu_reload.php

@@ -62,4 +62,4 @@
 	header("Location: ".PROJECT_PATH."/core/menu/menu_edit.php?id=".urlencode($menu_uuid));
 	return;
 
-?>
+?>

+ 1 - 1
core/menu/menu_restore_default.php

@@ -31,7 +31,7 @@
 		set_include_path(parse_ini_file($conf[0])['document.root']);
 
 		//includes files
-		require_once "resources/require.php";
+		require_once dirname(__DIR__, 2) . "/resources/require.php";
 		require_once "resources/check_auth.php";
 		if (permission_exists('menu_restore')) {
 			//access granted

+ 1 - 5
core/notifications/notification_edit.php

@@ -24,12 +24,8 @@ Contributor(s):
 Mark J Crane <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 
 //check permissions

+ 1 - 5
core/upgrade/index.php

@@ -27,12 +27,8 @@
 //set a timeout
 	set_time_limit(15*60); //15 minutes
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 
 //check the permission

+ 2 - 10
core/upgrade/upgrade_domains.php

@@ -26,22 +26,14 @@
 
 //check the permission
 	if(defined('STDIN')) {
-		//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
-		require_once "resources/require.php";
+		require_once dirname(__DIR__, 2) . "/resources/require.php";
 		$_SERVER["DOCUMENT_ROOT"] = $document_root;
 		$display_type = 'text'; //html, text
 	}
 	else if (!$included) {
-		//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
-		require_once "resources/require.php";
+		require_once dirname(__DIR__, 2) . "/resources/require.php";
 		require_once "resources/check_auth.php";
 		if (permission_exists('upgrade_apps') || if_group("superadmin")) {
 			//echo "access granted";

+ 1 - 5
core/upgrade/upgrade_schema.php

@@ -29,12 +29,8 @@
 
 //check the permission
 	if(defined('STDIN')) {
-		//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
-		require_once "resources/require.php";
+		require_once dirname(__DIR__, 2) . "/resources/require.php";
 		require_once "resources/functions.php";
 
 		//set the format

+ 1 - 5
core/user_logs/user_log_edit.php

@@ -1,11 +1,7 @@
 <?php
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 
 //check permissions

+ 1 - 5
core/user_logs/user_logs.php

@@ -21,12 +21,8 @@
 	the Initial Developer. All Rights Reserved.
 */
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 	require_once "resources/paging.php";
 

+ 1 - 5
core/user_settings/user_dashboard.php

@@ -1,15 +1,11 @@
 <?php
 
-//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']);
-
 //start the session
 	ini_set("session.cookie_httponly", True);
 	if (!isset($_SESSION)) { session_start(); }
 
 //includes files
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 
 //add the header

+ 1 - 5
core/user_settings/user_setting_edit.php

@@ -24,12 +24,8 @@
  Mark J Crane <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 
 //check permissions

+ 1 - 5
core/user_settings/user_setting_set.php

@@ -24,12 +24,8 @@ Contributor(s):
 Mark J Crane <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
   	require_once "resources/check_auth.php";
 
 //add multi-lingual support

+ 1 - 5
core/user_settings/user_settings.php

@@ -24,12 +24,8 @@
  Mark J Crane <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 	require_once "resources/paging.php";
 

+ 1 - 5
core/users/user_edit.php

@@ -25,12 +25,8 @@
 	Luis Daniel Lucio Quiroz <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 
 //add multi-lingual support

+ 1 - 5
core/users/user_imports.php

@@ -24,12 +24,8 @@
 	Mark J Crane <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 
 //check permissions

+ 2 - 3
core/users/user_json.php

@@ -24,9 +24,8 @@
 	Mark J Crane <[email protected]>
 */
 
-//includes
-	require_once "root.php";
-	require_once "resources/require.php";
+//includes files
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 
 //check permissions

+ 1 - 5
core/users/users.php

@@ -24,12 +24,8 @@
 	Mark J Crane <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 	require_once "resources/check_auth.php";
 	require_once "resources/paging.php";
 

+ 2 - 6
index.php

@@ -24,10 +24,6 @@
 	Mark J. Crane <[email protected]>
 */
 
-//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']);
-
 //start the session
 	ini_set("session.cookie_httponly", True);
 	if (!isset($_SESSION)) { session_start(); }
@@ -44,8 +40,8 @@
 		exit;
 	}
 
-//adds multiple includes
-	require_once "resources/require.php";
+//includes files
+	require_once __DIR__ . "/resources/require.php";
 
 //if logged in, redirect to login destination
 	if (isset($_SESSION["username"])) {

+ 1 - 5
login.php

@@ -23,12 +23,8 @@
 	Contributor(s):
 	Mark J. Crane <[email protected]>
 */
-//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
-	require_once "resources/require.php";
+	require_once __DIR__ . "/resources/require.php";
 
 //start session
 	if (!isset($_SESSION)) { session_start(); }

+ 1 - 5
logout.php

@@ -24,12 +24,8 @@
 	Mark J Crane <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+	require_once __DIR__ . "/resources/require.php";
 
 //destroy session
 	session_unset();

+ 2 - 2
resources/check_auth.php

@@ -24,8 +24,8 @@
 	Mark J Crane <[email protected]>
 */
 
-//includes
-	require_once "resources/require.php";
+//includes files
+    require_once __DIR__ . "/require.php";
 
 //add multi-lingual support
 	$language = new text;

+ 1 - 5
resources/classes/events.php

@@ -8,12 +8,8 @@
  * $e->execute_event(ADD, $params)	event type, params is an associative array
  */
 
-//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
-require_once "resources/require.php";
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 
 
 define ("MODULE_LOAD", 1);	// when loading a FS module with FS

+ 2 - 6
resources/fonts/web_font_loader.php

@@ -1,10 +1,6 @@
 <?php
-//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;
-require_once "resources/require.php";
+//includes files
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
 
 $font_loader_version = ($_GET['v'] != '') ? $_GET['v'] : 1;
 

+ 1 - 5
resources/footer.php

@@ -24,12 +24,8 @@
 	Mark J Crane <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+    require_once __DIR__ . "/require.php";
 
 //set variables if not set
 	//if (!isset($_SESSION["template_content"])) { $_SESSION["template_content"] = null; }

+ 1 - 5
resources/header.php

@@ -24,12 +24,8 @@
 	Mark J Crane <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+    require_once __DIR__ . "/require.php";
 
 //if reloadxml then run the command
 	if (permission_exists('dialplan_edit') && isset($_SESSION["reload_xml"])) {

+ 1 - 5
resources/login.php

@@ -24,12 +24,8 @@
 	Mark J Crane <[email protected]>
 */
 
-//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
-	require_once "resources/require.php";
+	require_once __DIR__ . "/require.php";
 
 //add multi-lingual support
 	$language = new text;

+ 1 - 4
resources/pdo.php

@@ -25,11 +25,8 @@
  Raymond Chandler <[email protected]>
  */
 
-//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
+	require_once __DIR__ . "/require.php";
 	require_once "resources/functions.php";
 
 //set defaults

+ 2 - 6
resources/pdo_vm.php

@@ -24,12 +24,8 @@
  Mark J Crane <[email protected]>
 */
 
-//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
-	require "resources/require.php";
+	require_once __DIR__ . "/require.php";
 
 //get the contents of xml_cdr.conf.xml
 	$conf_xml_string = file_get_contents($_SESSION['switch']['conf']['dir'].'/autoload_configs/voicemail.conf.xml');
@@ -71,4 +67,4 @@
 	   echo 'Connection failed: ' . $e->getMessage();
 	}
 
- ?>
+ ?>

+ 1 - 5
resources/uuid.php

@@ -1,11 +1,7 @@
 <?php
 
-//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
-	include "resources/functions.php";
+	require_once __DIR__ . "/functions.php";
 
 //show the uuid
 	echo uuid();

+ 1 - 5
themes/default/css.php

@@ -1,11 +1,7 @@
 <?php
 
-//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
-include "resources/require.php";
+require_once dirname(__DIR__, 2) . "/resources/require.php";
 
 ob_start('ob_gzhandler');
 header('Content-type: text/css; charset: UTF-8');