From 7641ea1aa025078d27b885dcb2adb37dbc0ea6bb Mon Sep 17 00:00:00 2001
From: gregory-p <gregory.pradun@teqspring.net>
Date: Fri, 22 Mar 2019 11:53:09 +0300
Subject: [PATCH 1/3] LAW-2640

---
 htdocs/wp-content/themes/lawcarta/footer.php  | 4 ++--
 htdocs/wp-content/themes/livecarta/footer.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/wp-content/themes/lawcarta/footer.php b/htdocs/wp-content/themes/lawcarta/footer.php
index 4b62381..98caf92 100644
--- a/htdocs/wp-content/themes/lawcarta/footer.php
+++ b/htdocs/wp-content/themes/lawcarta/footer.php
@@ -11,7 +11,7 @@ require_once 'inc/walker-nav-menu.php';
                     <div class="title">Menu</div>
                     <a href="/features">Features</a>
                     <a href="/about-us">About Us</a>
-                    <a href="/privacy-policy">Private Policy</a>
+                    <a href="/privacy-policy">Privacy Policy</a>
                     <a href="/terms-of-use">Terms of Use</a>
                     <a href="/contact-us">Contact Us</a>
                     <a href="/faq-page">FAQ</a>
@@ -23,7 +23,7 @@ require_once 'inc/walker-nav-menu.php';
                 </div>
                 <div class="fm-col hide-sm">
                     <div class="title">Legal</div>
-                    <a href="/privacy-policy">Private Policy</a>
+                    <a href="/privacy-policy">Privacy Policy</a>
                     <a href="/terms-of-use">Terms of Use</a>
                 </div>
                 <div class="fm-col hide-sm">
diff --git a/htdocs/wp-content/themes/livecarta/footer.php b/htdocs/wp-content/themes/livecarta/footer.php
index 4887ffd..2ef0c44 100644
--- a/htdocs/wp-content/themes/livecarta/footer.php
+++ b/htdocs/wp-content/themes/livecarta/footer.php
@@ -5,7 +5,7 @@
                     <div class="title">Menu</div>
                     <a href="/features">Features</a>
                     <a href="/about-us">About Us</a>
-                    <a href="/privacy-policy">Private Policy</a>
+                    <a href="/privacy-policy">Privacy Policy</a>
                     <a href="/terms-of-use">Terms of Use</a>
                     <a href="/contact-us">Contact Us</a>
                     <a href="/faq-page">FAQ</a>
@@ -17,7 +17,7 @@
                 </div>
                 <div class="fm-col hide-sm">
                     <div class="title">Legal</div>
-                    <a href="/privacy-policy">Private Policy</a>
+                    <a href="/privacy-policy">Privacy Policy</a>
                     <a href="/terms-of-use">Terms of Use</a>
                 </div>
                 <div class="fm-col hide-sm">

From fb84f44f9723718ce7c856f81cca61f21fe47176 Mon Sep 17 00:00:00 2001
From: gregory-p <gregory.pradun@teqspring.net>
Date: Fri, 22 Mar 2019 14:03:07 +0300
Subject: [PATCH 2/3] LAW-2639

---
 .../wp-content/themes/lawcarta/functions.php  | 29 +++++++++++++++++++
 htdocs/wp-content/themes/lawcarta/header.php  | 29 +------------------
 .../wp-content/themes/lawcarta/page_fac.php   |  6 ++--
 .../lawcarta/single-fac_category_answer.php   |  4 +--
 4 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/htdocs/wp-content/themes/lawcarta/functions.php b/htdocs/wp-content/themes/lawcarta/functions.php
index 2cd102e..b41aaf7 100644
--- a/htdocs/wp-content/themes/lawcarta/functions.php
+++ b/htdocs/wp-content/themes/lawcarta/functions.php
@@ -182,3 +182,32 @@ function my_filter_post_where( $where) {
 
     return $where;
 }
+
+function get_lawcarta_url(){
+    $urlParts = parse_url(home_url());
+    $scheme = isset($urlParts['scheme']) ? $urlParts['scheme'] . '://' : '';
+
+    $baseTemplate = basename( get_page_template() );
+
+    $host = isset($urlParts['host']) ? $urlParts['host'] : '';
+    if (defined('LAWCARTA_SUBDOMAIN')) {
+        $hostParts = explode('.', $host);
+        if (count($hostParts) === 3) {
+            array_shift($hostParts);
+        }
+        if (!empty(LAWCARTA_SUBDOMAIN)) {
+            array_unshift($hostParts, LAWCARTA_SUBDOMAIN);
+        }
+        $host = implode('.', $hostParts);
+    }
+
+    $port = isset($urlParts['port']) ? $urlParts['port'] : '';
+    if (defined('LAWCARTA_PORT')) {
+        $port = LAWCARTA_PORT;
+    }
+    if (!empty($port)) {
+        $port = ':' . $port;
+    }
+
+    return  "$scheme$host$port";
+}
\ No newline at end of file
diff --git a/htdocs/wp-content/themes/lawcarta/header.php b/htdocs/wp-content/themes/lawcarta/header.php
index 1cae7ce..e9099ec 100644
--- a/htdocs/wp-content/themes/lawcarta/header.php
+++ b/htdocs/wp-content/themes/lawcarta/header.php
@@ -2,33 +2,6 @@
 
 require_once 'inc/walker-nav-menu.php';
 
-$urlParts = parse_url(home_url());
-$scheme = isset($urlParts['scheme']) ? $urlParts['scheme'] . '://' : '';
-
-$baseTemplate = basename( get_page_template() );
-
-$host = isset($urlParts['host']) ? $urlParts['host'] : '';
-if (defined('LAWCARTA_SUBDOMAIN')) {
-    $hostParts = explode('.', $host);
-    if (count($hostParts) === 3) {
-        array_shift($hostParts);
-    }
-    if (!empty(LAWCARTA_SUBDOMAIN)) {
-        array_unshift($hostParts, LAWCARTA_SUBDOMAIN);
-    }
-    $host = implode('.', $hostParts);
-}
-
-$port = isset($urlParts['port']) ? $urlParts['port'] : '';
-if (defined('LAWCARTA_PORT')) {
-    $port = LAWCARTA_PORT;
-}
-if (!empty($port)) {
-    $port = ':' . $port;
-}
-
-$lawCartaUrl = "$scheme$host$port";
-
 ?>
 <!DOCTYPE html>
 <html <?php language_attributes(); ?>>
@@ -48,7 +21,7 @@ $lawCartaUrl = "$scheme$host$port";
     <?php if ($baseTemplate == 'page_home.php'):?>
         <script type="application/javascript">
             var isHomeTemplate = true;
-            var lawCartaDomain = '<?= $lawCartaUrl?>';
+            var lawCartaDomain = '<?= get_lawcarta_url()?>';
         </script>
     <?php endif;?>
 
diff --git a/htdocs/wp-content/themes/lawcarta/page_fac.php b/htdocs/wp-content/themes/lawcarta/page_fac.php
index b69b0e6..fb07230 100644
--- a/htdocs/wp-content/themes/lawcarta/page_fac.php
+++ b/htdocs/wp-content/themes/lawcarta/page_fac.php
@@ -93,8 +93,8 @@ if ($tIds !== false) {
         <div class="cont">
             <div class="sb-head">Interested? Get to know more</div>
             <div class="buttons">
-                <a href="#" class="button xxl mp-top-right">Request a demo</a>
-                <a href="#" class="button xxl mp-top-left">Sign Up For Free</a>
+                <a href="/contact-us" class="button xxl mp-top-right">Request a demo</a>
+                <a href="<?= get_lawcarta_url()?>/user/registration" class="button xxl mp-top-left">Sign Up For Free</a>
             </div>
         </div>
     </div>
@@ -102,5 +102,5 @@ if ($tIds !== false) {
 </div>
 <?php
 get_footer();
-
+get_site_url();
 
diff --git a/htdocs/wp-content/themes/lawcarta/single-fac_category_answer.php b/htdocs/wp-content/themes/lawcarta/single-fac_category_answer.php
index 3ab9693..e91e020 100644
--- a/htdocs/wp-content/themes/lawcarta/single-fac_category_answer.php
+++ b/htdocs/wp-content/themes/lawcarta/single-fac_category_answer.php
@@ -43,8 +43,8 @@ $post = $posts[0];
             <div class="cont">
                 <div class="sb-head">Interested? Get to know more</div>
                 <div class="buttons">
-                    <a href="#" class="button xxl mp-top-right">Request a demo</a>
-                    <a href="#" class="button xxl mp-top-left">Sign Up For Free</a>
+                    <a href="/contact-us" class="button xxl mp-top-right">Request a demo</a>
+                    <a href="<?= get_lawcarta_url()?>/user/registration" class="button xxl mp-top-left">Sign Up For Free</a>
                 </div>
             </div>
         </div>

From 15cf2b445ec92d59103feddc8f6779722aa62f04 Mon Sep 17 00:00:00 2001
From: gregory-p <gregory.pradun@teqspring.net>
Date: Fri, 22 Mar 2019 14:12:07 +0300
Subject: [PATCH 3/3] LAW-2639

---
 htdocs/wp-content/themes/lawcarta/header.php   | 6 +++---
 htdocs/wp-content/themes/lawcarta/page_fac.php | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/wp-content/themes/lawcarta/header.php b/htdocs/wp-content/themes/lawcarta/header.php
index e9099ec..def1ee1 100644
--- a/htdocs/wp-content/themes/lawcarta/header.php
+++ b/htdocs/wp-content/themes/lawcarta/header.php
@@ -50,14 +50,14 @@ require_once 'inc/walker-nav-menu.php';
                 }
             ?>
         </div>
-        <iframe src="<?= $lawCartaUrl ?>/menu" style="display: none;"></iframe>
+        <iframe src="<?= get_lawcarta_url()?>/menu" style="display: none;"></iframe>
 
         <script type="application/javascript">
             var eventMethod = window.addEventListener ? "addEventListener" : "attachEvent";
             var eventer = window[eventMethod];
             var messageEvent = eventMethod === "attachEvent" ? "onmessage" : "message";
             eventer(messageEvent, function (ev) {
-              if (ev.origin.indexOf('<?= $lawCartaUrl ?>') !== -1) {
+              if (ev.origin.indexOf('<?= get_lawcarta_url()?>') !== -1) {
                 // document.getElementById('header-menu').insertAdjacentHTML('beforeend', ev.data);
 
                 $('body').append('<div id="header-parser"></div>');
@@ -76,7 +76,7 @@ require_once 'inc/walker-nav-menu.php';
                 if ($('#is-guest').text() == 'true') {
                     $('.guest-data').css('display', 'inline-block');
                 } else {
-                    $('.home-label').text('Dashboard').attr('href', '<?= $lawCartaUrl?>/dashboard');
+                    $('.home-label').text('Dashboard').attr('href', '<?= get_lawcarta_url()?>/dashboard');
                     if (typeof isHomeTemplate != 'undefined' && isHomeTemplate === true) {
                         window.location.href = lawCartaDomain + '/dashboard';
                     }
diff --git a/htdocs/wp-content/themes/lawcarta/page_fac.php b/htdocs/wp-content/themes/lawcarta/page_fac.php
index fb07230..24883ba 100644
--- a/htdocs/wp-content/themes/lawcarta/page_fac.php
+++ b/htdocs/wp-content/themes/lawcarta/page_fac.php
@@ -102,5 +102,4 @@ if ($tIds !== false) {
 </div>
 <?php
 get_footer();
-get_site_url();