Resolving issue #58

Author: netniV

items.php

@@ -25,6 +25,12 @@
 chdir('../../');
 
 include_once('./include/auth.php');
+
+if (!defined('REPORTIT_BASE_PATH')) {
+	include_once(__DIR__ . '/setup.php');
+	reportit_define_constants();
+}
+
 include_once(REPORTIT_BASE_PATH . '/lib/funct_validate.php');
 include_once(REPORTIT_BASE_PATH . '/lib/funct_online.php');
 include_once(REPORTIT_BASE_PATH . '/lib/funct_shared.php');

measurands.php

@@ -25,6 +25,12 @@
 chdir('../../');
 
 include_once('./include/auth.php');
+
+if (!defined('REPORTIT_BASE_PATH')) {
+	include_once(__DIR__ . '/setup.php');
+	reportit_define_constants();
+}
+
 include_once(REPORTIT_BASE_PATH . '/lib/funct_validate.php');
 include_once(REPORTIT_BASE_PATH . '/lib/funct_html.php');
 include_once(REPORTIT_BASE_PATH . '/lib/funct_online.php');

reports.php

@@ -25,6 +25,12 @@
 chdir('../../');
 
 include_once('./include/auth.php');
+
+if (!defined('REPORTIT_BASE_PATH')) {
+	include_once(__DIR__ . '/setup.php');
+	reportit_define_constants();
+}
+
 include_once(REPORTIT_BASE_PATH . '/lib/funct_validate.php');
 include_once(REPORTIT_BASE_PATH . '/lib/funct_online.php');
 include_once(REPORTIT_BASE_PATH . '/lib/const_runtime.php');

rrdlist.php

@@ -25,12 +25,18 @@
 chdir('../../');
 
 include_once('./include/auth.php');
-include_once($config['base_path'] . '/plugins/reportit/lib/funct_validate.php');
-include_once($config['base_path'] . '/plugins/reportit/lib/funct_online.php');
-include_once($config['base_path'] . '/plugins/reportit/lib/funct_shared.php');
-include_once($config['base_path'] . '/plugins/reportit/lib/funct_html.php');
-include_once($config['base_path'] . '/plugins/reportit/lib/const_runtime.php');
-include_once($config['base_path'] . '/plugins/reportit/lib/const_rrdlist.php');
+
+if (!defined('REPORTIT_BASE_PATH')) {
+	include_once(__DIR__ . '/setup.php');
+	reportit_define_constants();
+}
+
+include_once(REPORTIT_BASE_PATH . 'lib/funct_validate.php');
+include_once(REPORTIT_BASE_PATH . 'lib/funct_online.php');
+include_once(REPORTIT_BASE_PATH . 'lib/funct_shared.php');
+include_once(REPORTIT_BASE_PATH . 'lib/funct_html.php');
+include_once(REPORTIT_BASE_PATH . 'lib/const_runtime.php');
+include_once(REPORTIT_BASE_PATH . 'lib/const_rrdlist.php');
 
 set_default_action();
 

run.php

@@ -25,6 +25,12 @@
 chdir('../../');
 
 include_once('./include/auth.php');
+
+if (!defined('REPORTIT_BASE_PATH')) {
+	include_once(__DIR__ . '/setup.php');
+	reportit_define_constants();
+}
+
 include_once(REPORTIT_BASE_PATH . '/lib/funct_validate.php');
 include_once(REPORTIT_BASE_PATH . '/lib/funct_shared.php');
 include_once(REPORTIT_BASE_PATH . '/lib/funct_online.php');

runtime.php

@@ -38,6 +38,10 @@
 $email_counter  = 0;
 $export_counter = 0;
 
+if (!defined('REPORTIT_BASE_PATH')) {
+	include_once(__DIR__ . '/setup.php');
+	reportit_define_constants();
+}
 
 //----- Running on CLI? -----
 if(isset($_SERVER['argv']['0']) && realpath($_SERVER['argv']['0']) == __FILE__) {

setup.php

@@ -348,6 +348,8 @@ function reportit_draw_navigation_text ($nav) {
 function reportit_config_arrays() {
 	global $user_auth_realms, $user_auth_realm_filenames, $menu, $messages;
 
+	reportit_define_constants();
+
 	/* register all realms of ReportIt */
 	api_plugin_register_realm('reportit', 'view.php,charts.php', __('View Reports'), 1);
 	api_plugin_register_realm('reportit', 'reports.php,rrdlist.php,items.php,run.php', __('Create Reports'), 1);
@@ -374,8 +376,6 @@ function reportit_config_arrays() {
 }
 
 function reportit_config_settings() {
-	reportit_define_constants();
-
 	global $tabs, $tabs_graphs, $settings, $graph_dateformats, $graph_datechar, $settings_graphs, $config;
 
 	/* presets */

templates.php

@@ -25,6 +25,12 @@
 chdir('../../');
 
 include_once('./include/auth.php');
+
+if (!defined('REPORTIT_BASE_PATH')) {
+	include_once(__DIR__ . '/setup.php');
+	reportit_define_constants();
+}
+
 include_once(REPORTIT_BASE_PATH . '/lib/funct_validate.php');
 include_once(REPORTIT_BASE_PATH . '/lib/funct_online.php');
 include_once(REPORTIT_BASE_PATH . '/lib/funct_shared.php');

variables.php

@@ -25,6 +25,12 @@
 chdir('../../');
 
 include_once('./include/auth.php');
+
+if (!defined('REPORTIT_BASE_PATH')) {
+	include_once(__DIR__ . '/setup.php');
+	reportit_define_constants();
+}
+
 include_once(REPORTIT_BASE_PATH . '/lib/funct_validate.php');
 include_once(REPORTIT_BASE_PATH . '/lib/funct_html.php');
 include_once(REPORTIT_BASE_PATH . '/lib/funct_online.php');

view.php

@@ -28,6 +28,12 @@
 $guest_account = true;
 
 include_once('./include/auth.php');
+
+if (!defined('REPORTIT_BASE_PATH')) {
+	include_once(__DIR__ . '/setup.php');
+	reportit_define_constants();
+}
+
 include_once(REPORTIT_BASE_PATH . '/lib/funct_validate.php');
 include_once(REPORTIT_BASE_PATH . '/lib/funct_shared.php');
 include_once(REPORTIT_BASE_PATH . '/lib/funct_html.php');