X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=CRM%2FReport%2FUtils%2FReport.php;h=93cdac329a993f1c9447cf44d64490d9db677ad5;hb=4de9f9328a1b4a7daf9802bdb6a6d9989b554fe8;hp=5cbf13d54f6e4ff1f7f0eea2e24459dabb79ea6a;hpb=22e263ad985b62de5cf7bdaf09555bfb3f0cd322;p=civicrm-core.git diff --git a/CRM/Report/Utils/Report.php b/CRM/Report/Utils/Report.php index 5cbf13d54f..93cdac329a 100644 --- a/CRM/Report/Utils/Report.php +++ b/CRM/Report/Utils/Report.php @@ -162,7 +162,8 @@ WHERE TRIM(BOTH '/' FROM CONCAT(report_id, '/', name)) = %1"; * @return int|null|string */ public static function getInstanceCount($optionVal) { - if (empty($optionVal)) { return 0; + if (empty($optionVal)) { + return 0; } $sql = " @@ -190,7 +191,7 @@ WHERE inst.report_id = %1"; list($domainEmailName, $domainEmailAddress - ) = CRM_Core_BAO_Domain::getNameAndEmail(); + ) = CRM_Core_BAO_Domain::getNameAndEmail(); $params = array('id' => $instanceID); $instanceInfo = array(); @@ -199,13 +200,13 @@ WHERE inst.report_id = %1"; $instanceInfo ); - $params = array(); + $params = array(); $params['groupName'] = 'Report Email Sender'; - $params['from'] = '"' . $domainEmailName . '" <' . $domainEmailAddress . '>'; + $params['from'] = '"' . $domainEmailName . '" <' . $domainEmailAddress . '>'; //$domainEmailName; - $params['toName'] = ""; + $params['toName'] = ""; $params['toEmail'] = CRM_Utils_Array::value('email_to', $instanceInfo); - $params['cc'] = CRM_Utils_Array::value('email_cc', $instanceInfo); + $params['cc'] = CRM_Utils_Array::value('email_cc', $instanceInfo); $params['subject'] = CRM_Utils_Array::value('email_subject', $instanceInfo); if (empty($instanceInfo['attachments'])) { $instanceInfo['attachments'] = array(); @@ -251,8 +252,8 @@ WHERE inst.report_id = %1"; } // Add the headers. $csv .= implode($config->fieldSeparator, - $headers - ) . "\r\n"; + $headers + ) . "\r\n"; $displayRows = array(); $value = NULL; @@ -287,8 +288,8 @@ WHERE inst.report_id = %1"; } // Add the data row. $csv .= implode($config->fieldSeparator, - $displayRows - ) . "\r\n"; + $displayRows + ) . "\r\n"; } return $csv; @@ -346,8 +347,8 @@ WHERE inst.report_id = %1"; if (!empty($instanceValues['permission']) && (!(CRM_Core_Permission::check($instanceValues['permission']) || - CRM_Core_Permission::check('administer Reports') - )) + CRM_Core_Permission::check('administer Reports') + )) ) { return FALSE; } @@ -362,7 +363,8 @@ WHERE inst.report_id = %1"; * * @param int $instanceId * - * @return boolean true if yes, else false + * @return boolean + * true if yes, else false * @static */ public static function isInstanceGroupRoleAllowed($instanceId) { @@ -410,8 +412,8 @@ WHERE inst.report_id = %1"; $messages = array("Report Mail Triggered..."); $templateInfo = CRM_Core_OptionGroup::getRowValues('report_template', $optionVal, 'value'); - $obj = new CRM_Report_Page_Instance(); - $is_error = 0; + $obj = new CRM_Report_Page_Instance(); + $is_error = 0; if (strstr(CRM_Utils_Array::value('name', $templateInfo), '_Form')) { $instanceInfo = array(); CRM_Report_BAO_ReportInstance::retrieve(array('id' => $instanceId), $instanceInfo); @@ -433,7 +435,7 @@ WHERE inst.report_id = %1"; 'default' => 'null', ), ), - 'ignoreKey' => TRUE + 'ignoreKey' => TRUE, ); $messages[] = $wrapper->run($templateInfo['name'], NULL, $arguments); } @@ -464,7 +466,8 @@ WHERE inst.report_id = %1"; * @param array $params * All effective report criteria, as in CRM_Report_Form::_params. * - * @return string URL query string + * @return string + * URL query string */ public static function getPreviewCriteriaQueryParams($defaults = array(), $params = array()) { static $query_string; @@ -486,8 +489,8 @@ WHERE inst.report_id = %1"; // (in other words, there's no point in propagating blank filters). foreach ($process_params as $field_name => $field_value) { $suffix_position = strrpos($field_name, '_'); - $suffix = substr($field_name, $suffix_position); - $basename = substr($field_name, 0, $suffix_position); + $suffix = substr($field_name, $suffix_position); + $basename = substr($field_name, 0, $suffix_position); if ($suffix == '_min' || $suffix == '_max' || $suffix == '_from' || $suffix == '_to' || $suffix == '_relative' @@ -543,7 +546,7 @@ WHERE inst.report_id = %1"; public static function getInstanceList($reportUrl) { static $instanceDetails = array(); - if (!array_key_exists($reportUrl, $instanceDetails )) { + if (!array_key_exists($reportUrl, $instanceDetails)) { $instanceDetails[$reportUrl] = array(); $sql = "