[Vtigercrm-commits] [vtiger-commits] r10589 - in /vtigercrm/branches/5.0.3/modules: Accounts/ListView.php Contacts/ListView.php HelpDesk/ListView.php Leads/ListView.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Mon Apr  9 00:58:04 2007
New Revision: 10589

Log:
Create Email Template link is visible for non-admin user - Fixed. Fixes #3527

Modified:
    vtigercrm/branches/5.0.3/modules/Accounts/ListView.php
    vtigercrm/branches/5.0.3/modules/Contacts/ListView.php
    vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php
    vtigercrm/branches/5.0.3/modules/Leads/ListView.php

Modified: vtigercrm/branches/5.0.3/modules/Accounts/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Accounts/ListView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Accounts/ListView.php Mon Apr  9 00:58:04 2007
@@ -242,10 +242,11 @@
 	}
 	else
         {
-                require("user_privileges/user_privileges_1.php");
+		global $current_user;
+                require("user_privileges/user_privileges_".$current_user->id.".php");
                 if($is_admin == true)
                 {
-		$smarty->assign("MERGEBUTTON",'<td><a href=index.php?module=Settings&action=upload&tempModule='.$currentModule.'>'. $app_strings["LBL_CREATE_MERGE_TEMPLATE"].'</td>');
+			$smarty->assign("MERGEBUTTON",'<td><a href=index.php?module=Settings&action=upload&tempModule='.$currentModule.'>'. $app_strings["LBL_CREATE_MERGE_TEMPLATE"].'</td>');
                 }
         }
 }

Modified: vtigercrm/branches/5.0.3/modules/Contacts/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Contacts/ListView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Contacts/ListView.php Mon Apr  9 00:58:04 2007
@@ -250,7 +250,8 @@
 	}
 	else
 	{ 
-		require("user_privileges/user_privileges_1.php");
+		global $current_user;
+                require("user_privileges/user_privileges_".$current_user->id.".php");
 		if($is_admin == true)
 		{
 			$smarty->assign("MERGEBUTTON","<td><a href=index.php?module=Settings&action=upload&tempModule=".$currentModule.">". $app_strings['LBL_CREATE_MERGE_TEMPLATE']."</td>");

Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php (original)
+++ vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php Mon Apr  9 00:58:04 2007
@@ -220,7 +220,8 @@
 	}
 	else
         {
-                require("user_privileges/user_privileges_1.php");
+		global $current_user;
+                require("user_privileges/user_privileges_".$current_user->id.".php");
                 if($is_admin == true)
                 {
 			$smarty->assign("MERGEBUTTON",'<td><a href=index.php?module=Settings&action=upload&tempModule='.$currentModule.'>'. $app_strings["LBL_CREATE_MERGE_TEMPLATE"].'</td>');

Modified: vtigercrm/branches/5.0.3/modules/Leads/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Leads/ListView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Leads/ListView.php Mon Apr  9 00:58:04 2007
@@ -254,7 +254,8 @@
 	}
 	else
         {
-                require("user_privileges/user_privileges_1.php");
+		global $current_user;
+                require("user_privileges/user_privileges_".$current_user->id.".php");
                 if($is_admin == true)
                 {
 			$smarty->assign("MERGEBUTTON",'<td><a href=index.php?module=Settings&action=upload&tempModule='.$currentModule.'>'. $app_strings["LBL_CREATE_MERGE_TEMPLATE"].'</td>');