Fixing Member website links

Remove the external js file if they are on a member page.
Fix member urls so they can use https.

diff --git a/Toolkit/Members/ProfilePage.php b/Toolkit/Members/ProfilePage.php
index 7107e45..736627d 100644 (file)
--- a/Toolkit/Members/ProfilePage.php
+++ b/Toolkit/Members/ProfilePage.php
@@ -577,7 +577,10 @@ class Toolkit_Members_ProfilePage
             $page->toll_free   = $row['toll_free'];
             $page->fax         = $row['fax'];
             $page->email       = $row['member_contact_email'];
-            if (($row['url']) && strpos($row['url'], 'http://') === false) {
+            if (($row['url'])
+                && strpos($row['url'], 'http://') === false
+                && strpos($url, 'https://') === false
+            ) {
                 $row['url'] = 'http://' . $row['url'];
             }
             $page->url         = $row['url'];

diff --git a/Toolkit/Members/SearchList.php b/Toolkit/Members/SearchList.php
index e73874c..e66a649 100644 (file)
--- a/Toolkit/Members/SearchList.php
+++ b/Toolkit/Members/SearchList.php
@@ -757,7 +757,9 @@ class Toolkit_Members_SearchList extends Toolkit_FlexyDataGridBuilder
             return false;
         }
         // make sure the url has http://
-        if (strpos($url, 'http://') === false) {
+        if (strpos($url, 'http://') === false
+            && strpos($url, 'https://') === false
+        ) {
             $url = 'http://' . $url;
         }
         return $url;

diff --git a/Toolkit/Page.php b/Toolkit/Page.php
index 93b7597..8fc8f36 100755 (executable)
--- a/Toolkit/Page.php
+++ b/Toolkit/Page.php
@@ -162,7 +162,7 @@ class Toolkit_Page
         $GLOBALS['bottomScripts'][] = MEDIA_BASE_URL . 'js/pageSetup.js';
         $GLOBALS['styleSheets'][] = $this->mediaBaseURL . 'fancybox/jquery.fancybox.css';
         $GLOBALS['bottomScripts'][] = $this->mediaBaseURL . "fancybox/jquery.fancybox.js";
-        $GLOBALS['bottomScripts'][] = $this->glmAppBaseURL . 'libjs/external.js';
+        $GLOBALS['bottomScripts']['external'] = $this->glmAppBaseURL . 'libjs/external.js';
     }
 
     /**

diff --git a/Toolkit/Template/Page/Member.php b/Toolkit/Template/Page/Member.php
index 5df0cf0..993a80a 100644 (file)
--- a/Toolkit/Template/Page/Member.php
+++ b/Toolkit/Template/Page/Member.php
@@ -326,6 +326,7 @@ class Toolkit_Template_Page_Member
      */
     public function getContent()
     {
+        unset($GLOBALS['bottomScripts']['external']);
         $GLOBALS['bottomScripts'][] = MEDIA_APP_BASE_URL . 'libjs/member-link.js';
         $breadCrumbsBuilder         = $this->breadCrumbsFactory->createBreadCrumbsHelper();
         $page                       = $this->pageGateway->find($this->id);