Cleaned up incompatible template references to URL/Url.

diff --git a/models/front/hooked/detail.php b/models/front/hooked/detail.php
index 015d966..60bf860 100644 (file)
--- a/models/front/hooked/detail.php
+++ b/models/front/hooked/detail.php
@@ -67,47 +67,6 @@ class GlmMembersFront_packaging_detailHook extends GlmDataPackages
         /*
          * Merge data returned from the model with the selected view
          */
-/*
-        // Load Smarty Template support
-        $smarty = new smartyTemplateSupport();
-
-        // Update the Smarty view path based on plugin/add-on that's providing the action
-        $smarty->template->setTemplateDir($viewPath);
-
-        // Add standard parameters
-        $smarty->templateAssign ( 'errorMsg', $errorMsg);
-        $smarty->templateAssign ( 'frontDebug', GLM_MEMBERS_PLUGIN_FRONT_DEBUG);
-        $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);
-
-        // Add data from model to Smarty template
-        if (is_array($results['data']) && count($results['data']) > 0) {
-            foreach ($results['data'] as $k => $d) {
-                $smarty->templateAssign($k, $d);
-            }
-        }
-
-        // If view debug has been requested
-        if (GLM_MEMBERS_PLUGIN_FRONT_DEBUG) {
-
-            glmMembersFront::addNotice("<b>Template File:</b> $view", 'Process');
-
-            $x = $smarty->template->getTemplateVars();
-            $templateVars = '<pre>' . print_r($x, 1) . '</pre>';
-            glmMembersFront::addNotice($templateVars, 'DataBlock', 'Template Parameters');
-        }
-
-        // Generate output from model data and view
-        $out = $smarty->template->fetch($view);
-*/
-
 
     }
 

diff --git a/models/front/packaging/detail.php b/models/front/packaging/detail.php
index c5330de..0053146 100644 (file)
--- a/models/front/packaging/detail.php
+++ b/models/front/packaging/detail.php
@@ -99,7 +99,6 @@ class GlmMembersFront_packaging_detail extends GlmDataPackages
         $havePackage = false;
         $packageID = false;
         $package = false;
-        $settings = array();
         $status = false;
 
         // If we have a package slug supplied from a rewrite - get the id
@@ -148,8 +147,7 @@ class GlmMembersFront_packaging_detail extends GlmDataPackages
             'menuItemRedirect' => false,
             'modelRedirect' => false,
             'view' => 'front/packaging/detail.html',
-            'data' => $templateData,
-            'settings' => $settings
+            'data' => $templateData
         );
 
     }

diff --git a/models/front/packaging/list.php b/models/front/packaging/list.php
index 3955af6..64a8221 100644 (file)
--- a/models/front/packaging/list.php
+++ b/models/front/packaging/list.php
@@ -99,7 +99,6 @@ class GlmMembersFront_packaging_list extends GlmDataPackages
         $havePackages = false;
         $packages = false;      // Used if sorting by package
         $members = false;       // Used if sorting by member then package
-        $settings = array();
         $status = false;
         $orderBy = '';
         $byMember = false;
@@ -261,8 +260,7 @@ class GlmMembersFront_packaging_list extends GlmDataPackages
             'menuItemRedirect' => false,
             'modelRedirect' => false,
             'view' => 'front/packaging/'.$view,
-            'data' => $templateData,
-            'settings' => $settings
+            'data' => $templateData
         );
 
     }

diff --git a/views/admin/management/packaging.html b/views/admin/management/packaging.html
index a98a700..8296a83 100644 (file)
--- a/views/admin/management/packaging.html
+++ b/views/admin/management/packaging.html
@@ -1,6 +1,6 @@
 {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="packaging">
         <input type="hidden" name="option" value="submit">
         

diff --git a/views/admin/member/packaging.html b/views/admin/member/packaging.html
index d337740..765a075 100644 (file)
--- a/views/admin/member/packaging.html
+++ b/views/admin/member/packaging.html
@@ -8,8 +8,8 @@
 
   {if apply_filters('glm_members_permit_admin_member_packaging_edit_package', true)}
 
-        {if $packageUpdated}<h2 class="glm-notice glm-flash-updated">Package Updated</h2>{/if}
-        {if $packageError}<h2 class="glm-error glm-flash-updated">Error submitting package, see below...</h2>{/if}
+        {if $packageUpdated}<h2 class="glm-notice glm-flash-updated glm-right">Package Updated</h2>{/if}
+        {if $packageError}<h2 class="glm-error glm-flash-updated glm-right">Error submitting package, see below...</h2>{/if}
     
       {if $option == 'edit'}
         <h2>Edit Package</h2>
@@ -35,9 +35,9 @@
       {else}
         <h2>Add new Package</h2>
       {/if}
-        <a href="{$thisURL}?page={$thisPage}&glm_action=packaging&member={$memberID}" class="button button-primary glm-button glm-right">Return to Package List</a>
+        <a href="{$thisUrl}?page={$thisPage}&glm_action=packaging&member={$memberID}" class="button button-primary glm-button glm-right">Return to Package List</a>
     
-        <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="packaging">
             <input type="hidden" name="member" value="{$memberID}">
             <input type="hidden" name="ref_type" value="{$ref_type_numb.Member}">
@@ -97,7 +97,7 @@
                             <tr>
                                 <td>
                                     <div class="glm-galleryImage" data-id="image">
-                                        <img src="{$glmPluginMediaURL}/images/small/{$packageInfo.fieldData.image}">
+                                        <img src="{$glmPluginMediaUrl}/images/small/{$packageInfo.fieldData.image}">
                                     </div>
                                 </td>
                                 <td>
@@ -108,7 +108,7 @@
             {/if}
                             <tr><td colspan="2"><b>New image:</b> <input type="file" name="image_new"></td></tr>
                         </table>
-                        <div id="glm-galleryImageLarger_image" class="glm-imageDialog"><img src="{$glmPluginMediaURL}/images/large/{$packageInfo.fieldData.image}"></div>
+                        <div id="glm-galleryImageLarger_image" class="glm-imageDialog"><img src="{$glmPluginMediaUrl}/images/large/{$packageInfo.fieldData.image}"></div>
                         {if $packageInfo.fieldFail.image}<p>{$packageInfo.fieldFail.image}</p>{/if}
                     </td>
                 </tr>
@@ -158,7 +158,7 @@
             <tr><th>Active:</th><td>{$packageInfo.fieldData.active.name}</td></tr>
             <tr><th>Short Description:</th><td>{$packageInfo.fieldData.short_descr}</td></tr>
             <tr><th>Description:</th><td>{$packageInfo.fieldData.descr}</td></tr>
-            <tr><th>Image:</th><td><img src="{$glmPluginMediaURL}/images/large/{$packageInfo.fieldData.image}"></td></tr>
+            <tr><th>Image:</th><td><img src="{$glmPluginMediaUrl}/images/large/{$packageInfo.fieldData.image}"></td></tr>
             <tr><th>Start Date:</th><td>{$packageInfo.fieldData.start_date.date}</td></tr>
             <tr><th>End Date:</th><td>{$packageInfo.fieldData.end_date.date}</td></tr>
             <tr><th>Expiration Date:</th><td>{$packageInfo.fieldData.expire_date.date}</td></tr>
@@ -190,7 +190,7 @@
         {foreach $packages as $p}
                 <tr>
                     <td>
-                        <a href="{$thisURL}?page={$thisPage}&glm_action=packaging&option=edit&packageID={$p.id}&member={$memberID}">{$p.title}</a>
+                        <a href="{$thisUrl}?page={$thisPage}&glm_action=packaging&option=edit&packageID={$p.id}&member={$memberID}">{$p.title}</a>
                     </td>
                     <td>
                         {$p.start_date.date}
@@ -215,7 +215,7 @@
     
             // Add Package Button Action
             $('#addPackageButton').click( function() {
-                window.location.href = "{$thisURL}?page={$thisPage}&glm_action=packaging&option=add&member={$memberID}";
+                window.location.href = "{$thisUrl}?page={$thisPage}&glm_action=packaging&option=add&member={$memberID}";
             });
             
             // Date Input
@@ -235,7 +235,7 @@
                 $("#deletePackageDialog").dialog("close");
             });            
             $('#deletePackageSubmit').click( function() {
-                window.location.replace("{$thisURL}?page={$thisPage}&glm_action=packaging&member={$memberID}&option=delete&packageID={$packageInfo.fieldData.id}");
+                window.location.replace("{$thisUrl}?page={$thisPage}&glm_action=packaging&member={$memberID}&option=delete&packageID={$packageInfo.fieldData.id}");
             });
     {/if}
     

diff --git a/views/admin/members/packaging.html b/views/admin/members/packaging.html
index 05baa5c..7aed491 100644 (file)
--- a/views/admin/members/packaging.html
+++ b/views/admin/members/packaging.html
@@ -32,10 +32,10 @@
       {else}
         <h2>Add new Multi-Member Package</h2>
       {/if}
-        <a href="{$thisURL}?page={$thisPage}&glm_action=packaging" class="button button-primary glm-button glm-right">Return to Package List</a>
+        <a href="{$thisUrl}?page={$thisPage}&glm_action=packaging" class="button button-primary glm-button glm-right">Return to Package List</a>
         
     
-        <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="packaging">
             <input type="hidden" name="ref_type" value="0">
             <input type="hidden" name="ref_dest" value="0">
@@ -91,7 +91,7 @@
                         <tr>
                             <td>
                                 <div class="glm-galleryImage" data-id="image">
-                                    <img src="{$glmPluginMediaURL}/images/small/{$packageInfo.fieldData.image}">
+                                    <img src="{$glmPluginMediaUrl}/images/small/{$packageInfo.fieldData.image}">
                                 </div>
                             </td>
                             <td>
@@ -102,7 +102,7 @@
         {/if}
                         <tr><td colspan="2"><b>New image:</b> <input type="file" name="image_new"></td></tr>
                     </table>
-                    <div id="glm-galleryImageLarger_image" class="glm-imageDialog"><img src="{$glmPluginMediaURL}/images/large/{$packageInfo.fieldData.image}"></div>
+                    <div id="glm-galleryImageLarger_image" class="glm-imageDialog"><img src="{$glmPluginMediaUrl}/images/large/{$packageInfo.fieldData.image}"></div>
                     {if $packageInfo.fieldFail.image}<p>{$packageInfo.fieldFail.image}</p>{/if}
                 </td>
                 </tr>
@@ -213,7 +213,7 @@
             <tr><th>Active:</th><td>{$packageInfo.fieldData.active.name}</td></tr>
             <tr><th>Description:</th><td>{$packageInfo.fieldData.descr}</td></tr>
             <tr><th>Short Description:</th><td>{$packageInfo.fieldData.short_descr}</td></tr>
-            <tr><th>Image:</th><td><img src="{$glmPluginMediaURL}/images/large/{$packageInfo.fieldData.image}"></td></tr>
+            <tr><th>Image:</th><td><img src="{$glmPluginMediaUrl}/images/large/{$packageInfo.fieldData.image}"></td></tr>
             <tr><th>Start Date:</th><td>{$packageInfo.fieldData.start_date.date}</td></tr>
             <tr><th>End Date:</th><td>{$packageInfo.fieldData.end_date.date}</td></tr>
             <tr><th>Expiration Date:</th><td>{$packageInfo.fieldData.expire_date.date}</td></tr>
@@ -258,13 +258,13 @@
             <tr>
                 <td class="glm-nowrap">
         {if $p.ref_type.value}
-                    <a href="{$thisURL}?page=glm-members-admin-menu-member&glm_action=packaging&option=edit&member={$p.ref_dest}&packageID={$p.id}">{$p.title}</a>
+                    <a href="{$thisUrl}?page=glm-members-admin-menu-member&glm_action=packaging&option=edit&member={$p.ref_dest}&packageID={$p.id}">{$p.title}</a>
         {else}
-                    <a href="{$thisURL}?page={$thisPage}&glm_action=packaging&option=edit&packageID={$p.id}">{$p.title}</a>
+                    <a href="{$thisUrl}?page={$thisPage}&glm_action=packaging&option=edit&packageID={$p.id}">{$p.title}</a>
         {/if}
                 </td>
                 <td class="glm-nowrap">
-                    <a href="{$thisURL}?page=glm-members-admin-menu-member&glm_action=index&member={$p.ref_dest}">{$p.ref_dest_name}</a>
+                    <a href="{$thisUrl}?page=glm-members-admin-menu-member&glm_action=index&member={$p.ref_dest}">{$p.ref_dest_name}</a>
                 </td>
                 <td>
                     {$p.start_date.date}
@@ -290,7 +290,7 @@
     
             // Add Package Button Action
             $('#addPackageButton').click( function() {
-                window.location.href = "{$thisURL}?page={$thisPage}&glm_action=packaging&option=add";
+                window.location.href = "{$thisUrl}?page={$thisPage}&glm_action=packaging&option=add";
             });
             
             // Date Input
@@ -313,7 +313,7 @@
                 $("#deletePackageDialog").dialog("close");
             });            
             $('#deletePackageSubmit').click( function() {
-                window.location.replace("{$thisURL}?page={$thisPage}&glm_action=packaging&option=delete&packageID={$packageInfo.fieldData.id}");
+                window.location.replace("{$thisUrl}?page={$thisPage}&glm_action=packaging&option=delete&packageID={$packageInfo.fieldData.id}");
             });
     {/if}
 
@@ -326,7 +326,7 @@
                  // Get type of package filter selected
                  filter = $(this).val();
                 
-                 window.location.href = "{$thisURL}?page={$thisPage}&glm_action=packaging&filterPackageType=" + filter;
+                 window.location.href = "{$thisUrl}?page={$thisPage}&glm_action=packaging&filterPackageType=" + filter;
                 
                 return false;
             });
@@ -354,10 +354,10 @@
                      var memberID = ui.item.memb;
                      if (memberID > 0) {
                          // Selected package is a member package
-                         window.location.replace("{$adminURL}?page=glm-members-admin-menu-member&glm_action=packaging&option=edit&member=" + memberID + "&packageID=" + packageID );
+                         window.location.replace("{$adminUrl}?page=glm-members-admin-menu-member&glm_action=packaging&option=edit&member=" + memberID + "&packageID=" + packageID );
                      } else {
                          // Selected package is a mulit-member package
-                         window.location.replace("{$adminURL}?page=glm-members-admin-menu-members&glm_action=packaging&option=edit&packageID=" + packageID );
+                         window.location.replace("{$adminUrl}?page=glm-members-admin-menu-members&glm_action=packaging&option=edit&packageID=" + packageID );
                      }
                  }
              });

diff --git a/views/front/footer.html b/views/front/footer.html
index e4b25c0..f8b0015 100644 (file)
--- a/views/front/footer.html
+++ b/views/front/footer.html
@@ -3,7 +3,7 @@
           
   {if $frontDebug}
     <script>
-        window.open('{$thisURL}?glmDebugWindow=true','GLM_Plugin_Debug','width=800,height=800,left=50,top=50,resizable=yes,scrollbars=yes');
+        window.open('{$thisUrl}?glmDebugWindow=true','GLM_Plugin_Debug','width=800,height=800,left=50,top=50,resizable=yes,scrollbars=yes');
     </script>
   {/if}
   

diff --git a/views/front/packaging/detail.html b/views/front/packaging/detail.html
index 741c128..3b37097 100644 (file)
--- a/views/front/packaging/detail.html
+++ b/views/front/packaging/detail.html
@@ -39,17 +39,17 @@
                     <div></div>
                     {apply_filters('glm-member-db-front-members-detail-otherDetailBottom', '', $package.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>      
 
                 {if $package.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}/{$package.member.logo}">
+                        <img CLASS="glm-member-list-image-left" src="{$glmPluginMediaUrl}/images/{$settings.detail_logo_size}/{$package.member.logo}">
                 </div>
                 {/if}
             </div>
@@ -59,10 +59,10 @@
 
               {if $package.image}
                <div class="glm-package-img-wrap">
-                <img src="{$glmPluginMediaURL}/images/medium/{$package.image}">
+                <img src="{$glmPluginMediaUrl}/images/medium/{$package.image}">
                </div>
               {/if}
-                <h3 class="package-title"><a href="{$thisURL}?glm_action=detail&packageID={$package.id}">{$package.title}</a></h3>
+                <h3 class="package-title"><a href="{$thisUrl}?glm_action=detail&packageID={$package.id}">{$package.title}</a></h3>
               {if $package.descr}
                 {$package.descr}
               {else if $package.short_descr}

diff --git a/views/front/packaging/list.html b/views/front/packaging/list.html
index 2304487..a9395b4 100644 (file)
--- a/views/front/packaging/list.html
+++ b/views/front/packaging/list.html
@@ -21,7 +21,7 @@
             <div class="member">
                 {if $m.logo}
                <div class="glm-member-img-wrap"> 
-                <img src="{$glmPluginMediaURL}/images/medium/{$m.logo}">
+                <img src="{$glmPluginMediaUrl}/images/medium/{$m.logo}">
                </div> 
               {/if}
                 <h4 class="glm-member-title"><a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$m.member_slug}/">{$m.member_name}</a></h4>
@@ -58,7 +58,7 @@
                     
                   {if $p.image}
                    <div class="glm-package-img-wrap">
-                    <img src="{$glmPluginMediaURL}/images/medium/{$p.image}">
+                    <img src="{$glmPluginMediaUrl}/images/medium/{$p.image}">
                    </div> 
                   {/if}
                     <h3 class="package-title"><a href="{$siteBaseUrl}{$settings.canonical_package_page}/{$p.package_slug}/">{$p.title}</a></h3>
@@ -87,7 +87,7 @@
             <div class="member">
                 {if $p.member.logo}
                <div class="glm-member-img-wrap"> 
-                <img src="{$glmPluginMediaURL}/images/medium/{$p.member.logo}">
+                <img src="{$glmPluginMediaUrl}/images/medium/{$p.member.logo}">
                </div> 
               {/if}
                 <h4 class="glm-member-title"><a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$p.member.member_slug}/">{$p.member.member_name}</a></h4>
@@ -121,7 +121,7 @@
                     
                   {if $p.image}
                    <div class="glm-package-img-wrap">
-                    <img src="{$glmPluginMediaURL}/images/medium/{$p.image}">
+                    <img src="{$glmPluginMediaUrl}/images/medium/{$p.image}">
                    </div>
                   {/if}
                     <h3 class="package-title"><a href="{$siteBaseUrl}{$settings.canonical_package_page}/{$p.package_slug}/">{$p.title}</a></h3>

diff --git a/views/front/packaging/listForMemberDetail.html b/views/front/packaging/listForMemberDetail.html
index 5746e8c..b32dfd9 100644 (file)
--- a/views/front/packaging/listForMemberDetail.html
+++ b/views/front/packaging/listForMemberDetail.html
@@ -15,7 +15,7 @@
 
                   {if $p.image}
                    <div class="glm-package-img-wrap">
-                    <img src="{$glmPluginMediaURL}/images/medium/{$p.image}">
+                    <img src="{$glmPluginMediaUrl}/images/medium/{$p.image}">
                    </div> 
                   {/if}
                     <h3 class="package-title"><a href="{$siteBaseUrl}{$settings.canonical_package_page}/{$p.package_slug}/">{$p.title}</a></h3>

diff --git a/views/front/packaging/listForMemberListing.html b/views/front/packaging/listForMemberListing.html
index 1718aa8..ad2ccdc 100644 (file)
--- a/views/front/packaging/listForMemberListing.html
+++ b/views/front/packaging/listForMemberListing.html
@@ -11,7 +11,7 @@
                 
               {if $p.image}
                <div class="glm-package-img-wrap">
-                <img src="{$glmPluginMediaURL}/images/medium/{$p.image}">
+                <img src="{$glmPluginMediaUrl}/images/medium/{$p.image}">
                </div> 
               {/if}
                 <h3 class="package-title"><a href="{$siteBaseUrl}{$settings.canonical_package_page}/{$p.package_slug}/">{$p.title}</a></h3>