[Vtigercrm-commits] [vtiger-commits] r10667 - in /vtigercrm/branches/5.0.3/modules/Reports: CheckReport.php SaveReportFolder.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Thu Apr 12 09:47:15 2007
New Revision: 10667

Log:
* Fixed the issue in UTF-8 in Report folder names, Fixed #3385

Modified:
    vtigercrm/branches/5.0.3/modules/Reports/CheckReport.php
    vtigercrm/branches/5.0.3/modules/Reports/SaveReportFolder.php

Modified: vtigercrm/branches/5.0.3/modules/Reports/CheckReport.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Reports/CheckReport.php (original)
+++ vtigercrm/branches/5.0.3/modules/Reports/CheckReport.php Thu Apr 12 09:47:15 2007
@@ -12,7 +12,7 @@
 require_once('include/logging.php');
 require_once('include/database/PearDatabase.php');
 $check=$_REQUEST['check'];
-
+global $default_charset;
 
 if($_REQUEST['check']== 'reportCheck')
 {
@@ -26,6 +26,7 @@
 else if($_REQUEST['check']== 'folderCheck')
 {
 	$folderName = $_REQUEST['folderName'];
+	$folderName = iconv("UTF-8",$default_charset,$folderName);
 	$sSQL="select * from vtiger_reportfolder where foldername='".$folderName."'";
 	
 	$sqlresult = $adb->query($sSQL);

Modified: vtigercrm/branches/5.0.3/modules/Reports/SaveReportFolder.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Reports/SaveReportFolder.php (original)
+++ vtigercrm/branches/5.0.3/modules/Reports/SaveReportFolder.php Thu Apr 12 09:47:15 2007
@@ -13,13 +13,14 @@
 require_once('include/database/PearDatabase.php');
 
 global $adb;
-
+global $default_charset;
 $local_log =& LoggerManager::getLogger('index');
 $focus = new Reports();
 
 $rfid = $_REQUEST['record'];
 $mode = $_REQUEST['savemode'];
 $foldername = addslashes($_REQUEST["foldername"]);
+$foldername = iconv("UTF-8",$default_charset,$foldername);
 $folderdesc = addslashes($_REQUEST["folderdesc"]);
 $foldername = str_replace('*amp*','&',$foldername);
 $folderdesc = str_replace('*amp*','&',$folderdesc);