CRM-15779 remove duplicate code block

[civicrm-core.git] / CRM / Contact / Page / DedupeRules.php

diff --git a/CRM/Contact/Page/DedupeRules.php b/CRM/Contact/Page/DedupeRules.php
index 4ea6369a924f33ba1f2cdd6390c24e3df48ef9c2..3359375c3aa1628d8272814756fc4730ff3f0ce1 100644 (file)
--- a/CRM/Contact/Page/DedupeRules.php
+++ b/CRM/Contact/Page/DedupeRules.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -47,7 +47,7 @@ class CRM_Contact_Page_DedupeRules extends CRM_Core_Page_Basic {
    *
    * @return string Classname of BAO.
    */
-  function getBAOName() {
+  public function getBAOName() {
     return 'CRM_Dedupe_BAO_RuleGroup';
   }
 
@@ -56,7 +56,7 @@ class CRM_Contact_Page_DedupeRules extends CRM_Core_Page_Basic {
    *
    * @return array (reference) of action links
    */
-  function &links() {
+  public function &links() {
     if (!(self::$_links)) {
       $deleteExtra = ts('Are you sure you want to delete this Rule?');
 
@@ -100,10 +100,9 @@ class CRM_Contact_Page_DedupeRules extends CRM_Core_Page_Basic {
    * method.
    *
    * @return void
-   * @access public
    *
    */
-  function run() {
+  public function run() {
     // get the requested action, default to 'browse'
     $action = CRM_Utils_Request::retrieve('action', 'String', $this, FALSE, 'browse');
 
@@ -139,15 +138,15 @@ class CRM_Contact_Page_DedupeRules extends CRM_Core_Page_Basic {
    * Browse all rule groups
    *
    * @return void
-   * @access public
    */
-  function browse() {
+  public function browse() {
     // get all rule groups
     $ruleGroups = array();
     $dao = new CRM_Dedupe_DAO_RuleGroup();
     $dao->orderBy('contact_type,used ASC');
     $dao->find();
 
+    $dedupeRuleTypes = CRM_Core_SelectValues::getDedupeRuleTypes();
     while ($dao->fetch()) {
       $ruleGroups[$dao->contact_type][$dao->id] = array();
       CRM_Core_DAO::storeValues($dao, $ruleGroups[$dao->contact_type][$dao->id]);
@@ -174,9 +173,9 @@ class CRM_Contact_Page_DedupeRules extends CRM_Core_Page_Basic {
         'DedupeRule',
         $dao->id
       );
-      CRM_Dedupe_DAO_RuleGroup::addDisplayEnums($ruleGroups[$dao->contact_type][$dao->id]);
-    }
 
+      $ruleGroups[$dao->contact_type][$dao->id]['used_display'] = $dedupeRuleTypes[$ruleGroups[$dao->contact_type][$dao->id]['used']];
+    }
     $this->assign('brows', $ruleGroups);
   }
 
@@ -185,7 +184,7 @@ class CRM_Contact_Page_DedupeRules extends CRM_Core_Page_Basic {
    *
    * @return string  classname of edit form
    */
-  function editForm() {
+  public function editForm() {
     return 'CRM_Contact_Form_DedupeRules';
   }
 
@@ -194,20 +193,25 @@ class CRM_Contact_Page_DedupeRules extends CRM_Core_Page_Basic {
    *
    * @return string  name of this page
    */
-  function editName() {
+  public function editName() {
     return 'DedupeRules';
   }
 
   /**
    * Get user context
    *
+   * @param null $mode
+   *
    * @return string  user context
    */
-  function userContext($mode = NULL) {
+  public function userContext($mode = NULL) {
     return 'civicrm/contact/deduperules';
   }
 
-  function delete($id) {
+  /**
+   * @param int $id
+   */
+  public function delete($id) {
     $ruleDao = new CRM_Dedupe_DAO_Rule();
     $ruleDao->dedupe_rule_group_id = $id;
     $ruleDao->delete();
@@ -217,4 +221,3 @@ class CRM_Contact_Page_DedupeRules extends CRM_Core_Page_Basic {
     $rgDao->delete();
   }
 }
-