/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.3 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2013 |
+--------------------------------------------------------------------+
);
}
- $params['is_reserved'] = CRM_Utils_Array::value('is_reserved', $params, FALSE);
+ if (!isset($params['id'])) {
+ $params['is_reserved'] = CRM_Utils_Array::value('is_reserved', $params, FALSE);
+ }
$instanceID = CRM_Utils_Array::value('id', $params);
- if (CRM_Utils_Array::value('instance_id', $params)) {
+ if (!empty($params['instance_id'])) {
$instanceID = CRM_Utils_Array::value('instance_id', $params);
}
}
// explicitly set to null if params value is empty
- if (empty($params['grouprole'])) {
+ if (!$instanceID && empty($params['grouprole'])) {
$instance->grouprole = 'null';
}
$instance->id = $instanceID;
}
- if ($reportID = CRM_Utils_Array::value('report_id', $params)) {
- $instance->report_id = $reportID;
- } else if ($instanceID) {
- $instance->report_id = CRM_Report_Utils_Report::getValueFromUrl($instanceID);
- } else {
- // just take it from current url
- $instance->report_id = CRM_Report_Utils_Report::getValueFromUrl();
+ if (! $instanceID) {
+ if ($reportID = CRM_Utils_Array::value('report_id', $params)) {
+ $instance->report_id = $reportID;
+ } else if ($instanceID) {
+ $instance->report_id = CRM_Report_Utils_Report::getValueFromUrl($instanceID);
+ } else {
+ // just take it from current url
+ $instance->report_id = CRM_Report_Utils_Report::getValueFromUrl();
+ }
}
+
$instance->save();
if ($instanceID) {
* @static
*/
static function &create(&$params) {
- $params['header'] = CRM_Utils_Array::value('report_header',$params);
- $params['footer'] = CRM_Utils_Array::value('report_footer',$params);
+ if (isset($params['report_header'])) {
+ $params['header'] = CRM_Utils_Array::value('report_header',$params);
+ }
+ if (isset($params['report_footer'])) {
+ $params['footer'] = CRM_Utils_Array::value('report_footer',$params);
+ }
// build navigation parameters
- if (CRM_Utils_Array::value('is_navigation', $params)) {
+ if (!empty($params['is_navigation'])) {
if (!array_key_exists('navigation', $params)) {
$params['navigation'] = array();
}
// add to dashboard
$dashletParams = array();
- if (CRM_Utils_Array::value('addToDashboard', $params)) {
+ if (!empty($params['addToDashboard'])) {
$dashletParams = array(
'label' => $params['title'],
'is_active' => 1,
// add / update navigation as required
if (!empty($navigationParams)) {
- if (!CRM_Utils_Array::value('id',$params) &&
- !CRM_Utils_Array::value('instance_id',$params) &&
- CRM_Utils_Array::value('id', $navigationParams)) {
+ if (empty($params['id']) && empty($params['instance_id']) && !empty($navigationParams['id'])) {
unset($navigationParams['id']);
}
$navigationParams['url'] = "civicrm/report/instance/{$instance->id}&reset=1";
$navigation = CRM_Core_BAO_Navigation::add($navigationParams);
- if (CRM_Utils_Array::value('is_active', $navigationParams)) {
+ if (!empty($navigationParams['is_active'])) {
//set the navigation id in report instance table
CRM_Core_DAO::setFieldValue('CRM_Report_DAO_ReportInstance', $instance->id, 'navigation_id', $navigation->id);
}
if (!empty($dashletParams)) {
$section = 2;
$chart = '';
- if (CRM_Utils_Array::value('charts', $params)) {
+ if (!empty($params['charts'])) {
$section = 1;
$chart = "&charts=" . $params['charts'];
}