[Vtigercrm-commits] [vtiger-commits] r10740 - in /vtigercrm/branches/5.0.3: Smarty/templates/Settings/EmailNotification.tpl include/js/en_us.lang.js modules/Settings/SaveNotification.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Thu Apr 19 10:14:10 2007
New Revision: 10740

Log:
* Fixed the issues with umlaut characters, Fixed #3390

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailNotification.tpl
    vtigercrm/branches/5.0.3/include/js/en_us.lang.js
    vtigercrm/branches/5.0.3/modules/Settings/SaveNotification.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailNotification.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailNotification.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailNotification.tpl Thu Apr 19 10:14:10 2007
@@ -112,8 +112,14 @@
                         method: 'post',
                         postBody: 'action=SettingsAjax&module=Settings&file=SaveNotification&active='+active+'&notifysubject='+subject+'&notifybody='+body+'&record='+id,
                         onComplete: function(response) {
+					if(response.responseText.indexOf(":#:FAILURE") > -1)
+					{
+						alert(alert_arr.VALID_DATA);
+					}else
+					{
+						$("notifycontents").innerHTML=response.responseText;
+					}
                                 $("status").style.display="none";
-				$("notifycontents").innerHTML=response.responseText;
                         }
                 }
         );

Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js
==============================================================================
--- vtigercrm/branches/5.0.3/include/js/en_us.lang.js (original)
+++ vtigercrm/branches/5.0.3/include/js/en_us.lang.js Thu Apr 19 10:14:10 2007
@@ -112,5 +112,6 @@
                                 VALID_TAX_PERCENT:'Enter a valid Tax percentage',
                                 VALID_SH_TAX:'Enter valid Taxes for shipping and handling ',
 				ROLE_DRAG_ERR_MSG:'You cannot move a Parent Node under a Child Node',
-				LBL_DEL:'del'
+				LBL_DEL:'del',
+				VALID_DATA :' Enter Valid Data ,Please try again... '
                        };

Modified: vtigercrm/branches/5.0.3/modules/Settings/SaveNotification.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/SaveNotification.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/SaveNotification.php Thu Apr 19 10:14:10 2007
@@ -10,13 +10,24 @@
  ********************************************************************************/
 
 require_once('include/database/PearDatabase.php');
+global $default_charset;
 global $adb;
+$notifysubject =str_replace(array("'",'"'),'',iconv("UTF-8",$default_charset,$_REQUEST['notifysubject']));
+$notifybody =str_replace(array("'",'"'),'',iconv("UTF-8",$default_charset,$_REQUEST['notifybody']));
 
-if(isset($_REQUEST['record']) && $_REQUEST['record']!='')
+if($notifysubject != '' && $notifybody != '')
 {
-	$query="UPDATE vtiger_notificationscheduler set notificationsubject='".$_REQUEST['notifysubject']."', notificationbody='".$_REQUEST['notifybody']."', active =".$_REQUEST['active']." where schedulednotificationid=".$_REQUEST['record'];
-	$adb->query($query);	
+	if(isset($_REQUEST['record']) && $_REQUEST['record']!='')
+	{	
+		$query="UPDATE vtiger_notificationscheduler set notificationsubject='".$notifysubject."', notificationbody='".$notifybody."', active =".$_REQUEST['active']." where schedulednotificationid=".$_REQUEST['record'];
+		$adb->query($query);	
+	}
+	$loc = "Location: index.php?action=SettingsAjax&file=listnotificationschedulers&module=Settings&directmode=ajax";
+	header($loc);
 }
-$loc = "Location: index.php?action=SettingsAjax&file=listnotificationschedulers&module=Settings&directmode=ajax";
-header($loc);
+else
+{
+	echo ":#:FAILURE";
+}
+
 ?>