diff --git a/.gitignore b/.gitignore index ee3f642..96b841b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,8 +7,8 @@ marketing/ firmware/ log/ assets/images/products/ -settings/config.php settings/settings.php +settings/config.php variable_scan.php -settings/veliti/settings.php settings/veliti/veliti_config.php +settings/veliti/veliti_settings.php diff --git a/account.php b/account.php index 138f30b..dab91a7 100644 --- a/account.php +++ b/account.php @@ -8,7 +8,7 @@ if (debug && debug_id == $_SESSION['id']){ } include_once './assets/functions.php'; -include_once './settings/settings.php'; +include_once './settings/settings_redirector.php'; //SET ORIGIN FOR NAVIGATION $_SESSION['prev_origin'] = $_SERVER['REQUEST_URI']; diff --git a/accounts.php b/accounts.php index 919487c..05514c1 100644 --- a/accounts.php +++ b/accounts.php @@ -8,7 +8,7 @@ if (debug && debug_id == $_SESSION['id']){ } include_once './assets/functions.php'; -include_once './settings/settings.php'; +include_once './settings/settings_redirector.php'; //SET ORIGIN FOR NAVIGATION $_SESSION['prev_origin'] = ''; diff --git a/api.php b/api.php index b2fc8fd..55ed46e 100644 --- a/api.php +++ b/api.php @@ -13,7 +13,7 @@ $input = stream_get_contents($post_data_curl); // Include functions //------------------------------------------ require_once './assets/functions.php'; -include './settings/settings.php'; +include './settings/settings_redirector.php'; include './settings/config_redirector.php'; //------------------------------------------ diff --git a/api/v0/get/application.php b/api/v0/get/application.php index 3334335..f04ed2b 100644 --- a/api/v0/get/application.php +++ b/api/v0/get/application.php @@ -216,7 +216,7 @@ case 'firmwareUpdate': if (isset($_GET['sn']) && $_GET['sn'] != '' && isset($_GET['hw_version']) && $_GET['hw_version'] != '' && isset($_GET['sw_version']) && $_GET['sw_version'] != '') { - include './settings/settings.php'; + include './settings/settings_redirector.php'; //Clean input data $hw_device_send = strip_tags(trim($_GET['hw_version'])); diff --git a/assets/functions.php b/assets/functions.php index 1400e79..494ae93 100644 --- a/assets/functions.php +++ b/assets/functions.php @@ -86,7 +86,7 @@ function send_mail($to, $subject, $message, $attachment, $attachment_name){ //------------------------------------------ function dbConnect($dbcon) { - include dirname(__FILE__,2).'/settings/settings.php'; + include dirname(__FILE__,2).'/settings/settings_redirector.php'; try { // Connect to the MySQL database using the PDO interface @@ -198,7 +198,7 @@ function filterMenuByProfile($menu, $profileString) { } function menu($selected,$selected_child){ - include dirname(__FILE__,2).'/settings/settings.php'; + include dirname(__FILE__,2).'/settings/settings_redirector.php'; if(isset($_SESSION['country_code'])){ $api_file_language = dirname(__FILE__,2).'/settings/translations/translations_'.strtoupper($_SESSION['country_code']).'.php'; @@ -470,7 +470,7 @@ EOT; //------------------------------------------ function generate_payload($payload) { - include dirname(__FILE__,2).'/settings/settings.php'; + include dirname(__FILE__,2).'/settings/settings_redirector.php'; $headers = array('alg'=>'HS256','typ'=>'payload'); $payload = array('payload'=>$payload,'exp'=>(time() + 1200)); @@ -510,7 +510,7 @@ function encrypt($input, $password) { // Decode Payload //------------------------------------------ function decode_payload($payload_input) { - include dirname(__FILE__,2).'/settings/settings.php'; + include dirname(__FILE__,2).'/settings/settings_redirector.php'; // split the jwt $tokenParts = explode('.', $payload_input); $header = base64_decode($tokenParts[0]); @@ -570,7 +570,7 @@ function base64url_encode($data) { //------------------------------------------ function generate_jwt($headers, $payload) { - include dirname(__FILE__,2).'/settings/settings.php'; + include dirname(__FILE__,2).'/settings/settings_redirector.php'; $headers_encoded = base64url_encode(json_encode($headers)); $payload_encoded = base64url_encode(json_encode($payload)); @@ -584,7 +584,7 @@ function generate_jwt($headers, $payload) { } function is_jwt_valid($jwt) { - include dirname(__FILE__,2).'/settings/settings.php'; + include dirname(__FILE__,2).'/settings/settings_redirector.php'; // split the jwt $tokenParts = explode('.', $jwt); $header = base64_decode($tokenParts[0]); @@ -625,7 +625,7 @@ function createCommunicationToken($input){ //------------------------------------------ function getUserKey($jwt){ - include dirname(__FILE__,2).'/settings/settings.php'; + include dirname(__FILE__,2).'/settings/settings_redirector.php'; $tokenParts = explode('.', $jwt); $payload = base64_decode($tokenParts[1]); $token = json_decode($payload)->token; @@ -670,7 +670,7 @@ function get_bearer_token() { //------------------------------------------ function ioServer($api_call, $data){ - include dirname(__FILE__,2).'/settings/settings.php'; + include dirname(__FILE__,2).'/settings/settings_redirector.php'; $token = $_SESSION['userkey'] ?? 'authorization_request'; $bearertoken = createCommunicationToken($token); @@ -714,7 +714,7 @@ function ioServer($api_call, $data){ //------------------------------------------ function ioAPI($api_call, $data, $token){ - include dirname(__FILE__,2).'/settings/settings.php'; + include dirname(__FILE__,2).'/settings/settings_redirector.php'; $bearertoken = createCommunicationToken($token); @@ -757,7 +757,7 @@ function ioAPI($api_call, $data, $token){ //------------------------------------------ function ioAPIv2($api_call, $data, $token){ - include dirname(__FILE__,2).'/settings/settings.php'; + include dirname(__FILE__,2).'/settings/settings_redirector.php'; $token = (!empty($token) || $token !='')? $token : 'authorization_request'; $bearertoken = createCommunicationToken($token); @@ -924,7 +924,7 @@ function getProfile($profile, $permission){ function isAllowed($page,$profile,$permission,$action){ //Include settingsa - include dirname(__FILE__,2).'/settings/settings.php'; + include dirname(__FILE__,2).'/settings/settings_redirector.php'; //GET ALLOWED ACTIONS $user_permission = ${'permission_'.$permission}; @@ -1045,7 +1045,7 @@ function getPartnerID($str){ // overview Indicators //------------------------------------------ function overviewIndicators($warranty, $service, $sw_version, $sw_version_latest){ - include dirname(__FILE__,2).'/settings/settings.php'; + include dirname(__FILE__,2).'/settings/settings_redirector.php'; include dirname(__FILE__,2).'/settings/systemfirmware.php'; $indicator =''; //In warranty @@ -1084,7 +1084,7 @@ function overviewIndicators($warranty, $service, $sw_version, $sw_version_latest function warrantyStatus($input){ - include dirname(__FILE__,2).'/settings/settings.php'; + include dirname(__FILE__,2).'/settings/settings_redirector.php'; //INCLUDE TRANSLATION FILE if(isset($_SESSION['country_code'])){ $api_file_language = dirname(__FILE__,2).'/settings/translations/translations_'.strtoupper($_SESSION['country_code']).'.php'; @@ -1116,7 +1116,7 @@ function warrantyStatus($input){ function serviceStatus($input){ - include dirname(__FILE__,2).'/settings/settings.php'; + include dirname(__FILE__,2).'/settings/settings_redirector.php'; //INCLUDE TRANSLATION FILE if(isset($_SESSION['country_code'])){ @@ -1184,7 +1184,7 @@ function availableFirmware($sw_version,$sw_version_latest){ //------------------------------------------ function serviceEvents ($messages,$page){ - include dirname(__FILE__,2).'/settings/settings.php'; + include dirname(__FILE__,2).'/settings/settings_redirector.php'; //INCLUDE TRANSLATION FILE if(isset($_SESSION['country_code'])){ @@ -1302,7 +1302,7 @@ function serviceReport($history, $request, $country_code) include dirname(__FILE__,2).'/settings/translations/translations_US.php'; } - include dirname(__FILE__,2).'/settings/settings.php'; + include dirname(__FILE__,2).'/settings/settings_redirector.php'; include dirname(__FILE__,2).'/settings/systemservicetool.php'; $json_array = json_decode($history->description); @@ -1948,7 +1948,7 @@ function serviceReport($history, $request, $country_code) //------------------------------------------ function listPartner($partnertype, $user_right, $input, $required) { - include dirname(__FILE__,2).'/settings/settings.php'; + include dirname(__FILE__,2).'/settings/settings_redirector.php'; //BASED ON USERRIGHT DEFINE SQL AND DATA RETURNED if ($user_right != 3 || $user_right !=4) { @@ -1996,7 +1996,7 @@ return $view; //------------------------------------------ function listAccounts($type, $user_right, $input) { - include dirname(__FILE__,2).'/settings/settings.php'; + include dirname(__FILE__,2).'/settings/settings_redirector.php'; //BASED ON USERRIGHT DEFINE SQL AND DATA RETURNED if ($user_right != 3 || $user_right !=4) { @@ -2088,7 +2088,7 @@ function uploadrequest($key){ //------------------------------------------ function displayImages($requestid,$request_type){ - include dirname(__FILE__,2).'/settings/settings.php'; + include dirname(__FILE__,2).'/settings/settings_redirector.php'; $pdo = dbConnect($dbname); @@ -2237,7 +2237,7 @@ function showlog($object,$objectID){ else { include dirname(__FILE__,2).'/settings/translations/translations_US.php'; } - include dirname(__FILE__,2).'/settings/settings.php'; + include dirname(__FILE__,2).'/settings/settings_redirector.php'; // Connect to DB $pdo = dbConnect($dbname); @@ -2368,7 +2368,7 @@ function createPartner($user_salesid,$user_soldto,$p_name,$p_type, $token){ // Update GEOlOCATION // +++++++++++++++++++++++++++++++++++++++++++++++++++++++ function geolocationUpdate($token){ - include dirname(__FILE__,2).'/settings/settings.php'; + include dirname(__FILE__,2).'/settings/settings_redirector.php'; //GET ALL WARRANTY REGISTRATIONS WHERE NO GEOLOCATION SET $sql = 'SELECT h.equipmentid, h.description FROM equipment e join equipment_history h on e.rowID = h.equipmentid where h.type = "Warranty" AND e.geolocation is Null'; @@ -2497,7 +2497,7 @@ function getQuestions($type){ // +++++++++++++++++++++++++++++++++++++++++++++++++++++++ function convertCartest(){ -include dirname(__FILE__,2).'/settings/settings.php'; +include dirname(__FILE__,2).'/settings/settings_redirector.php'; //GET CARTEST FROM equipment_history TABLE $pdo = dbConnect($dbname); @@ -2555,7 +2555,7 @@ $messages = $stmt->fetchAll(PDO::FETCH_ASSOC); function traintotalMeasurement(){ - include dirname(__FILE__,2).'/settings/settings.php'; + include dirname(__FILE__,2).'/settings/settings_redirector.php'; //total measurement internal array $total_measurement = []; @@ -2720,7 +2720,7 @@ function usageBilling($messages){ // +++++++++++++++++++++++++++++++++++++++++++++++++++++++ function closeContract(){ -include dirname(__FILE__,2).'/settings/settings.php'; +include dirname(__FILE__,2).'/settings/settings_redirector.php'; $pdo = dbConnect($dbname); @@ -2768,7 +2768,7 @@ foreach ($messages as $message){ function storeMeasurementProduct($total_results, $token){ - include dirname(__FILE__,2).'/settings/settings.php'; + include dirname(__FILE__,2).'/settings/settings_redirector.php'; $pdo = dbConnect($dbname); @@ -2817,7 +2817,7 @@ function storeMeasurementProduct($total_results, $token){ // +++++++++++++++++++++++++++++++++++++++++++++++++++++++ function storeMeasurementEquipment($serialnumber){ - include dirname(__FILE__,2).'/settings/settings.php'; + include dirname(__FILE__,2).'/settings/settings_redirector.php'; //Connect to DB $pdo = dbConnect($dbname); @@ -3004,7 +3004,7 @@ return $healthindex; // +++++++++++++++++++++++++++++++++++++++++++++++++++++++ function blockContracts($token){ - include dirname(__FILE__,2).'/settings/settings.php'; + include dirname(__FILE__,2).'/settings/settings_redirector.php'; //CALL TO API $api_url = '/v2/contracts/status=1&type=0'; diff --git a/buildtool.php b/buildtool.php index f8bbbc5..d580df4 100644 --- a/buildtool.php +++ b/buildtool.php @@ -8,7 +8,7 @@ if (debug && debug_id == $_SESSION['id']){ } include_once './assets/functions.php'; -include_once './settings/settings.php'; +include_once './settings/settings_redirector.php'; $page = 'buildtool'; //Check if allowed diff --git a/cartest.php b/cartest.php index 1098e8e..9db008a 100644 --- a/cartest.php +++ b/cartest.php @@ -8,7 +8,7 @@ if (debug && debug_id == $_SESSION['id']){ } include_once './assets/functions.php'; -include_once './settings/settings.php'; +include_once './settings/settings_redirector.php'; include_once './settings/systemcartest.php'; $page = 'cartest'; diff --git a/cartest_manage.php b/cartest_manage.php index 79d9ad5..81e11e6 100644 --- a/cartest_manage.php +++ b/cartest_manage.php @@ -8,7 +8,7 @@ if (debug && debug_id == $_SESSION['id']){ } include_once './assets/functions.php'; -include_once './settings/settings.php'; +include_once './settings/settings_redirector.php'; include_once './settings/systemcartest.php'; $page = 'cartest_manage'; diff --git a/cartests.php b/cartests.php index 58f72c5..985da3b 100644 --- a/cartests.php +++ b/cartests.php @@ -7,7 +7,7 @@ if (debug && debug_id == $_SESSION['id']){ error_reporting(E_ALL); } include_once './assets/functions.php'; -include_once './settings/settings.php'; +include_once './settings/settings_redirector.php'; $page = 'cartests'; //Check if allowed diff --git a/catalog.php b/catalog.php index 9a208b5..e53c7b1 100644 --- a/catalog.php +++ b/catalog.php @@ -8,7 +8,7 @@ if (debug && debug_id == $_SESSION['id']){ } include_once './assets/functions.php'; -include_once './settings/settings.php'; +include_once './settings/settings_redirector.php'; //SET ORIGIN FOR NAVIGATION $prev_page = $_SESSION['prev_origin'] ?? ''; diff --git a/categories.php b/categories.php index 2ece3c7..92ad7d4 100644 --- a/categories.php +++ b/categories.php @@ -8,7 +8,7 @@ if (debug && debug_id == $_SESSION['id']){ } include_once './assets/functions.php'; -include_once './settings/settings.php'; +include_once './settings/settings_redirector.php'; //SET ORIGIN FOR NAVIGATION $prev_page = $_SESSION['prev_origin'] ?? ''; diff --git a/communications.php b/communications.php index a73129f..fb98e90 100644 --- a/communications.php +++ b/communications.php @@ -8,7 +8,7 @@ if (debug && debug_id == $_SESSION['id']){ } include_once './assets/functions.php'; -include_once './settings/settings.php'; +include_once './settings/settings_redirector.php'; //SET PAGE ORIGIN FOR NAVIGATION AND SECURITY $prev_page = (isset($_SESSION['origin']) && $_SESSION['origin'] == 'equipments') ? $_SESSION['prev_origin_equipment'] : ((isset($_SESSION['origin']) && $_SESSION['origin'] == 'account')? $_SESSION['prev_origin'] :''); diff --git a/contract.php b/contract.php index 5cd8482..8437f2a 100644 --- a/contract.php +++ b/contract.php @@ -7,7 +7,7 @@ if (debug && debug_id == $_SESSION['id']){ error_reporting(E_ALL); } include_once './assets/functions.php'; -include_once './settings/settings.php'; +include_once './settings/settings_redirector.php'; //SET ORIGIN FOR NAVIGATION $prev_page = $_SESSION['prev_origin'] ?? ''; diff --git a/contracts.php b/contracts.php index eaf1a51..3de62d5 100644 --- a/contracts.php +++ b/contracts.php @@ -7,7 +7,7 @@ if (debug && debug_id == $_SESSION['id']){ error_reporting(E_ALL); } include_once './assets/functions.php'; -include_once './settings/settings.php'; +include_once './settings/settings_redirector.php'; //SET PAGE ORIGIN FOR NAVIGATION AND SECURITY diff --git a/cronjob.php b/cronjob.php index c24bf19..4902c3b 100644 --- a/cronjob.php +++ b/cronjob.php @@ -2,7 +2,7 @@ define('secure_34563$52', true); include_once './assets/functions.php'; -include_once './settings/settings.php'; +include_once './settings/settings_redirector.php'; include_once './settings/config_redirector.php'; if (debug && debug_id == $_SESSION['id']){ diff --git a/dashboard.php b/dashboard.php index c76ed46..da7f6a1 100644 --- a/dashboard.php +++ b/dashboard.php @@ -8,7 +8,7 @@ if (debug && debug_id == $_SESSION['id']){ } include_once './assets/functions.php'; -include_once './settings/settings.php'; +include_once './settings/settings_redirector.php'; //Check if allowed if (isAllowed('dashboard',$_SESSION['profile'],$_SESSION['permission'],'R') === 0){ diff --git a/discounts.php b/discounts.php index 27e3842..154e660 100644 --- a/discounts.php +++ b/discounts.php @@ -8,7 +8,7 @@ if (debug && debug_id == $_SESSION['id']){ } include_once './assets/functions.php'; -include_once './settings/settings.php'; +include_once './settings/settings_redirector.php'; //SET ORIGIN FOR NAVIGATION $prev_page = $_SESSION['prev_origin'] ?? ''; diff --git a/equipment.php b/equipment.php index 0c27655..3fdea98 100644 --- a/equipment.php +++ b/equipment.php @@ -8,7 +8,7 @@ if (debug && debug_id == $_SESSION['id']){ } include_once './assets/functions.php'; -include_once './settings/settings.php'; +include_once './settings/settings_redirector.php'; //SET ORIGIN FOR NAVIGATION $_SESSION['prev_origin_equipment'] = $_SERVER['REQUEST_URI']; diff --git a/equipments.php b/equipments.php index ef07fd8..ae0defc 100644 --- a/equipments.php +++ b/equipments.php @@ -7,7 +7,7 @@ if (debug && debug_id == $_SESSION['id']){ error_reporting(E_ALL); } include_once './assets/functions.php'; -include_once './settings/settings.php'; +include_once './settings/settings_redirector.php'; //SET PAGE ORIGIN FOR NAVIGATION AND SECURITY $prev_page = $_SESSION['prev_origin'] ?? ''; diff --git a/equipments_mass_update.php b/equipments_mass_update.php index c5198b0..8efae3a 100644 --- a/equipments_mass_update.php +++ b/equipments_mass_update.php @@ -8,7 +8,7 @@ if (debug && debug_id == $_SESSION['id']){ } include_once './assets/functions.php'; -include_once './settings/settings.php'; +include_once './settings/settings_redirector.php'; $page = 'equipments_mass_update'; //Check if allowed diff --git a/histories.php b/histories.php index da791c3..2eedd58 100644 --- a/histories.php +++ b/histories.php @@ -8,7 +8,7 @@ if (debug && debug_id == $_SESSION['id']){ } include_once './assets/functions.php'; -include_once './settings/settings.php'; +include_once './settings/settings_redirector.php'; //SET ORIGIN FOR NAVIGATION $_SESSION['prev_origin'] = $_SERVER['REQUEST_URI']; diff --git a/history.php b/history.php index 5bdebc3..7b75b45 100644 --- a/history.php +++ b/history.php @@ -8,7 +8,7 @@ if (debug && debug_id == $_SESSION['id']){ } include_once './assets/functions.php'; -include_once './settings/settings.php'; +include_once './settings/settings_redirector.php'; //Check if allowed $page = 'history'; diff --git a/index.php b/index.php index 7d0d1c5..a640646 100644 --- a/index.php +++ b/index.php @@ -17,7 +17,7 @@ if (debug && debug_id == $_SESSION['id']){ //INCLUDE FUNCTIONS AND SETTINGS include dirname(__FILE__).'/assets/functions.php'; -include dirname(__FILE__).'/settings/settings.php'; +include dirname(__FILE__).'/settings/settings_redirector.php'; //===================================== //TRANSLATION FILE LOCATION diff --git a/login.php b/login.php index 8c3ec71..8664f7c 100644 --- a/login.php +++ b/login.php @@ -3,7 +3,7 @@ error_reporting(E_ALL); include './assets/functions.php'; -include './settings/settings.php'; +include './settings/settings_redirector.php'; include './settings/config_redirector.php'; include_once './settings/translations/translations_US.php'; diff --git a/marketing.php b/marketing.php index 3022266..385c51d 100644 --- a/marketing.php +++ b/marketing.php @@ -8,7 +8,7 @@ if (debug && debug_id == $_SESSION['id']){ } include_once './assets/functions.php'; -include_once './settings/settings.php'; +include_once './settings/settings_redirector.php'; //Check if allowed if (isAllowed('marketing',$_SESSION['profile'],$_SESSION['permission'],'R') === 0){ diff --git a/media.php b/media.php index 12fc4aa..bec7b3d 100644 --- a/media.php +++ b/media.php @@ -7,7 +7,7 @@ if (debug && debug_id == $_SESSION['id']){ error_reporting(E_ALL); } include_once './assets/functions.php'; -include_once './settings/settings.php'; +include_once './settings/settings_redirector.php'; $page = 'media'; //Check if allowed diff --git a/order.php b/order.php index 624e860..f63271e 100644 --- a/order.php +++ b/order.php @@ -7,7 +7,7 @@ if (debug && debug_id == $_SESSION['id']){ error_reporting(E_ALL); } include_once './assets/functions.php'; -include_once './settings/settings.php'; +include_once './settings/settings_redirector.php'; //SET ORIGIN FOR NAVIGATION $prev_page = $_SESSION['prev_origin'] ?? ''; diff --git a/orders.php b/orders.php index 13bcd3e..9d73cee 100644 --- a/orders.php +++ b/orders.php @@ -8,7 +8,7 @@ if (debug && debug_id == $_SESSION['id']){ } include_once './assets/functions.php'; -include_once './settings/settings.php'; +include_once './settings/settings_redirector.php'; //SET ORIGIN FOR NAVIGATION $prev_page = $_SESSION['prev_origin'] ?? ''; diff --git a/partners.php b/partners.php index 85d2faf..3ffc7b3 100644 --- a/partners.php +++ b/partners.php @@ -8,7 +8,7 @@ if (debug && debug_id == $_SESSION['id']){ } include_once './assets/functions.php'; -include_once './settings/settings.php'; +include_once './settings/settings_redirector.php'; $page = 'partners'; //Check if allowed diff --git a/pricelists.php b/pricelists.php index fb44949..14f3d53 100644 --- a/pricelists.php +++ b/pricelists.php @@ -8,7 +8,7 @@ if (debug && debug_id == $_SESSION['id']){ } include_once './assets/functions.php'; -include_once './settings/settings.php'; +include_once './settings/settings_redirector.php'; //SET ORIGIN FOR NAVIGATION $prev_page = $_SESSION['prev_origin'] ?? ''; diff --git a/product.php b/product.php index a09c1b2..76f6c23 100644 --- a/product.php +++ b/product.php @@ -7,7 +7,7 @@ if (debug && debug_id == $_SESSION['id']){ error_reporting(E_ALL); } include_once './assets/functions.php'; -include_once './settings/settings.php'; +include_once './settings/settings_redirector.php'; //SET ORIGIN FOR NAVIGATION $prev_page = $_SESSION['prev_origin'] ?? ''; diff --git a/products.php b/products.php index 8ad987c..e9bb024 100644 --- a/products.php +++ b/products.php @@ -8,7 +8,7 @@ if (debug && debug_id == $_SESSION['id']){ } include_once './assets/functions.php'; -include_once './settings/settings.php'; +include_once './settings/settings_redirector.php'; //SET ORIGIN FOR NAVIGATION $prev_page = $_SESSION['prev_origin'] ?? ''; diff --git a/products_attributes.php b/products_attributes.php index 028fd79..77413a4 100644 --- a/products_attributes.php +++ b/products_attributes.php @@ -8,7 +8,7 @@ if (debug && debug_id == $_SESSION['id']){ } include_once './assets/functions.php'; -include_once './settings/settings.php'; +include_once './settings/settings_redirector.php'; //SET ORIGIN FOR NAVIGATION $prev_page = $_SESSION['prev_origin'] ?? ''; diff --git a/register.php b/register.php index 5588cad..4fa55f0 100644 --- a/register.php +++ b/register.php @@ -1,6 +1,6 @@ = 3) { + // Return the second-to-last and third-to-last parts + return $parts[$count - 2]; + } + // For hostnames with just domain and TLD (2 parts) + else if ($count == 2) { + // Return just the domain part (without the TLD) + return $parts[0]; + } + // If it's a single part hostname + else { + return $hostname; + } +} + +$domain = getDomain($_SERVER['SERVER_NAME']); +$settings_location = ((file_exists(dirname(__FILE__).'/'.$domain.'/'.$domain.'_settings.php')) ? dirname(__FILE__).'/'.$domain.'/'.$domain.'_settings.php' : dirname(__FILE__).'/settings.php'); + +include $settings_location; +?> \ No newline at end of file diff --git a/shipping.php b/shipping.php index 1528bdf..7da0d7f 100644 --- a/shipping.php +++ b/shipping.php @@ -8,7 +8,7 @@ if (debug && debug_id == $_SESSION['id']){ } include_once './assets/functions.php'; -include_once './settings/settings.php'; +include_once './settings/settings_redirector.php'; //SET ORIGIN FOR NAVIGATION $prev_page = $_SESSION['prev_origin'] ?? ''; diff --git a/translations.php b/translations.php index bc7977f..6afcc0a 100644 --- a/translations.php +++ b/translations.php @@ -8,7 +8,7 @@ if (debug && debug_id == $_SESSION['id']){ } include_once './assets/functions.php'; -include_once './settings/settings.php'; +include_once './settings/settings_redirector.php'; //SET ORIGIN FOR NAVIGATION $prev_page = $_SESSION['prev_origin'] ?? ''; diff --git a/unscribe.php b/unscribe.php index 0cef9fe..980c4c4 100644 --- a/unscribe.php +++ b/unscribe.php @@ -1,6 +1,6 @@