X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=CRM%2FContribute%2FForm%2FManagePremiums.php;h=fcd0c60eae038b3139874568638fecdbb9126a80;hb=874c9be71a0eaece92406de8089dc7de42298084;hp=a764bc62d01b81c783283699ad5d46a265956778;hpb=ce80b209ca04900e29af61f2c9b935af7d64fe67;p=civicrm-core.git diff --git a/CRM/Contribute/Form/ManagePremiums.php b/CRM/Contribute/Form/ManagePremiums.php index a764bc62d0..fcd0c60eae 100644 --- a/CRM/Contribute/Form/ManagePremiums.php +++ b/CRM/Contribute/Form/ManagePremiums.php @@ -122,7 +122,6 @@ class CRM_Contribute_Form_ManagePremiums extends CRM_Contribute_Form { $this->add('file', 'uploadFile', ts('Image File Name'), 'onChange="select_option();"'); - $this->add('text', 'price', ts('Market Value'), CRM_Core_DAO::getAttribute('CRM_Contribute_DAO_Product', 'price'), TRUE); $this->addRule('price', ts('Please enter the Market Value for this product.'), 'money'); @@ -152,9 +151,9 @@ class CRM_Contribute_Form_ManagePremiums extends CRM_Contribute_Form { CRM_Core_PseudoConstant::populate( $premiumFinancialType, 'CRM_Financial_DAO_EntityFinancialAccount', - $all = True, + $all = TRUE, $retrieve = 'entity_id', - $filter = null, + $filter = NULL, 'account_relationship = 8' ); @@ -162,15 +161,16 @@ class CRM_Contribute_Form_ManagePremiums extends CRM_Contribute_Form { CRM_Core_PseudoConstant::populate( $costFinancialType, 'CRM_Financial_DAO_EntityFinancialAccount', - $all = True, + $all = TRUE, $retrieve = 'entity_id', - $filter = null, + $filter = NULL, 'account_relationship = 7' ); $productFinancialType = array_intersect($costFinancialType, $premiumFinancialType); foreach( $financialType as $key => $financialTypeName ){ - if(!in_array( $key, $productFinancialType)) + if(!in_array( $key, $productFinancialType)) { unset( $financialType[$key] ); + } } if( count( $financialType ) ){ $this->assign( 'financialType', $financialType ); @@ -179,7 +179,7 @@ class CRM_Contribute_Form_ManagePremiums extends CRM_Contribute_Form { 'select', 'financial_type_id', ts( 'Financial Type' ), - array(''=>ts('- select -')) + $financialType + array('' => ts('- select -')) + $financialType ); $this->add('checkbox', 'is_active', ts('Enabled?')); @@ -264,7 +264,6 @@ class CRM_Contribute_Form_ManagePremiums extends CRM_Contribute_Form { $errors['frequency_interval'] = ts('Please enter the Frequency Interval for this subscription or service.'); } - return empty($errors) ? TRUE : $errors; } @@ -304,12 +303,12 @@ class CRM_Contribute_Form_ManagePremiums extends CRM_Contribute_Form { $gdSupport = CRM_Utils_System::getModuleSetting('gd', 'GD Support'); if($gdSupport) { if($imageFile) { - $error = false; + $error = FALSE; $params['image'] = $this->_resizeImage($imageFile, "_full", 200, 200); $params['thumbnail'] = $this->_resizeImage($imageFile, "_thumb", 50, 50); } } else { - $error = true; + $error = TRUE; $params['image'] = $config->resourceBase . 'i/contribute/default_premium.jpg'; $params['thumbnail'] = $config->resourceBase . 'i/contribute/default_premium_thumb.jpg'; } @@ -381,10 +380,10 @@ class CRM_Contribute_Form_ManagePremiums extends CRM_Contribute_Form { // save the resized image $fp = fopen($newFilename, 'w+'); ob_start(); - ImageJPEG($image); + imagejpeg($image); $image_buffer = ob_get_contents(); ob_end_clean(); - ImageDestroy($image); + imagedestroy($image); fwrite($fp, $image_buffer); rewind($fp); fclose($fp);