[Vtigercrm-commits] [vtiger-commits] r10992 - in /vtigercrm/branches/5.0.3/modules/Settings: listwordtemplates.php savewordtemplate.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Wed May 23 12:29:41 2007
New Revision: 10992

Log:
fix for adding mail merge template -Allen.Fixes #3905,#3901,#3902

Modified:
    vtigercrm/branches/5.0.3/modules/Settings/listwordtemplates.php
    vtigercrm/branches/5.0.3/modules/Settings/savewordtemplate.php

Modified: vtigercrm/branches/5.0.3/modules/Settings/listwordtemplates.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/listwordtemplates.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/listwordtemplates.php Wed May 23 12:29:41 2007
@@ -29,7 +29,7 @@
 {	
   $wordtemplatearray=array();
   $wordtemplatearray['templateid'] = $adb->query_result($result,$i,'templateid');
-  $wordtemplatearray['description'] = $adb->query_result($result,$i,'description');
+  $wordtemplatearray['description'] = urldecode($adb->query_result($result,$i,'description'));
   $wordtemplatearray['module'] = $adb->query_result($result,$i,'module');
   $wordtemplatearray['filename'] = $adb->query_result($result,$i,'filename');
   $wordtemplatearray['filetype'] = $adb->query_result($result,$i,'filetype');

Modified: vtigercrm/branches/5.0.3/modules/Settings/savewordtemplate.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/savewordtemplate.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/savewordtemplate.php Wed May 23 12:29:41 2007
@@ -26,7 +26,7 @@
                 $binFile .= ".txt";
         }
 $_FILES["binFile"]["name"] = $binFile;
-$strDescription = urlencode(addslashes($_REQUEST['txtDescription']));
+$strDescription = urlencode(($_REQUEST['txtDescription']));
 // Vulnerability fix ends
 if(move_uploaded_file($_FILES["binFile"]["tmp_name"],$uploaddir.$_FILES["binFile"]["name"])) 
 {