INFRA-132 - Batch 14 (g)

[civicrm-core.git] / api / v3 / ReportTemplate.php

diff --git a/api/v3/ReportTemplate.php b/api/v3/ReportTemplate.php
index a90112a97297a743273d3ba83859568de40a4b5e..17ecda8705bd3baad962987fb606a455b922c2d5 100644 (file)
--- a/api/v3/ReportTemplate.php
+++ b/api/v3/ReportTemplate.php
@@ -10,9 +10,9 @@
  * {@example OptionValueGet.php 0}
  * @example OptionValueGet.php
  *
- * @return  array details of found Option Values
+ * @return array
+ *   details of found Option Values
  * {@getfields OptionValue_get}
- * @access public
  */
 function civicrm_api3_report_template_get($params) {
   require_once 'api/v3/OptionValue.php';
@@ -31,9 +31,9 @@ function civicrm_api3_report_template_get($params) {
  *
  * @param array $params
  *
- * @return array of newly created option_value property values.
+ * @return array
+ *   Array of newly created option_value property values.
  * {@getfields OptionValue_create}
- * @access public
  */
 function civicrm_api3_report_template_create($params) {
   require_once 'api/v3/OptionValue.php';
@@ -72,9 +72,9 @@ function _civicrm_api3_report_template_create_spec(&$params) {
  *
  * {@example ReportTemplateDelete.php 0}
  *
- * @return array Api result
+ * @return array
+ *   Api result
  * {@getfields ReportTemplate_create}
- * @access public
  */
 function civicrm_api3_report_template_delete($params) {
   require_once 'api/v3/OptionValue.php';
@@ -87,8 +87,8 @@ function civicrm_api3_report_template_delete($params) {
  * @param array $params
  *   Input parameters.
  *
- * @return  array details of found instances
- * @access public
+ * @return array
+ *   details of found instances
  */
 function civicrm_api3_report_template_getrows($params) {
   civicrm_api3_verify_one_mandatory($params, NULL, array('report_id', 'instance_id'));
@@ -104,19 +104,19 @@ function civicrm_api3_report_template_getrows($params) {
  * @throws CiviCRM_API3_Exception
  */
 function _civicrm_api3_report_template_getrows($params) {
-  if(empty($params['report_id'])) {
+  if (empty($params['report_id'])) {
     $params['report_id'] = civicrm_api3('report_instance', 'getvalue', array('id' => $params['instance_id'], 'return' => 'report_id'));
   }
 
   $class = civicrm_api3('option_value', 'getvalue', array(
-    'option_group_id' => 'report_template',
+    'option_group_name' => 'report_template',
     'return' => 'name',
     'value' => $params['report_id'],
     )
   );
 
   $reportInstance = new $class();
-  if(!empty($params['instance_id'])) {
+  if (!empty($params['instance_id'])) {
     $reportInstance->setID($params['instance_id']);
   }
   $reportInstance->setParams($params);
@@ -124,7 +124,7 @@ function _civicrm_api3_report_template_getrows($params) {
   $reportInstance->preProcess();
   $reportInstance->setDefaultValues(FALSE);
   $reportInstance->setParams(array_merge($reportInstance->getDefaultValues(), $params));
-  $options = _civicrm_api3_get_options_from_params($params, TRUE,'report_template','get');
+  $options = _civicrm_api3_get_options_from_params($params, TRUE, 'report_template', 'get');
   $reportInstance->setLimitValue($options['limit']);
   $reportInstance->setOffsetValue($options['offset']);
   $reportInstance->beginPostProcessCommon();
@@ -132,12 +132,12 @@ function _civicrm_api3_report_template_getrows($params) {
   $rows = $metadata = $requiredMetadata  = array();
   $reportInstance->buildRows($sql, $rows);
   $requiredMetadata = array();
-  if(isset($params['options']) && !empty($params['options']['metadata'])) {
+  if (isset($params['options']) && !empty($params['options']['metadata'])) {
     $requiredMetadata = $params['options']['metadata'];
-    if(in_array('title', $requiredMetadata)) {
+    if (in_array('title', $requiredMetadata)) {
       $metadata['metadata']['title'] = $reportInstance->getTitle();
     }
-    if(in_array('labels', $requiredMetadata)) {
+    if (in_array('labels', $requiredMetadata)) {
       foreach ($reportInstance->_columnHeaders as $key => $header) {
         //would be better just to expect reports to provide titles but reports are not consistent so we anticipate empty
         //NB I think these are already translated
@@ -164,8 +164,8 @@ function civicrm_api3_report_template_getstatistics($params) {
  * @param array $params
  *   Input parameters.
  *
- * @return  array details of found instances
- * @access public
+ * @return array
+ *   details of found instances
  */
 function _civicrm_api3_report_template_getrows_spec(&$params) {
   $params['report_id'] = array(