[Vtigercrm-commits] [vtiger-commits] r6314 - /vtigercrm/trunk/modules/Contacts/Merge.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Mon May 22 23:44:52 2006
New Revision: 6314

Log:
modified for 5.0 beta release

Modified:
    vtigercrm/trunk/modules/Contacts/Merge.php

Modified: vtigercrm/trunk/modules/Contacts/Merge.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Merge.php (original)
+++ vtigercrm/trunk/modules/Contacts/Merge.php Mon May 22 23:44:52 2006
@@ -35,6 +35,11 @@
 //echo 'merge file name is ...' .$_REQUEST['mergefile'];
 
 $templateid = $_REQUEST['mergefile'];
+
+if($templateid == "")
+{
+	die("Select Mail Merge Template");
+}
 //get the particular file from db and store it in the local hard disk.
 //store the path to the location where the file is stored and pass it  as parameter to the method 
 $sql = "select filename,data,filesize from wordtemplates where templateid=".$templateid;
@@ -47,11 +52,6 @@
 $filesize=$temparray['filesize'];
 $wordtemplatedownloadpath =$root_directory ."/test/wordtemplatedownload/";
 
-//echo '<br> file name and size is ..'.$filename .'...'.$filesize;
-if($templateid == "")
-{
-die("Select Mail Merge Template");
-}
 $handle = fopen($wordtemplatedownloadpath .$temparray['filename'],"wb");
 fwrite($handle,base64_decode($fileContent),$filesize);
 fclose($handle);