Merge pull request #4528 from eileenmcnaughton/CRM-15555

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

diff --git a/CRM/Campaign/Page/DashBoard.php b/CRM/Campaign/Page/DashBoard.php
index a30603468bec67915dad61293b462cc94cf018fc..d60a7a77902f32f3522bb688aefdf579d91ba5d7 100644 (file)
--- a/CRM/Campaign/Page/DashBoard.php
+++ b/CRM/Campaign/Page/DashBoard.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.5                                                |
  --------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -86,6 +86,9 @@ class CRM_Campaign_Page_DashBoard extends CRM_Core_Page {
     return self::$_campaignActionLinks;
   }
 
+  /**
+   * @return array
+   */
   function &surveyActionLinks() {
     // check if variable _actionsLinks is populated
     if (!isset(self::$_surveyActionLinks)) {
@@ -118,6 +121,9 @@ class CRM_Campaign_Page_DashBoard extends CRM_Core_Page {
     return self::$_surveyActionLinks;
   }
 
+  /**
+   * @return array
+   */
   function &petitionActionLinks() {
     if (!isset(self::$_petitionActionLinks)) {
       self::$_petitionActionLinks = self::surveyActionLinks();
@@ -163,6 +169,9 @@ class CRM_Campaign_Page_DashBoard extends CRM_Core_Page {
     return self::$_petitionActionLinks;
   }
 
+  /**
+   * @return mixed
+   */
   function browseCampaign() {
     // ensure valid javascript (these must have a value set)
     $this->assign('searchParams', json_encode(NULL));
@@ -186,6 +195,11 @@ class CRM_Campaign_Page_DashBoard extends CRM_Core_Page {
     return $controller->run();
   }
 
+  /**
+   * @param array $params
+   *
+   * @return array
+   */
   public static function getCampaignSummary($params = array(
     )) {
     $campaignsData = array();
@@ -223,12 +237,12 @@ class CRM_Campaign_Page_DashBoard extends CRM_Core_Page {
         }
         $campaignsData[$cmpid]['isActive'] = $isActive;
 
-        if (CRM_Utils_Array::value('start_date', $campaignsData[$cmpid])) {
+        if (!empty($campaignsData[$cmpid]['start_date'])) {
           $campaignsData[$cmpid]['start_date'] = CRM_Utils_Date::customFormat($campaignsData[$cmpid]['start_date'],
             $config->dateformatFull
           );
         }
-        if (CRM_Utils_Array::value('end_date', $campaignsData[$cmpid])) {
+        if (!empty($campaignsData[$cmpid]['end_date'])) {
           $campaignsData[$cmpid]['end_date'] = CRM_Utils_Date::customFormat($campaignsData[$cmpid]['end_date'],
             $config->dateformatFull
           );
@@ -248,6 +262,9 @@ class CRM_Campaign_Page_DashBoard extends CRM_Core_Page {
     return $campaignsData;
   }
 
+  /**
+   * @return mixed
+   */
   function browseSurvey() {
     // ensure valid javascript - this must have a value set
     $this->assign('searchParams', json_encode(NULL));
@@ -272,6 +289,11 @@ class CRM_Campaign_Page_DashBoard extends CRM_Core_Page {
     return $controller->run();
   }
 
+  /**
+   * @param array $params
+   *
+   * @return array
+   */
   function getSurveySummary($params = array(
     )) {
     $surveysData = array();
@@ -287,7 +309,7 @@ class CRM_Campaign_Page_DashBoard extends CRM_Core_Page {
         $campaignId = CRM_Utils_Array::value('campaign_id', $survey);
         $surveysData[$sid]['campaign'] = CRM_Utils_Array::value($campaignId, $campaigns);
         $surveysData[$sid]['activity_type'] = $surveyType[$survey['activity_type_id']];
-        if (CRM_Utils_Array::value('release_frequency', $survey)) {
+        if (!empty($survey['release_frequency'])) {
           $surveysData[$sid]['release_frequency'] = $survey['release_frequency'] . ' Day(s)';
         }
 
@@ -368,6 +390,11 @@ class CRM_Campaign_Page_DashBoard extends CRM_Core_Page {
     return $controller->run();
   }
 
+  /**
+   * @param array $params
+   *
+   * @return array
+   */
   function getPetitionSummary($params = array(
     )) {
     $config = CRM_Core_Config::singleton();
@@ -440,12 +467,15 @@ class CRM_Campaign_Page_DashBoard extends CRM_Core_Page {
       $this->buildTabs();
     }
     CRM_Core_Resources::singleton()
-      ->addScriptFile('civicrm', 'templates/CRM/common/TabHeader.js')
+      ->addScriptFile('civicrm', 'templates/CRM/common/TabHeader.js', 1, 'html-header')
       ->addSetting(array('tabSettings' => array(
         'active' => strtolower(CRM_Utils_Array::value('subPage', $_GET, 'campaign')),
       )));
   }
 
+  /**
+   * @return string
+   */
   function run() {
     if (!CRM_Campaign_BAO_Campaign::accessCampaign()) {
       CRM_Utils_System::permissionDenied();