From 4847317168ff439c83d103d231d7326d992a9c29 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Sun, 1 Jun 2014 11:15:15 +0100 Subject: [PATCH] Search code cleanup - move variables into parent class --- CRM/Activity/Form/Search.php | 48 ---------------------------------- CRM/Campaign/Form/Search.php | 48 ---------------------------------- CRM/Case/Form/Search.php | 48 ---------------------------------- CRM/Contact/Form/Search.php | 48 ---------------------------------- CRM/Contribute/Form/Search.php | 48 ---------------------------------- CRM/Core/Form/Search.php | 48 ++++++++++++++++++++++++++++++++++ CRM/Event/Form/Search.php | 48 ---------------------------------- CRM/Grant/Form/Search.php | 48 ---------------------------------- CRM/Member/Form/Search.php | 48 ---------------------------------- CRM/Pledge/Form/Search.php | 48 ---------------------------------- 10 files changed, 48 insertions(+), 432 deletions(-) diff --git a/CRM/Activity/Form/Search.php b/CRM/Activity/Form/Search.php index 5899cfa2b2..b00e600880 100644 --- a/CRM/Activity/Form/Search.php +++ b/CRM/Activity/Form/Search.php @@ -41,38 +41,6 @@ */ class CRM_Activity_Form_Search extends CRM_Core_Form_Search { - /** - * Are we forced to run a search - * - * @var int - * @access protected - */ - protected $_force; - - /** - * name of search button - * - * @var string - * @access protected - */ - protected $_searchButtonName; - - /** - * name of action button - * - * @var string - * @access protected - */ - protected $_actionButtonName; - - /** - * form values that we will be using - * - * @var array - * @access protected - */ - public $_formValues; - /** * the params that are sent to the query * @@ -81,14 +49,6 @@ class CRM_Activity_Form_Search extends CRM_Core_Form_Search { */ protected $_queryParams; - /** - * have we already done this search - * - * @access protected - * @var boolean - */ - protected $_done; - /** * are we restricting ourselves to a single contact * @@ -105,14 +65,6 @@ class CRM_Activity_Form_Search extends CRM_Core_Form_Search { */ protected $_limit = NULL; - /** - * what context are we being invoked from - * - * @access protected - * @var string - */ - protected $_context = NULL; - /** * prefix for the controller * diff --git a/CRM/Campaign/Form/Search.php b/CRM/Campaign/Form/Search.php index 677d4525e1..5765f582da 100755 --- a/CRM/Campaign/Form/Search.php +++ b/CRM/Campaign/Form/Search.php @@ -38,38 +38,6 @@ */ class CRM_Campaign_Form_Search extends CRM_Core_Form_Search { - /** - * Are we forced to run a search - * - * @var int - * @access protected - */ - protected $_force; - - /** - * name of search button - * - * @var string - * @access protected - */ - protected $_searchButtonName; - - /** - * name of action button - * - * @var string - * @access protected - */ - protected $_actionButtonName; - - /** - * form values that we will be using - * - * @var array - * @access protected - */ - protected $_formValues; - /** * the params that are sent to the query * @@ -78,14 +46,6 @@ class CRM_Campaign_Form_Search extends CRM_Core_Form_Search { */ protected $_queryParams; - /** - * have we already done this search - * - * @access protected - * @var boolean - */ - protected $_done; - /** * are we restricting ourselves to a single contact * @@ -102,14 +62,6 @@ class CRM_Campaign_Form_Search extends CRM_Core_Form_Search { */ protected $_limit = NULL; - /** - * what context are we being invoked from - * - * @access protected - * @var string - */ - protected $_context = NULL; - protected $_defaults; /** diff --git a/CRM/Case/Form/Search.php b/CRM/Case/Form/Search.php index 67d9718101..045a8fc6f0 100644 --- a/CRM/Case/Form/Search.php +++ b/CRM/Case/Form/Search.php @@ -38,38 +38,6 @@ */ class CRM_Case_Form_Search extends CRM_Core_Form_Search { - /** - * Are we forced to run a search - * - * @var int - * @access protected - */ - protected $_force; - - /** - * name of search button - * - * @var string - * @access protected - */ - protected $_searchButtonName; - - /** - * name of action button - * - * @var string - * @access protected - */ - protected $_actionButtonName; - - /** - * form values that we will be using - * - * @var array - * @access protected - */ - public $_formValues; - /** * the params that are sent to the query * @@ -78,14 +46,6 @@ class CRM_Case_Form_Search extends CRM_Core_Form_Search { */ protected $_queryParams; - /** - * have we already done this search - * - * @access protected - * @var boolean - */ - protected $_done; - /** * are we restricting ourselves to a single contact * @@ -102,14 +62,6 @@ class CRM_Case_Form_Search extends CRM_Core_Form_Search { */ protected $_limit = NULL; - /** - * what context are we being invoked from - * - * @access protected - * @var string - */ - protected $_context = NULL; - /** * prefix for the controller * diff --git a/CRM/Contact/Form/Search.php b/CRM/Contact/Form/Search.php index 64a90c9222..2b8a0d7714 100644 --- a/CRM/Contact/Form/Search.php +++ b/CRM/Contact/Form/Search.php @@ -59,14 +59,6 @@ class CRM_Contact_Form_Search extends CRM_Core_Form_Search { */ static $_modeValues = NULL; - /** - * The context that we are working on - * - * @var string - * @access protected - */ - protected $_context; - /** * The contextMenu * @@ -100,30 +92,6 @@ class CRM_Contact_Form_Search extends CRM_Core_Form_Search { */ protected $_ssID; - /** - * Are we forced to run a search - * - * @var int - * @access protected - */ - protected $_force; - - /** - * name of search button - * - * @var string - * @access protected - */ - protected $_searchButtonName; - - /** - * name of action button - * - * @var string - * @access protected - */ - protected $_actionButtonName; - /** * the group elements * @@ -143,14 +111,6 @@ class CRM_Contact_Form_Search extends CRM_Core_Form_Search { public $_tag; public $_tagElement; - /** - * form values that we will be using - * - * @var array - * @access protected - */ - public $_formValues; - /** * The params used for search * @@ -206,14 +166,6 @@ class CRM_Contact_Form_Search extends CRM_Core_Form_Search { protected $_modeValue; - /** - * have we already done this search - * - * @access protected - * @var boolean - */ - protected $_done; - /** * name of the selector to use */ diff --git a/CRM/Contribute/Form/Search.php b/CRM/Contribute/Form/Search.php index f0f7621e91..12d1c078bf 100644 --- a/CRM/Contribute/Form/Search.php +++ b/CRM/Contribute/Form/Search.php @@ -42,38 +42,6 @@ */ class CRM_Contribute_Form_Search extends CRM_Core_Form_Search { - /** - * Are we forced to run a search - * - * @var int - * @access protected - */ - protected $_force; - - /** - * name of search button - * - * @var string - * @access protected - */ - protected $_searchButtonName; - - /** - * name of action button - * - * @var string - * @access protected - */ - protected $_actionButtonName; - - /** - * form values that we will be using - * - * @var array - * @access public - */ - public $_formValues; - /** * the params that are sent to the query * @@ -82,14 +50,6 @@ class CRM_Contribute_Form_Search extends CRM_Core_Form_Search { */ protected $_queryParams; - /** - * have we already done this search - * - * @access protected - * @var boolean - */ - protected $_done; - /** * are we restricting ourselves to a single contact * @@ -106,14 +66,6 @@ class CRM_Contribute_Form_Search extends CRM_Core_Form_Search { */ protected $_limit = NULL; - /** - * what context are we being invoked from - * - * @access protected - * @var string - */ - protected $_context = NULL; - protected $_defaults; /** diff --git a/CRM/Core/Form/Search.php b/CRM/Core/Form/Search.php index 1e9d14e966..7796d1212f 100644 --- a/CRM/Core/Form/Search.php +++ b/CRM/Core/Form/Search.php @@ -29,6 +29,54 @@ */ class CRM_Core_Form_Search extends CRM_Core_Form { + /** + * Are we forced to run a search + * + * @var int + * @access protected + */ + protected $_force; + + /** + * name of search button + * + * @var string + * @access protected + */ + protected $_searchButtonName; + + /** + * name of action button + * + * @var string + * @access protected + */ + protected $_actionButtonName; + + /** + * form values that we will be using + * + * @var array + * @access public + */ + public $_formValues; + + /** + * have we already done this search + * + * @access protected + * @var boolean + */ + protected $_done; + + /** + * what context are we being invoked from + * + * @access protected + * @var string + */ + protected $_context = NULL; + /** * Common buildform tasks required by all searches */ diff --git a/CRM/Event/Form/Search.php b/CRM/Event/Form/Search.php index aeaaad7a29..8ed56a7747 100644 --- a/CRM/Event/Form/Search.php +++ b/CRM/Event/Form/Search.php @@ -42,38 +42,6 @@ */ class CRM_Event_Form_Search extends CRM_Core_Form_Search { - /** - * Are we forced to run a search - * - * @var int - * @access protected - */ - protected $_force; - - /** - * name of search button - * - * @var string - * @access protected - */ - protected $_searchButtonName; - - /** - * name of action button - * - * @var string - * @access protected - */ - protected $_actionButtonName; - - /** - * form values that we will be using - * - * @var array - * @access protected - */ - protected $_formValues; - /** * the params that are sent to the query * @@ -82,14 +50,6 @@ class CRM_Event_Form_Search extends CRM_Core_Form_Search { */ protected $_queryParams; - /** - * have we already done this search - * - * @access protected - * @var boolean - */ - protected $_done; - /** * are we restricting ourselves to a single contact * @@ -106,14 +66,6 @@ class CRM_Event_Form_Search extends CRM_Core_Form_Search { */ protected $_limit = NULL; - /** - * what context are we being invoked from - * - * @access protected - * @var string - */ - protected $_context = NULL; - /** * prefix for the controller * diff --git a/CRM/Grant/Form/Search.php b/CRM/Grant/Form/Search.php index bda769908b..e81ad0cbf3 100644 --- a/CRM/Grant/Form/Search.php +++ b/CRM/Grant/Form/Search.php @@ -42,38 +42,6 @@ */ class CRM_Grant_Form_Search extends CRM_Core_Form_Search { - /** - * Are we forced to run a search - * - * @var int - * @access protected - */ - protected $_force; - - /** - * name of search button - * - * @var string - * @access protected - */ - protected $_searchButtonName; - - /** - * name of action button - * - * @var string - * @access protected - */ - protected $_actionButtonName; - - /** - * form values that we will be using - * - * @var array - * @access protected - */ - protected $_formValues; - /** * the params that are sent to the query * @@ -82,14 +50,6 @@ class CRM_Grant_Form_Search extends CRM_Core_Form_Search { */ protected $_queryParams; - /** - * have we already done this search - * - * @access protected - * @var boolean - */ - protected $_done; - /** * are we restricting ourselves to a single contact * @@ -106,14 +66,6 @@ class CRM_Grant_Form_Search extends CRM_Core_Form_Search { */ protected $_limit = NULL; - /** - * what context are we being invoked from - * - * @access protected - * @var string - */ - protected $_context = NULL; - /** * prefix for the controller * diff --git a/CRM/Member/Form/Search.php b/CRM/Member/Form/Search.php index 8ddb224036..0084cae0cd 100644 --- a/CRM/Member/Form/Search.php +++ b/CRM/Member/Form/Search.php @@ -42,38 +42,6 @@ */ class CRM_Member_Form_Search extends CRM_Core_Form_Search { - /** - * Are we forced to run a search - * - * @var int - * @access protected - */ - protected $_force; - - /** - * name of search button - * - * @var string - * @access protected - */ - protected $_searchButtonName; - - /** - * name of action button - * - * @var string - * @access protected - */ - protected $_actionButtonName; - - /** - * form values that we will be using - * - * @var array - * @access protected - */ - protected $_formValues; - /** * the params that are sent to the query * @@ -82,14 +50,6 @@ class CRM_Member_Form_Search extends CRM_Core_Form_Search { */ protected $_queryParams; - /** - * have we already done this search - * - * @access protected - * @var boolean - */ - protected $_done; - /** * are we restricting ourselves to a single contact * @@ -106,14 +66,6 @@ class CRM_Member_Form_Search extends CRM_Core_Form_Search { */ protected $_limit = NULL; - /** - * what context are we being invoked from - * - * @access protected - * @var string - */ - protected $_context = NULL; - protected $_defaults; /** diff --git a/CRM/Pledge/Form/Search.php b/CRM/Pledge/Form/Search.php index 4400064d47..d36dd279af 100644 --- a/CRM/Pledge/Form/Search.php +++ b/CRM/Pledge/Form/Search.php @@ -38,38 +38,6 @@ */ class CRM_Pledge_Form_Search extends CRM_Core_Form_Search { - /** - * Are we forced to run a search - * - * @var int - * @access protected - */ - protected $_force; - - /** - * name of search button - * - * @var string - * @access protected - */ - protected $_searchButtonName; - - /** - * name of action button - * - * @var string - * @access protected - */ - protected $_actionButtonName; - - /** - * form values that we will be using - * - * @var array - * @access protected - */ - protected $_formValues; - /** * the params that are sent to the query * @@ -78,14 +46,6 @@ class CRM_Pledge_Form_Search extends CRM_Core_Form_Search { */ protected $_queryParams; - /** - * have we already done this search - * - * @access protected - * @var boolean - */ - protected $_done; - /** * are we restricting ourselves to a single contact * @@ -102,14 +62,6 @@ class CRM_Pledge_Form_Search extends CRM_Core_Form_Search { */ protected $_limit = NULL; - /** - * what context are we being invoked from - * - * @access protected - * @var string - */ - protected $_context = NULL; - /** * prefix for the controller * -- 2.25.1