[Vtigercrm-commits] [vtiger-commits] r7190 - in /vtigercrm/trunk/modules/Potentials: Charts.php Opportunity.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: don
Date: Fri Jun 16 08:27:21 2006
New Revision: 7190

Log:
Fixed issues in vtiger_ prefixing in table names

Modified:
    vtigercrm/trunk/modules/Potentials/Charts.php
    vtigercrm/trunk/modules/Potentials/Opportunity.php

Modified: vtigercrm/trunk/modules/Potentials/Charts.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Charts.php (original)
+++ vtigercrm/trunk/modules/Potentials/Charts.php Fri Jun 16 08:27:21 2006
@@ -345,7 +345,7 @@
 		}
 		else {
 			$imgMap_fp = fopen($cache_file_name.'.map', "rb");
-			$imgMap = fread($imgMap_fp, vtiger_filesize($cache_file_name.'.map'));
+			$imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map'));
 			fclose($imgMap_fp);
 		}
 		$fileModTime = filemtime($cache_file_name.'.map');
@@ -680,7 +680,7 @@
 		}
 		else {
 			$imgMap_fp = fopen($cache_file_name.'.map', "rb");
-			$imgMap = fread($imgMap_fp, vtiger_filesize($cache_file_name.'.map'));
+			$imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map'));
 			fclose($imgMap_fp);
 		}
 		$fileModTime = filemtime($cache_file_name.'.map');
@@ -1001,7 +1001,7 @@
 		}
 		else {
 			$imgMap_fp = fopen($cache_file_name.'.map', "rb");
-			$imgMap = fread($imgMap_fp, vtiger_filesize($cache_file_name.'.map'));
+			$imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map'));
 			fclose($imgMap_fp);
 		}
 		$fileModTime = filemtime($cache_file_name.'.map');
@@ -1229,7 +1229,7 @@
 		}
 		else {
 			$imgMap_fp = fopen($cache_file_name.'.map', "rb");
-			$imgMap = fread($imgMap_fp, vtiger_filesize($cache_file_name.'.map'));
+			$imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map'));
 			fclose($imgMap_fp);
 		}
 		$fileModTime = filemtime($cache_file_name.'.map');

Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Opportunity.php (original)
+++ vtigercrm/trunk/modules/Potentials/Opportunity.php Fri Jun 16 08:27:21 2006
@@ -37,9 +37,9 @@
 	var $db;
 
 	var $module_name="Potentials";
-	var $table_name = "potential";
-	var $rel_product_table = "seproductsrel";
-	var $rel_opportunity_table = "contpotentialrel";
+	var $table_name = "vtiger_potential";
+	var $rel_product_table = "vtiger_seproductsrel";
+	var $rel_opportunity_table = "vtiger_contpotentialrel";
 	var $module_id = "potentialid";
 	var $object_name = "potential";
 
@@ -171,7 +171,7 @@
 		{
 			$query = $this->constructCustomQueryAddendum('potentialscf','Potentials') ."
 			vtiger_potential.*,
-			vtiger_account.accountname vtiger_account_name,
+			vtiger_account.accountname account_name,
 			vtiger_users.user_name assigned_user_name
 					FROM vtiger_potential
 					INNER JOIN vtiger_crmentity
@@ -216,7 +216,7 @@
 		if(isPermitted("Contacts",3,"") == 'yes')
 		{
 
-			$button .= '<input title="Change" accessKey="" vtiger_tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Contacts&action=Popup&return_module=Potentials&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
+			$button .= '<input title="Change" accessKey="" tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Contacts&action=Popup&return_module=Potentials&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
 		}
 		$returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id;
 
@@ -275,7 +275,7 @@
 		}
 		if(isPermitted("Products",3,"") == 'yes')
 		{
-			$button .= '<input title="Change" accessKey="" vtiger_tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_PRODUCT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Products&action=Popup&return_module=Potentials&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
+			$button .= '<input title="Change" accessKey="" tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_PRODUCT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Products&action=Popup&return_module=Potentials&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
 		}
 		$returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id;