comment fixes

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

diff --git a/CRM/Contact/Page/DashBoard.php b/CRM/Contact/Page/DashBoard.php
index ad108bc0b2533ac675a74c1b0e39e7221a866580..ed97dbc589d6d7a9d5f9ac15069bcfa3565792a7 100644 (file)
--- a/CRM/Contact/Page/DashBoard.php
+++ b/CRM/Contact/Page/DashBoard.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.6                                                |
+ | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2015
  * $Id$
  *
  */
@@ -50,8 +50,6 @@ class CRM_Contact_Page_DashBoard extends CRM_Core_Page {
     $resources->addScriptFile('civicrm', 'js/jquery/jquery.dashboard.js', 0, 'html-header', FALSE);
     $resources->addStyleFile('civicrm', 'css/dashboard.css');
 
-    $config = CRM_Core_Config::singleton();
-
     $resetCache = CRM_Utils_Request::retrieve('resetCache', 'Positive', CRM_Core_DAO::$_nullObject);
 
     CRM_Utils_System::setTitle(ts('CiviCRM Home'));
@@ -71,50 +69,6 @@ class CRM_Contact_Page_DashBoard extends CRM_Core_Page {
       $this->assign('hookContentPlacement', $contentPlacement);
     }
 
-    //check that default FROM email address, owner (domain) organization name and default mailbox are configured.
-    $fromEmailOK = TRUE;
-    $ownerOrgOK = TRUE;
-    $defaultMailboxOK = TRUE;
-
-    // Don't put up notices if user doesn't have administer CiviCRM permission
-    if (CRM_Core_Permission::check('administer CiviCRM')) {
-      $destination = CRM_Utils_System::url(
-        'civicrm/dashboard',
-        'reset=1',
-        FALSE, NULL, FALSE
-      );
-
-      $destination = urlencode($destination);
-
-      list($domainEmailName, $domainEmailAddress) = CRM_Core_BAO_Domain::getNameAndEmail(TRUE);
-
-      if (!$domainEmailAddress || $domainEmailAddress == 'info@EXAMPLE.ORG') {
-        $fixEmailUrl = CRM_Utils_System::url("civicrm/admin/domain", "action=update&reset=1&civicrmDestination={$destination}");
-        $this->assign('fixEmailUrl', $fixEmailUrl);
-        $fromEmailOK = FALSE;
-      }
-
-      $domain = CRM_Core_BAO_Domain::getDomain();
-      $domainName = $domain->name;
-      if (!$domainName || $domainName == 'Default Domain Name') {
-        $fixOrgUrl = CRM_Utils_System::url("civicrm/admin/domain", "action=update&reset=1&civicrmDestination={$destination}");
-        $this->assign('fixOrgUrl', $fixOrgUrl);
-        $ownerOrgOK = FALSE;
-      }
-
-      if (in_array('CiviMail', $config->enableComponents) &&
-        CRM_Core_BAO_MailSettings::defaultDomain() == "EXAMPLE.ORG"
-      ) {
-        $fixDefaultMailbox = CRM_Utils_System::url('civicrm/admin/mailSettings', "reset=1&civicrmDestination={$destination}");
-        $this->assign('fixDefaultMailbox', $fixDefaultMailbox);
-        $defaultMailboxOK = FALSE;
-      }
-    }
-
-    $this->assign('fromEmailOK', $fromEmailOK);
-    $this->assign('ownerOrgOK', $ownerOrgOK);
-    $this->assign('defaultMailboxOK', $defaultMailboxOK);
-
     $communityMessages = CRM_Core_CommunityMessages::create();
     if ($communityMessages->isEnabled()) {
       $message = $communityMessages->pick();