From e547f744f83b36d39a69903326ba168f7bfc578d Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Tue, 6 Jan 2015 13:09:19 -0800 Subject: [PATCH] INFRA-132 - CRM/Case - phpcbf --- CRM/Case/Audit/Audit.php | 8 ++++---- CRM/Case/BAO/Case.php | 8 +------- CRM/Case/BAO/CaseType.php | 8 +++++--- CRM/Case/BAO/Query.php | 5 +++-- CRM/Case/Form/Activity.php | 6 +++--- CRM/Case/Form/Activity/ChangeCaseStatus.php | 3 ++- CRM/Case/Form/Activity/ChangeCaseType.php | 3 ++- CRM/Case/Form/Activity/LinkCases.php | 3 ++- CRM/Case/Form/Case.php | 5 ++--- CRM/Case/Form/CaseView.php | 3 +-- CRM/Case/Form/Report.php | 3 ++- CRM/Case/Form/Search.php | 3 +-- CRM/Case/Form/Task/Result.php | 3 ++- CRM/Case/Info.php | 11 +++++++---- CRM/Case/Page/DashBoard.php | 2 +- CRM/Case/Page/Tab.php | 4 +--- CRM/Case/PseudoConstant.php | 6 +++--- CRM/Case/Selector/Search.php | 11 +++++------ CRM/Case/XMLProcessor/Process.php | 3 ++- CRM/Case/XMLProcessor/Report.php | 8 ++++---- CRM/Case/XMLRepository.php | 3 ++- 21 files changed, 55 insertions(+), 54 deletions(-) diff --git a/CRM/Case/Audit/Audit.php b/CRM/Case/Audit/Audit.php index 8517a7098c..afbbecdc15 100644 --- a/CRM/Case/Audit/Audit.php +++ b/CRM/Case/Audit/Audit.php @@ -220,10 +220,10 @@ class CRM_Case_Audit_Audit { static public function run($xmlString, $clientID, $caseID, $printReport = FALSE) { /* -$fh = fopen('C:/temp/audit2.xml', 'w'); -fwrite($fh, $xmlString); -fclose($fh); -*/ + $fh = fopen('C:/temp/audit2.xml', 'w'); + fwrite($fh, $xmlString); + fclose($fh); + */ $audit = new CRM_Case_Audit_Audit($xmlString, 'audit.conf.xml'); $activities = $audit->getActivities($printReport); diff --git a/CRM/Case/BAO/Case.php b/CRM/Case/BAO/Case.php index 14c84b89f1..987e089196 100644 --- a/CRM/Case/BAO/Case.php +++ b/CRM/Case/BAO/Case.php @@ -749,7 +749,6 @@ LEFT JOIN civicrm_option_group aog ON aog.name='activity_type' $allCases = FALSE; } - $condition = " AND civicrm_case.is_deleted = 0 "; if (!$allCases) { @@ -809,7 +808,6 @@ AND civicrm_case.status_id != $closedId"; // we're going to use the usual actions, so doesn't make sense to duplicate definitions $actions = CRM_Case_Selector_Search::links(); - // check is the user has view/edit signer permission $permissions = array(CRM_Core_Permission::VIEW); if (CRM_Core_Permission::check('access all cases and activities') || @@ -826,8 +824,7 @@ AND civicrm_case.status_id != $closedId"; foreach ($resultFields as $donCare => $field) { $casesList[$result->case_id][$field] = $result->$field; if ($field == 'contact_type') { - $casesList[$result->case_id]['contact_type_icon'] = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ? - $result->contact_sub_type : $result->contact_type + $casesList[$result->case_id]['contact_type_icon'] = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ? $result->contact_sub_type : $result->contact_type ); $casesList[$result->case_id]['action'] = CRM_Core_Action::formLink($actions['primaryActions'], $mask, array( @@ -999,7 +996,6 @@ SELECT case_status.label AS case_status, status_id, civicrm_case_type.title AS c LEFT JOIN civicrm_email ON (civicrm_email.contact_id = civicrm_contact.id ) WHERE civicrm_relationship.contact_id_a = %1 AND civicrm_relationship.case_id = %2'; - $params = array( 1 => array($contactID, 'Positive'), 2 => array($caseID, 'Positive'), @@ -1179,7 +1175,6 @@ SELECT case_status.label AS case_status, status_id, civicrm_case_type.title AS c //EXIT; $dao = CRM_Core_DAO::executeQuery($query, $params); - $activityTypes = CRM_Case_PseudoConstant::caseActivityType(FALSE, TRUE); $activityStatus = CRM_Core_PseudoConstant::activityStatus(); $activityPriority = CRM_Core_PseudoConstant::get('CRM_Activity_DAO_Activity', 'priority_id'); @@ -1342,7 +1337,6 @@ SELECT case_status.label AS case_status, status_id, civicrm_case_type.title AS c } } - $values[$dao->id]['links'] = $url; $values[$dao->id]['class'] = ""; diff --git a/CRM/Case/BAO/CaseType.php b/CRM/Case/BAO/CaseType.php index e57e0cb451..699ec1ca21 100644 --- a/CRM/Case/BAO/CaseType.php +++ b/CRM/Case/BAO/CaseType.php @@ -89,7 +89,7 @@ class CRM_Case_BAO_CaseType extends CRM_Case_DAO_CaseType { } protected function assignTestValue($fieldName, &$fieldDef, $counter) { - if ($fieldName == 'definition') { + if ($fieldName == 'definition') { $this->{$fieldName} = "TestCaseType{$counter}"; } else { parent::assignTestValue($fieldName, $fieldDef, $counter); @@ -145,12 +145,14 @@ class CRM_Case_BAO_CaseType extends CRM_Case_DAO_CaseType { $xmlFile .= "\n"; } break; + case 'sequence': // passthrough case 'timeline': if ($setVal) { $xmlFile .= "<{$index}>true\n"; } break; + default: $xmlFile .= "<{$index}>{$setVal}\n"; } @@ -347,7 +349,7 @@ class CRM_Case_BAO_CaseType extends CRM_Case_DAO_CaseType { * @return bool */ public static function isValidName($caseType) { - return preg_match('/^[a-zA-Z0-9_]+$/', $caseType); + return preg_match('/^[a-zA-Z0-9_]+$/', $caseType); } /** @@ -378,7 +380,7 @@ class CRM_Case_BAO_CaseType extends CRM_Case_DAO_CaseType { // if file-based definition explicitly disables "forkable" option, then don't allow changes to definition $fileDefinition = CRM_Case_XMLRepository::singleton()->retrieveFile($caseTypeName); if ($fileDefinition && isset($fileDefinition->forkable)) { - return CRM_Utils_String::strtobool((string)$fileDefinition->forkable); + return CRM_Utils_String::strtobool((string) $fileDefinition->forkable); } } return TRUE; diff --git a/CRM/Case/BAO/Query.php b/CRM/Case/BAO/Query.php index 2f460c9a7b..0890a48650 100644 --- a/CRM/Case/BAO/Query.php +++ b/CRM/Case/BAO/Query.php @@ -718,7 +718,7 @@ case_relation_type.id = case_relationship.relationship_type_id )"; } CRM_Core_Form_Date::buildDateRange($form, 'case_from', 1, '_start_date_low', '_start_date_high', ts('From'), FALSE); - CRM_Core_Form_Date::buildDateRange($form, 'case_to', 1, '_end_date_low', '_end_date_high', ts('From'), FALSE); + CRM_Core_Form_Date::buildDateRange($form, 'case_to', 1, '_end_date_low', '_end_date_high', ts('From'), FALSE); $form->assign('validCiviCase', TRUE); @@ -770,5 +770,6 @@ case_relation_type.id = case_relationship.relationship_type_id )"; * @param $row * @param int $id */ - public static function searchAction(&$row, $id) {} + public static function searchAction(&$row, $id) { + } } diff --git a/CRM/Case/Form/Activity.php b/CRM/Case/Form/Activity.php index ada4d36d11..43c05b0d4f 100644 --- a/CRM/Case/Form/Activity.php +++ b/CRM/Case/Form/Activity.php @@ -319,14 +319,14 @@ class CRM_Case_Form_Activity extends CRM_Activity_Form_Activity { $this->_relatedContacts[] = $rgc = CRM_Case_BAO_Case::getRelatedAndGlobalContacts($val); $contName = CRM_Case_BAO_Case::getContactNames($val); foreach ($contName as $nkey => $nval) { - array_push($this->_relatedContacts[$i][0] , $this->_relatedContacts[$i][0]['managerOf']= $nval['display_name']); + array_push($this->_relatedContacts[$i][0], $this->_relatedContacts[$i][0]['managerOf'] = $nval['display_name']); } $i++; } //add case client in send a copy selector.CRM-4438. foreach ($this->_caseId as $key => $val) { - $relatedContacts[] = $relCon= CRM_Case_BAO_Case::getContactNames($val); + $relatedContacts[] = $relCon = CRM_Case_BAO_Case::getContactNames($val); } if (!empty($relatedContacts)) { @@ -558,7 +558,7 @@ class CRM_Case_Form_Activity extends CRM_Activity_Form_Activity { foreach ($this->_caseId as $key => $val) { $newActParams['case_id'] = $val; $activity = CRM_Activity_BAO_Activity::create($newActParams); - $vvalue[] = array('case_id'=> $val, 'actId'=> $activity->id); + $vvalue[] = array('case_id' => $val, 'actId' => $activity->id); // call end post process, after the activity has been created/updated. $this->endPostProcess($newActParams, $activity); } diff --git a/CRM/Case/Form/Activity/ChangeCaseStatus.php b/CRM/Case/Form/Activity/ChangeCaseStatus.php index 21fda360de..5b9d506865 100644 --- a/CRM/Case/Form/Activity/ChangeCaseStatus.php +++ b/CRM/Case/Form/Activity/ChangeCaseStatus.php @@ -152,7 +152,8 @@ class CRM_Case_Form_Activity_ChangeCaseStatus { // FIXME: Is there an existing function to close a relationship? $query = 'UPDATE civicrm_relationship SET end_date=%2 WHERE id=%1'; foreach ($rels as $relId => $relData) { - $relParams = array(1 => array($relId, 'Integer'), + $relParams = array( + 1 => array($relId, 'Integer'), 2 => array($params['end_date'], 'Timestamp'), ); CRM_Core_DAO::executeQuery($query, $relParams); diff --git a/CRM/Case/Form/Activity/ChangeCaseType.php b/CRM/Case/Form/Activity/ChangeCaseType.php index 0d21503701..0fbc58421d 100644 --- a/CRM/Case/Form/Activity/ChangeCaseType.php +++ b/CRM/Case/Form/Activity/ChangeCaseType.php @@ -174,7 +174,8 @@ class CRM_Case_Form_Activity_ChangeCaseType { if ($activity->subject == 'null') { $activity->subject = ts('Case type changed from %1 to %2', - array(1 => CRM_Utils_Array::value($form->_defaults['case_type_id'], $allCaseTypes), + array( + 1 => CRM_Utils_Array::value($form->_defaults['case_type_id'], $allCaseTypes), 2 => CRM_Utils_Array::value($params['case_type_id'], $allCaseTypes), ) ); diff --git a/CRM/Case/Form/Activity/LinkCases.php b/CRM/Case/Form/Activity/LinkCases.php index ef335cb5d8..0539ec4775 100644 --- a/CRM/Case/Form/Activity/LinkCases.php +++ b/CRM/Case/Form/Activity/LinkCases.php @@ -128,7 +128,8 @@ class CRM_Case_Form_Activity_LinkCases { * * @return void */ - public static function beginPostProcess(&$form, &$params) {} + public static function beginPostProcess(&$form, &$params) { + } /** * Process the form submission diff --git a/CRM/Case/Form/Case.php b/CRM/Case/Form/Case.php index 925e1122b1..959f97a4a7 100644 --- a/CRM/Case/Form/Case.php +++ b/CRM/Case/Form/Case.php @@ -121,7 +121,8 @@ class CRM_Case_Form_Case extends CRM_Core_Form { } if (!$this->_caseId) { - $caseAttributes = array('case_type' => CRM_Case_PseudoConstant::caseType(), + $caseAttributes = array( + 'case_type' => CRM_Case_PseudoConstant::caseType(), 'case_status' => CRM_Case_PseudoConstant::caseStatus(), 'encounter_medium' => CRM_Case_PseudoConstant::encounterMedium(), ); @@ -181,7 +182,6 @@ class CRM_Case_Form_Case extends CRM_Core_Form { $this->assign('clientName', $contact->display_name); } - $session = CRM_Core_Session::singleton(); $this->_currentUserId = $session->get('userID'); @@ -364,7 +364,6 @@ class CRM_Case_Form_Case extends CRM_Core_Form { $params = $this->controller->exportValues($this->_name); $params['now'] = date("Ymd"); - // 1. call begin post process if ($this->_activityTypeFile) { $className = "CRM_Case_Form_Activity_{$this->_activityTypeFile}"; diff --git a/CRM/Case/Form/CaseView.php b/CRM/Case/Form/CaseView.php index a21f4585f2..ccdf0df41d 100644 --- a/CRM/Case/Form/CaseView.php +++ b/CRM/Case/Form/CaseView.php @@ -159,7 +159,6 @@ class CRM_Case_Form_CaseView extends CRM_Core_Form { $recentOther ); - //get the related cases for given case. $relatedCases = $this->get('relatedCases'); if (!isset($relatedCases)) { @@ -259,7 +258,7 @@ class CRM_Case_Form_CaseView extends CRM_Core_Form { ); } else if ($type == $pdfActivityType ) { - $url = CRM_Utils_System::url('civicrm/activity/pdf/add', + $url = CRM_Utils_System::url('civicrm/activity/pdf/add', "action=add&context=standalone&reset=1&cid={$this->_contactID}&caseid={$this->_caseID}&atype=$type", FALSE, NULL, FALSE ); } diff --git a/CRM/Case/Form/Report.php b/CRM/Case/Form/Report.php index 10798d66ab..e563b211d9 100644 --- a/CRM/Case/Form/Report.php +++ b/CRM/Case/Form/Report.php @@ -84,7 +84,8 @@ class CRM_Case_Form_Report extends CRM_Core_Form { return; } - $includeActivites = array(1 => ts('All Activities'), + $includeActivites = array( + 1 => ts('All Activities'), 2 => ts('Exclude Completed Activities'), ); $includeActivitesGroup = $this->addRadio('include_activities', diff --git a/CRM/Case/Form/Search.php b/CRM/Case/Form/Search.php index 02eba915bc..b6382ed171 100644 --- a/CRM/Case/Form/Search.php +++ b/CRM/Case/Form/Search.php @@ -135,7 +135,6 @@ class CRM_Case_Form_Search extends CRM_Core_Form_Search { ); } - $this->_queryParams = CRM_Contact_BAO_Query::convertFormValues($this->_formValues); $selector = new CRM_Case_Selector_Search($this->_queryParams, $this->_action, @@ -405,7 +404,7 @@ class CRM_Case_Form_Search extends CRM_Core_Form_Search { } } else { - // First, if "all" is stored in the session, default to all cases, otherwise default to no selection. + // First, if "all" is stored in the session, default to all cases, otherwise default to no selection. $session = CRM_Core_Session::singleton(); if (CRM_Utils_Request::retrieve('all', 'Positive', $session)) { $this->_formValues['case_owner'] = 1; diff --git a/CRM/Case/Form/Task/Result.php b/CRM/Case/Form/Task/Result.php index 5289241c0b..c18819d722 100644 --- a/CRM/Case/Form/Task/Result.php +++ b/CRM/Case/Form/Task/Result.php @@ -45,7 +45,8 @@ class CRM_Case_Form_Task_Result extends CRM_Case_Form_Task { * * @return void */ - public function preProcess() {} + public function preProcess() { + } /** * Build the form object diff --git a/CRM/Case/Info.php b/CRM/Case/Info.php index 6dd43cecbe..1b0db3c88f 100644 --- a/CRM/Case/Info.php +++ b/CRM/Case/Info.php @@ -152,7 +152,8 @@ class CRM_Case_Info extends CRM_Core_Component_Info { * @return array */ public function registerTab() { - return array('title' => ts('Cases'), + return array( + 'title' => ts('Cases'), 'url' => 'case', 'weight' => 50, ); @@ -163,7 +164,8 @@ class CRM_Case_Info extends CRM_Core_Component_Info { * @return array */ public function registerAdvancedSearchPane() { - return array('title' => ts('Cases'), + return array( + 'title' => ts('Cases'), 'weight' => 50, ); } @@ -190,7 +192,8 @@ class CRM_Case_Info extends CRM_Core_Component_Info { ); if ($atype) { $shortCuts = array_merge($shortCuts, array( - array('path' => 'civicrm/case/add', + array( + 'path' => 'civicrm/case/add', 'query' => "reset=1&action=add&atype=$atype&context=standalone", 'ref' => 'new-case', 'title' => ts('Case'), @@ -218,7 +221,7 @@ class CRM_Case_Info extends CRM_Core_Component_Info { && (!$oldValue || !in_array('CiviCase', $oldValue)) ) { - $pathToCaseSampleTpl = __DIR__ . '/xml/configuration.sample/'; + $pathToCaseSampleTpl = __DIR__ . '/xml/configuration.sample/'; $config = CRM_Core_Config::singleton(); CRM_Admin_Form_Setting_Component::loadCaseSampleData($config->dsn, $pathToCaseSampleTpl . 'case_sample.mysql.tpl'); if (!CRM_Case_BAO_Case::createCaseViews()) { diff --git a/CRM/Case/Page/DashBoard.php b/CRM/Case/Page/DashBoard.php index fa66d50816..9d9ac409aa 100644 --- a/CRM/Case/Page/DashBoard.php +++ b/CRM/Case/Page/DashBoard.php @@ -90,7 +90,7 @@ class CRM_Case_Page_DashBoard extends CRM_Core_Page { $upcoming = CRM_Case_BAO_Case::getCases($allCases, $userID, 'upcoming'); $recent = CRM_Case_BAO_Case::getCases($allCases, $userID, 'recent'); - foreach($upcoming as $key=>$value) { + foreach($upcoming as $key => $value) { if(strtotime($value['case_scheduled_activity_date']) < time()) { $upcoming[$key]['activity_status'] = 'status-overdue'; } diff --git a/CRM/Case/Page/Tab.php b/CRM/Case/Page/Tab.php index b9314f5ac8..279c025bef 100644 --- a/CRM/Case/Page/Tab.php +++ b/CRM/Case/Page/Tab.php @@ -130,7 +130,6 @@ class CRM_Case_Page_Tab extends CRM_Core_Page { $this->_id ); - $controller->setEmbedded(TRUE); $controller->run(); @@ -206,8 +205,7 @@ class CRM_Case_Page_Tab extends CRM_Core_Page { if ($this->_action & CRM_Core_Action::VIEW) { $this->view(); } - elseif (($this->_action & - (CRM_Core_Action::UPDATE | CRM_Core_Action::ADD | + elseif (($this->_action & (CRM_Core_Action::UPDATE | CRM_Core_Action::ADD | CRM_Core_Action::DELETE | CRM_Core_Action::RENEW ) ) || diff --git a/CRM/Case/PseudoConstant.php b/CRM/Case/PseudoConstant.php index 04c6eef8db..d22e4d8524 100644 --- a/CRM/Case/PseudoConstant.php +++ b/CRM/Case/PseudoConstant.php @@ -87,7 +87,7 @@ class CRM_Case_PseudoConstant extends CRM_Core_PseudoConstant { * @static */ public static function caseStatus($column = 'label', $onlyActive = TRUE, $condition = NULL, $fresh = FALSE) { - $cacheKey = "{$column}_" . (int)$onlyActive; + $cacheKey = "{$column}_" . (int) $onlyActive; if (!$condition) { $condition = 'AND filter = 0'; } @@ -174,7 +174,7 @@ class CRM_Case_PseudoConstant extends CRM_Core_PseudoConstant { * @static */ public static function encounterMedium($column = 'label', $onlyActive = TRUE) { - $cacheKey = "{$column}_" . (int)$onlyActive; + $cacheKey = "{$column}_" . (int) $onlyActive; if (!isset(self::$encounterMedium[$cacheKey])) { self::$encounterMedium[$cacheKey] = CRM_Core_OptionGroup::values('encounter_medium', FALSE, FALSE, FALSE, NULL, @@ -255,7 +255,7 @@ class CRM_Case_PseudoConstant extends CRM_Core_PseudoConstant { * @param bool|string $name pseudoconstant to be flushed */ public static function flush($name = 'cache') { - if (isset(self::$$name)) { + if (isset(self::$$name)) { self::$$name = NULL; } } diff --git a/CRM/Case/Selector/Search.php b/CRM/Case/Selector/Search.php index d6e9159cb5..10af1d82a0 100644 --- a/CRM/Case/Selector/Search.php +++ b/CRM/Case/Selector/Search.php @@ -146,11 +146,11 @@ class CRM_Case_Selector_Search extends CRM_Core_Selector_Base { @access public */ function __construct(&$queryParams, - $action = CRM_Core_Action::NONE, + $action = CRM_Core_Action::NONE, $additionalClause = NULL, - $single = FALSE, - $limit = NULL, - $context = 'search' + $single = FALSE, + $limit = NULL, + $context = 'search' ) { // submitted form values $this->_queryParams = &$queryParams; @@ -369,8 +369,7 @@ class CRM_Case_Selector_Search extends CRM_Core_Selector_Base { $result->case_id ); - $row['contact_type'] = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ? - $result->contact_sub_type : $result->contact_type + $row['contact_type'] = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ? $result->contact_sub_type : $result->contact_type ); //adding case manager to case selector.CRM-4510. diff --git a/CRM/Case/XMLProcessor/Process.php b/CRM/Case/XMLProcessor/Process.php index e3bf4fd41b..8eaadbba6a 100644 --- a/CRM/Case/XMLProcessor/Process.php +++ b/CRM/Case/XMLProcessor/Process.php @@ -389,7 +389,8 @@ AND ca.case_id = %2 AND a.is_deleted = 0 "; - $sqlParams = array(1 => array($params['activityTypeID'], 'Integer'), + $sqlParams = array( + 1 => array($params['activityTypeID'], 'Integer'), 2 => array($params['caseID'], 'Integer'), ); $count = CRM_Core_DAO::singleValueQuery($query, $sqlParams); diff --git a/CRM/Case/XMLProcessor/Report.php b/CRM/Case/XMLProcessor/Report.php index 5ee01eef3c..f2ebe640f9 100644 --- a/CRM/Case/XMLProcessor/Report.php +++ b/CRM/Case/XMLProcessor/Report.php @@ -44,7 +44,8 @@ class CRM_Case_XMLProcessor_Report extends CRM_Case_XMLProcessor { /** * */ - public function __construct() {} + public function __construct() { + } /** * @param int $clientID @@ -250,14 +251,12 @@ AND ac.case_id = %1 $this->getRedactionRules(); } - $index = $activityID . '_' . (int) $anyActivity; if ($clientID) { $index = $index . '_' . $clientID; } - if (!array_key_exists($index, $activityInfos)) { $activityInfos[$index] = array(); $selectCaseActivity = ""; @@ -788,7 +787,8 @@ LIMIT 1 } // next get activity set Informtion - $activitySet = array('label' => $form->getActivitySetLabel($xml, $activitySetName), + $activitySet = array( + 'label' => $form->getActivitySetLabel($xml, $activitySetName), 'includeActivities' => 'All', 'redact' => 'false', ); diff --git a/CRM/Case/XMLRepository.php b/CRM/Case/XMLRepository.php index 5710603aa8..0be96d708b 100644 --- a/CRM/Case/XMLRepository.php +++ b/CRM/Case/XMLRepository.php @@ -139,7 +139,8 @@ class CRM_Case_XMLRepository { * @param string $caseType * @return null|string file path */ - public function findXmlFile($caseType) { // first check custom templates directory + public function findXmlFile($caseType) { + // first check custom templates directory $fileName = NULL; if (!$fileName || !file_exists($fileName)) { -- 2.25.1