CRM-13337

----------------------------------------
* CRM-13337: Advanced search: improve form validation
  http://issues.civicrm.org/jira/browse/CRM-13337

diff --git a/CRM/Contact/Form/Search/Criteria.php b/CRM/Contact/Form/Search/Criteria.php
index 8a93dba8f8b42c63e696ebb6371d095ea34b2927..54f1e03cab321416788b2ab4ad8207811c4c4ef7 100644 (file)
--- a/CRM/Contact/Form/Search/Criteria.php
+++ b/CRM/Contact/Form/Search/Criteria.php
@@ -115,6 +115,7 @@ class CRM_Contact_Form_Search_Criteria {
 
     //added internal ID
     $form->addElement('text', 'contact_id', ts('Contact ID'), CRM_Core_DAO::getAttribute('CRM_Contact_DAO_Contact', 'id'));
+    $form->addRule('contact_id', ts('Please enter valid Contact ID'), 'positiveInteger');
 
     //added external ID
     $form->addElement('text', 'external_identifier', ts('External ID'), CRM_Core_DAO::getAttribute('CRM_Contact_DAO_Contact', 'external_identifier'));

diff --git a/CRM/Pledge/BAO/Query.php b/CRM/Pledge/BAO/Query.php
index 57fb1a1ae5b1bfd4d41353b994bd813fb4dd3861..4b8721afda403702df03286685480ee2ef3f3781 100644 (file)
--- a/CRM/Pledge/BAO/Query.php
+++ b/CRM/Pledge/BAO/Query.php
@@ -589,7 +589,7 @@ class CRM_Pledge_BAO_Query {
 
     //add fields for pledge frequency
     $form->add('text', 'pledge_frequency_interval', ts('Every'), array('size' => 8, 'maxlength' => 8));
-
+    $form->addRule('pledge_frequency_interval', ts('Please enter valid Pledge Frequency Interval'), 'integer');
     $frequencies = CRM_Core_OptionGroup::values('recur_frequency_units');
     foreach ($frequencies as $val => $label) {
       $freqUnitsDisplay["'{$val}'"] = ts('%1(s)', array(1 => $label));