From: Chuck Scott <cscott@gaslightmedia.com>
Date: Tue, 1 Mar 2016 16:38:08 +0000 (-0500)
Subject: Cleaned up incompatible template references to URL/Url.
X-Git-Tag: v2.0.0^2~60
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=9fc54e2aba5fab65d5927cd49af45eb09602f91b;p=WP-Plugins%2Fglm-member-db.git

Cleaned up incompatible template references to URL/Url.
---

diff --git a/controllers/admin.php b/controllers/admin.php
index 9e505102..df2c81e0 100644
--- a/controllers/admin.php
+++ b/controllers/admin.php
@@ -826,20 +826,7 @@ class glmMembersAdmin extends GlmPluginSupport
         $smarty->template->addTemplateDir(GLM_MEMBERS_WORDPRESS_PLUGIN_PATH . "$plugIn/views");
 
         // Add standard template parameters
-        $smarty->templateAssign ( 'addOnTabs', $addOnTabs);
-        $smarty->templateAssign ( 'adminDebug', GLM_MEMBERS_PLUGIN_ADMIN_DEBUG);
-        $smarty->templateAssign ( 'adminURL', GLM_MEMBERS_PLUGIN_ADMIN_URL);
-        $smarty->templateAssign ( 'siteBaseURL', GLM_MEMBERS_SITE_BASE_URL);
-        $smarty->templateAssign ( 'baseURL', GLM_MEMBERS_PLUGIN_BASE_URL);
-        $smarty->templateAssign ( 'thisURL', GLM_MEMBERS_PLUGIN_CURRENT_URL );
-        $smarty->templateAssign ( 'thisPage', (isset($_REQUEST['page']) ? $_REQUEST['page']: '') );
-        $smarty->templateAssign ( 'glmPluginName', GLM_MEMBERS_PLUGIN_NAME );
-        $smarty->templateAssign ( 'glmPluginMediaURL', GLM_MEMBERS_PLUGIN_MEDIA_URL );
-        $smarty->templateAssign ( 'glmWordpresBasePluginPath', GLM_MEMBERS_WORDPRESS_PLUGIN_PATH );
-        $smarty->templateAssign ( 'thisYear', date ( 'Y' ) );
-        $smarty->templateAssign ( 'ref_type_numb', $this->config['ref_type_numb']);
-        $smarty->templateAssign ( 'settings', $this->config['settings']);
-        $smarty->templateAssign ( 'terms', $this->config['terms']);
+        require GLM_MEMBERS_PLUGIN_SETUP_PATH.'/standardTemplateParams.php';
 
         // Add data from model to Smarty template
         if (is_array($results['data']) && count($results['data']) > 0) {
diff --git a/controllers/front.php b/controllers/front.php
index bb093fd8..35608d73 100644
--- a/controllers/front.php
+++ b/controllers/front.php
@@ -447,18 +447,7 @@ class glmMembersFront extends GlmPluginSupport
         $smarty->template->setTemplateDir($viewPath);
 
         // Add standard parameters
-        $smarty->templateAssign ( 'errorMsg', $errorMsg);
-        $smarty->templateAssign ( 'frontDebug', GLM_MEMBERS_PLUGIN_FRONT_DEBUG);
-        $smarty->templateAssign ( 'siteBaseUrl', GLM_MEMBERS_SITE_BASE_URL);
-        $smarty->templateAssign ( 'baseURL', GLM_MEMBERS_PLUGIN_BASE_URL);
-        $smarty->templateAssign ( 'thisURL', GLM_MEMBERS_PLUGIN_CURRENT_URL );
-        $smarty->templateAssign ( 'glmPluginName', GLM_MEMBERS_PLUGIN_NAME );
-        $smarty->templateAssign ( 'glmPluginMediaURL', GLM_MEMBERS_PLUGIN_MEDIA_URL );
-        $smarty->templateAssign ( 'ref_type_numb', $this->config['ref_type_numb']);
-        $smarty->templateAssign ( 'thisYear', date ( 'Y' ) );
-        $smarty->templateAssign ( 'settings', $this->config['settings']);
-        $smarty->templateAssign ( 'terms', $this->config['terms']);
-        $smarty->templateAssign('thisAction', $action);
+        require GLM_MEMBERS_PLUGIN_SETUP_PATH.'/standardTemplateParams.php';
 
         // Add data from model to Smarty template
         if (is_array($results['data']) && count($results['data']) > 0) {
diff --git a/setup/standardTemplateParams.php b/setup/standardTemplateParams.php
new file mode 100644
index 00000000..b5090be5
--- /dev/null
+++ b/setup/standardTemplateParams.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Gaslight Media Members Database
+ * GLM Members DB - Main Mmebers Add-on - Standard Template Parameters
+ *
+ * PHP version 5.5
+ *
+ * @category glmWordPressPlugin
+ * @package  glmMembersDatabase
+ * @author   Chuck Scott <cscott@gaslightmedia.com>
+ * @license  http://www.gaslightmedia.com Gaslightmedia
+ * @release  admin.php,v 1.0 2014/10/31 19:31:47 cscott Exp $
+ * @link     http://dev.gaslightmedia.com/
+ */
+
+/*
+ * Standard template parameters available to all templates
+ *
+ * This file is "required" by both the front and admin controllers
+ * inside the controller() function. As such, this runs in the
+ * context of those controllers.
+ *
+ */
+
+// Common to both admin and front-end
+$smarty->templateAssign('glmPluginName', GLM_MEMBERS_PLUGIN_NAME );
+$smarty->templateAssign('siteBaseUrl', GLM_MEMBERS_SITE_BASE_URL);
+$smarty->templateAssign('baseUrl', GLM_MEMBERS_PLUGIN_BASE_URL);
+$smarty->templateAssign('thisUrl', GLM_MEMBERS_PLUGIN_CURRENT_URL );
+$smarty->templateAssign('glmPluginMediaUrl', GLM_MEMBERS_PLUGIN_MEDIA_URL );
+$smarty->templateAssign('thisPage', (isset($_REQUEST['page']) ? $_REQUEST['page']: '') );
+$smarty->templateAssign('glmWordpresBasePluginPath', GLM_MEMBERS_WORDPRESS_PLUGIN_PATH );
+$smarty->templateAssign('thisYear', date ( 'Y' ) );
+$smarty->templateAssign('ref_type_numb', $this->config['ref_type_numb']);
+$smarty->templateAssign('settings', $this->config['settings']);
+$smarty->templateAssign('terms', $this->config['terms']);
+
+
+if (is_admin()) {
+
+    // Admin specific
+    $smarty->templateAssign('adminDebug', GLM_MEMBERS_PLUGIN_ADMIN_DEBUG);
+    $smarty->templateAssign('addOnTabs', $addOnTabs);
+    $smarty->templateAssign('adminUrl', GLM_MEMBERS_PLUGIN_ADMIN_URL);
+
+} else {
+
+    // Front specific
+    $smarty->templateAssign('frontDebug', GLM_MEMBERS_PLUGIN_FRONT_DEBUG);
+    $smarty->templateAssign('errorMsg', $errorMsg);
+    $smarty->templateAssign('thisAction', $action);
+
+}
+
+
+
+
+
diff --git a/views/admin/dashboardWidget/index.html b/views/admin/dashboardWidget/index.html
index 9e524dae..883d3461 100644
--- a/views/admin/dashboardWidget/index.html
+++ b/views/admin/dashboardWidget/index.html
@@ -29,7 +29,7 @@
                      html: true,
                      select: function( event, ui ) {
                          var memberID = ui.item.id;
-                         window.location.replace("{$adminURL}?page=glm-members-admin-menu-member&glm_action=index&member=" + memberID );
+                         window.location.replace("{$adminUrl}?page=glm-members-admin-menu-member&glm_action=index&member=" + memberID );
                      },
                      response: function(event, ui) {
                          if (!ui.content.length) {
@@ -50,40 +50,40 @@
   {if !$haveMemberTypes}
         <tr>
             <th class="glm-error">No Member Types</th>
-            <td><a href="{$adminURL}?page=glm-members-admin-menu-configure&glm_action=memberTypes" class="glm-right">Add</a></td>
+            <td><a href="{$adminUrl}?page=glm-members-admin-menu-configure&glm_action=memberTypes" class="glm-right">Add</a></td>
         </tr>
   {/if}                
   {if !$haveCategories}
         <tr>
             <th><span class="glm-error">No Member Categories</span></th>
-            <td><a href="{$adminURL}?page=glm-members-admin-menu-configure&glm_action=categories" class="glm-right">Add</a></td>
+            <td><a href="{$adminUrl}?page=glm-members-admin-menu-configure&glm_action=categories" class="glm-right">Add</a></td>
         </tr>
   {/if}                
   {if !$haveAmenities}
         <tr>
             <th><span class="glm-error">No Amenities</span></th>
-            <td><a href="{$adminURL}?page=glm-members-admin-menu-configure&glm_action=amenities" class="glm-right">Add</a></td>
+            <td><a href="{$adminUrl}?page=glm-members-admin-menu-configure&glm_action=amenities" class="glm-right">Add</a></td>
         </tr>
   {/if}                
   {if !$haveCities}
         <tr>
             <th><span class="glm-error">No Cities</span></th>
-            <td><a href="{$adminURL}?page=glm-members-admin-menu-configure&glm_action=cities" class="glm-right">Add</a></td>
+            <td><a href="{$adminUrl}?page=glm-members-admin-menu-configure&glm_action=cities" class="glm-right">Add</a></td>
         </tr>
   {/if}                
   {if !$haveRegions}
         <tr>
             <th><span class="glm-error">No Regions</span></th>
-            <td><a href="{$adminURL}?page=glm-members-admin-menu-configure&glm_action=regions" class="glm-right">Add</a></td>
+            <td><a href="{$adminUrl}?page=glm-members-admin-menu-configure&glm_action=regions" class="glm-right">Add</a></td>
         </tr>
   {/if}                
   {if $numbMembers == 0}
         <tr>
            <th> <span class="glm-error">No Members</span></th>
-            <td><a href="{$adminURL}?page=glm-members-admin-menu-member&glm_action=index&member_id=" class="glm-right">Add a Member</a></td>
+            <td><a href="{$adminUrl}?page=glm-members-admin-menu-member&glm_action=index&member_id=" class="glm-right">Add a Member</a></td>
         </tr>
   {/if}                
-        <tr><th>Number of Members Listed: </th><td><a href="{$adminURL}?page=glm-members-admin-menu-members&glm_action=list" class="glm-right">List Members</a><span class="glm-left">{$numbMembers}</span></td></tr>
+        <tr><th>Number of Members Listed: </th><td><a href="{$adminUrl}?page=glm-members-admin-menu-members&glm_action=list" class="glm-right">List Members</a><span class="glm-left">{$numbMembers}</span></td></tr>
     </table>
 
   {if $haveBadLatLon}
@@ -100,7 +100,7 @@
             <tr class="alternate">
         {/if}
                 <td>
-                    <a href="{$adminURL}?page=glm-members-admin-menu-member&glm_action=memberInfo&member={$p.member_pointer}&memberInfo={$p.id}">{$p.member}:</a> {$p.reference_name}
+                    <a href="{$adminUrl}?page=glm-members-admin-menu-member&glm_action=memberInfo&member={$p.member_pointer}&memberInfo={$p.id}">{$p.member}:</a> {$p.reference_name}
                 </td>
             </tr>
     {/foreach}
@@ -125,7 +125,7 @@
         {/if}
                 <td>
                     <span class="glm-admin-table-medium-text">
-                        <a href="{$adminURL}?page=glm-members-admin-menu-member&glm_action=memberInfo&member={$p.member_pointer}&memberInfo={$p.id}}">{$p.member}</a>:  
+                        <a href="{$adminUrl}?page=glm-members-admin-menu-member&glm_action=memberInfo&member={$p.member_pointer}&memberInfo={$p.id}}">{$p.member}</a>:  
                         {$p.reference_name}
                     </span>
                 </td>
diff --git a/views/admin/management/development.html b/views/admin/management/development.html
index 9687cbb1..74c00994 100644
--- a/views/admin/management/development.html
+++ b/views/admin/management/development.html
@@ -10,7 +10,7 @@
             <ul>
                 <li>
                     <p>
-                        <a href="{$thisURL}?page={$thisPage}&glm_action=development&option=import_connections">Import data from "Connections" business directory</a>
+                        <a href="{$thisUrl}?page={$thisPage}&glm_action=development&option=import_connections">Import data from "Connections" business directory</a>
 
     {if $importNotice} 
                         <div class="glm-indent glm-notice">{$importNotice}</div>
@@ -23,7 +23,7 @@
                     
     {else}
         {if $haveMembers}
-                    <form action="{$thisURL}?page={$thisPage}&glm_action=development&option=import_connections" method="POST">
+                    <form action="{$thisUrl}?page={$thisPage}&glm_action=development&option=import_connections" method="POST">
                         <div class="glm-item-container">
                             <b>Default data to use when importing members.</b>
                             <table>
@@ -91,18 +91,18 @@
             <H3>Database</H3>
             <ul>
 <!-- These need to be converted to using the dbVersions tables for all plugins             
-                <li><a href="{$thisURL}?page={$thisPage}&glm_action=development&option=drop">Drop database tables</a> (WARNING: Destroys all current data)</li>
-                <li><a href="{$thisURL}?page={$thisPage}&glm_action=development&option=create">Create database tables</a></li>
-                <li><a href="{$thisURL}?page={$thisPage}&glm_action=development&option=reset">Fully Reset Database (drop/create)</a> (WARNING: Destroys all current data)</li>
+                <li><a href="{$thisUrl}?page={$thisPage}&glm_action=development&option=drop">Drop database tables</a> (WARNING: Destroys all current data)</li>
+                <li><a href="{$thisUrl}?page={$thisPage}&glm_action=development&option=create">Create database tables</a></li>
+                <li><a href="{$thisUrl}?page={$thisPage}&glm_action=development&option=reset">Fully Reset Database (drop/create)</a> (WARNING: Destroys all current data)</li>
 -->                
-                <li><a href="{$thisURL}?page={$thisPage}&glm_action=development&option=list">List database tables</a></li>
+                <li><a href="{$thisUrl}?page={$thisPage}&glm_action=development&option=list">List database tables</a></li>
             </ul>
         </li>
     </ul>
 
     <div>
         <h3>Docuemtation and References</h3>    
-        <p><a href="{$baseURL}/lib/GlmDataAbstract/GlmDataAbstract_Programmers_Manual.pdf">Data Abstract Class Documentation</a></p>
+        <p><a href="{$baseUrl}/lib/GlmDataAbstract/GlmDataAbstract_Programmers_Manual.pdf">Data Abstract Class Documentation</a></p>
     </div>
 {if $resultMessage}    
     <div>
@@ -139,7 +139,7 @@
                             <table style="font-size: .9em;">
       {foreach $d.tables as $t}
                                 <tr>
-                                    <td align="left"><a href="{$thisURL}?page={$thisPage}&glm_action=development&option=list&descTable={$t.table_name}">{$t.table_name}</a></td>
+                                    <td align="left"><a href="{$thisUrl}?page={$thisPage}&glm_action=development&option=list&descTable={$t.table_name}">{$t.table_name}</a></td>
                                 </tr>
         {if isset($t.desctable)}
                                 <tr><td>
diff --git a/views/admin/management/header.html b/views/admin/management/header.html
index b539c747..913b6f0a 100644
--- a/views/admin/management/header.html
+++ b/views/admin/management/header.html
@@ -3,14 +3,14 @@
     <h2>{$glmPluginName} Configuration</h2>
        
     <h2 class="nav-tab-wrapper">
-        <a href="{$thisURL}?page={$thisPage}&glm_action=index" class="nav-tab{if $thisAction==index} nav-tab-active{/if}">General Settings</a>
-        <a href="{$thisURL}?page={$thisPage}&glm_action=terms" class="nav-tab{if $thisAction==terms} nav-tab-active{/if}">Terms and Phrases</a>
-        <a href="{$thisURL}?page={$thisPage}&glm_action=development" class="nav-tab{if $thisAction==development} nav-tab-active{/if}">Development</a>
-        <a href="{$thisURL}?page={$thisPage}&glm_action=import" class="nav-tab{if $thisAction==import} nav-tab-active{/if}">Data Import</a>
-        <a href="{$thisURL}?page={$thisPage}&glm_action=addons" class="nav-tab{if $thisAction==addons} nav-tab-active{/if}">Add-Ons</a>
-        <a href="{$thisURL}?page={$thisPage}&glm_action=hooks" class="nav-tab{if $thisAction==hooks} nav-tab-active{/if}">Hooks</a>
+        <a href="{$thisUrl}?page={$thisPage}&glm_action=index" class="nav-tab{if $thisAction==index} nav-tab-active{/if}">General Settings</a>
+        <a href="{$thisUrl}?page={$thisPage}&glm_action=terms" class="nav-tab{if $thisAction==terms} nav-tab-active{/if}">Terms and Phrases</a>
+        <a href="{$thisUrl}?page={$thisPage}&glm_action=development" class="nav-tab{if $thisAction==development} nav-tab-active{/if}">Development</a>
+        <a href="{$thisUrl}?page={$thisPage}&glm_action=import" class="nav-tab{if $thisAction==import} nav-tab-active{/if}">Data Import</a>
+        <a href="{$thisUrl}?page={$thisPage}&glm_action=addons" class="nav-tab{if $thisAction==addons} nav-tab-active{/if}">Add-Ons</a>
+        <a href="{$thisUrl}?page={$thisPage}&glm_action=hooks" class="nav-tab{if $thisAction==hooks} nav-tab-active{/if}">Hooks</a>
 {foreach $addOnTabs as $a}
-        <a href="{$thisURL}?page={$thisPage}&glm_action={$a.action}" class="nav-tab{if $thisAction==$a.action} nav-tab-active{/if}">{$a.text}</a>
+        <a href="{$thisUrl}?page={$thisPage}&glm_action={$a.action}" class="nav-tab{if $thisAction==$a.action} nav-tab-active{/if}">{$a.text}</a>
 {/foreach}        
     </h2>
     <div id="glm-admin-content-container">
diff --git a/views/admin/management/import.html b/views/admin/management/import.html
index d65a243d..3133d9c0 100644
--- a/views/admin/management/import.html
+++ b/views/admin/management/import.html
@@ -21,7 +21,7 @@
         <p class="glm-error">{$genError}</p>
     </p>
 {/if}    
-    <form action="{$thisURL}?page={$thisPage}" method="post" enctype="multipart/form-data">
+    <form action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
         <input type="hidden" name="glm_action" value="import">
         <input type="hidden" name="option" value="readDatabase">
         
diff --git a/views/admin/management/import/readDatabase.html b/views/admin/management/import/readDatabase.html
index 2728152f..c96d13b2 100644
--- a/views/admin/management/import/readDatabase.html
+++ b/views/admin/management/import/readDatabase.html
@@ -47,7 +47,7 @@
         <p class="glm-error">{$genError}</p>
     </p>
 {/if}    
-    <form action="{$thisURL}?page={$thisPage}" method="post" enctype="multipart/form-data">
+    <form action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
         <input type="hidden" name="glm_action" value="import">
         <input type="hidden" name="option" value="importImages">
         <p><span class="glm-notice">WARNING:</span> This process may take a very long time!<br>Do not interrupt or re-submit this page.</p>
diff --git a/views/admin/management/index.html b/views/admin/management/index.html
index c7f380be..af4627fa 100644
--- a/views/admin/management/index.html
+++ b/views/admin/management/index.html
@@ -1,7 +1,7 @@
 {include file='admin/management/header.html'}
     
     
-    <form action="{$thisURL}?page={$thisPage}" method="post" enctype="multipart/form-data">
+    <form action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
         <input type="hidden" name="glm_action" value="index">
         <input type="hidden" name="option" value="submit">
    
diff --git a/views/admin/management/terms.html b/views/admin/management/terms.html
index f594b6ce..ce74c48e 100644
--- a/views/admin/management/terms.html
+++ b/views/admin/management/terms.html
@@ -2,7 +2,7 @@
         
     <h2 style="color: blue;">NOTE: Not all of these tems have been integrated into the site yet.</h2>    
         
-    <form action="{$thisURL}?page={$thisPage}" method="post" enctype="multipart/form-data">
+    <form action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
         <input type="hidden" name="glm_action" value="terms">
         <input type="hidden" name="option" value="submit">
         
diff --git a/views/admin/member/header.html b/views/admin/member/header.html
index 2d1e3342..e69abf42 100644
--- a/views/admin/member/header.html
+++ b/views/admin/member/header.html
@@ -17,10 +17,10 @@
     </h2>
 
     <h2 class="nav-tab-wrapper">
-        <a href="{$thisURL}?page={$thisPage}&glm_action=index&member={$memberID}&id={$memberInfoID}" class="nav-tab{if $thisAction==index || $thisAction==memberEdit || $thisAction==memberInfo} nav-tab-active{/if}">Member Dashboard</a>
+        <a href="{$thisUrl}?page={$thisPage}&glm_action=index&member={$memberID}&id={$memberInfoID}" class="nav-tab{if $thisAction==index || $thisAction==memberEdit || $thisAction==memberInfo} nav-tab-active{/if}">Member Dashboard</a>
 {if $memberID}
   {foreach $addOnTabs as $a}
-        <a href="{$thisURL}?page={$thisPage}&glm_action={$a.action}&member={$memberID}" class="nav-tab{if $thisAction==$a.action} nav-tab-active{/if}">{$a.text}</a>
+        <a href="{$thisUrl}?page={$thisPage}&glm_action={$a.action}&member={$memberID}" class="nav-tab{if $thisAction==$a.action} nav-tab-active{/if}">{$a.text}</a>
   {/foreach}        
 {/if}
 
diff --git a/views/admin/member/index.html b/views/admin/member/index.html
index 6f14409e..908cb392 100644
--- a/views/admin/member/index.html
+++ b/views/admin/member/index.html
@@ -34,7 +34,7 @@
                 </table>
             </td>
             <td class="glm-right">
-                <span class="glm-right"><a href="{$thisURL}?page={$thisPage}&glm_action=memberEdit&member={$memberID}" class="button button-primary glm-button glm-right">Edit Member Name and Status</a></span>
+                <span class="glm-right"><a href="{$thisUrl}?page={$thisPage}&glm_action=memberEdit&member={$memberID}" class="button button-primary glm-button glm-right">Edit Member Name and Status</a></span>
             </td>
         </tr>            
     </table>
@@ -55,7 +55,7 @@
         <span class="glm-right">
             <p>
                 <input type="checkbox" id="showArchived"{if $showArchived} checked="checked"{/if}> Show archived information&nbsp;&nbsp;
-                <a href="{$thisURL}?page={$thisPage}&glm_action=memberInfo&member={$memberID}" class="button button-primary glm-button glm-right">Add New Member Information Version</a>
+                <a href="{$thisUrl}?page={$thisPage}&glm_action=memberInfo&member={$memberID}" class="button button-primary glm-button glm-right">Add New Member Information Version</a>
             </p>
         </span>
     </p> 
@@ -83,7 +83,7 @@
             <tr class="alternate{if $m.status.name == 'Active'} glm-admin-table-active{/if}">
           {/if}
                 <td>
-                    <a href="{$thisURL}?page={$thisPage}&glm_action=memberInfo&member={$memberID}&memberInfo={$m.id}"{if $m.status.value == $statusPending} class="glm-notice"{/if}>{$m.status.name}</a>
+                    <a href="{$thisUrl}?page={$thisPage}&glm_action=memberInfo&member={$memberID}&memberInfo={$m.id}"{if $m.status.value == $statusPending} class="glm-notice"{/if}>{$m.status.name}</a>
                 </td>
                 <td>{$m.reference_name}</td>
                 <td>{$m.create_time.datetime}</td>
@@ -91,8 +91,8 @@
                 <td>
                     {if $m.bad_lat_lon}<span class="glm-error">Bad Map Location</span>{/if}
           {if apply_filters('glm_members_permit_admin_member_index_clone_activate_info_version', true)}       
-                    <a href="{$thisURL}?page={$thisPage}&glm_action=memberInfo&member={$memberID}&memberInfo={$m.id}&option=clone" class="button button-secondary glm-button-small glm-right">Clone</a>&nbsp;
-                    {if $m.status.name != 'Active'}<a href="{$thisURL}?page={$thisPage}&glm_action=index&member={$memberID}&activateID={$m.id}" class="button button-secondary glm-button-small glm-right">Activate</a>{/if}
+                    <a href="{$thisUrl}?page={$thisPage}&glm_action=memberInfo&member={$memberID}&memberInfo={$m.id}&option=clone" class="button button-secondary glm-button-small glm-right">Clone</a>&nbsp;
+                    {if $m.status.name != 'Active'}<a href="{$thisUrl}?page={$thisPage}&glm_action=index&member={$memberID}&activateID={$m.id}" class="button button-secondary glm-button-small glm-right">Activate</a>{/if}
           {/if}
                 </td>
             </tr>
@@ -101,7 +101,7 @@
          {/if}
         {/foreach}
       {else} <!-- haveInfoRecords -->
-            <tr><td colspan="5"><a href="{$thisURL}?page={$thisPage}&glm_action=memberInfo&member={$memberID}">Click here to start entering information for this member.</a></td></tr>
+            <tr><td colspan="5"><a href="{$thisUrl}?page={$thisPage}&glm_action=memberInfo&member={$memberID}">Click here to start entering information for this member.</a></td></tr>
       {/if}
         </tbody>
     </table>
@@ -111,7 +111,7 @@
  {else}        
     <h3 class="glm-error">You do not have any Member Types setup.</h3>
     <p>You must have at least one Member Type to add a new member.</p>
-    <td><a href="{$thisURL}?page=glm-members-admin-menu-configure&glm_action=memberTypes">Click here to add Member Types.</a></td>
+    <td><a href="{$thisUrl}?page=glm-members-admin-menu-configure&glm_action=memberTypes">Click here to add Member Types.</a></td>
  {/if}
 {else}
     <h3 class="glm-error">No member currently selected.</h3>
@@ -126,7 +126,7 @@
         		if ($(this).attr('checked') == 'checked') {
         		    checked = 'true';	
         		}
-                window.location.replace("{$thisURL}?page={$thisPage}&glm_action=index&member={$memberID}&showArchived=" + checked);        	    
+                window.location.replace("{$thisUrl}?page={$thisPage}&glm_action=index&member={$memberID}&showArchived=" + checked);        	    
         	});
         	
             // Flash certain elements for a short time after display      
diff --git a/views/admin/member/memberEdit.html b/views/admin/member/memberEdit.html
index b576dbda..7b6affee 100644
--- a/views/admin/member/memberEdit.html
+++ b/views/admin/member/memberEdit.html
@@ -17,7 +17,7 @@
     </h2>
 
   {if apply_filters('glm_members_permit_admin_member_index_edit_member', true)}
-    <form id="member-edit-form" action="{$thisURL}?page={$thisPage}" method="post" enctype="multipart/form-data">
+    <form id="member-edit-form" action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
         <input type="hidden" name="glm_action" value="memberEdit">
       {if $addingMember}
         <input type="hidden" name="option" value="addNew">
@@ -144,9 +144,9 @@
                 <td {if $member.fieldFail.logo}class="glm-form-bad-input"{/if}>
         {if $member.fieldData.logo}
                     <div class="glm-galleryImage" data-id="logo">
-                        <img src="{$glmPluginMediaURL}/images/small/{$member.fieldData.logo}">
+                        <img src="{$glmPluginMediaUrl}/images/small/{$member.fieldData.logo}">
                     </div>
-                    <div id="glm-galleryImageLarger_logo" class="glm-imageDialog"><img src="{$glmPluginMediaURL}/images/large/{$member.fieldData.logo}"></div>
+                    <div id="glm-galleryImageLarger_logo" class="glm-imageDialog"><img src="{$glmPluginMediaUrl}/images/large/{$member.fieldData.logo}"></div>
         {/if}
                 </td>
             </tr>
@@ -168,7 +168,7 @@
  {else}        
     <h3 class="glm-error">You do not have any Member Types setup.</h3>
     <p>You must have at least one Member Type to add a new member.</p>
-    <td><a href="{$thisURL}?page=glm-members-admin-menu-configure&glm_action=memberTypes">Click here to add Member Types.</a></td>
+    <td><a href="{$thisUrl}?page=glm-members-admin-menu-configure&glm_action=memberTypes">Click here to add Member Types.</a></td>
  {/if}
 {else}
     <h3 class="glm-error">No member currently selected.</h3>
diff --git a/views/admin/member/memberInfo.html b/views/admin/member/memberInfo.html
index 7a7c97cc..7fd15c48 100644
--- a/views/admin/member/memberInfo.html
+++ b/views/admin/member/memberInfo.html
@@ -66,7 +66,7 @@
         <h2>Add New Member Profile</h2>
     {/if} <!-- memberInfoID && memberInfo -->
 
-    <form action="{$thisURL}?page={$thisPage}" method="post" enctype="multipart/form-data">
+    <form action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
         <input type="hidden" name="glm_action" value="memberInfo">
         <input type="hidden" name="member" value="{$member.id}">
       {if $memberInfoID && $memberInfo}
@@ -417,7 +417,7 @@
                         <tr>
                             <td>
                                 <div class="glm-galleryImage" data-id="logo">
-                                    <img src="{$glmPluginMediaURL}/images/small/{$memberInfo.fieldData.logo}">
+                                    <img src="{$glmPluginMediaUrl}/images/small/{$memberInfo.fieldData.logo}">
                                 </div>
                             </td>
                             <td>
@@ -428,7 +428,7 @@
         {/if}
                         <tr><td colspan="2"><b>New image:</b> <input type="file" name="logo_new"></td></tr>
                     </table>
-                    <div id="glm-galleryImageLarger_logo" class="glm-imageDialog"><img src="{$glmPluginMediaURL}/images/large/{$memberInfo.fieldData.logo}"></div>
+                    <div id="glm-galleryImageLarger_logo" class="glm-imageDialog"><img src="{$glmPluginMediaUrl}/images/large/{$memberInfo.fieldData.logo}"></div>
                     {if $memberInfo.fieldFail.logo}<p>{$memberInfo.fieldFail.logo}</p>{/if}
                 </td>
             </tr>
@@ -501,11 +501,11 @@
                                         </table>
                                     </div>
                                     <div class="glm-galleryImage" data-id="{ id }">
-                                        <bust-stupid-ngg-image-selection src="{$glmPluginMediaURL}/images/small/{ filename }"></bust-stupid-ngg-image-selection>
+                                        <bust-stupid-ngg-image-selection src="{$glmPluginMediaUrl}/images/small/{ filename }"></bust-stupid-ngg-image-selection>
                                     </div>
                                 </li>
                                 <div id="glm-galleryImageLarger2_{ id }" class="glm-imageDialog">
-                                    <bust-stupid-ngg-image-selection src="{$glmPluginMediaURL}/images/large/{ filename }" /></bust-stupid-ngg-image-selection>
+                                    <bust-stupid-ngg-image-selection src="{$glmPluginMediaUrl}/images/large/{ filename }" /></bust-stupid-ngg-image-selection>
                                 </div>
                                 <!-- End of template -->
                                 
@@ -544,9 +544,9 @@
                                 </table>
                             </div>
                             <div class="glm-galleryImage" data-id="{$i.id}">
-                                <img src="{$glmPluginMediaURL}/images/small/{$i.file_name}">
+                                <img src="{$glmPluginMediaUrl}/images/small/{$i.file_name}">
                             </div>
-                            <div id="glm-galleryImageLarger_{$i.id}" class="glm-imageDialog"><img src="{$glmPluginMediaURL}/images/large/{$i.file_name}"></div>
+                            <div id="glm-galleryImageLarger_{$i.id}" class="glm-imageDialog"><img src="{$glmPluginMediaUrl}/images/large/{$i.file_name}"></div>
                 {/if}
                        </li>
                                          
@@ -643,9 +643,9 @@
                                 </table>
                             </div>
                             <div class="glm-galleryImage" data-id="{$i.id}">
-                                <img src="{$glmPluginMediaURL}/images/small/{$i.file_name}">
+                                <img src="{$glmPluginMediaUrl}/images/small/{$i.file_name}">
                             </div>
-                            <div id="glm-galleryImageLarger_{$i.id}" class="glm-imageDialog"><img src="{$glmPluginMediaURL}/images/large/{$i.file_name}"></div>
+                            <div id="glm-galleryImageLarger_{$i.id}" class="glm-imageDialog"><img src="{$glmPluginMediaUrl}/images/large/{$i.file_name}"></div>
                 {/if}
                        </li>
                                          
@@ -739,7 +739,7 @@
                 $("#deleteMemberInfoDialog").dialog("close");
             });            
             $('#deleteMemberInfoSubmit').click( function() {
-            	window.location.replace("{$thisURL}?page={$thisPage}&glm_action=index&member={$memberID}&deleteID={$memberInfo.fieldData.id}");
+            	window.location.replace("{$thisUrl}?page={$thisPage}&glm_action=index&member={$memberID}&deleteID={$memberInfo.fieldData.id}");
             });
     {/if}        
             /*
diff --git a/views/admin/members/header.html b/views/admin/members/header.html
index 650c3cfc..4e3963e0 100644
--- a/views/admin/members/header.html
+++ b/views/admin/members/header.html
@@ -1,10 +1,10 @@
 <div class="wrap">
     <h2>All Members</h2>
     <h2 class="nav-tab-wrapper">
-        <a href="{$thisURL}?page={$thisPage}&glm_action=index" class="nav-tab{if $thisAction==index} nav-tab-active{/if}">Dashboard</a>
-        <a href="{$thisURL}?page={$thisPage}&glm_action=list" class="nav-tab{if $thisAction==list} nav-tab-active{/if}">Members List</a>
+        <a href="{$thisUrl}?page={$thisPage}&glm_action=index" class="nav-tab{if $thisAction==index} nav-tab-active{/if}">Dashboard</a>
+        <a href="{$thisUrl}?page={$thisPage}&glm_action=list" class="nav-tab{if $thisAction==list} nav-tab-active{/if}">Members List</a>
 {foreach $addOnTabs as $a}
-        <a href="{$thisURL}?page=glm-members-admin-menu-{$a.menu}&glm_action={$a.action}" class="nav-tab{if $thisAction==$a.action} nav-tab-active{/if}">{$a.text}</a>
+        <a href="{$thisUrl}?page=glm-members-admin-menu-{$a.menu}&glm_action={$a.action}" class="nav-tab{if $thisAction==$a.action} nav-tab-active{/if}">{$a.text}</a>
 {/foreach}        
     </h2>
     <div id="glm-admin-content-container">
diff --git a/views/admin/members/index.html b/views/admin/members/index.html
index b0bf63ea..2df82d35 100644
--- a/views/admin/members/index.html
+++ b/views/admin/members/index.html
@@ -1,7 +1,7 @@
 {include file='admin/members/header.html'}
     
 {if apply_filters('glm_members_permit_admin_members_index_add_member', true)}
-    <a href="{$thisURL}?page=glm-members-admin-menu-member&glm_action=memberEdit&option=add" class="button button-primary glm-button glm-right">Add A New Member</a>
+    <a href="{$thisUrl}?page=glm-members-admin-menu-member&glm_action=memberEdit&option=add" class="button button-primary glm-button glm-right">Add A New Member</a>
 {/if}
     <h2 class="glm-left">Main Dashboard</h2>
     
@@ -17,31 +17,31 @@
   {if !$haveMemberTypes}
         <tr>
             <th class="glm-error">You do not have any Member Types setup.</th>
-            <td><a href="{$thisURL}?page=glm-members-admin-menu-settings&glm_action=index">Click here to add Member Types.</a></td>
+            <td><a href="{$thisUrl}?page=glm-members-admin-menu-settings&glm_action=index">Click here to add Member Types.</a></td>
         </tr>
   {/if}                
   {if !$haveCategories}
         <tr>
             <th><span class="glm-error">You do not have any Member Categories setup.</span></th>
-            <td><a href="{$thisURL}?page=glm-members-admin-menu-settings&glm_action=categories">Click here to add Member Categories.</a></td>
+            <td><a href="{$thisUrl}?page=glm-members-admin-menu-settings&glm_action=categories">Click here to add Member Categories.</a></td>
         </tr>
   {/if}                
   {if !$haveAmenities}
         <tr>
             <th><span class="glm-error">You do not have any Amenities setup.</span></th>
-            <td><a href="{$thisURL}?page=glm-members-admin-menu-settings&glm_action=amenities">Click here to add Amenities.</a></td>
+            <td><a href="{$thisUrl}?page=glm-members-admin-menu-settings&glm_action=amenities">Click here to add Amenities.</a></td>
         </tr>
   {/if}                
   {if !$haveCities}
         <tr>
             <th><span class="glm-error">You do not have any Cities setup.</span></th>
-            <td><a href="{$thisURL}?page=glm-members-admin-menu-settings&glm_action=cities">Click here to add Cities.</a></td>
+            <td><a href="{$thisUrl}?page=glm-members-admin-menu-settings&glm_action=cities">Click here to add Cities.</a></td>
         </tr>
   {/if}                
   {if !$haveRegions}
         <tr>
             <th><span class="glm-error">You do not have any Regions setup.</span></th>
-            <td><a href="{$thisURL}?page=glm-members-admin-menu-settings&glm_action=regions">Click here to add Regions.</a></td>
+            <td><a href="{$thisUrl}?page=glm-members-admin-menu-settings&glm_action=regions">Click here to add Regions.</a></td>
         </tr>
   {/if}
 {/if}
@@ -50,7 +50,7 @@
         <tr><td colspan="2">&nbsp;</td></tr>
         <tr>
            <th> <span class="glm-error">You do not have any members listed.</span></th>
-            <td><a href="{$thisURL}?page=glm-members-admin-menu-member&glm_action=memberEdit&option=add">Click here to create your first member.</a></td>
+            <td><a href="{$thisUrl}?page=glm-members-admin-menu-member&glm_action=memberEdit&option=add">Click here to create your first member.</a></td>
         </tr>
 {/if}                
     </table>
@@ -78,7 +78,7 @@
             <tr class="alternate">
         {/if}
                 <td>
-                    <a href="{$thisURL}?page=glm-members-admin-menu-member&glm_action=memberInfo&member={$p.member_pointer}&memberInfo={$p.id}">{$p.member}</a>
+                    <a href="{$thisUrl}?page=glm-members-admin-menu-member&glm_action=memberInfo&member={$p.member_pointer}&memberInfo={$p.id}">{$p.member}</a>
                 </td>
                 <td>
                     {$p.modify_time.datetime}
@@ -115,7 +115,7 @@
             <tr class="alternate">
         {/if}
                 <td>
-                    <a href="{$thisURL}?page=glm-members-admin-menu-member&glm_action=memberInfo&member={$p.member_pointer}&memberInfo={$p.id}">{$p.member}</a>
+                    <a href="{$thisUrl}?page=glm-members-admin-menu-member&glm_action=memberInfo&member={$p.member_pointer}&memberInfo={$p.id}">{$p.member}</a>
                 </td>
                 <td>
                     {$p.modify_time.datetime}
@@ -151,7 +151,7 @@
                  html: true,
                  select: function( event, ui ) {
                      var memberID = ui.item.id;
-                     window.location.replace("{$adminURL}?page=glm-members-admin-menu-member&glm_action=index&member=" + memberID );
+                     window.location.replace("{$adminUrl}?page=glm-members-admin-menu-member&glm_action=index&member=" + memberID );
                  },
                  response: function(event, ui) {
                      if (!ui.content.length) {
diff --git a/views/admin/members/list.html b/views/admin/members/list.html
index 4b06a1bb..a78635e1 100644
--- a/views/admin/members/list.html
+++ b/views/admin/members/list.html
@@ -1,6 +1,7 @@
 {include file='admin/members/header.html'}
     
-    <form action="{$thisURL}?page={$thisPage}" method="post" id="searchForm" class="glm-right">
+    <form action="{$thisUrl}?page={$thisPage}" method="post" id="searchForm" class="glm-right">
+        <input type="hidden" name="glm_action" value="list">
         <table>
             <tr>
                 <th>Members Found:</th><td><span style="margin-right: 2em;">{$memberCount}</span></td>
@@ -44,10 +45,10 @@
         {/if}
                 <td>
                     {$m.id}
-                    <a href="{$thisURL}?page=glm-members-admin-menu-member&glm_action=memberInfo&member={$m.id}&memberInfo={$m.active_id}" class="button button-secondary glm-button-small" style="margin: 0 .2em 0 .2em;">Active Profile</a>
+                    <a href="{$thisUrl}?page=glm-members-admin-menu-member&glm_action=memberInfo&member={$m.id}&memberInfo={$m.active_id}" class="button button-secondary glm-button-small" style="margin: 0 .2em 0 .2em;">Active Profile</a>
                 </td>
                 <td class="glm-nowrap">
-                    <a href="{$thisURL}?page=glm-members-admin-menu-member&glm_action=index&member={$m.id}">{$m.name}</a>
+                    <a href="{$thisUrl}?page=glm-members-admin-menu-member&glm_action=index&member={$m.id}">{$m.name}</a>
                 </td>
                 <td class="glm-nowrap">
                     {$m.access_short.name}
@@ -84,7 +85,7 @@
                     filter += '&filterPending=true';
                 }
                 
-                window.location.href = "{$thisURL}?page={$thisPage}&glm_action=list" + filter;
+                window.location.href = "{$thisUrl}?page={$thisPage}&glm_action=list" + filter;
                 
                 return false;
             });
@@ -108,7 +109,7 @@
                  html: true,
                  select: function( event, ui ) {
                      var memberID = ui.item.id;
-                     window.location.replace("{$adminURL}?page=glm-members-admin-menu-member&glm_action=index&member=" + memberID );
+                     window.location.replace("{$adminUrl}?page=glm-members-admin-menu-member&glm_action=index&member=" + memberID );
                  },
                  response: function(event, ui) {
                      if (!ui.content.length) {
diff --git a/views/admin/settings/amenities.html b/views/admin/settings/amenities.html
index a49de2c1..6e96d013 100644
--- a/views/admin/settings/amenities.html
+++ b/views/admin/settings/amenities.html
@@ -3,7 +3,7 @@
     <!-- Add Amenities Button and Dialog Box -->
     <div id="newAmenityButton" class="button button-primary glm-right">Add an Amenity</div>
     <div id="newAmenityDialog" class="glm-dialog-box" title="Enter a New Amenity">
-        <form action="{$thisURL}?page={$thisPage}" method="post" enctype="multipart/form-data">
+        <form action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
             <input type="hidden" name="glm_action" value="amenities">
             <input type="hidden" name="option" value="addNew">
             <table class="glm-admin-table">
@@ -59,7 +59,7 @@
 
     <!-- Edit Amenities Dialog Box -->
     <div id="editAmenityDialog" class="glm-dialog-box" title="Edit this Amenity">
-        <form action="{$thisURL}?page={$thisPage}" method="post" enctype="multipart/form-data">
+        <form action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
             <input type="hidden" name="glm_action" value="amenities">
             <input type="hidden" name="option" value="update">
             <input id="editAmenityID" type="hidden" name="id" value="">
@@ -205,7 +205,7 @@
             });
             $('#deleteAmenityConfirm').click( function() {
                 $("#deleteAmenityDialog").dialog("close");
-                window.location.href = "{$thisURL}?page={$thisPage}&glm_action=amenities&option=delete&id=" + id;
+                window.location.href = "{$thisUrl}?page={$thisPage}&glm_action=amenities&option=delete&id=" + id;
             });
             $('#deleteAmenityCancel').click( function() {
                 $("#deleteAmenityDialog").dialog("close");
diff --git a/views/admin/settings/categories.html b/views/admin/settings/categories.html
index 1c0983f6..ef5be9d2 100644
--- a/views/admin/settings/categories.html
+++ b/views/admin/settings/categories.html
@@ -3,7 +3,7 @@
     <!-- Add Categories Button and Dialog Box -->
     <div id="newCategoryButton" class="button button-primary glm-right">Add a Category</div>
     <div id="newCategoryDialog" class="glm-dialog-box" title="Enter a New Category">
-        <form action="{$thisURL}?page={$thisPage}" method="post" enctype="multipart/form-data">
+        <form action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
             <input type="hidden" name="glm_action" value="categories">
             <input type="hidden" name="option" value="addNew">
             
@@ -59,7 +59,7 @@
 
     <!-- Edit Category Dialog Box -->                    
     <div id="editCategoryDialog" class="glm-dialog-box" title="Edit this Category">
-        <form action="{$thisURL}?page={$thisPage}" method="post" enctype="multipart/form-data">
+        <form action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
             <input type="hidden" name="glm_action" value="categories">
             <input type="hidden" name="option" value="update">
             <input id="editCategoryID" type="hidden" name="id" value="">
@@ -200,7 +200,7 @@
             });
             $('#deleteCategoryConfirm').click( function() {
                 $("#deleteCategoryDialog").dialog("close");
-                window.location.href = "{$thisURL}?page={$thisPage}&glm_action=categories&option=delete&id=" + id;
+                window.location.href = "{$thisUrl}?page={$thisPage}&glm_action=categories&option=delete&id=" + id;
             });
             $('#deleteCategoryCancel').click( function() {
                 $("#deleteCategoryDialog").dialog("close");
diff --git a/views/admin/settings/cities.html b/views/admin/settings/cities.html
index 04a72108..879c8e22 100644
--- a/views/admin/settings/cities.html
+++ b/views/admin/settings/cities.html
@@ -3,7 +3,7 @@
     <!-- Add City Button and Dialog Box -->
     <div id="newCityButton" class="button button-primary glm-right">Add a City</div>
     <div id="newCityDialog" class="glm-dialog-box" title="Enter a New City">
-        <form action="{$thisURL}?page={$thisPage}" method="post" enctype="multipart/form-data">
+        <form action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
             <input type="hidden" name="glm_action" value="cities">
             <input type="hidden" name="option" value="addNew">
             <table class="glm-admin-table">
@@ -31,7 +31,7 @@
 
     <!-- Edit City Dialog Box -->                    
     <div id="editCityDialog" class="glm-dialog-box" title="Edit this City">
-        <form action="{$thisURL}?page={$thisPage}" method="post" enctype="multipart/form-data">
+        <form action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
             <input type="hidden" name="glm_action" value="cities">
             <input type="hidden" name="option" value="update">
             <input id="editCityID" type="hidden" name="id" value="">
@@ -124,7 +124,7 @@
             });
             $('#deleteCityConfirm').click( function() {
                 $("#deleteCityDialog").dialog("close");
-                window.location.href = "{$thisURL}?page={$thisPage}&glm_action=cities&option=delete&id=" + id;
+                window.location.href = "{$thisUrl}?page={$thisPage}&glm_action=cities&option=delete&id=" + id;
             });
             $('#deleteCityCancel').click( function() {
                 $("#deleteCityDialog").dialog("close");
diff --git a/views/admin/settings/header.html b/views/admin/settings/header.html
index 4d841d1d..a69ee22e 100644
--- a/views/admin/settings/header.html
+++ b/views/admin/settings/header.html
@@ -3,13 +3,13 @@
     <h2>{$glmPluginName} Settings</h2>
        
     <h2 class="nav-tab-wrapper">
-        <a href="{$thisURL}?page={$thisPage}&glm_action=index" class="nav-tab{if $thisAction==index} nav-tab-active{/if}">Member Types</a>
-        <a href="{$thisURL}?page={$thisPage}&glm_action=categories" class="nav-tab{if $thisAction==categories} nav-tab-active{/if}">Member Categories</a>
-        <a href="{$thisURL}?page={$thisPage}&glm_action=amenities" class="nav-tab{if $thisAction==amenities} nav-tab-active{/if}">Amenities</a>
-        <a href="{$thisURL}?page={$thisPage}&glm_action=cities" class="nav-tab{if $thisAction==cities} nav-tab-active{/if}">Cities</a>
-        <a href="{$thisURL}?page={$thisPage}&glm_action=regions" class="nav-tab{if $thisAction==regions} nav-tab-active{/if}">Regions</a>
+        <a href="{$thisUrl}?page={$thisPage}&glm_action=index" class="nav-tab{if $thisAction==index} nav-tab-active{/if}">Member Types</a>
+        <a href="{$thisUrl}?page={$thisPage}&glm_action=categories" class="nav-tab{if $thisAction==categories} nav-tab-active{/if}">Member Categories</a>
+        <a href="{$thisUrl}?page={$thisPage}&glm_action=amenities" class="nav-tab{if $thisAction==amenities} nav-tab-active{/if}">Amenities</a>
+        <a href="{$thisUrl}?page={$thisPage}&glm_action=cities" class="nav-tab{if $thisAction==cities} nav-tab-active{/if}">Cities</a>
+        <a href="{$thisUrl}?page={$thisPage}&glm_action=regions" class="nav-tab{if $thisAction==regions} nav-tab-active{/if}">Regions</a>
 {foreach $addOnTabs as $a}
-        <a href="{$thisURL}?page={$thisPage}&glm_action={$a.action}" class="nav-tab{if $thisAction==$a.action} nav-tab-active{/if}">{$a.text}</a>
+        <a href="{$thisUrl}?page={$thisPage}&glm_action={$a.action}" class="nav-tab{if $thisAction==$a.action} nav-tab-active{/if}">{$a.text}</a>
 {/foreach}        
     </h2>
     <div id="glm-admin-content-container">
diff --git a/views/admin/settings/index.html b/views/admin/settings/index.html
index 9bacee5a..0ea75916 100644
--- a/views/admin/settings/index.html
+++ b/views/admin/settings/index.html
@@ -3,7 +3,7 @@
     <!-- Add Member Type Button and Dialog Box -->
     <div id="newMemberTypeButton" class="button button-primary glm-right">Add a Member Type</div>    
     <div id="newMemberTypeDialog" class="glm-dialog-box" title="Enter New Member Type">
-        <form action="{$thisURL}?page={$thisPage}" method="post" enctype="multipart/form-data">
+        <form action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
             <input type="hidden" name="glm_action" value="index">
             <input type="hidden" name="option" value="addNew">
             
@@ -38,7 +38,7 @@
                     
     <!-- Edit Member Type Dialog Box -->
     <div id="editMemberTypeDialog" class="glm-dialog-box" title="Edit Member Type">
-        <form action="{$thisURL}?page={$thisPage}" method="post" enctype="multipart/form-data">
+        <form action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
             <input type="hidden" name="glm_action" value="index">
             <input type="hidden" name="option" value="update">
             <input id="editMemberTypeID" type="hidden" name="id" value="">
@@ -67,7 +67,7 @@
 {if $couldNotDelete}
     <h3 class="glm-error">
         Member Type could not be deleted. Type is in use by at least one member.
-        <a href="{$thisURL}?page=glm-members-admin-menu-members&glm_action=list">Click here to see the members list.</a>
+        <a href="{$thisUrl}?page=glm-members-admin-menu-members&glm_action=list">Click here to see the members list.</a>
     </h3>
     
 {/if}
@@ -150,7 +150,7 @@
             });
             $('#deleteMemberTypeConfirm').click( function() {
                 $("#deleteMemberTypeDialog").dialog("close");
-                window.location.href = "{$thisURL}?page={$thisPage}&glm_action=index&option=delete&id=" + id;
+                window.location.href = "{$thisUrl}?page={$thisPage}&glm_action=index&option=delete&id=" + id;
             });
             $('#deleteMemberTypeCancel').click( function() {
                 $("#deleteMemberTypeDialog").dialog("close");
diff --git a/views/admin/settings/regions.html b/views/admin/settings/regions.html
index 9de5f163..9867d717 100644
--- a/views/admin/settings/regions.html
+++ b/views/admin/settings/regions.html
@@ -3,7 +3,7 @@
     <!-- Add Regions Button and Dialog Box -->
     <div id="newRegionButton" class="button button-primary glm-right">Add a Region</div>
     <div id="newRegionDialog" class="glm-dialog-box" title="Enter a New Region">
-        <form action="{$thisURL}?page={$thisPage}" method="post" enctype="multipart/form-data">
+        <form action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
             <input type="hidden" name="glm_action" value="regions">
             <input type="hidden" name="option" value="addNew">
             <table class="glm-admin-table">
@@ -43,7 +43,7 @@
 
     <!-- Edit Regions Dialog Box -->                    
     <div id="editRegionDialog" class="glm-dialog-box" title="Edit this Region">
-        <form action="{$thisURL}?page={$thisPage}" method="post" enctype="multipart/form-data">
+        <form action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
             <input type="hidden" name="glm_action" value="regions">
             <input type="hidden" name="option" value="update">
             <input id="editRegionID" type="hidden" name="id" value="">
@@ -160,7 +160,7 @@
             });
             $('#deleteRegionConfirm').click( function() {
                 $("#deleteRegionDialog").dialog("close");
-                window.location.href = "{$thisURL}?page={$thisPage}&glm_action=regions&option=delete&id=" + id;
+                window.location.href = "{$thisUrl}?page={$thisPage}&glm_action=regions&option=delete&id=" + id;
             });
             $('#deleteRegionCancel').click( function() {
                 $("#deleteRegionDialog").dialog("close");
diff --git a/views/front/members/detail.html b/views/front/members/detail.html
index ed23829a..2c7a0927 100644
--- a/views/front/members/detail.html
+++ b/views/front/members/detail.html
@@ -75,10 +75,10 @@
                     <div></div>
                     {apply_filters('glm-member-db-front-members-detail-otherDetailBottom', '', $member.id)}
                     <div id="glm-member-detail-social">
-                        <a href="#" target="_blank"><img src="{$baseURL}/assets/blog.png"></a>
-                        <a href="http://www.blogger.com" target="_blank"><img src="{$baseURL}/assets/blogger.png"></a>
-                        <a href="http://www.facebook.com" target="_blank"><img src="{$baseURL}/assets/facebook.png"></a>
-                        <a href="http://www.twitter.com" target="_blank"><img src="{$baseURL}/assets/twitter.png"></a>
+                        <a href="#" target="_blank"><img src="{$baseUrl}/assets/blog.png"></a>
+                        <a href="http://www.blogger.com" target="_blank"><img src="{$baseUrl}/assets/blogger.png"></a>
+                        <a href="http://www.facebook.com" target="_blank"><img src="{$baseUrl}/assets/facebook.png"></a>
+                        <a href="http://www.twitter.com" target="_blank"><img src="{$baseUrl}/assets/twitter.png"></a>
                     </div>
                     <div id="glm-member-detail-list-links">
                         {apply_filters('glm-member-db-front-members-detail-linksTop', '', $member.id)}
@@ -93,7 +93,7 @@
                 {if $member.logo && $settings.detail_show_logo}
                 <div class="glm-member-detail-featured-image-wrapper small-12 medium-6 columns">
 <!--                            <img class="glm-member-list-image-left" src="http://placehold.it/500x300">-->
-                        <img CLASS="glm-member-list-image-left" src="{$glmPluginMediaURL}/images/{$settings.detail_logo_size}/{$member.logo}">
+                        <img CLASS="glm-member-list-image-left" src="{$glmPluginMediaUrl}/images/{$settings.detail_logo_size}/{$member.logo}">
                 </div>
                 {/if}
             </div>
@@ -194,7 +194,7 @@
                         <div class="small-12 columns">
                             <ul class="clearing-thumbs small-block-grid-2 medium-block-grid-3 large-block-grid-4" data-clearing>
                         {foreach $imageGallery as $i}
-                                <li><a href="{$glmPluginMediaURL}/images/large/{$i.file_name}"><img data-caption="{$i.caption}" src="{$glmPluginMediaURL}/images/small/{$i.file_name}"></a></li>
+                                <li><a href="{$glmPluginMediaUrl}/images/large/{$i.file_name}"><img data-caption="{$i.caption}" src="{$glmPluginMediaUrl}/images/small/{$i.file_name}"></a></li>
                         {/foreach}
                             </ul>
                         </div>
diff --git a/views/front/members/list.html b/views/front/members/list.html
index 999a82fd..281b5a63 100644
--- a/views/front/members/list.html
+++ b/views/front/members/list.html
@@ -12,7 +12,7 @@
 
 {if $settings.list_show_search}
         
-        <form action="{$thisURL}?glm_action=list" method="post" enctype="multipart/form-data">
+        <form action="{$thisUrl}?glm_action=list" method="post" enctype="multipart/form-data">
             <div class="row">           
                 <div class="small-12 columns glm-member-entry-container glm-member-container">
                     {apply_filters('glm-member-db-front-members-list-searchFormTop', '')}
@@ -72,9 +72,9 @@
             
     {if $settings.list_show_search_alpha}
         <div class="glm-alpha-links">
-            <a href="{$thisURL}?glm_action=list&textSearch={$textSearch}&categorySearch={$catSelected}" class="glm-alpha-link{if !$alphaSelected} glm-alpha-link-selected{/if}">All</a>
+            <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}&categorySearch={$catSelected}" class="glm-alpha-link{if !$alphaSelected} glm-alpha-link-selected{/if}">All</a>
       {foreach $alphaList as $a}
-            <a href="{$thisURL}?glm_action=list&alpha={$a.alpha}&textSearch={$textSearch}&categorySearch={$catSelected}" class="glm-alpha-link{if $a.default} glm-alpha-link-selected{/if}">{$a.alpha}</a>
+            <a href="{$thisUrl}?glm_action=list&alpha={$a.alpha}&textSearch={$textSearch}&categorySearch={$catSelected}" class="glm-alpha-link{if $a.default} glm-alpha-link-selected{/if}">{$a.alpha}</a>
       {/foreach}
         </div>
     {/if}
@@ -93,7 +93,7 @@
                 {if $m.logo && $settings.list_show_logo}
                     <div class="glm-member-list-image-wrapper small-12 medium-4 columns">
                         <div class="glm-member-list-image-border">
-                           <img class="glm-member-list-image" src="{$glmPluginMediaURL}/images/{$settings.list_logo_size}/{$m.logo}"> 
+                           <img class="glm-member-list-image" src="{$glmPluginMediaUrl}/images/{$settings.list_logo_size}/{$m.logo}"> 
 <!--                            <img class="glm-member-list-image left" src="http://placehold.it/500x300">-->
                         </div>
                     </div>
@@ -187,7 +187,7 @@
         <!-- Member information displayed in map bubbles -->
         <div id="map_info_{$m.id}" class="glm-hidden">
             {apply_filters('glm-member-db-front-members-list-mapBubbleTop', '', $m.id)}
-            {if $m.logo && $settings.list_map_show_logo}<div class="glm-member-list-image"><img src="{$glmPluginMediaURL}/images/{$settings.list_map_logo_size}/{$m.logo}"></div>{/if}
+            {if $m.logo && $settings.list_map_show_logo}<div class="glm-member-list-image"><img src="{$glmPluginMediaUrl}/images/{$settings.list_map_logo_size}/{$m.logo}"></div>{/if}
             <div class="glm-map-member-name">
               {if $settings.list_map_show_detaillink}
                 <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$m.member_slug}/">{$m.member}</a>