From ba37db93423189ed01b4c21a497f47d132d8fd0f Mon Sep 17 00:00:00 2001 From: Chuck Scott Date: Fri, 26 Feb 2016 11:01:58 -0500 Subject: [PATCH] Made siteBaseURL a standard template parameter --- config/plugin.ini | 18 +++++++++++++++--- controllers/admin.php | 1 + controllers/front.php | 1 + models/front/members/list.php | 1 - 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/config/plugin.ini b/config/plugin.ini index ff84c060..ff3949ef 100644 --- a/config/plugin.ini +++ b/config/plugin.ini @@ -230,9 +230,9 @@ month_bit['December'] = 11 ; Week of Month - numbers are an exponent of 2 that represent the bit position week[0] = 'First' week[1] = 'Second' -week[3] = 'Third' -week[4] = 'Fourth' -week[5] = 'Fifth' +week[2] = 'Third' +week[3] = 'Fourth' +week[4] = 'Fifth' week_bit['First'] = 0 week_bit['Second'] = 1 @@ -240,6 +240,18 @@ week_bit['Third'] = 2 week_bit['Fourth'] = 3 week_bit['Fifth'] = 4 +; Day of Month - numbers are an exponent of 2 that represent the bit position +day_of_month[0] = 'First' +day_of_month[1] = 'Second' +day_of_month[2] = 'Third' +day_of_month[3] = 'Fourth' +day_of_month[4] = 'Fifth' +day_of_month[5] = 'Sixth' +day_of_month[6] = 'Seventh' +day_of_month[7] = 'Eighth' +day_of_month[8] = 'Nineth' +day_of_month[9] = 'Tenth' +day_of_month[10] = 'Eleventh' diff --git a/controllers/admin.php b/controllers/admin.php index d2ce71cd..9e505102 100644 --- a/controllers/admin.php +++ b/controllers/admin.php @@ -829,6 +829,7 @@ class glmMembersAdmin extends GlmPluginSupport $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']: '') ); diff --git a/controllers/front.php b/controllers/front.php index 4d5f8757..e8099278 100644 --- a/controllers/front.php +++ b/controllers/front.php @@ -449,6 +449,7 @@ class glmMembersFront extends GlmPluginSupport // 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 ); diff --git a/models/front/members/list.php b/models/front/members/list.php index f42bf877..f7c368ca 100644 --- a/models/front/members/list.php +++ b/models/front/members/list.php @@ -456,7 +456,6 @@ class GlmMembersFront_members_list extends GlmDataMemberInfo // Compile template data $templateData = array( - 'siteBaseUrl' => GLM_MEMBERS_SITE_BASE_URL, 'haveMembers' => $haveMembers, 'members' => $list, 'haveFilter' => $haveFilter, -- 2.17.1