From 3a872e59c99a26a68a9f4152e891ce151d3f4730 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Tue, 6 Jan 2015 13:09:19 -0800 Subject: [PATCH] INFRA-132 - CRM/Badge - phpcbf --- CRM/Badge/BAO/Badge.php | 16 +++++++++++----- CRM/Badge/BAO/Layout.php | 4 ++-- CRM/Badge/Form/Layout.php | 8 +++----- CRM/Badge/Page/AJAX.php | 2 +- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/CRM/Badge/BAO/Badge.php b/CRM/Badge/BAO/Badge.php index 74931c9323..f1a0391c04 100644 --- a/CRM/Badge/BAO/Badge.php +++ b/CRM/Badge/BAO/Badge.php @@ -89,7 +89,6 @@ class CRM_Badge_BAO_Badge { $formattedRow['labelTitle'] = $layout['title']; $formattedRow['labelId'] = $layout['id']; - if (!empty($layout['data']['rowElements'])) { foreach ($layout['data']['rowElements'] as $key => $element) { $value = ''; @@ -166,6 +165,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); @@ -212,9 +212,11 @@ class CRM_Badge_BAO_Badge { case 'R': $imageAlign = 68; break; + case 'L': $imageAlign = 0; break; + default: break; } @@ -289,9 +291,11 @@ class CRM_Badge_BAO_Badge { case 'L': $xAlign += -14; break; + case 'R': $xAlign += 27; break; + case 'C': $xAlign += 9; break; @@ -325,24 +329,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'); } } diff --git a/CRM/Badge/BAO/Layout.php b/CRM/Badge/BAO/Layout.php index a5813ff910..2f9a8372a1 100644 --- a/CRM/Badge/BAO/Layout.php +++ b/CRM/Badge/BAO/Layout.php @@ -166,7 +166,7 @@ class CRM_Badge_BAO_Layout extends CRM_Core_DAO_PrintLabel { CRM_Badge_BAO_Layout::retrieve($layoutParams, $layoutInfo); $formatProperties = CRM_Core_OptionGroup::getValue('name_badge', $layoutInfo['label_format_name'], 'name'); - $layoutInfo['format'] = json_decode($formatProperties, true); + $layoutInfo['format'] = json_decode($formatProperties, TRUE); $layoutInfo['data'] = CRM_Badge_BAO_Layout::getDecodedData($layoutInfo['data']); return $layoutInfo; } @@ -181,6 +181,6 @@ class CRM_Badge_BAO_Layout extends CRM_Core_DAO_PrintLabel { * @static */ static public function getDecodedData($jsonData) { - return json_decode($jsonData, true); + return json_decode($jsonData, TRUE); } } diff --git a/CRM/Badge/Form/Layout.php b/CRM/Badge/Form/Layout.php index 70528b664c..7294a5ac5a 100644 --- a/CRM/Badge/Form/Layout.php +++ b/CRM/Badge/Form/Layout.php @@ -61,7 +61,7 @@ class CRM_Badge_Form_Layout extends CRM_Admin_Form { $this->applyFilter('__ALL__', 'trim'); - $this->add('text', 'title', ts('Title'), CRM_Core_DAO::getAttribute('CRM_Core_DAO_PrintLabel', 'title'), true); + $this->add('text', 'title', ts('Title'), CRM_Core_DAO::getAttribute('CRM_Core_DAO_PrintLabel', 'title'), TRUE); $labelStyle = CRM_Core_BAO_LabelFormat::getList(TRUE, 'name_badge'); $this->add('select', 'label_format_name', ts('Label Format'), array('' => ts('- select -')) + $labelStyle, TRUE); @@ -92,7 +92,7 @@ class CRM_Badge_Form_Layout extends CRM_Admin_Form { unset($imageAlignment['C']); $rowCount = self::FIELD_ROWCOUNT; - for ( $i =1; $i <= $rowCount; $i++ ) { + for ( $i = 1; $i <= $rowCount; $i++ ) { $this->add('select', "token[$i]", ts('Token'), array('' => ts('- skip -')) + $tokens); $this->add('select', "font_name[$i]", ts('Font Name'), $fontNames); $this->add('select', "font_size[$i]", ts('Font Size'), $fontSizes); @@ -107,8 +107,7 @@ class CRM_Badge_Form_Layout extends CRM_Admin_Form { $this->add('select', "barcode_type", ts('Type'), $barcodeTypes); $this->add('select', "barcode_alignment", ts('Alignment'), $textAlignment); - - $attributes = array('readonly'=> true); + $attributes = array('readonly' => TRUE); $this->add('text', 'image_1', ts('Image (top left)'), $attributes + CRM_Core_DAO::getAttribute('CRM_Core_DAO_PrintLabel', 'title')); $this->add('text', 'width_image_1', ts('Width (mm)'), array('size' => 6)); @@ -119,7 +118,6 @@ class CRM_Badge_Form_Layout extends CRM_Admin_Form { $this->add('text', 'width_image_2', ts('Width (mm)'), array('size' => 6)); $this->add('text', 'height_image_2', ts('Height (mm)'), array('size' => 6)); - $this->add('checkbox', 'show_participant_image', ts('Use Participant Image?')); $this->add('text', 'width_participant_image', ts('Width (mm)'), array('size' => 6)); $this->add('text', 'height_participant_image', ts('Height (mm)'), array('size' => 6)); diff --git a/CRM/Badge/Page/AJAX.php b/CRM/Badge/Page/AJAX.php index 030caa76a0..5019e9a190 100644 --- a/CRM/Badge/Page/AJAX.php +++ b/CRM/Badge/Page/AJAX.php @@ -35,7 +35,7 @@ class CRM_Badge_Page_AJAX { public static function getImageProp() { $img = $_GET['img']; - list($w, $h) = CRM_Badge_BAO_Badge::getImageProperties($img); + list($w, $h) = CRM_Badge_BAO_Badge::getImageProperties($img); CRM_Utils_JSON::output(array('width' => $w, 'height' => $h)); } } -- 2.25.1