Merge pull request #9616 from ErichBSchulz/feature/drupal_boot_no_exit

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

diff --git a/CRM/Admin/Form/CMSUser.php b/CRM/Admin/Form/CMSUser.php
index 03dd5e866b47f52ce73beb70dbeb22db50800dc4..ee79cc7742164387430cc93123fdf36ef74bde1d 100644 (file)
--- a/CRM/Admin/Form/CMSUser.php
+++ b/CRM/Admin/Form/CMSUser.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015                                |
+ | Copyright CiviCRM LLC (c) 2004-2017                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2017
  */
 
 /**
@@ -59,7 +59,31 @@ class CRM_Admin_Form_CMSUser extends CRM_Core_Form {
    * Process the form submission.
    */
   public function postProcess() {
-    CRM_Core_BAO_CMSUser::synchronize();
+    $result = CRM_Utils_System::synchronizeUsers();
+
+    $status = ts('Checked one user record.',
+        array(
+          'count' => $result['contactCount'],
+          'plural' => 'Checked %count user records.',
+        )
+      );
+    if ($result['contactMatching']) {
+      $status .= '<br />' . ts('Found one matching contact record.',
+          array(
+            'count' => $result['contactMatching'],
+            'plural' => 'Found %count matching contact records.',
+          )
+        );
+    }
+
+    $status .= '<br />' . ts('Created one new contact record.',
+        array(
+          'count' => $result['contactCreated'],
+          'plural' => 'Created %count new contact records.',
+        )
+      );
+    CRM_Core_Session::setStatus($status, ts('Synchronize Complete'), 'success');
+    CRM_Core_Session::singleton()->pushUserContext(CRM_Utils_System::url('civicrm/admin', 'reset=1'));
   }
 
 }