X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FContact%2FForm%2FDomain.php;h=5978859faf604a9e0b7a302c937a0abdcc6b03fc;hb=def009f6ffde7d063873b76711c03c463548c479;hp=af7d6a2de0714a5296d4a61540b6a2e0490f9134;hpb=ab2e3179d57fbd8b60c0730ec38b6cb678100a28;p=civicrm-core.git

diff --git a/CRM/Contact/Form/Domain.php b/CRM/Contact/Form/Domain.php
index af7d6a2de0..5978859faf 100644
--- a/CRM/Contact/Form/Domain.php
+++ b/CRM/Contact/Form/Domain.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -72,9 +72,9 @@ class CRM_Contact_Form_Domain extends CRM_Core_Form {
    * @var int
    * @const
    */
-  CONST LOCATION_BLOCKS = 1;
+  const LOCATION_BLOCKS = 1;
 
-  function preProcess() {
+  public function preProcess() {
     CRM_Utils_System::setTitle(ts('Organization Address and Contact Info'));
     $breadCrumbPath = CRM_Utils_System::url('civicrm/admin', 'reset=1');
     CRM_Utils_System::appendBreadCrumb(ts('Administer CiviCRM'), $breadCrumbPath);
@@ -94,7 +94,6 @@ class CRM_Contact_Form_Domain extends CRM_Core_Form {
    * Set default values for the form.
    * the default values are retrieved from the database
    *
-   * @access public
    * @return void
    */
   /**
@@ -109,7 +108,7 @@ class CRM_Contact_Form_Domain extends CRM_Core_Form {
   /**
    * @return array
    */
-  function setDefaultValues() {
+  public function setDefaultValues() {
     $defaults  = array();
     $params    = array();
 
@@ -153,7 +152,6 @@ class CRM_Contact_Form_Domain extends CRM_Core_Form {
    * Build the form object
    *
    * @return void
-   * @access public
    */
   public function buildQuickForm() {
 
@@ -190,24 +188,23 @@ class CRM_Contact_Form_Domain extends CRM_Core_Form {
   /**
    * Add local and global form rules
    *
-   * @access protected
    *
    * @return void
    */
-  function addRules() {
+  public function addRules() {
     $this->addFormRule(array('CRM_Contact_Form_Domain', 'formRule'));
   }
 
   /**
    * Global validation rules for the form
    *
-   * @param array $fields posted values of the form
+   * @param array $fields
+   *   Posted values of the form.
    *
    * @return array list of errors to be posted back to the form
    * @static
-   * @access public
    */
-  static function formRule($fields) {
+  public static function formRule($fields) {
     // check for state/country mapping
     $errors = CRM_Contact_Form_Edit_Address::formRule($fields, CRM_Core_DAO::$_nullArray, CRM_Core_DAO::$_nullObject);
     // $errors === TRUE means no errors from above formRule excution,
@@ -237,7 +234,6 @@ class CRM_Contact_Form_Domain extends CRM_Core_Form {
    * Process the form when submitted
    *
    * @return void
-   * @access public
    */
   public function postProcess() {
     $params = $this->exportValues();
@@ -269,7 +265,7 @@ class CRM_Contact_Form_Domain extends CRM_Core_Form {
     }
 
     $params += array('contact_id' => $this->_contactId);
-    $contactParams = array (
+    $contactParams = array(
       'sort_name'    => $domain->name,
       'display_name' => $domain->name,
       'legal_name'   => $domain->name,
@@ -323,4 +319,3 @@ class CRM_Contact_Form_Domain extends CRM_Core_Form {
     $session->replaceUserContext(CRM_Utils_System::url('civicrm/admin', 'reset=1'));
   }
 }
-