Compatibility regression fix for previous commit.

[fa-stable.git] / reporting / includes / barcodes.php

diff --git a/reporting/includes/barcodes.php b/reporting/includes/barcodes.php
index bfe7f4a8fe1f50ba8728c62e0c4fa68df3878133..4b88fff846d47c6b49d0901f7c45cc8fd33db242 100644 (file)
--- a/reporting/includes/barcodes.php
+++ b/reporting/includes/barcodes.php
@@ -243,7 +243,7 @@ class TCPDFBarcode {
                $bararray = array("code" => $code, "maxw" => 0, "maxh" => 1, "bcode" => array());
                $k = 0;
                for($i=0; $i < strlen($code); $i++) {
-                       $char = $code{$i};
+                       $char = $code[$i];
                        if(!isset($chr[$char])) {
                                // invalid character
                                return false;
@@ -254,7 +254,7 @@ class TCPDFBarcode {
                                } else {
                                        $t = false; // space
                                }
-                               $w = $chr[$char]{$j};
+                               $w = $chr[$char][$j];
                                $bararray["bcode"][$k] = array("t" => $t, "w" => $w, "h" => 1, "p" => 0);
                                $bararray["maxw"] += $w;
                                $k++;
@@ -308,10 +308,10 @@ class TCPDFBarcode {
                        chr(124) => '%Q', chr(125) => '%R', chr(126) => '%S', chr(127) => '%T');
                $code_ext = '';
                for ($i = 0 ; $i < strlen($code); $i++) {
-                       if (ord($code{$i}) > 127) {
+                       if (ord($code[$i]) > 127) {
                                return false;
                        }
-                       $code_ext .= $encode[$code{$i}];
+                       $code_ext .= $encode[$code[$i]];
                }
                return $code_ext;
        }
@@ -330,7 +330,7 @@ class TCPDFBarcode {
                        'W', 'X', 'Y', 'Z', '-', '.', ' ', '$', '/', '+', '%');
                $sum = 0;
                for ($i=0 ; $i < strlen($code); $i++) {
-                       $k = array_keys($chars, $code{$i});
+                       $k = array_keys($chars, $code[$i]);
                        $sum += $k[0];
                }
                $j = ($sum % 43);
@@ -369,8 +369,8 @@ class TCPDFBarcode {
                $bararray = array("code" => $code, "maxw" => 0, "maxh" => 1, "bcode" => array());
                $k = 0;
                for($i=0; $i < strlen($code); $i=$i+2) {
-                       $char_bar = $code{$i};
-                       $char_space = $code{$i+1};
+                       $char_bar = $code[$i];
+                       $char_space = $code[$i+1];
                        if((!isset($chr[$char_bar])) OR (!isset($chr[$char_space]))) {
                                // invalid character
                                return false;
@@ -378,7 +378,7 @@ class TCPDFBarcode {
                        // create a bar-space sequence
                        $seq = "";
                        for($s=0; $s < strlen($chr[$char_bar]); $s++){
-                               $seq .= $chr[$char_bar]{$s} . $chr[$char_space]{$s};
+                               $seq .= $chr[$char_bar][$s] . $chr[$char_space][$s];
                        }
                        for($j=0; $j < strlen($seq); $j++) {
                                if (($j % 2) == 0) {
@@ -386,7 +386,7 @@ class TCPDFBarcode {
                                } else {
                                        $t = false; // space
                                }
-                               $w = $seq{$j};
+                               $w = $seq[$j];
                                $bararray["bcode"][$k] = array("t" => $t, "w" => $w, "h" => 1, "p" => 0);
                                $bararray["maxw"] += $w;
                                $k++;
@@ -541,7 +541,7 @@ class TCPDFBarcode {
                                }
                                $new_code = "";
                                for ($i=0; $i < (strlen($code) / 2); $i++) {
-                                       $new_code .= chr(intval($code{(2 * $i)}.$code{(2 * $i + 1)}));
+                                       $new_code .= chr(intval($code[(2 * $i)].$code[(2 * $i + 1)]));
                                }
                                $code = $new_code;
                                break;
@@ -553,7 +553,7 @@ class TCPDFBarcode {
                // calculate check character
                $sum = $startid;
                for ($i=0; $i < strlen($code); $i++) {
-                       $sum +=  (strpos($keys, $code{$i}) * ($i+1));
+                       $sum +=  (strpos($keys, $code[$i]) * ($i+1));
                }
                $check = ($sum % 103);
                
@@ -563,9 +563,9 @@ class TCPDFBarcode {
                $k = 0;
                $len = strlen($code);
                for($i=0; $i < $len; $i++) {
-                       $ck = strpos($keys, $code{$i});
+                       $ck = strpos($keys, $code[$i]);
                        if (($i == 0) OR ($i > ($len-4))) {
-                               $seq = $chr[ord($code{$i})];
+                               $seq = $chr[ord($code[$i])];
                        } elseif(($ck >= 0) AND isset($chr[$ck])) {
                                        $seq = $chr[$ck];
                        } else {
@@ -578,7 +578,7 @@ class TCPDFBarcode {
                                } else {
                                        $t = false; // space
                                }
-                               $w = $seq{$j};
+                               $w = $seq[$j];
                                $bararray["bcode"][$k] = array("t" => $t, "w" => $w, "h" => 1, "p" => 0);
                                $bararray["maxw"] += $w;
                                $k++;
@@ -610,14 +610,14 @@ class TCPDFBarcode {
                // calculate check digit
                $sum_a = 0;
                for ($i = 1; $i < $data_len; $i+=2) {
-                       $sum_a += $code{$i};
+                       $sum_a += $code[$i];
                }
                if ($len > 12) {
                        $sum_a *= 3;
                }
                $sum_b = 0;
                for ($i = 0; $i < $data_len; $i+=2) {
-                       $sum_b += ($code{$i});
+                       $sum_b += ($code[$i]);
                }
                if ($len < 13) {
                        $sum_b *= 3;
@@ -629,7 +629,7 @@ class TCPDFBarcode {
                if ($code_len == $data_len) {
                        // add check digit
                        $code .= $r;
-               } elseif ($r !== intval($code{$data_len})) {
+               } elseif ($r !== intval($code[$data_len])) {
                        // wrong checkdigit
                        return false;
                }
@@ -740,7 +740,7 @@ class TCPDFBarcode {
                        $bararray = array('code' => $upce_code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
                        $p = $upce_parities[$code[1]][$r];
                        for ($i = 0; $i < 6; ++$i) {
-                               $seq .= $codes[$p[$i]][$upce_code{$i}];
+                               $seq .= $codes[$p[$i]][$upce_code[$i]];
                        }
                        $seq .= '010101'; // right guard bar
                } else {
@@ -748,17 +748,17 @@ class TCPDFBarcode {
                        $half_len = intval(ceil($len / 2));
                        if ($len == 8) {
                                for ($i = 0; $i < $half_len; ++$i) {
-                                       $seq .= $codes['A'][$code{$i}];
+                                       $seq .= $codes['A'][$code[$i]];
                                }
                        } else {
                                $p = $parities[$code[0]];
                                for ($i = 1; $i < $half_len; ++$i) {
-                                       $seq .= $codes[$p[$i-1]][$code{$i}];
+                                       $seq .= $codes[$p[$i-1]][$code[$i]];
                                }
                        }
                        $seq .= '01010'; // center guard bar
                        for ($i = $half_len; $i < $len; ++$i) {
-                               $seq .= $codes['C'][$code{$i}];
+                               $seq .= $codes['C'][$code[$i]];
                        }
                        $seq .= '101'; // right guard bar
                }
@@ -766,8 +766,8 @@ class TCPDFBarcode {
                $w = 0;
                for ($i = 0; $i < $clen; ++$i) {
                        $w += 1;
-                       if (($i == ($clen - 1)) OR (($i < ($clen - 1)) AND ($seq{$i} != $seq{($i+1)}))) {
-                               if ($seq{$i} == '1') {
+                       if (($i == ($clen - 1)) OR (($i < ($clen - 1)) AND ($seq[$i] != $seq[($i+1)]))) {
+                               if ($seq[$i] == '1') {
                                        $t = true; // bar
                                } else {
                                        $t = false; // space
@@ -809,7 +809,7 @@ class TCPDFBarcode {
                // calculate checksum
                $sum = 0;
                for($i=0; $i < $len; $i++) {
-                       $sum += intval($code{$i});
+                       $sum += intval($code[$i]);
                }
                if(($sum % 10) == 0) {
                        return false;
@@ -822,7 +822,7 @@ class TCPDFBarcode {
                $bararray["maxw"] += 2;
                for ($i=0; $i < $len; $i++) {
                        for ($j=0; $j < 5; $j++) {
-                               $h = $barlen[$code{$i}][$j];
+                               $h = $barlen[$code[$i]][$j];
                                $p = floor(1 / $h);
                                $bararray["bcode"][$k++] = array("t" => 1, "w" => 1, "h" => $h, "p" => $p);
                                $bararray["bcode"][$k++] = array("t" => 0, "w" => 1, "h" => 2, "p" => 0);
@@ -872,17 +872,17 @@ class TCPDFBarcode {
                $code = "A".strtoupper($code)."A";
                $len = strlen($code);
                for($i=0; $i < $len; $i++) {
-                       if (!isset($chr[$code{$i}])) {
+                       if (!isset($chr[$code[$i]])) {
                                return false;
                        }
-                       $seq = $chr[$code{$i}];
+                       $seq = $chr[$code[$i]];
                        for($j=0; $j < 8; $j++) {
                                if (($j % 2) == 0) {
                                        $t = true; // bar
                                } else {
                                        $t = false; // space
                                }
-                               $w = $seq{$j};
+                               $w = $seq[$j];
                                $bararray["bcode"][$k] = array("t" => $t, "w" => $w, "h" => 1, "p" => 0);
                                $bararray["maxw"] += $w;
                                $k++;