From: Chuck Scott <cscott@gaslightmedia.com>
Date: Thu, 12 Sep 2019 17:03:21 +0000 (-0400)
Subject: Now using info from database for policy page contact information.
X-Git-Tag: v4.0.0^2~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=a00fc13efae9ff17de3866a3f0d57060ba6a673d;p=WP-Plugins%2Fglm-serverstats.git

Now using info from database for policy page contact information.
---

diff --git a/setup/commonHooks.php b/setup/commonHooks.php
index 74448a1..ecdba0c 100644
--- a/setup/commonHooks.php
+++ b/setup/commonHooks.php
@@ -47,13 +47,17 @@ add_filter('glm-serverstats-is-provider', function() {
  * Shortcode to output contact information for the bottom of the cookie and policy page created by this plugin.
  */
 function policy_contact_shortcode( $atts ){
-    return "
-        Gaslight Media<br>
-        120 E. Lake St.<br>
-        Petoskey, MI 49770<br>
-        <br>
-        E-Mail: info@gaslightmedia.com<br>
-        Phone: 231-487-0692
-    ";
+    global $websiteSettings;
+    return
+         (!empty($websiteSettings['contact_name'])?$websiteSettings['contact_name']."<br>":'')
+        .(!empty($websiteSettings['contact_org'])?$websiteSettings['contact_org']."<br>":'')
+        .(!empty($websiteSettings['contact_address'])?$websiteSettings['contact_address']."<br>":'')
+        .(!empty($websiteSettings['contact_address2'])?$websiteSettings['contact_address2']."<br>":'')
+        .(!empty($websiteSettings['contact_city'])?$websiteSettings['contact_city']:'')
+        .(!empty($websiteSettings['contact_state'])?", ".$websiteSettings['contact_state']:'')
+        .(!empty($websiteSettings['contact_zip'])?" ".$websiteSettings['contact_zip']:'')
+        .(!empty($websiteSettings['contact_city'])||!empty($websiteSettings['contact_state'])||!empty($websiteSettings['contact_zip'])?"<br>":'')
+        .(!empty($websiteSettings['contact_phone'])?"<br>Phone: ".$websiteSettings['contact_phone']:'')
+        .(!empty($websiteSettings['contact_email'])?"<br>E-Mail: ".$websiteSettings['contact_email']:'');
 }
 add_shortcode( 'policy_contact', 'policy_contact_shortcode' );