Work in progress adding checks for enabled plugins for pages.

diff --git a/WEB-INF/templates/charts.tpl b/WEB-INF/templates/charts.tpl
index 22238715ef2f2e14ca800ef8658751f96ac6cbac..4c676147fecd772c69e45fc079d2a1166b1ba31d 100644 (file)
--- a/WEB-INF/templates/charts.tpl
+++ b/WEB-INF/templates/charts.tpl
@@ -35,5 +35,3 @@
   <tr><td valign="top">{$forms.chartForm.date.control}</td></tr>
 </table>
 {$forms.chartForm.close}
-
-

diff --git a/WEB-INF/templates/header.tpl b/WEB-INF/templates/header.tpl
index ce8e229c51aa792347d39965d0a52b33262cdffa..b307f4c895e7f0d4ead132a07d6ce2defc32a976 100644 (file)
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -27,7 +27,7 @@ With 101% height we essentially force the scrollbar to always appear. -->
   <tr>
     <td valign="top" align="center"> <!-- This is to centrally align all our content. -->
 
-      <!-- Top image -->
+      <!-- top image -->
       <table cellspacing="0" cellpadding="0" width="100%" border="0">
         <tr>
 {if $user->custom_logo}
@@ -54,11 +54,11 @@ With 101% height we essentially force the scrollbar to always appear. -->
           </td>
         </tr>
       </table>
-      <!-- End of top image -->
+      <!-- end of top image -->
 
 {if $authenticated}
   {if $user->isAdmin()}
-      <!-- Top menu for admin -->
+      <!-- top menu for admin -->
       <table cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
           <td class="systemMenu" height="17" align="center">&nbsp;
@@ -68,9 +68,9 @@ With 101% height we essentially force the scrollbar to always appear. -->
           </td>
         </tr>
       </table>
-      <!-- End of top menu for admin -->
+      <!-- end of top menu for admin -->
 
-      <!-- Sub menu for admin -->
+      <!-- sub menu for admin -->
       <table cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
           <td align="center" bgcolor="#d9d9d9" nowrap height="17" background="images/subm_bg.gif">&nbsp;
@@ -79,9 +79,9 @@ With 101% height we essentially force the scrollbar to always appear. -->
           </td>
         </tr>
       </table>
-      <!-- End of sub menu for admin -->
+      <!-- end of sub menu for admin -->
   {else}
-      <!-- Top menu for authorized user -->
+      <!-- top menu for authorized user -->
       <table cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
           <td class="systemMenu" height="17" align="center">&nbsp;
@@ -92,9 +92,9 @@ With 101% height we essentially force the scrollbar to always appear. -->
           </td>
         </tr>
       </table>
-      <!-- End of top menu for authorized user -->
+      <!-- end of top menu for authorized user -->
 
-      <!-- Sub menu for authorized user -->
+      <!-- sub menu for authorized user -->
       <table cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
           <td align="center" bgcolor="#d9d9d9" nowrap height="17" background="images/subm_bg.gif">&nbsp;
@@ -130,10 +130,10 @@ With 101% height we essentially force the scrollbar to always appear. -->
           </td>
         </tr>
       </table>
-      <!-- End of sub menu for authorized user -->
+      <!-- end of sub menu for authorized user -->
   {/if}
 {else}
-      <!-- Top menu for non authorized user -->
+      <!-- top menu for non authorized user -->
       <table cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
           <td class="systemMenu" height="17" align="center">&nbsp;
@@ -149,16 +149,16 @@ With 101% height we essentially force the scrollbar to always appear. -->
 {/if}
       <br>
 
-      <!-- Page title and user details -->
+      <!-- page title and user details -->
 {if $title}
       <table cellspacing="0" cellpadding="5" width="{$tab_width+20}" border="0">
         <tr><td class="sectionHeader"><div class="pageTitle">{$title}{if $timestring}: {$timestring}{/if}</div></td></tr>
         <tr><td>{$user->name|escape:'html'}{if $user->isAdmin()} {$i18n.label.role_admin}{elseif $user->isManager()} {$i18n.label.role_manager}{elseif $user->canManageTeam()} {$i18n.label.role_comanager}{/if}{if $user->behalf_id > 0} <b>{$i18n.label.on_behalf} {$user->behalf_name|escape:'html'}</b>{/if}{if $user->team}, {$user->team|escape:'html'}{/if}</td></tr>
       </table>
 {/if}
-      <!-- End of page title and user details -->
+      <!-- end of page title and user details -->
 
-      <!-- Output errors -->
+      <!-- output errors -->
 {if $err->yes()}
       <table cellspacing="4" cellpadding="7" width="{$tab_width}" border="0">
         <tr>
@@ -170,9 +170,9 @@ With 101% height we essentially force the scrollbar to always appear. -->
         </tr>
       </table>
 {/if}
-      <!-- End of output errors -->
+      <!-- end of output errors -->
 
-      <!-- Output messages -->
+      <!-- output messages -->
 {if $msg->yes()}
       <table cellspacing="4" cellpadding="7" width="{$tab_width}" border="0">
         <tr>
@@ -184,4 +184,4 @@ With 101% height we essentially force the scrollbar to always appear. -->
         </tr>
       </table>
 {/if}
-      <!-- End of output messages -->
+      <!-- end of output messages -->

diff --git a/WEB-INF/templates/mobile/header.tpl b/WEB-INF/templates/mobile/header.tpl
index cd266aeb9ff244112424f10bd0d31d70cc9c5a5e..7a48f5e9a8ed06e6e2eb46b3d10bebe47b0ee067 100644 (file)
--- a/WEB-INF/templates/mobile/header.tpl
+++ b/WEB-INF/templates/mobile/header.tpl
@@ -25,7 +25,7 @@
   <tr>
     <td valign="top" align="center"> <!-- This is to centrally align all our content. -->
 
-      <!-- Top image -->
+      <!-- top image -->
       <table cellspacing="0" cellpadding="0" width="100%" border="0">
         <tr>
 {if $user->custom_logo}
@@ -52,12 +52,12 @@
           </td>
         </tr>
       </table>
-      <!-- End of top image -->
+      <!-- end of top image -->
       
 {if $authenticated}
   {if $user->isAdmin()}
   
-      <!-- Sub menu for admin -->
+      <!-- sub menu for admin -->
       <table cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
           <td align="center" bgcolor="#d9d9d9" height="17" style="background-repeat: repeat-x;" background="../images/subm_bg.gif">&nbsp;
@@ -66,10 +66,10 @@
           </td>
         </tr>
       </table>
-      <!-- End of sub menu for admin -->
+      <!-- end of sub menu for admin -->
   {else}
 
-      <!-- Sub menu for authorized user -->
+      <!-- sub menu for authorized user -->
       <table cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
           <td align="center" bgcolor="#d9d9d9" height="17" style="background-repeat: repeat-x;" background="../images/subm_bg.gif">&nbsp;
@@ -94,11 +94,11 @@
           </td>
         </tr>
       </table>
-      <!-- End of sub menu for authorized user -->
+      <!-- end of sub menu for authorized user -->
   {/if}
 {/if}
       
-      <!-- Output errors -->
+      <!-- output errors -->
 {if $err->yes()}
       <table cellspacing="4" cellpadding="7" width="{$tab_width}" border="0">
         <tr>
@@ -110,9 +110,9 @@
         </tr>
       </table>
 {/if}
-      <!-- End of output errors -->
+      <!-- end of output errors -->
 
-      <!-- Output messages -->
+      <!-- output messages -->
 {if $msg->yes()}
       <table cellspacing="4" cellpadding="7" width="{$tab_width}" border="0">
         <tr>
@@ -124,4 +124,4 @@
         </tr>
       </table>
 {/if}
-      <!-- End of output messages -->
+      <!-- end of output messages -->

diff --git a/charts.php b/charts.php
index 9dec840aed24effabaa760455d674fc505426b17..3ef76e528bda3ff4fcba5a39fc79b6ef0a74ba01 100644 (file)
--- a/charts.php
+++ b/charts.php
@@ -38,7 +38,7 @@ import('ttUserHelper');
 import('ttTeamHelper');
 
 // Access check.
-if (!ttAccessCheck(right_view_charts)) {
+if (!ttAccessCheck(right_view_charts) || !$user->isPluginEnabled('ch')) {
   header('Location: access_denied.php');
   exit();
 }

diff --git a/clients.php b/clients.php
index 6dcfe4a5663d4331708b7e978260d075baf478bc..0a027b8bd1a5ad613d7bf498ddaefd9dfe0a89a6 100644 (file)
--- a/clients.php
+++ b/clients.php
@@ -31,7 +31,7 @@ import('form.Form');
 import('ttTeamHelper');
 
 // Access check.
-if (!ttAccessCheck(right_manage_team)) {
+if (!ttAccessCheck(right_manage_team) || !$user->isPluginEnabled('cl')) {
   header('Location: access_denied.php');
   exit();
 }

diff --git a/expenses.php b/expenses.php
index 4c2b7b27ef08b18d1a6739311247add9e825fed3..0f4265aa862d0326dc9bbc57cbf7ffafad0718f5 100644 (file)
--- a/expenses.php
+++ b/expenses.php
@@ -34,7 +34,7 @@ import('DateAndTime');
 import('ttExpenseHelper');
 
 // Access check.
-if (!ttAccessCheck(right_data_entry)) {
+if (!ttAccessCheck(right_data_entry) || !$user->isPluginEnabled('ex')) {
   header('Location: access_denied.php');
   exit();
 }

diff --git a/mobile/clients.php b/mobile/clients.php
index d6ebbe40691f98f6d5c18d43d77a312f3133cb86..6312c2dd4e3c207115c5b2ec9ec52364d6528106 100644 (file)
--- a/mobile/clients.php
+++ b/mobile/clients.php
@@ -31,7 +31,7 @@ import('form.Form');
 import('ttTeamHelper');
 
 // Access check.
-if (!ttAccessCheck(right_manage_team)) {
+if (!ttAccessCheck(right_manage_team) || !$user->isPluginEnabled('cl')) {
   header('Location: access_denied.php');
   exit();
 }

diff --git a/mobile/expenses.php b/mobile/expenses.php
index 4246f589e6fab5557aa4b8d4521e32572899fdde..fafe1373e19a3a722d99f02de3679657bf13b050 100644 (file)
--- a/mobile/expenses.php
+++ b/mobile/expenses.php
@@ -34,7 +34,7 @@ import('DateAndTime');
 import('ttExpenseHelper');
 
 // Access check.
-if (!ttAccessCheck(right_data_entry)) {
+if (!ttAccessCheck(right_data_entry) || !$user->isPluginEnabled('ex')) {
   header('Location: access_denied.php');
   exit();
 }