Merge pull request #5242 from colemanw/getstat

[civicrm-core.git] / CRM / Utils / OpenFlashChart.php

diff --git a/CRM/Utils/OpenFlashChart.php b/CRM/Utils/OpenFlashChart.php
index 7e7049237cc40799136ad79ea6d7ff7e6a33af06..63173bae52e50a2543f916a90a40acfd5b40c2d9 100644 (file)
--- a/CRM/Utils/OpenFlashChart.php
+++ b/CRM/Utils/OpenFlashChart.php
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -43,7 +43,6 @@ class CRM_Utils_OpenFlashChart {
   /**
    * Colours.
    * @var array
-   * @static
    */
   private static $_colours = array(
     "#C3CC38",
@@ -68,7 +67,6 @@ class CRM_Utils_OpenFlashChart {
    *
    * @return object
    *   $chart   object of open flash chart.
-   * @static
    */
   public static function &barChart(&$params) {
     $chart = NULL;
@@ -199,7 +197,6 @@ class CRM_Utils_OpenFlashChart {
    *
    * @return object
    *   $chart   object of open flash chart.
-   * @static
    */
   public static function &pieChart(&$params) {
     $chart = NULL;
@@ -264,7 +261,6 @@ class CRM_Utils_OpenFlashChart {
    *
    * @return object
    *   $chart   object of open flash chart.
-   * @static
    */
   public static function &bar_3dChart(&$params) {
     $chart = NULL;
@@ -456,13 +452,12 @@ class CRM_Utils_OpenFlashChart {
       foreach ($rows['multiValue'] as $key => $val) {
         $graph[$key] = array_combine($dateKeys, $rows['multiValue'][$key]);
       }
-      $chartData =
-        array(
-          'legend' => "$legend " . CRM_Utils_Array::value('legend', $rows, ts('Contribution')) . ' ' . ts('Summary'),
-          'values' => $graph[0],
-          'multiValues' => $graph,
-          'barKeys' => CRM_Utils_Array::value('barKeys', $rows, array()),
-        );
+      $chartData = array(
+        'legend' => "$legend " . CRM_Utils_Array::value('legend', $rows, ts('Contribution')) . ' ' . ts('Summary'),
+        'values' => $graph[0],
+        'multiValues' => $graph,
+        'barKeys' => CRM_Utils_Array::value('barKeys', $rows, array()),
+      );
     }
 
     // rotate the x labels.
@@ -479,7 +474,7 @@ class CRM_Utils_OpenFlashChart {
     foreach (array(
                'xSize',
                'ySize',
-               'divName'
+               'divName',
              ) as $f) {
       if (!empty($rows[$f])) {
         $chartData[$f] = $rows[$f];
@@ -519,7 +514,7 @@ class CRM_Utils_OpenFlashChart {
     foreach (array(
                'xSize',
                'ySize',
-               'divName'
+               'divName',
              ) as $f) {
       if (!empty($rows[$f])) {
         $chartData[$f] = $rows[$f];
@@ -573,4 +568,5 @@ class CRM_Utils_OpenFlashChart {
 
     return $openFlashChart;
   }
+
 }