[Vtigercrm-commits] [vtiger-commits] r10880 - in /vtigercrm/branches/5.0.3: install/1checkSystem.php modules/Contacts/DetailView.php modules/Contacts/Save.php modules/Reports/Reports.js modules/Settings/EditCompanyDetails.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Sat May 12 06:51:14 2007
New Revision: 10880

Log:
Fixes #3742,#3736,#3809

Modified:
    vtigercrm/branches/5.0.3/install/1checkSystem.php
    vtigercrm/branches/5.0.3/modules/Contacts/DetailView.php
    vtigercrm/branches/5.0.3/modules/Contacts/Save.php
    vtigercrm/branches/5.0.3/modules/Reports/Reports.js
    vtigercrm/branches/5.0.3/modules/Settings/EditCompanyDetails.php

Modified: vtigercrm/branches/5.0.3/install/1checkSystem.php
==============================================================================
--- vtigercrm/branches/5.0.3/install/1checkSystem.php (original)
+++ vtigercrm/branches/5.0.3/install/1checkSystem.php Sat May 12 06:51:14 2007
@@ -333,7 +333,7 @@
 				<tr bgcolor="#ffffff"> <td valign=top ><strong>Register Globals Off</strong></tr>
 				<tr bgcolor="#ffffff"> <td valign=top ><strong>Max Execution Time 600</strong></tr>
 				<tr bgcolor="#ffffff"> <td valign=top ><strong>output_buffering= On</strong></tr>
-				<tr bgcolor="#ffffff"> <td valign=top ><strong>Change the memory limit = 32M</strong></tr>
+				<tr bgcolor="#ffffff"> <td valign=top ><strong>Change the memory limit = 64M</strong></tr>
 				<tr bgcolor="#ffffff"> <td valign=top ><strong>error_reporting = E_ALL & ~E_NOTICE</strong></tr>
 				<tr bgcolor="#ffffff"> <td valign=top ><strong>allow_call_time_pass_reference = On</strong></tr>
 				<tr bgcolor="#ffffff"> <td valign=top ><strong>log_errors = Off</strong></tr>

Modified: vtigercrm/branches/5.0.3/modules/Contacts/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Contacts/DetailView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Contacts/DetailView.php Sat May 12 06:51:14 2007
@@ -36,6 +36,12 @@
 $focus = new Contacts();
 
 if(isset($_REQUEST['record']) && $_REQUEST['record']!='') {
+        //Display the error message
+        if($_SESSION['image_type_error'] != '')
+        {
+                echo '<font color="red">'.$_SESSION['image_type_error'].'</font>';
+                session_unregister('image_type_error');
+        }
 
         $focus->id=$_REQUEST['record'];
         $focus->retrieve_entity_info($_REQUEST['record'],'Contacts');

Modified: vtigercrm/branches/5.0.3/modules/Contacts/Save.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Contacts/Save.php (original)
+++ vtigercrm/branches/5.0.3/modules/Contacts/Save.php Sat May 12 06:51:14 2007
@@ -95,7 +95,14 @@
 
 //if image added then we have to set that $_FILES['name'] in imagename field then only the image will be displayed
 if($_FILES['imagename']['name'] != '')
+{
 	$focus->column_fields['imagename'] = $_FILES['imagename']['name'];
+}
+else
+{
+	$result = $adb->query("select imagename from vtiger_contactdetails where contactid = ".$focus->id);
+	$focus->column_fields['imagename'] = $adb->query_result($result,0,'imagename');
+}
 	
 //Saving the contact
 if($image_error=="false")

Modified: vtigercrm/branches/5.0.3/modules/Reports/Reports.js
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Reports/Reports.js (original)
+++ vtigercrm/branches/5.0.3/modules/Reports/Reports.js Sat May 12 06:51:14 2007
@@ -217,7 +217,7 @@
 		}
 	}else
 	{
-		exit();
+		return false;
 	}
 }
 //this function is done for checking,whether the user has access to edit the field :Bharath

Modified: vtigercrm/branches/5.0.3/modules/Settings/EditCompanyDetails.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/EditCompanyDetails.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/EditCompanyDetails.php Sat May 12 06:51:14 2007
@@ -46,7 +46,7 @@
 
 $sql="select * from vtiger_organizationdetails";
 $result = $adb->query($sql);
-$organization_name = $adb->query_result($result,0,'organizationname');
+$organization_name = str_replace('"','&quot;',$adb->query_result($result,0,'organizationname'));
 $organization_address= $adb->query_result($result,0,'address');
 $organization_city = $adb->query_result($result,0,'city');
 $organization_state = $adb->query_result($result,0,'state');