[Vtigercrm-commits] [vtiger-commits] r7083 - in /vtigercrm/trunk/modules/Users: CreateUserPrivilegeFile.php EditDefOrgFieldLevelAccess.php ShowHistory.php TabCustomise.php UpdateTab.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Wed Jun 14 05:08:59 2006
New Revision: 7083

Log:
unwanted include removed
passed an additional variable to the method

Modified:
    vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php
    vtigercrm/trunk/modules/Users/EditDefOrgFieldLevelAccess.php
    vtigercrm/trunk/modules/Users/ShowHistory.php
    vtigercrm/trunk/modules/Users/TabCustomise.php
    vtigercrm/trunk/modules/Users/UpdateTab.php

Modified: vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php
==============================================================================
--- vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php (original)
+++ vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php Wed Jun 14 05:08:59 2006
@@ -30,8 +30,7 @@
 		$newbuf .="\n";		
 		$newbuf .= "//This is the access privilege file\n";
 		$user_focus= new User();
-		$user_focus->retrieve_entity_info($userid,'Users');
-		
+		$user_focus->retrieve_entity_info($userid,"Users");
 		$userInfo=Array();
 		$user_focus->column_fields["id"] = '';
 		$user_focus->id = $userid; 
@@ -116,7 +115,7 @@
 		$newbuf .="\n";		
 		$newbuf .= "//This is the sharing access privilege file\n";
 		$user_focus= new User();
-		$user_focus->retrieve_entity_info($userid,'Users');
+		$user_focus->retrieve_entity_info($userid,"Users");
 		if($user_focus->is_admin == 'on')
 		{
 			$newbuf .= "\n";
@@ -496,7 +495,7 @@
 		}
 
 
-		//Get vtiger_roles from Role2Grp
+		//Get roles from Role2Grp
 		$grpIterator=false;
 		$groupList = "(";
 		foreach($current_user_groups as $grp_id)
@@ -669,7 +668,7 @@
 		}
 
 
-		//Get vtiger_roles from Rs2Grp
+		//Get roles from Rs2Grp
 
 
 		$query="select vtiger_datashare_rs2grp.* from vtiger_datashare_rs2grp inner join vtiger_datashare_module_rel on vtiger_datashare_module_rel.shareid=vtiger_datashare_rs2grp.shareid where vtiger_datashare_module_rel.tabid=".$mod_tabid." and vtiger_datashare_rs2grp.to_groupid in ".$groupList;
@@ -1421,7 +1420,7 @@
 		$adb->query($query);
 	}
 
-	//Populating Values into the tmp sharing vtiger_tables
+	//Populating Values into the tmp sharing tables
 	$sharingArray=Array('Leads','Accounts','Contacts','Potentials','HelpDesk','Emails','Campaigns','Quotes','PurchaseOrder','SalesOrder','Invoice');
 	foreach($sharingArray as $module)
 	{
@@ -1430,7 +1429,7 @@
 		populateSharingPrivileges('GROUP',$userid,$module,'read');
 		populateSharingPrivileges('GROUP',$userid,$module,'write');
 	}
-	//Populating Values into the temp related sharing vtiger_tables
+	//Populating Values into the temp related sharing tables
 	foreach($related_module_share as $rel_tab_id => $tabid_arr)
 	{
 		$rel_tab_name=getTabname($rel_tab_id);

Modified: vtigercrm/trunk/modules/Users/EditDefOrgFieldLevelAccess.php
==============================================================================
--- vtigercrm/trunk/modules/Users/EditDefOrgFieldLevelAccess.php (original)
+++ vtigercrm/trunk/modules/Users/EditDefOrgFieldLevelAccess.php Wed Jun 14 05:08:59 2006
@@ -12,7 +12,6 @@
 
 
 require_once('include/database/PearDatabase.php');
-require_once('XTemplate/xtpl.php');
 require_once('themes/'.$theme.'/layout_utils.php');
 require_once('include/utils/UserInfoUtil.php');
 require_once('include/utils/utils.php');

Modified: vtigercrm/trunk/modules/Users/ShowHistory.php
==============================================================================
--- vtigercrm/trunk/modules/Users/ShowHistory.php (original)
+++ vtigercrm/trunk/modules/Users/ShowHistory.php Wed Jun 14 05:08:59 2006
@@ -38,7 +38,7 @@
 $focus = new User();
 
 if(isset($_REQUEST['record'])) {
-	$focus->retrieve($_REQUEST['record']);
+	$focus->retrieve_entity_info($_REQUEST['record'],"Users");
 }
 if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
 	$focus->id = "";

Modified: vtigercrm/trunk/modules/Users/TabCustomise.php
==============================================================================
--- vtigercrm/trunk/modules/Users/TabCustomise.php (original)
+++ vtigercrm/trunk/modules/Users/TabCustomise.php Wed Jun 14 05:08:59 2006
@@ -28,7 +28,7 @@
 $focus = new User();
 
 if(isset($_REQUEST['record'])) {
-	$focus->retrieve($_REQUEST['record']);
+	$focus->retrieve_entity_info($_REQUEST['record'],"Users");
 }
 if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
 	$focus->id = "";
@@ -342,7 +342,7 @@
                 } else if (id.indexOf("fieldlist")>=0) {//if Field List
                         if (currSelItemObj.id.indexOf("fd")<0) {
                                 itemObj.style.cursor='move'
-                                itemObj.className='tableBorder mouseover'       //Hiliting Field List only when added vtiger_fields are removed
+                                itemObj.className='tableBorder mouseover'       //Hiliting Field List only when added fields are removed
                         }
                 }
         }

Modified: vtigercrm/trunk/modules/Users/UpdateTab.php
==============================================================================
--- vtigercrm/trunk/modules/Users/UpdateTab.php (original)
+++ vtigercrm/trunk/modules/Users/UpdateTab.php Wed Jun 14 05:08:59 2006
@@ -25,7 +25,7 @@
 $focus = new User();
 
 if(isset($_REQUEST['record'])) {
-	$focus->retrieve($_REQUEST['record']);
+	$focus->retrieve_entity_info($_REQUEST['record'],"Users");
 }
 if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
 	$focus->id = "";
@@ -60,12 +60,12 @@
 	$xtpl->out("user_settings");
 }
 
-$sql_set = "update vtiger_tab set presence=1 where presence !=2";
+$sql_set = "update tab set presence=1 where presence !=2";
 $adb->query($sql_set);
 $j=1;
 foreach($_POST as $name=>$value)
 {
-  $sql="update vtiger_tab set presence=0,tabsequence= " . $j . " where vtiger_tabid = " .$value;
+  $sql="update tab set presence=0,tabsequence= " . $j . " where tabid = " .$value;
   $adb->query($sql);
   $j++;
 }