alxarafe / alixar

public/htdocs/includes/stripe/stripe-php/lib/BankAccount.php

Indentation +8 added lines, -8 removed lines

@@ -88,10 +88,10 @@ 
     public static function retrieve($_id, $_opts = null)
     {
         $msg = 'Bank accounts cannot be retrieved without a customer ID or ' .
-               'an account ID. Retrieve a bank account using ' .
-               "`Customer::retrieveSource('customer_id', " .
-               "'bank_account_id')` or `Account::retrieveExternalAccount(" .
-               "'account_id', 'bank_account_id')`.";
+                'an account ID. Retrieve a bank account using ' .
+                "`Customer::retrieveSource('customer_id', " .
+                "'bank_account_id')` or `Account::retrieveExternalAccount(" .
+                "'account_id', 'bank_account_id')`.";
 
         throw new Exception\BadMethodCallException($msg);
     }
@@ -106,10 +106,10 @@ 
     public static function update($_id, $_params = null, $_options = null)
     {
         $msg = 'Bank accounts cannot be updated without a customer ID or an ' .
-               'account ID. Update a bank account using ' .
-               "`Customer::updateSource('customer_id', 'bank_account_id', " .
-               '$updateParams)` or `Account::updateExternalAccount(' .
-               "'account_id', 'bank_account_id', \$updateParams)`.";
+                'account ID. Update a bank account using ' .
+                "`Customer::updateSource('customer_id', 'bank_account_id', " .
+                '$updateParams)` or `Account::updateExternalAccount(' .
+                "'account_id', 'bank_account_id', \$updateParams)`.";
 
         throw new Exception\BadMethodCallException($msg);
     }

public/htdocs/includes/stripe/stripe-php/lib/CustomerBalanceTransaction.php

Indentation +6 added lines, -6 removed lines

@@ -78,9 +78,9 @@ 
     public static function retrieve($_id, $_opts = null)
     {
         $msg = 'Customer Balance Transactions cannot be retrieved without a ' .
-               'customer ID. Retrieve a Customer Balance Transaction using ' .
-               "`Customer::retrieveBalanceTransaction('customer_id', " .
-               "'balance_transaction_id')`.";
+                'customer ID. Retrieve a Customer Balance Transaction using ' .
+                "`Customer::retrieveBalanceTransaction('customer_id', " .
+                "'balance_transaction_id')`.";
 
         throw new Exception\BadMethodCallException($msg);
     }
@@ -95,9 +95,9 @@ 
     public static function update($_id, $_params = null, $_options = null)
     {
         $msg = 'Customer Balance Transactions cannot be updated without a ' .
-               'customer ID. Update a Customer Balance Transaction using ' .
-               "`Customer::updateBalanceTransaction('customer_id', " .
-               "'balance_transaction_id', \$updateParams)`.";
+                'customer ID. Update a Customer Balance Transaction using ' .
+                "`Customer::updateBalanceTransaction('customer_id', " .
+                "'balance_transaction_id', \$updateParams)`.";
 
         throw new Exception\BadMethodCallException($msg);
     }

public/htdocs/includes/stripe/stripe-php/lib/Capability.php

Indentation +4 added lines, -4 removed lines

@@ -64,8 +64,8 @@ 
     public static function retrieve($_id, $_opts = null)
     {
         $msg = 'Capabilities cannot be retrieved without an account ID. ' .
-               'Retrieve a capability using `Account::retrieveCapability(' .
-               "'account_id', 'capability_id')`.";
+                'Retrieve a capability using `Account::retrieveCapability(' .
+                "'account_id', 'capability_id')`.";
 
         throw new Exception\BadMethodCallException($msg);
     }
@@ -80,8 +80,8 @@ 
     public static function update($_id, $_params = null, $_options = null)
     {
         $msg = 'Capabilities cannot be updated without an account ID. ' .
-               'Update a capability using `Account::updateCapability(' .
-               "'account_id', 'capability_id', \$updateParams)`.";
+                'Update a capability using `Account::updateCapability(' .
+                "'account_id', 'capability_id', \$updateParams)`.";
 
         throw new Exception\BadMethodCallException($msg);
     }

public/htdocs/includes/stripe/stripe-php/lib/TaxId.php

Indentation +2 added lines, -2 removed lines

@@ -117,8 +117,8 @@
     public static function retrieve($_id, $_opts = null)
     {
         $msg = 'Tax IDs cannot be retrieved without a customer ID. Retrieve ' .
-               "a tax ID using `Customer::retrieveTaxId('customer_id', " .
-               "'tax_id_id')`.";
+                "a tax ID using `Customer::retrieveTaxId('customer_id', " .
+                "'tax_id_id')`.";
 
         throw new Exception\BadMethodCallException($msg);
     }

public/htdocs/includes/stripe/stripe-php/lib/Source.php

Indentation +2 added lines, -2 removed lines

@@ -99,7 +99,7 @@ 
         if (!$id) {
             $class = static::class;
             $msg = "Could not determine which URL to request: {$class} instance "
-             . "has invalid ID: {$id}";
+                . "has invalid ID: {$id}";
 
             throw new Exception\UnexpectedValueException($msg, null);
         }
@@ -116,7 +116,7 @@ 
             return $this;
         }
         $message = 'This source object does not appear to be currently attached '
-               . 'to a customer object.';
+                . 'to a customer object.';
 
         throw new Exception\UnexpectedValueException($message);
     }

public/htdocs/includes/stripe/stripe-php/lib/Card.php

Indentation +7 added lines, -7 removed lines

@@ -111,9 +111,9 @@ 
     public static function retrieve($_id, $_opts = null)
     {
         $msg = 'Cards cannot be retrieved without a customer ID or an ' .
-               'account ID. Retrieve a card using ' .
-               "`Customer::retrieveSource('customer_id', 'card_id')` or " .
-               "`Account::retrieveExternalAccount('account_id', 'card_id')`.";
+                'account ID. Retrieve a card using ' .
+                "`Customer::retrieveSource('customer_id', 'card_id')` or " .
+                "`Account::retrieveExternalAccount('account_id', 'card_id')`.";
 
         throw new Exception\BadMethodCallException($msg);
     }
@@ -128,10 +128,10 @@ 
     public static function update($_id, $_params = null, $_options = null)
     {
         $msg = 'Cards cannot be updated without a customer ID or an ' .
-               'account ID. Update a card using ' .
-               "`Customer::updateSource('customer_id', 'card_id', " .
-               '$updateParams)` or `Account::updateExternalAccount(' .
-               "'account_id', 'card_id', \$updateParams)`.";
+                'account ID. Update a card using ' .
+                "`Customer::updateSource('customer_id', 'card_id', " .
+                '$updateParams)` or `Account::updateExternalAccount(' .
+                "'account_id', 'card_id', \$updateParams)`.";
 
         throw new Exception\BadMethodCallException($msg);
     }

public/htdocs/includes/tcpdi/tcpdi_parser.php

Indentation +10 added lines, -10 removed lines

@@ -1202,7 +1202,7 @@ 
      */
     private function _getPageResources($obj)
     {
- // $obj = /Page
+    // $obj = /Page
         $obj = $this->getObjectVal($obj);
 
         // If the current object has a resources
@@ -1335,14 +1335,14 @@ 
         if (!is_null($box) && $box[0] == PDF_TYPE_ARRAY) {
             $b =& $box[1];
             return array('x' => $b[0][1] / $k,
-                         'y' => $b[1][1] / $k,
-                         'w' => abs($b[0][1] - $b[2][1]) / $k,
-                         'h' => abs($b[1][1] - $b[3][1]) / $k,
-                         'llx' => min($b[0][1], $b[2][1]) / $k,
-                         'lly' => min($b[1][1], $b[3][1]) / $k,
-                         'urx' => max($b[0][1], $b[2][1]) / $k,
-                         'ury' => max($b[1][1], $b[3][1]) / $k,
-                         );
+                            'y' => $b[1][1] / $k,
+                            'w' => abs($b[0][1] - $b[2][1]) / $k,
+                            'h' => abs($b[1][1] - $b[3][1]) / $k,
+                            'llx' => min($b[0][1], $b[2][1]) / $k,
+                            'lly' => min($b[1][1], $b[3][1]) / $k,
+                            'urx' => max($b[0][1], $b[2][1]) / $k,
+                            'ury' => max($b[1][1], $b[3][1]) / $k,
+                            );
         } elseif (!isset($page[1][1]['/Parent'])) {
             return false;
         } else {
@@ -1394,7 +1394,7 @@ 
 
     private function _getPageRotation($obj)
     {
- // $obj = /Page
+    // $obj = /Page
         $obj = $this->getObjectVal($obj);
         if (isset($obj[1][1]['/Rotate'])) {
             $res = $this->getObjectVal($obj[1][1]['/Rotate']);

Spacing +9 added lines, -9 removed lines

@@ -520,7 +520,7 @@ 
                     }
                 }
             } elseif ($filltrailer) {
-                switch($key) {
+                switch ($key) {
                     case '/Size':
                     case '/Root':
                     case '/Info':
@@ -712,7 +712,7 @@ 
     protected function getRawObject($offset = 0, $data = null)
     {
         if ($data == null) {
-            $data =& $this->pdfdata;
+            $data = & $this->pdfdata;
         }
         $objtype = ''; // object type to be returned
         $objval = ''; // object value to be returned
@@ -1020,7 +1020,7 @@ 
                 $objs = $streaminfo[0];
                 if (!isset($this->objstreams[$objs[0]][$objs[1]])) {
                     // Fetch and decode object stream
-                    $offset = $this->findObjectOffset($objs);;
+                    $offset = $this->findObjectOffset($objs); ;
                     $objstream = $this->getObjectVal(array(PDF_TYPE_OBJREF, $objs[0], $objs[1]));
                     $decoded = $this->decodeStream($objstream[1][1], $objstream[2][1]);
                     $this->objstreams[$objs[0]][$objs[1]] = $decoded[0]; // Store just the data, in case we need more from this objstream
@@ -1055,7 +1055,7 @@ 
             // Not a valid object stream dictionary - skip it.
             return;
         }
-        $stream = $this->decodeStream($obj[1][1], $obj[2][1]);// Decode object stream, as we need the first bit
+        $stream = $this->decodeStream($obj[1][1], $obj[2][1]); // Decode object stream, as we need the first bit
         $first = intval($obj[1][1]['/First'][1]);
         $ints = explode(' ', substr($stream[0], 0, $first)); // Get list of object / offset pairs
         for ($j = 1; $j < count($ints); $j++) {
@@ -1078,7 +1078,7 @@ 
         $this->objoffsets = array();
         if (preg_match_all('/(*ANYCRLF)^[\s]*([0-9]+)[\s]+([0-9]+)[\s]+obj/im', $this->pdfdata, $matches, PREG_OFFSET_CAPTURE) >= 1) {
             $i = 0;
-            foreach($matches[0] as $match) {
+            foreach ($matches[0] as $match) {
                 $offset = $match[1] + strspn($match[0], "\x00\x09\x0a\x0c\x0d\x20");
                 $this->objoffsets[trim($match[0])] = $offset;
                 $dictoffset = $match[1] + strlen($match[0]);
@@ -1240,7 +1240,7 @@ 
 
         if (isset($this->pages[$this->pageno][1][1]['/Contents'])) {
             $contents = $this->_getPageContent($this->pages[$this->pageno][1][1]['/Contents']);
-            foreach($contents as $tmp_content) {
+            foreach ($contents as $tmp_content) {
                 $buffer .= $this->_rebuildContentStream($tmp_content) . ' ';
             }
         }
@@ -1325,7 +1325,7 @@ 
         $page = $this->getObjectVal($page);
         $box = null;
         if (isset($page[1][1][$box_index]))
-            $box =& $page[1][1][$box_index];
+            $box = & $page[1][1][$box_index];
 
         if (!is_null($box) && $box[0] == PDF_TYPE_OBJREF) {
             $tmp_box = $this->getObjectVal($box);
@@ -1333,7 +1333,7 @@ 
         }
 
         if (!is_null($box) && $box[0] == PDF_TYPE_ARRAY) {
-            $b =& $box[1];
+            $b = & $box[1];
             return array('x' => $b[0][1] / $k,
                          'y' => $b[1][1] / $k,
                          'w' => abs($b[0][1] - $b[2][1]) / $k,
@@ -1372,7 +1372,7 @@ 
     {
         $boxes = array();
 
-        foreach($this->availableBoxes as $box) {
+        foreach ($this->availableBoxes as $box) {
             if ($_box = $this->getPageBox($page, $box, $k)) {
                 $boxes[$box] = $_box;
             }

Braces +49 added lines, -27 removed lines

@@ -49,35 +49,51 @@ 
  */
 
 // include class for decoding filters
-if (defined('TCPDF_PATH')) require_once(constant('TCPDF_PATH') . '/include/tcpdf_filters.php');
-else require_once(dirname(__FILE__) . '/../tecnickcom/tcpdf/include/tcpdf_filters.php');
+if (defined('TCPDF_PATH')) {
+    require_once(constant('TCPDF_PATH') . '/include/tcpdf_filters.php');
+} else {
+    require_once(dirname(__FILE__) . '/../tecnickcom/tcpdf/include/tcpdf_filters.php');
+}
 
-if (!defined('PDF_TYPE_NULL'))
+if (!defined('PDF_TYPE_NULL')) {
     define('PDF_TYPE_NULL', 0);
-if (!defined('PDF_TYPE_NUMERIC'))
+}
+if (!defined('PDF_TYPE_NUMERIC')) {
     define('PDF_TYPE_NUMERIC', 1);
-if (!defined('PDF_TYPE_TOKEN'))
+}
+if (!defined('PDF_TYPE_TOKEN')) {
     define('PDF_TYPE_TOKEN', 2);
-if (!defined('PDF_TYPE_HEX'))
+}
+if (!defined('PDF_TYPE_HEX')) {
     define('PDF_TYPE_HEX', 3);
-if (!defined('PDF_TYPE_STRING'))
+}
+if (!defined('PDF_TYPE_STRING')) {
     define('PDF_TYPE_STRING', 4);
-if (!defined('PDF_TYPE_DICTIONARY'))
+}
+if (!defined('PDF_TYPE_DICTIONARY')) {
     define('PDF_TYPE_DICTIONARY', 5);
-if (!defined('PDF_TYPE_ARRAY'))
+}
+if (!defined('PDF_TYPE_ARRAY')) {
     define('PDF_TYPE_ARRAY', 6);
-if (!defined('PDF_TYPE_OBJDEC'))
+}
+if (!defined('PDF_TYPE_OBJDEC')) {
     define('PDF_TYPE_OBJDEC', 7);
-if (!defined('PDF_TYPE_OBJREF'))
+}
+if (!defined('PDF_TYPE_OBJREF')) {
     define('PDF_TYPE_OBJREF', 8);
-if (!defined('PDF_TYPE_OBJECT'))
+}
+if (!defined('PDF_TYPE_OBJECT')) {
     define('PDF_TYPE_OBJECT', 9);
-if (!defined('PDF_TYPE_STREAM'))
+}
+if (!defined('PDF_TYPE_STREAM')) {
     define('PDF_TYPE_STREAM', 10);
-if (!defined('PDF_TYPE_BOOLEAN'))
+}
+if (!defined('PDF_TYPE_BOOLEAN')) {
     define('PDF_TYPE_BOOLEAN', 11);
-if (!defined('PDF_TYPE_REAL'))
+}
+if (!defined('PDF_TYPE_REAL')) {
     define('PDF_TYPE_REAL', 12);
+}
 
 /**
  * @class tcpdi_parser
@@ -251,8 +267,9 @@ 
     public function getPDFVersion()
     {
         preg_match('/\d\.\d/', substr($this->pdfdata, 0, 16), $m);
-        if (isset($m[0]))
-            $this->pdfVersion = $m[0];
+        if (isset($m[0])) {
+                    $this->pdfVersion = $m[0];
+        }
         return $this->pdfVersion;
     }
 
@@ -1211,16 +1228,18 @@ 
         // parent object.
         if (isset($obj[1][1]['/Resources'])) {
             $res = $obj[1][1]['/Resources'];
-            if ($res[0] == PDF_TYPE_OBJECT)
-                return $res[1];
+            if ($res[0] == PDF_TYPE_OBJECT) {
+                            return $res[1];
+            }
             return $res;
         } else {
             if (!isset($obj[1][1]['/Parent'])) {
                 return false;
             } else {
                 $res = $this->_getPageResources($obj[1][1]['/Parent']);
-                if ($res[0] == PDF_TYPE_OBJECT)
-                    return $res[1];
+                if ($res[0] == PDF_TYPE_OBJECT) {
+                                    return $res[1];
+                }
                 return $res;
             }
         }
@@ -1324,8 +1343,9 @@ 
     {
         $page = $this->getObjectVal($page);
         $box = null;
-        if (isset($page[1][1][$box_index]))
-            $box =& $page[1][1][$box_index];
+        if (isset($page[1][1][$box_index])) {
+                    $box =& $page[1][1][$box_index];
+        }
 
         if (!is_null($box) && $box[0] == PDF_TYPE_OBJREF) {
             $tmp_box = $this->getObjectVal($box);
@@ -1398,16 +1418,18 @@ 
         $obj = $this->getObjectVal($obj);
         if (isset($obj[1][1]['/Rotate'])) {
             $res = $this->getObjectVal($obj[1][1]['/Rotate']);
-            if (isset($res[0]) && $res[0] == PDF_TYPE_OBJECT)
-                return $res[1];
+            if (isset($res[0]) && $res[0] == PDF_TYPE_OBJECT) {
+                            return $res[1];
+            }
             return $res;
         } else {
             if (!isset($obj[1][1]['/Parent'])) {
                 return false;
             } else {
                 $res = $this->_getPageRotation($obj[1][1]['/Parent']);
-                if (isset($res[0]) && $res[0] == PDF_TYPE_OBJECT)
-                    return $res[1];
+                if (isset($res[0]) && $res[0] == PDF_TYPE_OBJECT) {
+                                    return $res[1];
+                }
                 return $res;
             }
         }

public/htdocs/includes/tcpdi/tcpdi.php

Indentation +1 added lines, -1 removed lines

@@ -336,7 +336,7 @@
                     switch($tpl['_rotationAngle']) {
                         case -90:
                            $tx = -$tpl['box']['lly'];
-                           $ty = $tpl['box']['urx'];
+                            $ty = $tpl['box']['urx'];
                             break;
                         case -180:
                             $tx = $tpl['box']['urx'];

Spacing +19 added lines, -19 removed lines

@@ -91,7 +91,7 @@ 
 
         if (!isset($this->parsers[$filename]))
             $this->parsers[$filename] = $this->_getPdfParser($filename);
-        $this->current_parser =& $this->parsers[$filename];
+        $this->current_parser = & $this->parsers[$filename];
         $this->setPDFVersion(max($this->getPDFVersion(), $this->current_parser->getPDFVersion()));
 
         return $this->parsers[$filename]->getPageCount();
@@ -110,7 +110,7 @@ 
 
         if (!isset($this->parsers[$filename]))
             $this->parsers[$filename] = new tcpdi_parser($pdfdata, $filename);
-        $this->current_parser =& $this->parsers[$filename];
+        $this->current_parser = & $this->parsers[$filename];
         $this->setPDFVersion(max($this->getPDFVersion(), $this->current_parser->getPDFVersion()));
 
         return $this->parsers[$filename]->getPageCount();
@@ -163,11 +163,11 @@ 
         $fn = $this->current_filename;
 
         // check if page already imported
-        $pageKey = $fn . '-' . ((int)$pageno) . $boxName;
+        $pageKey = $fn . '-' . ((int) $pageno) . $boxName;
         if (isset($this->_importedPages[$pageKey]))
             return $this->_importedPages[$pageKey];
 
-        $parser =& $this->parsers[$fn];
+        $parser = & $this->parsers[$fn];
         $parser->setPageno($pageno);
 
         if (!in_array($boxName, $parser->availableBoxes))
@@ -196,8 +196,8 @@ 
 
         $this->tpl++;
         $this->tpls[$this->tpl] = array();
-        $tpl =& $this->tpls[$this->tpl];
-        $tpl['parser'] =& $parser;
+        $tpl = & $this->tpls[$this->tpl];
+        $tpl['parser'] = & $parser;
         $tpl['resources'] = $parser->getPageResources();
         $tpl['buffer'] = $parser->getContent();
         $tpl['box'] = $box;
@@ -265,10 +265,10 @@ 
     function _putimportedobjects()
     {
         if (is_array($this->parsers) && count($this->parsers) > 0) {
-            foreach($this->parsers as $filename => $p) {
-                $this->current_parser =& $this->parsers[$filename];
+            foreach ($this->parsers as $filename => $p) {
+                $this->current_parser = & $this->parsers[$filename];
                 if (isset($this->_obj_stack[$filename]) && is_array($this->_obj_stack[$filename])) {
-                    while(($n = key($this->_obj_stack[$filename])) !== null) {
+                    while (($n = key($this->_obj_stack[$filename])) !== null) {
                         $nObj = $this->current_parser->getObjectVal($this->_obj_stack[$filename][$n][1]);
 
                         $this->_newobj($this->_obj_stack[$filename][$n][0]);
@@ -301,7 +301,7 @@ 
     {
         $filter = ($this->compress) ? '/Filter /FlateDecode ' : '';
         reset($this->tpls);
-        foreach($this->tpls as $tplidx => $tpl) {
+        foreach ($this->tpls as $tplidx => $tpl) {
             $p = ($this->compress) ? gzcompress($tpl['buffer']) : $tpl['buffer'];
             $this->_newobj();
             $cN = $this->n; // TCPDF/Protection: rem current "n"
@@ -333,7 +333,7 @@ 
                     $c = cos($angle);
                     $s = sin($angle);
 
-                    switch($tpl['_rotationAngle']) {
+                    switch ($tpl['_rotationAngle']) {
                         case -90:
                            $tx = -$tpl['box']['lly'];
                            $ty = $tpl['box']['urx'];
@@ -366,28 +366,28 @@ 
             $this->_out('/Resources ');
 
             if (isset($tpl['resources'])) {
-                $this->current_parser =& $tpl['parser'];
+                $this->current_parser = & $tpl['parser'];
                 $this->pdf_write_value($tpl['resources']); // "n" will be changed
             } else {
                 $this->_out('<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
                 if (isset($this->_res['tpl'][$tplidx]['fonts']) && count($this->_res['tpl'][$tplidx]['fonts'])) {
                     $this->_out('/Font <<');
-                    foreach($this->_res['tpl'][$tplidx]['fonts'] as $font)
+                    foreach ($this->_res['tpl'][$tplidx]['fonts'] as $font)
                         $this->_out('/F' . $font['i'] . ' ' . $font['n'] . ' 0 R');
                     $this->_out('>>');
                 }
-                if(
+                if (
                     isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images']) ||
                     isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls'])
                 )
                 {
                     $this->_out('/XObject <<');
                     if (isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images'])) {
-                        foreach($this->_res['tpl'][$tplidx]['images'] as $image)
+                        foreach ($this->_res['tpl'][$tplidx]['images'] as $image)
                             $this->_out('/I' . $image['i'] . ' ' . $image['n'] . ' 0 R');
                     }
                     if (isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls'])) {
-                        foreach($this->_res['tpl'][$tplidx]['tpls'] as $i => $tpl)
+                        foreach ($this->_res['tpl'][$tplidx]['tpls'] as $i => $tpl)
                             $this->_out($this->tplprefix . $i . ' ' . $tpl['n'] . ' 0 R');
                     }
                     $this->_out('>>');
@@ -510,7 +510,7 @@ 
             case PDF_TYPE_OBJREF:
                 // An indirect object reference
                 // Fill the object stack if needed
-                $cpfn =& $this->current_parser->uniqueid;
+                $cpfn = & $this->current_parser->uniqueid;
 
                 if (!isset($this->_don_obj_stack[$cpfn][$value[1]])) {
                     $this->_newobj(false, true);
@@ -608,7 +608,7 @@ 
      */
     function cleanUp()
     {
-        foreach ($this->parsers as $k => $_){
+        foreach ($this->parsers as $k => $_) {
             $this->parsers[$k]->cleanUp();
             $this->parsers[$k] = null;
             unset($this->parsers[$k]);
@@ -625,7 +625,7 @@ 
     {
         $out = parent::_getxobjectdict();
         if (count($this->tpls)) {
-            foreach($this->tpls as $tplidx => $tpl) {
+            foreach ($this->tpls as $tplidx => $tpl) {
                 $out .= sprintf('%s%d %d 0 R', $this->tplprefix, $tplidx, $tpl['n']);
             }
         }

Braces +36 added lines, -24 removed lines

@@ -89,8 +89,9 @@ 
     {
         $this->current_filename = $filename;
 
-        if (!isset($this->parsers[$filename]))
-            $this->parsers[$filename] = $this->_getPdfParser($filename);
+        if (!isset($this->parsers[$filename])) {
+                    $this->parsers[$filename] = $this->_getPdfParser($filename);
+        }
         $this->current_parser =& $this->parsers[$filename];
         $this->setPDFVersion(max($this->getPDFVersion(), $this->current_parser->getPDFVersion()));
 
@@ -108,8 +109,9 @@ 
         $filename = uniqid('tcpdi-');
         $this->current_filename = $filename;
 
-        if (!isset($this->parsers[$filename]))
-            $this->parsers[$filename] = new tcpdi_parser($pdfdata, $filename);
+        if (!isset($this->parsers[$filename])) {
+                    $this->parsers[$filename] = new tcpdi_parser($pdfdata, $filename);
+        }
         $this->current_parser =& $this->parsers[$filename];
         $this->setPDFVersion(max($this->getPDFVersion(), $this->current_parser->getPDFVersion()));
 
@@ -164,14 +166,16 @@ 
 
         // check if page already imported
         $pageKey = $fn . '-' . ((int)$pageno) . $boxName;
-        if (isset($this->_importedPages[$pageKey]))
-            return $this->_importedPages[$pageKey];
+        if (isset($this->_importedPages[$pageKey])) {
+                    return $this->_importedPages[$pageKey];
+        }
 
         $parser =& $this->parsers[$fn];
         $parser->setPageno($pageno);
 
-        if (!in_array($boxName, $parser->availableBoxes))
-            return $this->Error(sprintf('Unknown box: %s', $boxName));
+        if (!in_array($boxName, $parser->availableBoxes)) {
+                    return $this->Error(sprintf('Unknown box: %s', $boxName));
+        }
 
         $pageboxes = $parser->getPageBoxes($pageno, $this->k);
 
@@ -182,13 +186,16 @@ 
          * TrimBox: Default -> CropBox
          * ArtBox: Default -> CropBox
          */
-        if (!isset($pageboxes[$boxName]) && ($boxName == '/BleedBox' || $boxName == '/TrimBox' || $boxName == '/ArtBox'))
-            $boxName = '/CropBox';
-        if (!isset($pageboxes[$boxName]) && $boxName == '/CropBox')
-            $boxName = '/MediaBox';
+        if (!isset($pageboxes[$boxName]) && ($boxName == '/BleedBox' || $boxName == '/TrimBox' || $boxName == '/ArtBox')) {
+                    $boxName = '/CropBox';
+        }
+        if (!isset($pageboxes[$boxName]) && $boxName == '/CropBox') {
+                    $boxName = '/MediaBox';
+        }
 
-        if (!isset($pageboxes[$boxName]))
-            return false;
+        if (!isset($pageboxes[$boxName])) {
+                    return false;
+        }
 
         $this->lastUsedPageBox = $boxName;
 
@@ -220,8 +227,9 @@ 
             $tpl['w'] = $steps % 2 == 0 ? $_w : $_h;
             $tpl['h'] = $steps % 2 == 0 ? $_h : $_w;
 
-            if ($angle < 0)
-                $angle += 360;
+            if ($angle < 0) {
+                            $angle += 360;
+            }
 
             $tpl['_rotationAngle'] = $angle * -1;
         }
@@ -372,8 +380,9 @@ 
                 $this->_out('<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
                 if (isset($this->_res['tpl'][$tplidx]['fonts']) && count($this->_res['tpl'][$tplidx]['fonts'])) {
                     $this->_out('/Font <<');
-                    foreach($this->_res['tpl'][$tplidx]['fonts'] as $font)
-                        $this->_out('/F' . $font['i'] . ' ' . $font['n'] . ' 0 R');
+                    foreach($this->_res['tpl'][$tplidx]['fonts'] as $font) {
+                                            $this->_out('/F' . $font['i'] . ' ' . $font['n'] . ' 0 R');
+                    }
                     $this->_out('>>');
                 }
                 if(
@@ -383,12 +392,14 @@ 
                 {
                     $this->_out('/XObject <<');
                     if (isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images'])) {
-                        foreach($this->_res['tpl'][$tplidx]['images'] as $image)
-                            $this->_out('/I' . $image['i'] . ' ' . $image['n'] . ' 0 R');
+                        foreach($this->_res['tpl'][$tplidx]['images'] as $image) {
+                                                    $this->_out('/I' . $image['i'] . ' ' . $image['n'] . ' 0 R');
+                        }
                     }
                     if (isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls'])) {
-                        foreach($this->_res['tpl'][$tplidx]['tpls'] as $i => $tpl)
-                            $this->_out($this->tplprefix . $i . ' ' . $tpl['n'] . ' 0 R');
+                        foreach($this->_res['tpl'][$tplidx]['tpls'] as $i => $tpl) {
+                                                    $this->_out($this->tplprefix . $i . ' ' . $tpl['n'] . ' 0 R');
+                        }
                     }
                     $this->_out('>>');
                 }
@@ -668,8 +679,9 @@ 
                         $out .= chr(0x0A);
                         break;
                     case "\r":
-                        if ($count != $n - 1 && $s[$count + 1] == "\n")
-                            $count++;
+                        if ($count != $n - 1 && $s[$count + 1] == "\n") {
+                                                    $count++;
+                        }
                         break;
                     case "\n":
                         break;

public/htdocs/includes/tcpdi/fpdf_tpl.php

Indentation +1 added lines, -1 removed lines

@@ -412,7 +412,7 @@
                 $this->_out('/XObject <<');
                 if (isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images'])) {
                     foreach($this->_res['tpl'][$tplidx]['images'] as $image)
-                          $this->_out('/I' . $image['i'] . ' ' . $image['n'] . ' 0 R');
+                            $this->_out('/I' . $image['i'] . ' ' . $image['n'] . ' 0 R');
                 }
                 if (isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls'])) {
                     foreach($this->_res['tpl'][$tplidx]['tpls'] as $i => $tpl)

Spacing +19 added lines, -19 removed lines

@@ -96,7 +96,7 @@ 
 
         // Save settings
         $this->tpl++;
-        $tpl =& $this->tpls[$this->tpl];
+        $tpl = & $this->tpls[$this->tpl];
         $tpl = array(
             'o_x' => $this->x,
             'o_y' => $this->y,
@@ -130,7 +130,7 @@ 
 
         if ($this->CurrentFont) {
             $fontkey = $this->FontFamily . $this->FontStyle;
-            $this->_res['tpl'][$this->tpl]['fonts'][$fontkey] =& $this->fonts[$fontkey];
+            $this->_res['tpl'][$this->tpl]['fonts'][$fontkey] = & $this->fonts[$fontkey];
             
             $this->_out(sprintf('BT /F%d %.2f Tf ET', $this->CurrentFont['i'], $this->FontSizePt));
         }
@@ -154,7 +154,7 @@ 
         
         if ($this->_intpl) {
             $this->_intpl = false; 
-            $tpl =& $this->tpls[$this->tpl];
+            $tpl = & $this->tpls[$this->tpl];
             $this->SetXY($tpl['o_x'], $tpl['o_y']);
             $this->tMargin = $tpl['o_tMargin'];
             $this->lMargin = $tpl['o_lMargin'];
@@ -170,7 +170,7 @@ 
             
             $fontkey = $this->FontFamily . $this->FontStyle;
             if ($fontkey)
-                $this->CurrentFont =& $this->fonts[$fontkey];
+                $this->CurrentFont = & $this->fonts[$fontkey];
             
             return $this->tpl;
         } else {
@@ -204,10 +204,10 @@ 
             $this->error('Template does not exist!');
             
         if ($this->_intpl) {
-            $this->_res['tpl'][$this->tpl]['tpls'][$tplidx] =& $this->tpls[$tplidx];
+            $this->_res['tpl'][$this->tpl]['tpls'][$tplidx] = & $this->tpls[$tplidx];
         }
         
-        $tpl =& $this->tpls[$tplidx];
+        $tpl = & $this->tpls[$tplidx];
         $w = $tpl['w'];
         $h = $tpl['h'];
         
@@ -258,7 +258,7 @@ 
         if (!isset($this->tpls[$tplidx]))
             return false;
 
-        $tpl =& $this->tpls[$tplidx];
+        $tpl = & $this->tpls[$tplidx];
         $w = $tpl['w'];
         $h = $tpl['h'];
         
@@ -267,9 +267,9 @@ 
             $_h = $h;
         }
 
-        if($_w == 0)
+        if ($_w == 0)
             $_w = $_h * $w / $h;
-        if($_h == 0)
+        if ($_h == 0)
             $_h = $_w * $h / $w;
             
         return array("w" => $_w, "h" => $_h);
@@ -290,9 +290,9 @@ 
         $fontkey = $this->FontFamily . $this->FontStyle;
         
         if ($this->_intpl) {
-            $this->_res['tpl'][$this->tpl]['fonts'][$fontkey] =& $this->fonts[$fontkey];
+            $this->_res['tpl'][$this->tpl]['fonts'][$fontkey] = & $this->fonts[$fontkey];
         } else {
-            $this->_res['page'][$this->page]['fonts'][$fontkey] =& $this->fonts[$fontkey];
+            $this->_res['page'][$this->page]['fonts'][$fontkey] = & $this->fonts[$fontkey];
         }
     }
     
@@ -327,9 +327,9 @@ 
         
         $ret = parent::Image($file, $x, $y, $w, $h, $type, $link);
         if ($this->_intpl) {
-            $this->_res['tpl'][$this->tpl]['images'][$file] =& $this->images[$file];
+            $this->_res['tpl'][$this->tpl]['images'][$file] = & $this->images[$file];
         } else {
-            $this->_res['page'][$this->page]['images'][$file] =& $this->images[$file];
+            $this->_res['page'][$this->page]['images'][$file] = & $this->images[$file];
         }
         
         return $ret;
@@ -400,7 +400,7 @@ 
     {
         $filter = ($this->compress) ? '/Filter /FlateDecode ' : '';
         reset($this->tpls);
-        foreach($this->tpls as $tplidx => $tpl) {
+        foreach ($this->tpls as $tplidx => $tpl) {
             $p = ($this->compress) ? gzcompress($tpl['buffer']) : $tpl['buffer'];
             $this->_newobj();
             $this->tpls[$tplidx]['n'] = $this->n;
@@ -431,22 +431,22 @@ 
             $this->_out('<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
             if (isset($this->_res['tpl'][$tplidx]['fonts']) && count($this->_res['tpl'][$tplidx]['fonts'])) {
                 $this->_out('/Font <<');
-                foreach($this->_res['tpl'][$tplidx]['fonts'] as $font)
+                foreach ($this->_res['tpl'][$tplidx]['fonts'] as $font)
                     $this->_out('/F' . $font['i'] . ' ' . $font['n'] . ' 0 R');
                 $this->_out('>>');
             }
-            if(
+            if (
                 isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images']) || 
                 isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls'])
             )
             {
                 $this->_out('/XObject <<');
                 if (isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images'])) {
-                    foreach($this->_res['tpl'][$tplidx]['images'] as $image)
+                    foreach ($this->_res['tpl'][$tplidx]['images'] as $image)
                           $this->_out('/I' . $image['i'] . ' ' . $image['n'] . ' 0 R');
                 }
                 if (isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls'])) {
-                    foreach($this->_res['tpl'][$tplidx]['tpls'] as $i => $tpl)
+                    foreach ($this->_res['tpl'][$tplidx]['tpls'] as $i => $tpl)
                         $this->_out($this->tplprefix . $i . ' ' . $tpl['n'] . ' 0 R');
                 }
                 $this->_out('>>');
@@ -474,7 +474,7 @@ 
         parent::_putxobjectdict();
         
         if (count($this->tpls)) {
-            foreach($this->tpls as $tplidx => $tpl) {
+            foreach ($this->tpls as $tplidx => $tpl) {
                 $this->_out(sprintf('%s%d %d 0 R', $this->tplprefix, $tplidx, $tpl['n']));
             }
         }

Braces +60 added lines, -40 removed lines

@@ -82,17 +82,22 @@ 
             return;
         }
         
-        if ($this->page <= 0)
-            $this->error("You have to add a page to fpdf first!");
+        if ($this->page <= 0) {
+                    $this->error("You have to add a page to fpdf first!");
+        }
 
-        if ($x == null)
-            $x = 0;
-        if ($y == null)
-            $y = 0;
-        if ($w == null)
-            $w = $this->w;
-        if ($h == null)
-            $h = $this->h;
+        if ($x == null) {
+                    $x = 0;
+        }
+        if ($y == null) {
+                    $y = 0;
+        }
+        if ($w == null) {
+                    $w = $this->w;
+        }
+        if ($h == null) {
+                    $h = $this->h;
+        }
 
         // Save settings
         $this->tpl++;
@@ -169,8 +174,9 @@ 
             $this->FontSize = $tpl['o_FontSize'];
             
             $fontkey = $this->FontFamily . $this->FontStyle;
-            if ($fontkey)
-                $this->CurrentFont =& $this->fonts[$fontkey];
+            if ($fontkey) {
+                            $this->CurrentFont =& $this->fonts[$fontkey];
+            }
             
             return $this->tpl;
         } else {
@@ -197,11 +203,13 @@ 
      */
     function useTemplate($tplidx, $_x = null, $_y = null, $_w = 0, $_h = 0)
     {
-        if ($this->page <= 0)
-            $this->error('You have to add a page first!');
+        if ($this->page <= 0) {
+                    $this->error('You have to add a page first!');
+        }
         
-        if (!isset($this->tpls[$tplidx]))
-            $this->error('Template does not exist!');
+        if (!isset($this->tpls[$tplidx])) {
+                    $this->error('Template does not exist!');
+        }
             
         if ($this->_intpl) {
             $this->_res['tpl'][$this->tpl]['tpls'][$tplidx] =& $this->tpls[$tplidx];
@@ -211,10 +219,12 @@ 
         $w = $tpl['w'];
         $h = $tpl['h'];
         
-        if ($_x == null)
-            $_x = 0;
-        if ($_y == null)
-            $_y = 0;
+        if ($_x == null) {
+                    $_x = 0;
+        }
+        if ($_y == null) {
+                    $_y = 0;
+        }
             
         $_x += $tpl['x'];
         $_y += $tpl['y'];
@@ -255,8 +265,9 @@ 
      */
     function getTemplateSize($tplidx, $_w = 0, $_h = 0)
     {
-        if (!isset($this->tpls[$tplidx]))
-            return false;
+        if (!isset($this->tpls[$tplidx])) {
+                    return false;
+        }
 
         $tpl =& $this->tpls[$tplidx];
         $w = $tpl['w'];
@@ -267,10 +278,12 @@ 
             $_h = $h;
         }
 
-        if($_w == 0)
-            $_w = $_h * $w / $h;
-        if($_h == 0)
-            $_h = $_w * $h / $w;
+        if($_w == 0) {
+                    $_w = $_h * $w / $h;
+        }
+        if($_h == 0) {
+                    $_h = $_w * $h / $w;
+        }
             
         return array("w" => $_w, "h" => $_h);
     }
@@ -347,8 +360,9 @@ 
             return call_user_func_array(array($this, 'TCPDF::AddPage'), $args);
         }
         
-        if ($this->_intpl)
-            $this->Error('Adding pages in templates isn\'t possible!');
+        if ($this->_intpl) {
+                    $this->Error('Adding pages in templates isn\'t possible!');
+        }
             
         parent::AddPage($orientation, $format);
     }
@@ -363,8 +377,9 @@ 
             return call_user_func_array(array($this, 'TCPDF::Link'), $args);
         }
         
-        if ($this->_intpl)
-            $this->Error('Using links in templates aren\'t possible!');
+        if ($this->_intpl) {
+                    $this->Error('Using links in templates aren\'t possible!');
+        }
             
         parent::Link($x, $y, $w, $h, $link);
     }
@@ -376,8 +391,9 @@ 
             return call_user_func_array(array($this, 'TCPDF::AddLink'), $args);
         }
         
-        if ($this->_intpl)
-            $this->Error('Adding links in templates aren\'t possible!');
+        if ($this->_intpl) {
+                    $this->Error('Adding links in templates aren\'t possible!');
+        }
         return parent::AddLink();
     }
     
@@ -388,8 +404,9 @@ 
             return call_user_func_array(array($this, 'TCPDF::SetLink'), $args);
         }
         
-        if ($this->_intpl)
-            $this->Error('Setting links in templates aren\'t possible!');
+        if ($this->_intpl) {
+                    $this->Error('Setting links in templates aren\'t possible!');
+        }
         parent::SetLink($link, $y, $page);
     }
     
@@ -431,8 +448,9 @@ 
             $this->_out('<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
             if (isset($this->_res['tpl'][$tplidx]['fonts']) && count($this->_res['tpl'][$tplidx]['fonts'])) {
                 $this->_out('/Font <<');
-                foreach($this->_res['tpl'][$tplidx]['fonts'] as $font)
-                    $this->_out('/F' . $font['i'] . ' ' . $font['n'] . ' 0 R');
+                foreach($this->_res['tpl'][$tplidx]['fonts'] as $font) {
+                                    $this->_out('/F' . $font['i'] . ' ' . $font['n'] . ' 0 R');
+                }
                 $this->_out('>>');
             }
             if(
@@ -442,12 +460,14 @@ 
             {
                 $this->_out('/XObject <<');
                 if (isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images'])) {
-                    foreach($this->_res['tpl'][$tplidx]['images'] as $image)
-                          $this->_out('/I' . $image['i'] . ' ' . $image['n'] . ' 0 R');
+                    foreach($this->_res['tpl'][$tplidx]['images'] as $image) {
+                                              $this->_out('/I' . $image['i'] . ' ' . $image['n'] . ' 0 R');
+                    }
                 }
                 if (isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls'])) {
-                    foreach($this->_res['tpl'][$tplidx]['tpls'] as $i => $tpl)
-                        $this->_out($this->tplprefix . $i . ' ' . $tpl['n'] . ' 0 R');
+                    foreach($this->_res['tpl'][$tplidx]['tpls'] as $i => $tpl) {
+                                            $this->_out($this->tplprefix . $i . ' ' . $tpl['n'] . ' 0 R');
+                    }
                 }
                 $this->_out('>>');
             }