X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FBadge%2FBAO%2FBadge.php;h=c5752a8ce014d48ad76c09679a52401a03ec106d;hb=d36b8b20ac964dc3c0a74f98f580dc7b0ad7383e;hp=eca1c03461cd25b91c07f970dfaf0f9430b1ee0c;hpb=973535196eeb576136587c194710bc648df9946c;p=civicrm-core.git

diff --git a/CRM/Badge/BAO/Badge.php b/CRM/Badge/BAO/Badge.php
index eca1c03461..c5752a8ce0 100644
--- a/CRM/Badge/BAO/Badge.php
+++ b/CRM/Badge/BAO/Badge.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -45,11 +45,12 @@ class CRM_Badge_BAO_Badge {
   /**
    *  This function is called to create name label pdf
    *
-   * @param   array $participants associated array with participant info
-   * @param   array $layoutInfo   associated array which contains meta data about format/layout
+   * @param array $participants
+   *   Associated array with participant info.
+   * @param array $layoutInfo
+   *   Associated array which contains meta data about format/layout.
    *
-   * @return  void
-   * @access  public
+   * @return void
    */
   public function createLabels(&$participants, &$layoutInfo) {
     $this->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;
@@ -286,9 +293,11 @@ class CRM_Badge_BAO_Badge {
           case 'L':
             $xAlign += -14;
             break;
+
           case 'R':
             $xAlign += 27;
             break;
+
           case 'C':
             $xAlign += 9;
             break;
@@ -322,24 +331,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 +359,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 +368,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 +396,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;
@@ -394,21 +405,20 @@ class CRM_Badge_BAO_Badge {
   }
 
   /**
-   * function to build badges parameters before actually creating badges.
+   * Build badges parameters before actually creating badges.
    *
-   * @param  array $params associated array of submitted values
-   * @param $form
-   * @params object $form form/controller object
+   * @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
     $layoutInfo = CRM_Badge_BAO_Layout::buildLayout($params);
 
-    // spit / get actual field names from tokeni and individual contact image URLs
+    // split/get actual field names from token and individual contact image URLs
     $returnProperties = array();
     if (!empty($layoutInfo['data']['token'])) {
       foreach ($layoutInfo['data']['token'] as $index => $value) {
@@ -475,12 +485,7 @@ class CRM_Badge_BAO_Badge {
     $dao = CRM_Core_DAO::executeQuery($queryString);
     $rows = array();
     while ($dao->fetch()) {
-      if (!empty($dao->country_id)) {
-        $dao->country = CRM_Core_PseudoConstant::country($dao->country_id);
-      }
-      if (!empty($dao->state_province_id)) {
-        $dao->state_province = CRM_Core_PseudoConstant::stateProvince($dao->state_province_id);
-      }
+      $query->convertToPseudoNames($dao);
       $rows[$dao->participant_id] = array();
       foreach ($returnProperties as $key => $dontCare) {
         $rows[$dao->participant_id][$key] = isset($dao->$key) ? $dao->$key : NULL;
@@ -491,4 +496,3 @@ class CRM_Badge_BAO_Badge {
     $eventBadgeClass->createLabels($rows, $layoutInfo);
   }
 }
-