lxbfYeaa/LiveCartaWP
1
0
Fork 0
forked from LiveCarta/LiveCartaWP
Code Issues 238 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6608 from gregory-p/wordpress

Browse Source 
LAW-5340
This commit is contained in:
gregory-p
2022-04-26 11:33:48 +03:00
committed by GitHub
parent 676f3a705b 689a134ab2
commit 7449fa23ae
7 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
environments/demo/wp-config-local.php
View File

@@ -15,4 +15,6 @@ define('LAWCARTA_WP_REST_API_RESPONSE_URL', 'https://app-demo.lawcarta.com/v1/ev
define('LAWCARTA_ENVIRONMENT_NAME', 'demo');
define('LC_ALLOW_COOKIE_POPUP', true);
$_SERVER['HTTPS'] = 'On';

2
environments/dev/wp-config-local.php
View File

@@ -15,4 +15,6 @@ define('LAWCARTA_WP_REST_API_RESPONSE_URL', 'https://app-dev.lawcarta.com/v1/eve
define('LAWCARTA_ENVIRONMENT_NAME', 'dev');
define('LC_ALLOW_COOKIE_POPUP', true);
$_SERVER['HTTPS'] = 'On';

1
environments/local/wp-config-local.php
View File

@@ -11,6 +11,7 @@ define('LAWCARTA_SUBDOMAIN', 'app');
define('LAWCARTA_PORT', '');
define('LAWCARTA_ENVIRONMENT_NAME', 'local');
define('LC_ALLOW_COOKIE_POPUP', true);
$_SERVER['HTTPS'] = 'On';

2
environments/prod/wp-config-local.php
View File

@@ -12,6 +12,8 @@ define('LAWCARTA_PORT', '');
define('LAWCARTA_ENVIRONMENT_NAME', 'prod');
define('LC_ALLOW_COOKIE_POPUP', true);
define('LAWCARTA_GA_CONFIG', 'UA-111488943-1');
define('LIVECARTA_GA_CONFIG', 'UA-111488943-2');

2
environments/qa/wp-config-local.php
View File

@@ -12,6 +12,8 @@ define('LAWCARTA_PORT', '');
define('LAWCARTA_ENVIRONMENT_NAME', 'qa');
define('LC_ALLOW_COOKIE_POPUP', true);
$_SERVER['HTTPS'] = 'On';
//S3 uploads settings

3
htdocs/wp-content/themes/lawcarta/functions.php
View File

@@ -357,8 +357,7 @@ function mark_redirected_user(){
if(
isset($_GET['law'])
&& $_GET['law'] == 1
&& isset($_COOKIE['cookie_level'])
&& in_array($_COOKIE['cookie_level'], ['12', '123'])
&& ((isset($_COOKIE['cookie_level']) && in_array($_COOKIE['cookie_level'], ['12', '123'])) || LC_ALLOW_COOKIE_POPUP == false)
){
$cookieDomain = (LAWCARTA_ENVIRONMENT_NAME == 'local') ? 'livecarta.loc' : 'livecarta.com';
setcookie('law_'.LAWCARTA_ENVIRONMENT_NAME, 1,0,"/", $cookieDomain);

7
htdocs/wp-content/themes/lawcarta/header.php
View File

@@ -58,7 +58,10 @@ $scripts = [];
})(window,document,'script','dataLayer','GTM-K8LWZ6K');"]; ?>
<?php $scripts[] = ['type' => 'comment', 'source' =>'End Google Tag Manager']; ?>
<?php endif;?>
<?php if(isset($_COOKIE['cookie_level']) && in_array($_COOKIE['cookie_level'],['13','123'])):?>
<?php if(
(isset($_COOKIE['cookie_level']) && in_array($_COOKIE['cookie_level'],['13','123']))
|| LC_ALLOW_COOKIE_POPUP == false
):?>
<?php foreach($scripts as $script):?>
<?php switch($script['type']):
case 'comment': ?>
@@ -77,7 +80,7 @@ $scripts = [];
<?php endswitch; ?>
<?php endforeach;?>
<?php endif; ?>
<?php if(!isset($_COOKIE['cookie_level'])):?>
<?php if(!isset($_COOKIE['cookie_level']) && LC_ALLOW_COOKIE_POPUP == true):?>
<script>
var scripts = <?php echo json_encode($scripts) ?>;
</script>