Merge pull request #4979 from xurizaemon/codingstandards-12

[civicrm-core.git] / CRM / Admin / Form / Preferences / Address.php

diff --git a/CRM/Admin/Form/Preferences/Address.php b/CRM/Admin/Form/Preferences/Address.php
index 546e5dbb360523ae071d9c3e34081b3dff90c1e1..57be327a5967af2fce4063b56e41e05b6ec080a2 100644 (file)
--- a/CRM/Admin/Form/Preferences/Address.php
+++ b/CRM/Admin/Form/Preferences/Address.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -37,17 +37,17 @@
  * This class generates form components for Address Section
  */
 class CRM_Admin_Form_Preferences_Address extends CRM_Admin_Form_Preferences {
-  function preProcess() {
+  public function preProcess() {
 
     CRM_Utils_System::setTitle(ts('Settings - Addresses'));
 
     // Address Standardization
     $addrProviders = array(
-      '' => '- select -') + CRM_Core_SelectValues::addressProvider();
+      '' => '- select -',
+    ) + CRM_Core_SelectValues::addressProvider();
 
     $this->_varNames = array(
-      CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME =>
-      array(
+      CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME => array(
         'address_options' => array(
           'html_type' => 'checkboxes',
           'title' => ts('Address Fields'),
@@ -66,8 +66,7 @@ class CRM_Admin_Form_Preferences_Address extends CRM_Admin_Form_Preferences {
           'weight' => 3,
         ),
       ),
-      CRM_Core_BAO_Setting::ADDRESS_STANDARDIZATION_PREFERENCES_NAME =>
-      array(
+      CRM_Core_BAO_Setting::ADDRESS_STANDARDIZATION_PREFERENCES_NAME => array(
         'address_standardization_provider' => array(
           'html_type' => 'select',
           'title' => ts('Provider'),
@@ -95,13 +94,12 @@ class CRM_Admin_Form_Preferences_Address extends CRM_Admin_Form_Preferences {
   /**
    * @return array
    */
-  function setDefaultValues() {
+  public function setDefaultValues() {
     $defaults = array();
     $defaults['address_standardization_provider'] = $this->_config->address_standardization_provider;
     $defaults['address_standardization_userid'] = $this->_config->address_standardization_userid;
     $defaults['address_standardization_url'] = $this->_config->address_standardization_url;
 
-
     $this->addressSequence = isset($newSequence) ? $newSequence : "";
 
     if (empty($this->_config->address_format)) {
@@ -131,17 +129,15 @@ class CRM_Admin_Form_Preferences_Address extends CRM_Admin_Form_Preferences {
       $defaults['mailing_format'] = $this->_config->mailing_format;
     }
 
-
     parent::cbsDefaultValues($defaults);
 
     return $defaults;
   }
 
   /**
-   * Function to build the form
+   * Build the form object
    *
    * @return void
-   * @access public
    */
   public function buildQuickForm() {
     $this->applyFilter('__ALL__', 'trim');
@@ -160,7 +156,7 @@ class CRM_Admin_Form_Preferences_Address extends CRM_Admin_Form_Preferences {
    *
    * @return bool
    */
-  static function formRule($fields) {
+  public static function formRule($fields) {
     $p = $fields['address_standardization_provider'];
     $u = $fields['address_standardization_userid'];
     $w = $fields['address_standardization_url'];
@@ -183,9 +179,8 @@ class CRM_Admin_Form_Preferences_Address extends CRM_Admin_Form_Preferences {
   }
 
   /**
-   * Function to process the form
+   * Process the form submission
    *
-   * @access public
    *
    * @return void
    */
@@ -196,7 +191,6 @@ class CRM_Admin_Form_Preferences_Address extends CRM_Admin_Form_Preferences {
 
     $this->_params = $this->controller->exportValues($this->_name);
 
-
     // check if county option has been set
     $options = CRM_Core_OptionGroup::values('address_options', FALSE, FALSE, TRUE);
     foreach ($options as $key => $title) {
@@ -219,6 +213,4 @@ class CRM_Admin_Form_Preferences_Address extends CRM_Admin_Form_Preferences {
 
     $this->postProcessCommon();
   }
-  //end of function
 }
-