X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FUtils%2FAddress%2FBatchUpdate.php;h=4e3f24f7bb8ea23c412fffb6e9481683b41bc1dc;hb=9f7b401dfb7fa7cd52ecd4d8bcab3d7b1422ebd2;hp=a047bcd76fd7a5da93ffa239238ceb7925ec7e40;hpb=55039e98512c204e7919bd586b9e99ab176e51ea;p=civicrm-core.git

diff --git a/CRM/Utils/Address/BatchUpdate.php b/CRM/Utils/Address/BatchUpdate.php
index a047bcd76f..4e3f24f7bb 100644
--- a/CRM/Utils/Address/BatchUpdate.php
+++ b/CRM/Utils/Address/BatchUpdate.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * A PHP cron script to format all the addresses in the database. Currently
@@ -122,7 +122,7 @@ class CRM_Utils_Address_BatchUpdate {
    * @return array
    * @throws Exception
    */
-  function processContacts(&$config, $processGeocode, $parseStreetAddress) {
+  public function processContacts(&$config, $processGeocode, $parseStreetAddress) {
     // build where clause.
     $clause = array('( c.id = a.contact_id )');
     $params = array();
@@ -164,10 +164,9 @@ class CRM_Utils_Address_BatchUpdate {
 
     $dao = CRM_Core_DAO::executeQuery($query, $params);
     if ($processGeocode) {
-      require_once (str_replace('_', DIRECTORY_SEPARATOR, $config->geocodeMethod) . '.php');
+      require_once str_replace('_', DIRECTORY_SEPARATOR, $config->geocodeMethod) . '.php';
     }
 
-
     $unparseableContactAddress = array();
     while ($dao->fetch()) {
       $totalAddresses++;
@@ -194,7 +193,7 @@ class CRM_Utils_Address_BatchUpdate {
           }
 
           $className = $config->geocodeMethod;
-          $className::format( $params, true );
+          $className::format($params, TRUE);
 
           // see if we got a geocode error, in this case we'll trigger a fatal
           // CRM-13760
@@ -257,14 +256,17 @@ class CRM_Utils_Address_BatchUpdate {
     }
 
     $this->returnMessages[] = ts("Addresses Evaluated: %1", array(
-      1 => $totalAddresses)) . "\n";
+      1 => $totalAddresses,
+      )) . "\n";
     if ($processGeocode) {
       $this->returnMessages[] = ts("Addresses Geocoded: %1", array(
-        1 => $totalGeocoded)) . "\n";
+          1 => $totalGeocoded,
+        )) . "\n";
     }
     if ($parseStreetAddress) {
       $this->returnMessages[] = ts("Street Addresses Parsed: %1", array(
-        1 => $totalAddressParsed)) . "\n";
+          1 => $totalAddressParsed,
+        )) . "\n";
       if ($unparseableContactAddress) {
         $this->returnMessages[] = "<br />\n" . ts("Following is the list of contacts whose address is not parsed:") . "<br />\n";
         foreach ($unparseableContactAddress as $contactLink) {
@@ -279,11 +281,11 @@ class CRM_Utils_Address_BatchUpdate {
   /**
    * @return array
    */
-  function returnResult() {
-    $result             = array();
+  public function returnResult() {
+    $result = array();
     $result['is_error'] = $this->returnError;
     $result['messages'] = implode("", $this->returnMessages);
     return $result;
   }
-}
 
+}