From e364fc74d359c307686346b2f38f46954316384a Mon Sep 17 00:00:00 2001 From: Manoj K Date: Mon, 13 Oct 2014 16:13:32 +0530 Subject: [PATCH] #29759 - Fix for namespace and class name issue. --- CRM/Wci/BAO/ProgressBar.php | 18 +++++++++--------- CRM/Wci/BAO/ProgressBarFormula.php | 12 ++++++------ CRM/Wci/BAO/Widget.php | 12 ++++++------ CRM/Wci/DAO/ProgressBar.php | 4 +--- CRM/Wci/DAO/ProgressBarFormula.php | 4 +--- CRM/Wci/DAO/Widget.php | 4 +--- CRM/Wci/Form/CreateWidget.php | 4 ++-- CRM/Wci/Form/ProgressBar.php | 4 ++-- CRM/Wci/Page/ProgressBarList.php | 2 +- CRM/Wci/Page/WidgetList.php | 2 +- 10 files changed, 30 insertions(+), 36 deletions(-) diff --git a/CRM/Wci/BAO/ProgressBar.php b/CRM/Wci/BAO/ProgressBar.php index 42760e2..ff1a677 100644 --- a/CRM/Wci/BAO/ProgressBar.php +++ b/CRM/Wci/BAO/ProgressBar.php @@ -33,7 +33,7 @@ */ require_once 'CRM/Wci/DAO/ProgressBar.php'; -class CRM_WCI_BAO_ProgressBar extends CRM_WCI_DAO_ProgressBar { +class CRM_Wci_BAO_ProgressBar extends CRM_Wci_DAO_ProgressBar { /** * class constructor @@ -50,7 +50,7 @@ class CRM_WCI_BAO_ProgressBar extends CRM_WCI_DAO_ProgressBar { * * @param array $params (reference ) an assoc array of name/value pairs * - * @return object CRM_WCI_BAO_ProgressBar object + * @return object CRM_Wci_BAO_ProgressBar object * @access public * @static */ @@ -61,7 +61,7 @@ class CRM_WCI_BAO_ProgressBar extends CRM_WCI_DAO_ProgressBar { CRM_Core_Error::fatal('Not enough data to create a progress bar.'); } - $progress_bar = new CRM_WCI_BAO_ProgressBar(); + $progress_bar = new CRM_Wci_BAO_ProgressBar(); $progress_bar->copyValues($params); $progress_bar->save(); @@ -74,12 +74,12 @@ class CRM_WCI_BAO_ProgressBar extends CRM_WCI_DAO_ProgressBar { * names of civicrm_wci_widget. * * @param array $params - * @return array of CRM_WCI_BAO_ProgressBar objects + * @return array of CRM_Wci_BAO_ProgressBar objects */ static function retrieve(array $params) { $result = array(); - $progress_bar = new CRM_WCI_BAO_ProgressBar(); + $progress_bar = new CRM_Wci_BAO_ProgressBar(); $progress_bar->copyValues($params); $progress_bar->find(); @@ -96,7 +96,7 @@ class CRM_WCI_BAO_ProgressBar extends CRM_WCI_DAO_ProgressBar { * Wrapper method for retrieve * * @param mixed $id Int or int-like string representing widget ID - * @return CRM_WCI_BAO_ProgressBar + * @return CRM_Wci_BAO_ProgressBar */ static function retrieveByID($id) { if (!is_int($id) && !ctype_digit($id)) { @@ -139,7 +139,7 @@ class CRM_WCI_BAO_ProgressBar extends CRM_WCI_DAO_ProgressBar { $params = array(); $pbList = array(); - $dao = CRM_Core_DAO::executeQuery($query, $params, TRUE, 'CRM_WCI_DAO_ProgressBar'); + $dao = CRM_Core_DAO::executeQuery($query, $params, TRUE, 'CRM_Wci_DAO_ProgressBar'); while ($dao->fetch()) { $pbList[$dao->id] = array(); @@ -161,7 +161,7 @@ class CRM_WCI_BAO_ProgressBar extends CRM_WCI_DAO_ProgressBar { $bp = 0; $query = "SELECT * FROM civicrm_wci_progress_bar where id=" . $idPB; $params = array(); - $dao = CRM_Core_DAO::executeQuery($query, $params, TRUE, 'CRM_WCI_DAO_ProgressBar'); + $dao = CRM_Core_DAO::executeQuery($query, $params, TRUE, 'CRM_Wci_DAO_ProgressBar'); while ($dao->fetch()) { $con_page[$dao->id] = array(); @@ -174,7 +174,7 @@ class CRM_WCI_BAO_ProgressBar extends CRM_WCI_DAO_ProgressBar { $query = "SELECT * FROM civicrm_wci_progress_bar_formula WHERE progress_bar_id =" . $idPB; $params = array(); - $daoPbf = CRM_Core_DAO::executeQuery($query, $params, TRUE, 'CRM_WCI_DAO_ProgressBarFormula'); + $daoPbf = CRM_Core_DAO::executeQuery($query, $params, TRUE, 'CRM_Wci_DAO_ProgressBarFormula'); while ($daoPbf->fetch()) { $for_page[$daoPbf->id] = array(); CRM_Core_DAO::storeValues($daoPbf, $for_page[$daoPbf->id]); diff --git a/CRM/Wci/BAO/ProgressBarFormula.php b/CRM/Wci/BAO/ProgressBarFormula.php index 547d95a..d45c69a 100644 --- a/CRM/Wci/BAO/ProgressBarFormula.php +++ b/CRM/Wci/BAO/ProgressBarFormula.php @@ -32,7 +32,7 @@ * */ -class CRM_WCI_BAO_ProgressBarFormula extends CRM_WCI_DAO_ProgressBarFormula { +class CRM_Wci_BAO_ProgressBarFormula extends CRM_Wci_DAO_ProgressBarFormula { /** * class constructor @@ -49,7 +49,7 @@ class CRM_WCI_BAO_ProgressBarFormula extends CRM_WCI_DAO_ProgressBarFormula { * * @param array $params (reference ) an assoc array of name/value pairs * - * @return object CRM_WCI_BAO_ProgressBarFormula object + * @return object CRM_Wci_BAO_ProgressBarFormula object * @access public * @static */ @@ -60,7 +60,7 @@ class CRM_WCI_BAO_ProgressBarFormula extends CRM_WCI_DAO_ProgressBarFormula { CRM_Core_Error::fatal('Not enough data to create a progress bar formula entry.'); } - $progress_bar_formula = new CRM_WCI_BAO_ProgressBarFormula(); + $progress_bar_formula = new CRM_Wci_BAO_ProgressBarFormula(); $progress_bar_formula->copyValues($params); $progress_bar_formula->save(); @@ -73,12 +73,12 @@ class CRM_WCI_BAO_ProgressBarFormula extends CRM_WCI_DAO_ProgressBarFormula { * names of civicrm_wci_widget. * * @param array $params - * @return array of CRM_WCI_BAO_ProgressBarFormula objects + * @return array of CRM_Wci_BAO_ProgressBarFormula objects */ static function retrieve(array $params) { $result = array(); - $progress_bar_formula = new CRM_WCI_BAO_ProgressBarFormula(); + $progress_bar_formula = new CRM_Wci_BAO_ProgressBarFormula(); $progress_bar_formula->copyValues($params); $progress_bar_formula->find(); @@ -95,7 +95,7 @@ class CRM_WCI_BAO_ProgressBarFormula extends CRM_WCI_DAO_ProgressBarFormula { * Wrapper method for retrieve * * @param mixed $id Int or int-like string representing widget ID - * @return CRM_WCI_BAO_ProgressBarFormula + * @return CRM_Wci_BAO_ProgressBarFormula */ static function retrieveByID($id) { if (!is_int($id) && !ctype_digit($id)) { diff --git a/CRM/Wci/BAO/Widget.php b/CRM/Wci/BAO/Widget.php index f6cca9c..782686a 100644 --- a/CRM/Wci/BAO/Widget.php +++ b/CRM/Wci/BAO/Widget.php @@ -32,7 +32,7 @@ * */ -class CRM_WCI_BAO_Widget extends CRM_WCI_DAO_Widget { +class CRM_Wci_BAO_Widget extends CRM_Wci_DAO_Widget { /** * class constructor @@ -49,7 +49,7 @@ class CRM_WCI_BAO_Widget extends CRM_WCI_DAO_Widget { * * @param array $params (reference ) an assoc array of name/value pairs * - * @return object CRM_WCI_BAO_Widget object + * @return object CRM_Wci_BAO_Widget object * @access public * @static */ @@ -60,7 +60,7 @@ class CRM_WCI_BAO_Widget extends CRM_WCI_DAO_Widget { CRM_Core_Error::fatal('Not enough data to create a widget.'); } - $widget = new CRM_WCI_BAO_Widget(); + $widget = new CRM_Wci_BAO_Widget(); $widget->copyValues($params); $widget->save(); @@ -73,12 +73,12 @@ class CRM_WCI_BAO_Widget extends CRM_WCI_DAO_Widget { * names of civicrm_wci_widget. * * @param array $params - * @return array of CRM_WCI_BAO_Widget objects + * @return array of CRM_Wci_BAO_Widget objects */ static function retrieve(array $params) { $result = array(); - $widget = new CRM_WCI_BAO_Widget(); + $widget = new CRM_Wci_BAO_Widget(); $widget->copyValues($params); $widget->find(); @@ -95,7 +95,7 @@ class CRM_WCI_BAO_Widget extends CRM_WCI_DAO_Widget { * Wrapper method for retrieve * * @param mixed $id Int or int-like string representing widget ID - * @return CRM_WCI_BAO_Widget + * @return CRM_Wci_BAO_Widget */ static function retrieveByID($id) { if (!is_int($id) && !ctype_digit($id)) { diff --git a/CRM/Wci/DAO/ProgressBar.php b/CRM/Wci/DAO/ProgressBar.php index cf0d401..480b6a0 100644 --- a/CRM/Wci/DAO/ProgressBar.php +++ b/CRM/Wci/DAO/ProgressBar.php @@ -29,9 +29,7 @@ * @package CRM * @copyright CiviCRM LLC (c) 2004-2013 */ -require_once 'CRM/Core/DAO.php'; -require_once 'CRM/Utils/Type.php'; -class CRM_WCI_DAO_ProgressBar extends CRM_Core_DAO +class CRM_Wci_DAO_ProgressBar extends CRM_Core_DAO { /** * static instance to hold the table name diff --git a/CRM/Wci/DAO/ProgressBarFormula.php b/CRM/Wci/DAO/ProgressBarFormula.php index 31298e4..a0a87c0 100644 --- a/CRM/Wci/DAO/ProgressBarFormula.php +++ b/CRM/Wci/DAO/ProgressBarFormula.php @@ -29,9 +29,7 @@ * @package CRM * @copyright CiviCRM LLC (c) 2004-2013 */ -require_once 'CRM/Core/DAO.php'; -require_once 'CRM/Utils/Type.php'; -class CRM_WCI_DAO_ProgressBarFormula extends CRM_Core_DAO +class CRM_Wci_DAO_ProgressBarFormula extends CRM_Core_DAO { /** * static instance to hold the table name diff --git a/CRM/Wci/DAO/Widget.php b/CRM/Wci/DAO/Widget.php index 2cb0aad..f062e23 100644 --- a/CRM/Wci/DAO/Widget.php +++ b/CRM/Wci/DAO/Widget.php @@ -29,9 +29,7 @@ * @package CRM * @copyright CiviCRM LLC (c) 2004-2013 */ -require_once 'CRM/Core/DAO.php'; -require_once 'CRM/Utils/Type.php'; -class CRM_WCI_DAO_Widget extends CRM_Core_DAO +class CRM_Wci_DAO_Widget extends CRM_Core_DAO { /** * static instance to hold the table name diff --git a/CRM/Wci/Form/CreateWidget.php b/CRM/Wci/Form/CreateWidget.php index 50743b7..a87d940 100644 --- a/CRM/Wci/Form/CreateWidget.php +++ b/CRM/Wci/Form/CreateWidget.php @@ -143,7 +143,7 @@ class CRM_Wci_Form_CreateWidget extends CRM_Core_Form { where w.id=" . $this->_id; $params = array(); - $dao = CRM_Core_DAO::executeQuery($query, $params, TRUE, 'CRM_WCI_DAO_Widget'); + $dao = CRM_Core_DAO::executeQuery($query, $params, TRUE, 'CRM_Wci_DAO_Widget'); while ($dao->fetch()) { $wid_page[$dao->id] = array(); @@ -279,7 +279,7 @@ where w.id=" . $this->_id; $options = array( '' => ts('- select -'), ); - $pbList = CRM_WCI_BAO_ProgressBar::getProgressbarList(); + $pbList = CRM_Wci_BAO_ProgressBar::getProgressbarList(); foreach ($pbList as $pb) { $options[$pb['id']] = $pb['name']; } diff --git a/CRM/Wci/Form/ProgressBar.php b/CRM/Wci/Form/ProgressBar.php index 4b47371..012d6f5 100644 --- a/CRM/Wci/Form/ProgressBar.php +++ b/CRM/Wci/Form/ProgressBar.php @@ -24,7 +24,7 @@ class CRM_Wci_Form_ProgressBar extends CRM_Core_Form { $query = "SELECT * FROM civicrm_wci_progress_bar where id=" . $this->_id; $params = array(); - $dao = CRM_Core_DAO::executeQuery($query, $params, TRUE, 'CRM_WCI_DAO_ProgressBar'); + $dao = CRM_Core_DAO::executeQuery($query, $params, TRUE, 'CRM_Wci_DAO_ProgressBar'); while ($dao->fetch()) { $con_page[$dao->id] = array(); @@ -40,7 +40,7 @@ class CRM_Wci_Form_ProgressBar extends CRM_Core_Form { $query = "SELECT * FROM civicrm_wci_progress_bar_formula WHERE progress_bar_id =" . $this->_id; $params = array(); - $dao = CRM_Core_DAO::executeQuery($query, $params, TRUE, 'CRM_WCI_DAO_ProgressBarFormula'); + $dao = CRM_Core_DAO::executeQuery($query, $params, TRUE, 'CRM_Wci_DAO_ProgressBarFormula'); while ($dao->fetch()) { $for_page[$dao->id] = array(); diff --git a/CRM/Wci/Page/ProgressBarList.php b/CRM/Wci/Page/ProgressBarList.php index 3b2454d..acc2de1 100644 --- a/CRM/Wci/Page/ProgressBarList.php +++ b/CRM/Wci/Page/ProgressBarList.php @@ -48,7 +48,7 @@ class CRM_Wci_Page_ProgressBarList extends CRM_Core_Page { $query = "SELECT * FROM civicrm_wci_progress_bar"; $params = array(); - $dao = CRM_Core_DAO::executeQuery($query, $params, TRUE, 'CRM_WCI_DAO_ProgressBar'); + $dao = CRM_Core_DAO::executeQuery($query, $params, TRUE, 'CRM_Wci_DAO_ProgressBar'); while ($dao->fetch()) { $con_page[$dao->id] = array(); diff --git a/CRM/Wci/Page/WidgetList.php b/CRM/Wci/Page/WidgetList.php index 2a9d8af..a6e5811 100644 --- a/CRM/Wci/Page/WidgetList.php +++ b/CRM/Wci/Page/WidgetList.php @@ -45,7 +45,7 @@ class CRM_Wci_Page_WidgetList extends CRM_Core_Page { $query = "SELECT * FROM civicrm_wci_widget"; $params = array(); - $dao = CRM_Core_DAO::executeQuery($query, $params, TRUE, 'CRM_WCI_DAO_Widget'); + $dao = CRM_Core_DAO::executeQuery($query, $params, TRUE, 'CRM_Wci_DAO_Widget'); while ($dao->fetch()) { $wid_page[$dao->id] = array(); -- 2.25.1