X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FBadge%2FBAO%2FBadge.php;h=14611420375e8cbe8fa4d8a045b99999a135a916;hb=87878ac8e6101fc5bed04f356c677b5f9ec54bc7;hp=cf0f1f97abd511ce2d461549dc14ca609d077737;hpb=db551313046d894dd1e7669f664ca7caac35f6fe;p=civicrm-core.git diff --git a/CRM/Badge/BAO/Badge.php b/CRM/Badge/BAO/Badge.php index cf0f1f97ab..1461142037 100644 --- a/CRM/Badge/BAO/Badge.php +++ b/CRM/Badge/BAO/Badge.php @@ -1,7 +1,7 @@ pdf = new CRM_Utils_PDF_Label($layoutInfo['format'], 'mm'); @@ -76,17 +77,19 @@ class CRM_Badge_BAO_Badge { /** * Funtion to create structure and add meta data according to layout * - * @param array $row row element that needs to be formatted - * @param array $layout layout meta data + * @param array $row + * Row element that needs to be formatted. + * @param array $layout + * Layout meta data. * - * @return array $formattedRow row with meta data + * @return array + * row with meta data */ - static function formatLabel(&$row, &$layout) { + public static function formatLabel(&$row, &$layout) { $formattedRow = array('labelFormat' => $layout['label_format_name']); $formattedRow['labelTitle'] = $layout['title']; $formattedRow['labelId'] = $layout['id']; - if (!empty($layout['data']['rowElements'])) { foreach ($layout['data']['rowElements'] as $key => $element) { $value = ''; @@ -163,6 +166,7 @@ class CRM_Badge_BAO_Badge { case 'Hanging Badge 3-3/4" x 4-3"/4': self::labelCreator($formattedRow, 5); break; + case 'Avery 5395': default: self::labelCreator($formattedRow); @@ -196,7 +200,8 @@ class CRM_Badge_BAO_Badge { } if ((CRM_Utils_Array::value('height_image_1', $formattedRow) > - CRM_Utils_Array::value('height_image_2', $formattedRow)) && !empty($formattedRow['height_image_1'])) { + CRM_Utils_Array::value('height_image_2', $formattedRow)) && !empty($formattedRow['height_image_1']) + ) { $startOffset = CRM_Utils_Array::value('height_image_1', $formattedRow); } elseif (!empty($formattedRow['height_image_2'])) { @@ -209,9 +214,11 @@ class CRM_Badge_BAO_Badge { case 'R': $imageAlign = 68; break; + case 'L': $imageAlign = 0; break; + default: break; } @@ -226,7 +233,7 @@ class CRM_Badge_BAO_Badge { 'cap' => 'round', 'join' => 'round', 'dash' => '2,2', - 'color' => array(0, 0, 200) + 'color' => array(0, 0, 200), )); $rowCount = CRM_Badge_Form_Layout::FIELD_ROWCOUNT; @@ -261,8 +268,7 @@ class CRM_Badge_BAO_Badge { $data = $formattedRow['values']; if ($formattedRow['barcode']['type'] == 'barcode') { - $data['current_value'] = - $formattedRow['values']['contact_id'] . '-' . $formattedRow['values']['participant_id']; + $data['current_value'] = $formattedRow['values']['contact_id'] . '-' . $formattedRow['values']['participant_id']; } else { // view participant url @@ -286,9 +292,11 @@ class CRM_Badge_BAO_Badge { case 'L': $xAlign += -14; break; + case 'R': $xAlign += 27; break; + case 'C': $xAlign += 9; break; @@ -322,24 +330,26 @@ class CRM_Badge_BAO_Badge { case 'L': $xAlign += -5; break; + case 'R': $xAlign += 56; break; + case 'C': $xAlign += 29; break; } $style = array( - 'border' => false, + 'border' => FALSE, 'hpadding' => 13.5, 'vpadding' => 'auto', - 'fgcolor' => array(0,0,0), - 'bgcolor' => false, + 'fgcolor' => array(0, 0, 0), + 'bgcolor' => FALSE, 'position' => '', ); - $this->pdf->write2DBarcode($data['current_value'], 'QRCODE,H', $xAlign, $y + $this->pdf->height - 26, 30, + $this->pdf->write2DBarcode($data['current_value'], 'QRCODE,H', $xAlign, $y + $this->pdf->height - 26, 30, 30, $style, 'B'); } } @@ -348,7 +358,8 @@ class CRM_Badge_BAO_Badge { /** * Helper function to print images * - * @param string $img image url + * @param string $img + * Image url. * * @param string $x * @param string $y @@ -356,9 +367,8 @@ class CRM_Badge_BAO_Badge { * @param null $h * * @return void - * @access public */ - function printImage($img, $x = '', $y = '', $w = NULL, $h = NULL) { + public function printImage($img, $x = '', $y = '', $w = NULL, $h = NULL) { if (!$x) { $x = $this->pdf->GetAbsX(); } @@ -385,7 +395,7 @@ class CRM_Badge_BAO_Badge { * * @return array */ - static function getImageProperties($img, $imgRes = 300, $w = NULL, $h = NULL) { + public static function getImageProperties($img, $imgRes = 300, $w = NULL, $h = NULL) { $imgsize = getimagesize($img); $f = $imgRes / 25.4; $w = !empty($w) ? $w : $imgsize[0] / $f; @@ -396,12 +406,11 @@ class CRM_Badge_BAO_Badge { /** * Build badges parameters before actually creating badges. * - * @param array $params associated array of submitted values + * @param array $params + * Associated array of submitted values. * @param CRM_Core_Form $form * * @return void - * @access public - * @static */ public static function buildBadges(&$params, &$form) { // get name badge layout info @@ -485,4 +494,3 @@ class CRM_Badge_BAO_Badge { $eventBadgeClass->createLabels($rows, $layoutInfo); } } -