X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FContribute%2FForm%2FUpdateBilling.php;h=83b5244c5481a7757b313de12f5a5264a0c846ca;hb=dc195289d598fae6feedab517c4ababcdb840541;hp=46986518c6cfcf66ce6999fa9097e08846a3a5b1;hpb=a335f6b228626e3e1b2f1549c8ddcbb9232b3c6b;p=civicrm-core.git diff --git a/CRM/Contribute/Form/UpdateBilling.php b/CRM/Contribute/Form/UpdateBilling.php index 46986518c6..83b5244c54 100644 --- a/CRM/Contribute/Form/UpdateBilling.php +++ b/CRM/Contribute/Form/UpdateBilling.php @@ -1,7 +1,7 @@ _mid = CRM_Utils_Request::retrieve('mid', 'Integer', $this, FALSE); @@ -142,7 +141,7 @@ class CRM_Contribute_Form_UpdateBilling extends CRM_Core_Form { /** * @return array */ - function setDefaultValues() { + public function setDefaultValues() { $this->_defaults = array(); if ($this->_subscriptionDetails->contact_id) { @@ -188,11 +187,10 @@ class CRM_Contribute_Form_UpdateBilling extends CRM_Core_Form { * Build the form object * * @return void - * @access public */ public function buildQuickForm() { $type = 'next'; - if ( $this->_selfService ) { + if ($this->_selfService) { $type = 'submit'; } @@ -216,16 +214,17 @@ class CRM_Contribute_Form_UpdateBilling extends CRM_Core_Form { /** * Global form rule * - * @param array $fields the input form values - * @param array $files the uploaded files if any + * @param array $fields + * The input form values. + * @param array $files + * The uploaded files if any. * @param $self * * * @return true if no errors, else array of errors - * @access public * @static */ - static function formRule($fields, $files, $self) { + public static function formRule($fields, $files, $self) { $errors = array(); CRM_Core_Form::validateMandatoryFields($self->_fields, $fields, $errors); @@ -239,7 +238,6 @@ class CRM_Contribute_Form_UpdateBilling extends CRM_Core_Form { * Process the form * * @return void - * @access public */ public function postProcess() { $params = $this->controller->exportValues($this->_name); @@ -297,7 +295,7 @@ class CRM_Contribute_Form_UpdateBilling extends CRM_Core_Form { array( 1 => $this->_subscriptionDetails->amount, 2 => $this->_subscriptionDetails->frequency_interval, - 3 => $this->_subscriptionDetails->frequency_unit + 3 => $this->_subscriptionDetails->frequency_unit, ) ); $msgTitle = ts('Details Updated'); @@ -422,9 +420,10 @@ class CRM_Contribute_Form_UpdateBilling extends CRM_Core_Form { $session = CRM_Core_Session::singleton(); $userID = $session->get('userID'); - if ( $userID && $status) { + if ($userID && $status) { $session->setStatus($status, $msgTitle, $msgType); - } else if (!$userID) { + } + elseif (!$userID) { if ($status) CRM_Utils_System::setUFMessage($status); $result = (int) ($updateSubscription && isset($ctype)); @@ -435,4 +434,3 @@ class CRM_Contribute_Form_UpdateBilling extends CRM_Core_Form { } } } -