joenilson / residentes

controller/documentos_residentes.php

Spacing +63 added lines, -63 removed lines

@@ -78,13 +78,13 @@ 
 
     public function crear_documento($tipo_documento)
     {
-        $this->archivo = \date('dmYhis') . '.pdf';
+        $this->archivo = \date('dmYhis').'.pdf';
         switch ($tipo_documento) {
             case 'informacion_cobros':
                 $this->documento = new residentes_pdf('letter', 'portrait');
-                $this->documento->pdf->addInfo('Title', 'Pagos Residente ' .
+                $this->documento->pdf->addInfo('Title', 'Pagos Residente '.
                                         $this->cliente_residente->codcliente);
-                $this->documento->pdf->addInfo('Subject', 'Pagos del Residente ' .
+                $this->documento->pdf->addInfo('Subject', 'Pagos del Residente '.
                                         $this->cliente_residente->codcliente);
                 $this->documento->pdf->addInfo('Author', $this->empresa->nombre);
                 $this->documento->pdf->ezSetMargins(10, 10, 10, 10);
@@ -134,7 +134,7 @@ 
     public function crearFacturaDetallada()
     {
         $customerInfo = (array) $this->cliente_residente;
-        $customerInfo['direccion'] = trim($this->cliente_residente->inmueble->codigo_externo()) . ' numero '
+        $customerInfo['direccion'] = trim($this->cliente_residente->inmueble->codigo_externo()).' numero '
             . $this->cliente_residente->inmueble->numero;
         $datosFactura = $this->datosFactura();
         $datosEmpresa = (array) $this->empresa;
@@ -195,7 +195,7 @@ 
 
         $this->documento->set_y(80);
         if ($this->empresa->pie_factura) {
-            $this->documento->pdf->addText(20, 40, 8, fs_fix_html('<b>Generado por:</b> ' .
+            $this->documento->pdf->addText(20, 40, 8, fs_fix_html('<b>Generado por:</b> '.
                 $this->user->get_agente_fullname()), 0);
             $this->documento->pdf->addText(
                 10,
@@ -206,9 +206,9 @@ 
         }
 
         if ($this->filter_request('info_accion') == 'enviar') {
-            $this->documento->save('tmp/' . FS_TMP_NAME . 'enviar/' . $this->archivo);
-        } else {
-            $this->documento->show('documento_cobros_' . \date('dmYhis') . '.pdf');
+            $this->documento->save('tmp/'.FS_TMP_NAME.'enviar/'.$this->archivo);
+        }else {
+            $this->documento->show('documento_cobros_'.\date('dmYhis').'.pdf');
         }
     }
 
@@ -256,7 +256,7 @@ 
         }
         $this->documento->set_y(80);
         if ($this->empresa->pie_factura) {
-            $this->documento->pdf->addText(20, 40, 8, fs_fix_html('<b>Generado por:</b> ' .
+            $this->documento->pdf->addText(20, 40, 8, fs_fix_html('<b>Generado por:</b> '.
                 $this->user->get_agente_fullname()), 0);
             $this->documento->pdf->addText(
                 10,
@@ -267,9 +267,9 @@ 
         }
 
         if ($this->filter_request('info_accion') == 'enviar') {
-            $this->documento->save('tmp/' . FS_TMP_NAME . 'enviar/' . $this->archivo);
-        } else {
-            $this->documento->show('documento_cobros_' . \date('dmYhis') . '.pdf');
+            $this->documento->save('tmp/'.FS_TMP_NAME.'enviar/'.$this->archivo);
+        }else {
+            $this->documento->show('documento_cobros_'.\date('dmYhis').'.pdf');
         }
     }
 
@@ -277,7 +277,7 @@ 
     {
         $this->crear_documento($tipo_documento);
         $tipo_doc = $this->generar_tipo_doc($tipo_documento);
-        if (file_exists('tmp/' . FS_TMP_NAME . 'enviar/' . $this->archivo)) {
+        if (file_exists('tmp/'.FS_TMP_NAME.'enviar/'.$this->archivo)) {
             $mail = $this->empresa->new_mail();
             $mail->FromName = $this->user->get_agente_fullname();
 
@@ -289,22 +289,22 @@ 
             if ($_POST['email_copia']) {
                 if (isset($_POST['cco'])) {
                     $mail->addBCC($_POST['email_copia'], $this->cliente_residente->nombre);
-                } else {
+                }else {
                     $mail->addCC($_POST['email_copia'], $this->cliente_residente->nombre);
                 }
             }
 
-            $mail->Subject = $this->empresa->nombre . ': ' . $tipo_doc;
+            $mail->Subject = $this->empresa->nombre.': '.$tipo_doc;
 
             if ($this->is_html($_POST['mensaje'])) {
                 $mail->AltBody = strip_tags($_POST['mensaje']);
                 $mail->msgHTML($_POST['mensaje']);
                 $mail->isHTML(true);
-            } else {
+            }else {
                 $mail->Body = $_POST['mensaje'];
             }
 
-            $mail->addAttachment('tmp/' . FS_TMP_NAME . 'enviar/' . $this->archivo);
+            $mail->addAttachment('tmp/'.FS_TMP_NAME.'enviar/'.$this->archivo);
             if (is_uploaded_file($_FILES['adjunto']['tmp_name'])) {
                 $mail->addAttachment($_FILES['adjunto']['tmp_name'], $_FILES['adjunto']['name']);
             }
@@ -312,12 +312,12 @@ 
             if ($this->empresa->mail_connect($mail) && $mail->send()) {
                 $this->new_message('Mensaje enviado correctamente.');
                 $this->empresa->save_mail($mail);
-            } else {
-                $this->new_error_msg("Error al enviar el email: " . $mail->ErrorInfo);
+            }else {
+                $this->new_error_msg("Error al enviar el email: ".$mail->ErrorInfo);
             }
 
-            unlink('tmp/' . FS_TMP_NAME . 'enviar/' . $this->archivo);
-        } else {
+            unlink('tmp/'.FS_TMP_NAME.'enviar/'.$this->archivo);
+        }else {
             $this->new_error_msg('Imposible generar el PDF.');
         }
     }
@@ -336,9 +336,9 @@ 
         $pdf_doc->new_table();
         $pdf_doc->add_table_row(
             array(
-                'campo1' => "<b>" . $tipo_doc . "</b>",
+                'campo1' => "<b>".$tipo_doc."</b>",
                 'dato1' => '',
-                'campo2' => "<b>Fecha Impresión:</b> " . \date('d-m-Y H:i:s')
+                'campo2' => "<b>Fecha Impresión:</b> ".\date('d-m-Y H:i:s')
             )
         );
 
@@ -346,27 +346,27 @@ 
             array(
                 'campo1' => "<b>Residente:</b>",
                 'dato1' => fs_fix_html($this->cliente_residente->nombre),
-                'campo2' => "<b>Tipo Residente:</b> " . $tipo_residente
+                'campo2' => "<b>Tipo Residente:</b> ".$tipo_residente
             )
         );
 
         $row = array(
             'campo1' => "<b>Inmueble:</b>",
-            'dato1' => fs_fix_html($this->cliente_residente->inmueble->codigo_externo() .
-                ' - ' . $this->cliente_residente->inmueble->numero),
+            'dato1' => fs_fix_html($this->cliente_residente->inmueble->codigo_externo().
+                ' - '.$this->cliente_residente->inmueble->numero),
             'campo2' => ''
         );
 
         if (!$this->cliente_residente) {
             /// nada
         } elseif ($this->cliente_residente->telefono1) {
-            $row['campo2'] = "<b>Teléfonos:</b> " . $this->cliente_residente->telefono1;
+            $row['campo2'] = "<b>Teléfonos:</b> ".$this->cliente_residente->telefono1;
             if ($this->cliente_residente->telefono2) {
-                $row['campo2'] .= "\n" . $this->cliente_residente->telefono2;
+                $row['campo2'] .= "\n".$this->cliente_residente->telefono2;
                 $lppag -= 2;
             }
         } elseif ($this->cliente_residente->telefono2) {
-            $row['campo2'] = "<b>Teléfonos:</b> " . $this->cliente_residente->telefono2;
+            $row['campo2'] = "<b>Teléfonos:</b> ".$this->cliente_residente->telefono2;
         }
         $pdf_doc->add_table_row($row);
 
@@ -414,7 +414,7 @@ 
         [$table_header, $array_cols] = $this->generar_pdf_lineas_tablas($tipo);
         $pdf_doc->add_table_header($table_header);
 
-        for ($i = $linea_actual; (($linea_actual < ($lppag + $i)) && ( $linea_actual < count($items)));) {
+        for ($i = $linea_actual; (($linea_actual < ($lppag + $i)) && ($linea_actual < count($items)));) {
             $fila = $this->generar_pdf_lineas_fila($tipo, $items, $linea_actual);
             $pdf_doc->add_table_row($fila);
             $linea_actual++;
@@ -456,7 +456,7 @@ 
             );
         }
         
-        return array($table_header,$array_cols);
+        return array($table_header, $array_cols);
     }
     
     public function generar_pdf_lineas_fila($tipo, $items, $linea_actual)
@@ -467,7 +467,7 @@ 
             'fecha' => $items[$linea_actual]->fecha,
             'vencimiento' => $items[$linea_actual]->vencimiento,
             'importe' => $this->show_precio($items[$linea_actual]->pvpsindto, $this->empresa->coddivisa, true, FS_NF0),
-            'descuento' => $this->show_numero($items[$linea_actual]->dtopor) . " %",
+            'descuento' => $this->show_numero($items[$linea_actual]->dtopor)." %",
             'total' => $this->show_precio($items[$linea_actual]->pvptotal, $this->empresa->coddivisa, true, FS_NF0),
             'atraso' => $items[$linea_actual]->dias_atraso
         );
@@ -494,7 +494,7 @@ 
                 }
                 $aux = explode("\n", $lin->descripcion);
                 if (count($aux) > 1) {
-                    $linea_size += 0.5 * ( count($aux) - 1);
+                    $linea_size += 0.5 * (count($aux) - 1);
                 }
                 if ($linea_size > 1) {
                     $lppag2 -= $linea_size - 1;
@@ -522,83 +522,83 @@ 
                     if (imagepng(imagecreatefromstring(file_get_contents($pdf_doc->logo)), FS_MYDOCS
                         . 'images/logo.png')) {
                         $pdf_doc->pdf->addPngFromFile(
-                            FS_MYDOCS . 'images/logo.png',
+                            FS_MYDOCS.'images/logo.png',
                             $pdf_doc_LOGO_X,
                             $pdf_doc_LOGO_Y,
                             $tamanyo[0],
                             $tamanyo[1]
                         );
-                    } else {
+                    }else {
                         $pdf_doc->pdf->addJpegFromFile($pdf_doc->logo, $pdf_doc_LOGO_X, $pdf_doc_LOGO_Y, $tamanyo[0], $tamanyo[1]);
                     }
-                } else {
+                }else {
                     $pdf_doc->pdf->addJpegFromFile($pdf_doc->logo, $pdf_doc_LOGO_X, $pdf_doc_LOGO_Y, $tamanyo[0], $tamanyo[1]);
                 }
                 $pdf_doc->set_y(400);
                 $pdf_doc->pdf->ez['leftMargin'] = 120;
                 $pdf_doc->pdf->ezText(
-                    "<b>" . fs_fix_html($empresa->nombre) . "</b>",
+                    "<b>".fs_fix_html($empresa->nombre)."</b>",
                     12,
                     array('justification' => 'left')
                 );
-                $pdf_doc->pdf->ezText(FS_CIFNIF . ": " . $empresa->cifnif, 8, array('justification' => 'left'));
+                $pdf_doc->pdf->ezText(FS_CIFNIF.": ".$empresa->cifnif, 8, array('justification' => 'left'));
 
-                $direccion = $empresa->direccion . "\n";
+                $direccion = $empresa->direccion."\n";
                 if ($empresa->apartado) {
-                    $direccion .= ucfirst(FS_APARTADO) . ': ' . $empresa->apartado . ' - ';
+                    $direccion .= ucfirst(FS_APARTADO).': '.$empresa->apartado.' - ';
                 }
 
                 if ($empresa->codpostal) {
-                    $direccion .= 'CP: ' . $empresa->codpostal . ' - ';
+                    $direccion .= 'CP: '.$empresa->codpostal.' - ';
                 }
 
                 if ($empresa->ciudad) {
-                    $direccion .= $empresa->ciudad . ' - ';
+                    $direccion .= $empresa->ciudad.' - ';
                 }
 
                 if ($empresa->provincia) {
-                    $direccion .= '(' . $empresa->provincia . ')';
+                    $direccion .= '('.$empresa->provincia.')';
                 }
 
                 if ($empresa->telefono) {
-                    $direccion .= "\nTeléfono: " . $empresa->telefono . ' - '.$pdf_doc_LOGO_X."/".$pdf_doc_LOGO_Y;
+                    $direccion .= "\nTeléfono: ".$empresa->telefono.' - '.$pdf_doc_LOGO_X."/".$pdf_doc_LOGO_Y;
                 }
 
-                $pdf_doc->pdf->ezText(fs_fix_html($direccion) . "\n", 8, array('justification' => 'left'));
+                $pdf_doc->pdf->ezText(fs_fix_html($direccion)."\n", 8, array('justification' => 'left'));
                 $pdf_doc->set_y($pdf_doc_LOGO_Y);
 
                 $pdf_doc->pdf->ez['leftMargin'] = 10;
-            } else {
+            }else {
                 die('ERROR: no se encuentra la función imagecreatefromstring(). '
                     . 'Y por tanto no se puede usar el logotipo en los documentos.');
             }
-        } else {
+        }else {
             $pdf_doc->pdf->ezText(
-                "<b>" . fs_fix_html($empresa->nombre) . "</b>",
+                "<b>".fs_fix_html($empresa->nombre)."</b>",
                 12,
                 array('justification' => 'left')
             );
-            $pdf_doc->pdf->ezText(FS_CIFNIF . ": " . $empresa->cifnif, 8, array('justification' => 'left'));
+            $pdf_doc->pdf->ezText(FS_CIFNIF.": ".$empresa->cifnif, 8, array('justification' => 'left'));
 
             $direccion = $empresa->direccion;
             if ($empresa->apartado) {
-                $direccion .= ' - ' . ucfirst(FS_APARTADO) . ': ' . $empresa->apartado;
+                $direccion .= ' - '.ucfirst(FS_APARTADO).': '.$empresa->apartado;
             }
 
             if ($empresa->codpostal) {
-                $direccion .= ' - CP: ' . $empresa->codpostal;
+                $direccion .= ' - CP: '.$empresa->codpostal;
             }
 
             if ($empresa->ciudad) {
-                $direccion .= ' - ' . $empresa->ciudad;
+                $direccion .= ' - '.$empresa->ciudad;
             }
 
             if ($empresa->provincia) {
-                $direccion .= ' (' . $empresa->provincia . ')';
+                $direccion .= ' ('.$empresa->provincia.')';
             }
 
             if ($empresa->telefono) {
-                $direccion .= ' - Teléfono: ' . $empresa->telefono;
+                $direccion .= ' - Teléfono: '.$empresa->telefono;
             }
 
             $pdf_doc->pdf->ezText(fs_fix_html($direccion), 8, array('justification' => 'left'));
@@ -623,8 +623,8 @@ 
         $pdf_doc->new_table();
         $pdf_doc->add_table_row(
             array(
-                'campos' => "<b>" . ucfirst(FS_FACTURA) . ":</b>\n <b>".FS_NUMERO2.":</b>\n<b>Fecha:</b>\n<b>" . 'F. Pago' . ":</b>",
-                'factura' => $factura->codigo . "\n" . $factura->numero2 . "\n" . $factura->fecha . "\n" . $factura->codpago,
+                'campos' => "<b>".ucfirst(FS_FACTURA).":</b>\n <b>".FS_NUMERO2.":</b>\n<b>Fecha:</b>\n<b>".'F. Pago'.":</b>",
+                'factura' => $factura->codigo."\n".$factura->numero2."\n".$factura->fecha."\n".$factura->codpago,
             )
         );
         $pdf_doc->save_table(
@@ -643,7 +643,7 @@ 
         $pdf_doc->pdf->ez['leftMargin'] = 10;
     }
 
-    public function pdfFacturaDetalle(&$pdf_doc, &$empresa, &$lppag,  &$linea_actual)
+    public function pdfFacturaDetalle(&$pdf_doc, &$empresa, &$lppag, &$linea_actual)
     {
         $facturas = new factura_cliente();
         $clientes = new cliente();
@@ -662,10 +662,10 @@ 
 
         $pdf_doc->add_table_header($table_header);
 
-        for ($i = $linea_actual; (($linea_actual < ($lppag + $i)) && ( $linea_actual < count($lineas)));) {
+        for ($i = $linea_actual; (($linea_actual < ($lppag + $i)) && ($linea_actual < count($lineas)));) {
             $descripcion = fs_fix_html($lineas[$linea_actual]->descripcion);
             if (!is_null($lineas[$linea_actual]->referencia) && $this->impresion['print_ref']) {
-                $descripcion = '<b>' . $lineas[$linea_actual]->referencia . '</b> ' . $descripcion;
+                $descripcion = '<b>'.$lineas[$linea_actual]->referencia.'</b> '.$descripcion;
             }
 
             /// ¿El articulo tiene trazabilidad?
@@ -677,7 +677,7 @@ 
                 'descripcion' => $descripcion,
                 'cantidad' => $this->show_numero($lineas[$linea_actual]->cantidad, 0),
                 'pvp' => $this->show_precio($lineas[$linea_actual]->pvpunitario, $factura->coddivisa, true, FS_NF0_ART),
-                'dto' => $this->show_numero($due_lineas) . " %",
+                'dto' => $this->show_numero($due_lineas)." %",
                 'importe' => $this->show_precio($lineas[$linea_actual]->pvptotal, $this->documento->coddivisa)
             );
 
@@ -718,7 +718,7 @@ 
 
         /// ¿Última página?
         if ($linea_actual == count($lineas) && $this->documento->observaciones != '') {
-            $pdf_doc->pdf->ezText("\n" . fs_fix_html($this->documento->observaciones), 9);
+            $pdf_doc->pdf->ezText("\n".fs_fix_html($this->documento->observaciones), 9);
         }
     }
 
@@ -737,8 +737,8 @@ 
     {
         $this->existe_tesoreria();
         $this->cliente_residente = false;
-        if (!file_exists('tmp/' . FS_TMP_NAME . 'enviar') &&
-            !mkdir($concurrentDirectory = 'tmp/' . FS_TMP_NAME . 'enviar') &&
+        if (!file_exists('tmp/'.FS_TMP_NAME.'enviar') &&
+            !mkdir($concurrentDirectory = 'tmp/'.FS_TMP_NAME.'enviar') &&
             !is_dir($concurrentDirectory)) {
             throw new \RuntimeException(sprintf('Directory "%s" was not created', $concurrentDirectory));
         }

controller/imprimir_factura_residentes.php

Spacing +12 added lines, -12 removed lines

@@ -58,7 +58,7 @@ 
         if ($logo) {
             $type = pathinfo($logo, PATHINFO_EXTENSION);
             $data = file_get_contents($logo);
-            $this->factura_logo_uri = 'data:image/' . $type . ';base64,' . base64_encode($data);
+            $this->factura_logo_uri = 'data:image/'.$type.';base64,'.base64_encode($data);
         }
 
         if ($this->id) {
@@ -71,13 +71,13 @@ 
         $fac = new factura_cliente();
         $this->factura = $fac->get($this->id);
         //Agregamos la cantidad de lineas multiplicadas por 4
-        $this->sizeFactura+= count($this->factura->get_lineas())*8;
+        $this->sizeFactura += count($this->factura->get_lineas()) * 8;
         //Agregamos la linea de separación del total
-        $this->sizeFactura+=4;
+        $this->sizeFactura += 4;
         //Agregamos las 3 lineas de Neto, FS_IVA y Total
-        $this->sizeFactura+=12;
+        $this->sizeFactura += 12;
         //Agregamos un espacio de 4 lineas aprox
-        $this->sizeFactura+=20;
+        $this->sizeFactura += 20;
         $cli = new cliente();
         $this->cliente = $cli->get($this->factura->codcliente);
         $facturas = $fac->all_from_cliente($this->factura->codcliente);
@@ -89,12 +89,12 @@ 
                         'fecha'=>$f->fecha,
                         'monto'=>$f->total
                     );
-                    $this->sizeFactura+=4;
+                    $this->sizeFactura += 4;
                     $this->total_facturas_pendientes += $f->total;
                 }
             }
         }
-        $this->sizeFactura+=20;
+        $this->sizeFactura += 20;
     }
 
     public function url()
@@ -120,8 +120,8 @@ 
                 'page_from' => __CLASS__,
                 'page_to' => __CLASS__,
                 'type' => 'head',
-                'text' => '<script src="' .
-                            FS_PATH .
+                'text' => '<script src="'.
+                            FS_PATH.
                             'plugins/residentes/view/js/jspdf.min.js" type="text/javascript"></script>',
                 'params' => ''
             ),
@@ -130,9 +130,9 @@ 
                 'page_from' => __CLASS__,
                 'page_to' => __CLASS__,
                 'type' => 'head',
-                'text' => '<script src="' .
-                             FS_PATH .
-                            'plugins/residentes/view/js/jsPDF/plugins/split_text_to_size.min.js" ' .
+                'text' => '<script src="'.
+                             FS_PATH.
+                            'plugins/residentes/view/js/jsPDF/plugins/split_text_to_size.min.js" '.
                             'type="text/javascript"></script>',
                 'params' => ''
             ),

controller/informe_residentes.php

Spacing +31 added lines, -31 removed lines

@@ -108,7 +108,7 @@ 
         }
 
         if ($this->codigo_edificacion) {
-            $this->where_code = " AND r.codigo like '" . $this->codigo_edificacion . "%' ";
+            $this->where_code = " AND r.codigo like '".$this->codigo_edificacion."%' ";
         }
 
         if ($this->tipo === 'informacion') {
@@ -147,8 +147,8 @@ 
         $this->offset = $this->confirmarValor($this->filter_request('offset'), 0);
         $this->limit = $this->confirmarValor($this->filter_request('limit'), FS_ITEM_LIMIT);
         $this->search = $this->confirmarValor($this->filter_request('search'), false);
-        $this->sort = ($sort and $sort!='undefined')?$sort:'r.codigo, r.numero';
-        $this->order = ($order and $order!='undefined')?$order:'ASC';
+        $this->sort = ($sort and $sort != 'undefined') ? $sort : 'r.codigo, r.numero';
+        $this->order = ($order and $order != 'undefined') ? $order : 'ASC';
     }
 
     public function informacion_edificaciones()
@@ -169,7 +169,7 @@ 
         }
 
         //Verificamos los que están ocupados
-        $this->inmuebles_libres = $inmuebles-$inmuebles_ocupados;
+        $this->inmuebles_libres = $inmuebles - $inmuebles_ocupados;
         $this->inmuebles_ocupados = $inmuebles_ocupados;
         $this->total_vehiculos = $vehiculos;
         $this->carpetasPlugin();
@@ -178,10 +178,10 @@ 
 
     public function generarArchivoExcel()
     {
-        $this->archivoXLSX = $this->exportDir . DIRECTORY_SEPARATOR .
-                            $this->archivo . "_" . $this->user->nick . ".xlsx";
-        $this->archivoXLSXPath = $this->publicPath . DIRECTORY_SEPARATOR .
-                            $this->archivo . "_" . $this->user->nick . ".xlsx";
+        $this->archivoXLSX = $this->exportDir.DIRECTORY_SEPARATOR.
+                            $this->archivo."_".$this->user->nick.".xlsx";
+        $this->archivoXLSXPath = $this->publicPath.DIRECTORY_SEPARATOR.
+                            $this->archivo."_".$this->user->nick.".xlsx";
         if (file_exists($this->archivoXLSX)) {
             unlink($this->archivoXLSX);
         }
@@ -261,10 +261,10 @@ 
     public function datosInformacion()
     {
         //Cantidad de Edificaciones
-        $sql_edificaciones = "SELECT ret.id,ret.descripcion, count(rme.id) as total " .
-            "FROM residentes_edificaciones_tipo as ret " .
-            " join residentes_mapa_edificaciones as rme on (rme.id_tipo = ret.id) " .
-            " group by ret.id,ret.descripcion " .
+        $sql_edificaciones = "SELECT ret.id,ret.descripcion, count(rme.id) as total ".
+            "FROM residentes_edificaciones_tipo as ret ".
+            " join residentes_mapa_edificaciones as rme on (rme.id_tipo = ret.id) ".
+            " group by ret.id,ret.descripcion ".
             " order by ret.padre;";
         $data_edificaciones = $this->db->select($sql_edificaciones);
         //cantidad de Inmuebles
@@ -307,7 +307,7 @@ 
         echo json_encode($data, JSON_THROW_ON_ERROR);
     }
 
-    public function lista_residentes ($todo = false)
+    public function lista_residentes($todo = false)
     {
         $sql = " select r.codcliente, c.nombre, c.cifnif, c.telefono1, c.email, codigo, numero, fecha_ocupacion ".
             " from residentes_edificaciones as r, clientes as c ".
@@ -315,7 +315,7 @@ 
             " order by ".$this->sort." ".$this->order;
         if ($todo) {
             $data = $this->db->select($sql);
-        } else {
+        }else {
             $data = $this->db->select_limit($sql, $this->limit, $this->offset);
         }
         $sql_cantidad = "select count(r.id) as total from residentes_edificaciones as r ".
@@ -337,13 +337,13 @@ 
             " order by ".$this->sort." ".$this->order;
         if ($todo) {
             $data = $this->db->select($sql);
-        } else {
+        }else {
             $data = $this->db->select_limit($sql, $this->limit, $this->offset);
         }
 
         $sql_cantidad = "select count(r.id) as total from residentes_edificaciones as r";
         if ($this->where_code) {
-            $sql_cantidad.=" WHERE r.codigo!='' ".$this->where_code;
+            $sql_cantidad .= " WHERE r.codigo!='' ".$this->where_code;
         }
         $data_cantidad = $this->db->select($sql_cantidad);
         return array($data, $data_cantidad[0]['total']);
@@ -365,7 +365,7 @@ 
             " order by ".$this->sort." ".$this->order;
         if ($todo) {
             $data = $this->db->select($sql);
-        } else {
+        }else {
             $data = $this->db->select_limit($sql, $this->limit, $this->offset);
         }
 
@@ -446,7 +446,7 @@ 
 
     public function crearXLSX(&$writer, $hoja_nombre, $header, $headerText, $data)
     {
-        $style_header = array('border'=>'left,right,top,bottom','font'=>'Arial','font-size'=>10,'font-style'=>'bold');
+        $style_header = array('border'=>'left,right,top,bottom', 'font'=>'Arial', 'font-size'=>10, 'font-style'=>'bold');
         $writer->writeSheetRow($hoja_nombre, $headerText, $style_header);
         $writer->writeSheetHeader($hoja_nombre, $header, true);
         $this->agregarDatosXLSX($writer, $hoja_nombre, $data, $headerText);
@@ -478,9 +478,9 @@ 
     public function carpetasPlugin()
     {
         $basepath = dirname(__DIR__, 3);
-        $this->documentosDir = $basepath . DIRECTORY_SEPARATOR . FS_MYDOCS . 'documentos';
-        $this->exportDir = $this->documentosDir . DIRECTORY_SEPARATOR . "informes_residentes";
-        $this->publicPath = FS_PATH . FS_MYDOCS . 'documentos' . DIRECTORY_SEPARATOR . 'informes_residentes';
+        $this->documentosDir = $basepath.DIRECTORY_SEPARATOR.FS_MYDOCS.'documentos';
+        $this->exportDir = $this->documentosDir.DIRECTORY_SEPARATOR."informes_residentes";
+        $this->publicPath = FS_PATH.FS_MYDOCS.'documentos'.DIRECTORY_SEPARATOR.'informes_residentes';
         if (!is_dir($this->documentosDir)) {
             if (!mkdir($concurrentDirectory = $this->documentosDir) && !is_dir($concurrentDirectory)) {
                 throw new \RuntimeException(sprintf('Directory "%s" was not created', $concurrentDirectory));
@@ -497,8 +497,8 @@ 
     public function url()
     {
         if (isset($_REQUEST['inmueble'])) {
-            return 'index.php?page=informe_residentes&inmueble=' . $_REQUEST['inmueble'];
-        } else {
+            return 'index.php?page=informe_residentes&inmueble='.$_REQUEST['inmueble'];
+        }else {
             return parent::url();
         }
     }
@@ -515,7 +515,7 @@ 
                 'page_from' => __CLASS__,
                 'page_to' => __CLASS__,
                 'type' => 'head',
-                'text' => '<script src="' . FS_PATH .
+                'text' => '<script src="'.FS_PATH.
                                 'plugins/residentes/view/js/1/bootstrap-table.min.js" type="text/javascript"></script>',
                 'params' => ''
             ),
@@ -524,7 +524,7 @@ 
                 'page_from' => __CLASS__,
                 'page_to' => __CLASS__,
                 'type' => 'head',
-                'text' => '<script src="' . FS_PATH .
+                'text' => '<script src="'.FS_PATH.
                     'plugins/residentes/view/js/1/bootstrap-table-locale-all.min.js" type="text/javascript"></script>',
                 'params' => ''
             ),
@@ -533,7 +533,7 @@ 
                 'page_from' => __CLASS__,
                 'page_to' => __CLASS__,
                 'type' => 'head',
-                'text' => '<script src="' . FS_PATH .
+                'text' => '<script src="'.FS_PATH.
                 'plugins/residentes/view/js/plugins/bootstrap-table-filter.min.js" type="text/javascript"></script>',
                 'params' => ''
             ),
@@ -542,7 +542,7 @@ 
                 'page_from' => __CLASS__,
                 'page_to' => __CLASS__,
                 'type' => 'head',
-                'text' => '<script src="' . FS_PATH .
+                'text' => '<script src="'.FS_PATH.
                 'plugins/residentes/view/js/plugins/bootstrap-table-toolbar.min.js" type="text/javascript"></script>',
                 'params' => ''
             ),
@@ -551,7 +551,7 @@ 
                 'page_from' => __CLASS__,
                 'page_to' => __CLASS__,
                 'type' => 'head',
-                'text' => '<script src="' . FS_PATH .
+                'text' => '<script src="'.FS_PATH.
                 'plugins/residentes/view/js/plugins/bootstrap-table-mobile.min.js" type="text/javascript"></script>',
                 'params' => ''
             ),
@@ -560,7 +560,7 @@ 
                 'page_from' => __CLASS__,
                 'page_to' => __CLASS__,
                 'type' => 'head',
-                'text' => '<script src="' . FS_PATH . 'view/js/chart.bundle.min.js" type="text/javascript"></script>',
+                'text' => '<script src="'.FS_PATH.'view/js/chart.bundle.min.js" type="text/javascript"></script>',
                 'params' => ''
             ),
             array(
@@ -568,7 +568,7 @@ 
                 'page_from' => __CLASS__,
                 'page_to' => __CLASS__,
                 'type' => 'head',
-                'text' => '<link rel="stylesheet" type="text/css" media="screen" href="' . FS_PATH .
+                'text' => '<link rel="stylesheet" type="text/css" media="screen" href="'.FS_PATH.
                     'plugins/residentes/view/css/bootstrap-table.min.css"/>',
                 'params' => ''
             ),
@@ -577,7 +577,7 @@ 
         foreach ($extensiones as $ext) {
             $fsext0 = new fs_extension($ext);
             if (!$fsext0->save()) {
-                $this->new_error_msg('Imposible guardar los datos de la extensión ' . $ext['name'] . '.');
+                $this->new_error_msg('Imposible guardar los datos de la extensión '.$ext['name'].'.');
             }
         }
     }

controller/imprimir_factura_residentes_detallada.php

Spacing +12 added lines, -12 removed lines

@@ -58,7 +58,7 @@ 
         if ($logo) {
             $type = pathinfo($logo, PATHINFO_EXTENSION);
             $data = file_get_contents($logo);
-            $this->factura_logo_uri = 'data:image/' . $type . ';base64,' . base64_encode($data);
+            $this->factura_logo_uri = 'data:image/'.$type.';base64,'.base64_encode($data);
         }
 
         if ($this->id) {
@@ -71,13 +71,13 @@ 
         $fac = new factura_cliente();
         $this->factura = $fac->get($this->id);
         //Agregamos la cantidad de lineas multiplicadas por 4
-        $this->sizeFactura+= count($this->factura->get_lineas())*8;
+        $this->sizeFactura += count($this->factura->get_lineas()) * 8;
         //Agregamos la linea de separación del total
-        $this->sizeFactura+=4;
+        $this->sizeFactura += 4;
         //Agregamos las 3 lineas de Neto, FS_IVA y Total
-        $this->sizeFactura+=12;
+        $this->sizeFactura += 12;
         //Agregamos un espacio de 4 lineas aprox
-        $this->sizeFactura+=20;
+        $this->sizeFactura += 20;
         $cli = new cliente();
         $this->cliente = $cli->get($this->factura->codcliente);
         $facturas = $fac->all_from_cliente($this->factura->codcliente);
@@ -89,12 +89,12 @@ 
                         'fecha'=>$f->fecha,
                         'monto'=>$f->total
                     );
-                    $this->sizeFactura+=4;
+                    $this->sizeFactura += 4;
                     $this->total_facturas_pendientes += $f->total;
                 }
             }
         }
-        $this->sizeFactura+=20;
+        $this->sizeFactura += 20;
     }
 
     public function url()
@@ -120,8 +120,8 @@ 
                 'page_from' => __CLASS__,
                 'page_to' => __CLASS__,
                 'type' => 'head',
-                'text' => '<script src="' .
-                            FS_PATH .
+                'text' => '<script src="'.
+                            FS_PATH.
                             'plugins/residentes/view/js/jspdf.min.js" type="text/javascript"></script>',
                 'params' => ''
             ),
@@ -130,9 +130,9 @@ 
                 'page_from' => __CLASS__,
                 'page_to' => __CLASS__,
                 'type' => 'head',
-                'text' => '<script src="' .
-                             FS_PATH .
-                            'plugins/residentes/view/js/jsPDF/plugins/split_text_to_size.min.js" ' .
+                'text' => '<script src="'.
+                             FS_PATH.
+                            'plugins/residentes/view/js/jsPDF/plugins/split_text_to_size.min.js" '.
                             'type="text/javascript"></script>',
                 'params' => ''
             ),

controller/clientes_vehiculos.php

Spacing +3 added lines, -3 removed lines

@@ -68,14 +68,14 @@ 
             if ($accion === 'agregar') {
                 if ($vehiculo->save()) {
                     $this->new_message('Vehiculo agregado exitosamente');
-                } else {
+                }else {
                     $this->new_error_msg('No se pudieron agregar los datos del vehiculo, revise la información e ".
                     "intentelo nuevamente.');
                 }
             } elseif ($accion === 'eliminar') {
                 if ($vehiculo->delete()) {
                     $this->new_message('Vehiculo eliminado exitosamente');
-                } else {
+                }else {
                     $this->new_error_msg('No se pudieron eliminar los datos del vehiculo, revise la información e ".
                     "intentelo nuevamente.');
                 }
@@ -110,7 +110,7 @@ 
         foreach ($extensiones as $ext) {
             $fsext0 = new fs_extension($ext);
             if (!$fsext0->save()) {
-                $this->new_error_msg('Imposible guardar los datos de la extensión ' . $ext['name'] . '.');
+                $this->new_error_msg('Imposible guardar los datos de la extensión '.$ext['name'].'.');
             }
         }
     }

extras/residentes_pdf.php

Spacing +21 added lines, -21 removed lines

@@ -62,81 +62,81 @@
                     if (imagepng(imagecreatefromstring(file_get_contents($this->logo)), FS_MYDOCS
                         . 'images/logo.png')) {
                         $this->pdf->addPngFromFile(
-                            FS_MYDOCS . 'images/logo.png',
+                            FS_MYDOCS.'images/logo.png',
                             self::LOGO_X,
                             self::LOGO_Y,
                             $tamanyo[0],
                             $tamanyo[1]
                         );
-                    } else {
+                    }else {
                         $this->pdf->addJpegFromFile($this->logo, self::LOGO_X, self::LOGO_Y, $tamanyo[0], $tamanyo[1]);
                     }
-                } else {
+                }else {
                     $this->pdf->addJpegFromFile($this->logo, self::LOGO_X, self::LOGO_Y, $tamanyo[0], $tamanyo[1]);
                 }
 
                 $this->pdf->ez['rightMargin'] = 40;
                 $this->pdf->ezText(
-                    "<b>" . fs_fix_html($empresa->nombre) . "</b>",
+                    "<b>".fs_fix_html($empresa->nombre)."</b>",
                     12,
                     array('justification' => 'right')
                 );
-                $this->pdf->ezText(FS_CIFNIF . ": " . $empresa->cifnif, 8, array('justification' => 'right'));
+                $this->pdf->ezText(FS_CIFNIF.": ".$empresa->cifnif, 8, array('justification' => 'right'));
 
-                $direccion = $empresa->direccion . "\n";
+                $direccion = $empresa->direccion."\n";
                 if ($empresa->apartado) {
-                    $direccion .= ucfirst(FS_APARTADO) . ': ' . $empresa->apartado . ' - ';
+                    $direccion .= ucfirst(FS_APARTADO).': '.$empresa->apartado.' - ';
                 }
 
                 if ($empresa->codpostal) {
-                    $direccion .= 'CP: ' . $empresa->codpostal . ' - ';
+                    $direccion .= 'CP: '.$empresa->codpostal.' - ';
                 }
 
                 if ($empresa->ciudad) {
-                    $direccion .= $empresa->ciudad . ' - ';
+                    $direccion .= $empresa->ciudad.' - ';
                 }
 
                 if ($empresa->provincia) {
-                    $direccion .= '(' . $empresa->provincia . ')';
+                    $direccion .= '('.$empresa->provincia.')';
                 }
 
                 if ($empresa->telefono) {
-                    $direccion .= "\nTeléfono: " . $empresa->telefono;
+                    $direccion .= "\nTeléfono: ".$empresa->telefono;
                 }
 
-                $this->pdf->ezText(fs_fix_html($direccion) . "\n", 8, array('justification' => 'right'));
+                $this->pdf->ezText(fs_fix_html($direccion)."\n", 8, array('justification' => 'right'));
                 $this->set_y(self::LOGO_Y + 10);
-            } else {
+            }else {
                 die('ERROR: no se encuentra la función imagecreatefromstring(). '
                     . 'Y por tanto no se puede usar el logotipo en los documentos.');
             }
-        } else {
+        }else {
             $this->pdf->ezText(
-                "<b>" . fs_fix_html($empresa->nombre) . "</b>",
+                "<b>".fs_fix_html($empresa->nombre)."</b>",
                 12,
                 array('justification' => 'center')
             );
-            $this->pdf->ezText(FS_CIFNIF . ": " . $empresa->cifnif, 8, array('justification' => 'center'));
+            $this->pdf->ezText(FS_CIFNIF.": ".$empresa->cifnif, 8, array('justification' => 'center'));
 
             $direccion = $empresa->direccion;
             if ($empresa->apartado) {
-                $direccion .= ' - ' . ucfirst(FS_APARTADO) . ': ' . $empresa->apartado;
+                $direccion .= ' - '.ucfirst(FS_APARTADO).': '.$empresa->apartado;
             }
 
             if ($empresa->codpostal) {
-                $direccion .= ' - CP: ' . $empresa->codpostal;
+                $direccion .= ' - CP: '.$empresa->codpostal;
             }
 
             if ($empresa->ciudad) {
-                $direccion .= ' - ' . $empresa->ciudad;
+                $direccion .= ' - '.$empresa->ciudad;
             }
 
             if ($empresa->provincia) {
-                $direccion .= ' (' . $empresa->provincia . ')';
+                $direccion .= ' ('.$empresa->provincia.')';
             }
 
             if ($empresa->telefono) {
-                $direccion .= ' - Teléfono: ' . $empresa->telefono;
+                $direccion .= ' - Teléfono: '.$empresa->telefono;
             }
 
             $this->pdf->ezText(fs_fix_html($direccion), 8, array('justification' => 'center'));

extras/fpdf183/exfpdf.php

Indentation +289 added lines, -289 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- /*********************************************************************
+    /*********************************************************************
  * exFPDF  extend FPDF v1.81                                                    *
  *                                                                    *
  * Version: 2.2                                                       *
@@ -7,378 +7,378 @@ 
  * Author:  Dan Machado                                               *
  * Require  FPDF v1.81, formatedstring v1.0                                                *
  **********************************************************************/
- include 'formatedstring.php';
- class exFPDF extends FPDF
- {
+    include 'formatedstring.php';
+    class exFPDF extends FPDF
+    {
     public function PageBreak(){
-       return $this->PageBreakTrigger;
-   }
+        return $this->PageBreakTrigger;
+    }
 
-   public function current_font($c){
-      if($c=='family'){
-         return $this->FontFamily;
-      }
-      elseif($c=='style'){
-         return $this->FontStyle;
-      }
-      elseif($c=='size'){
-         return $this->FontSizePt;
-      }
-   }
+    public function current_font($c){
+        if($c=='family'){
+            return $this->FontFamily;
+        }
+        elseif($c=='style'){
+            return $this->FontStyle;
+        }
+        elseif($c=='size'){
+            return $this->FontSizePt;
+        }
+    }
 
-   public function get_color($c){
-      if($c=='fill'){
-         return $this->FillColor;
-      }
-      elseif($c=='text'){
-         return $this->TextColor;
-      }
-   }
+    public function get_color($c){
+        if($c=='fill'){
+            return $this->FillColor;
+        }
+        elseif($c=='text'){
+            return $this->TextColor;
+        }
+    }
 
-   public function get_page_width(){
-      return $this->w;
-   }
+    public function get_page_width(){
+        return $this->w;
+    }
 
-   public function get_margin($c){
-      if($c=='l'){
-         return $this->lMargin;
-      }
-      elseif($c=='r'){
-         return $this->rMargin;
-      }
-      elseif($c=='t'){
-         return $this->tMargin;
-      }
-   }
+    public function get_margin($c){
+        if($c=='l'){
+            return $this->lMargin;
+        }
+        elseif($c=='r'){
+            return $this->rMargin;
+        }
+        elseif($c=='t'){
+            return $this->tMargin;
+        }
+    }
 
-   public function get_linewidth(){
-      return $this->LineWidth;
-   }
+    public function get_linewidth(){
+        return $this->LineWidth;
+    }
 
-   public function get_orientation(){
-      return $this->CurOrientation;
-   }
-   static private $hex=array('0'=>0,'1'=>1,'2'=>2,'3'=>3,'4'=>4,'5'=>5,'6'=>6,'7'=>7,'8'=>8,'9'=>9,
-   'A'=>10,'B'=>11,'C'=>12,'D'=>13,'E'=>14,'F'=>15);
+    public function get_orientation(){
+        return $this->CurOrientation;
+    }
+    static private $hex=array('0'=>0,'1'=>1,'2'=>2,'3'=>3,'4'=>4,'5'=>5,'6'=>6,'7'=>7,'8'=>8,'9'=>9,
+    'A'=>10,'B'=>11,'C'=>12,'D'=>13,'E'=>14,'F'=>15);
 
-   public function is_rgb($str){
-      $a=true;
-      $tmp=explode(',', trim($str, ','));
-      foreach($tmp as $color){
-         if(!is_numeric($color) || $color<0 || $color>255){
+    public function is_rgb($str){
+        $a=true;
+        $tmp=explode(',', trim($str, ','));
+        foreach($tmp as $color){
+            if(!is_numeric($color) || $color<0 || $color>255){
             $a=false;
             break;
-         }
-      }
-      return $a;
-   }
+            }
+        }
+        return $a;
+    }
 
-   public function is_hex($str){
-      $a=true;
-      $str=strtoupper($str);
-      $n=strlen($str);
-      if(($n==7 || $n==4) && $str[0]=='#'){
-         for($i=1; $i<$n; $i++){
+    public function is_hex($str){
+        $a=true;
+        $str=strtoupper($str);
+        $n=strlen($str);
+        if(($n==7 || $n==4) && $str[0]=='#'){
+            for($i=1; $i<$n; $i++){
             if(!isset(self::$hex[$str[$i]])){
-               $a=false;
-               break;
+                $a=false;
+                break;
+            }
             }
-         }
-      }
-      else{
-         $a=false;
-      }
-      return $a;
-   }
+        }
+        else{
+            $a=false;
+        }
+        return $a;
+    }
 
-   public function hextodec($str){
-      $result=array();
-      $str=strtoupper(substr($str,1));
-      $n=strlen($str);
-      for($i=0; $i<3; $i++){
-         if($n==6){
+    public function hextodec($str){
+        $result=array();
+        $str=strtoupper(substr($str,1));
+        $n=strlen($str);
+        for($i=0; $i<3; $i++){
+            if($n==6){
             $result[$i]=self::$hex[$str[2*$i]]*16+self::$hex[$str[2*$i+1]];
-         }
-         else{
+            }
+            else{
             $result[$i]=self::$hex[$str[$i]]*16+self::$hex[$str[$i]];
-         }
-      }
-      return $result;
-   }
-   static private $options=array('F'=>'', 'T'=>'', 'D'=>'');
+            }
+        }
+        return $result;
+    }
+    static private $options=array('F'=>'', 'T'=>'', 'D'=>'');
 
-   public function resetColor($str, $p='F'){
-      if(isset(self::$options[$p]) && self::$options[$p]!=$str){
-         self::$options[$p]=$str;
-         $array=array();
-         if($this->is_hex($str)){
+    public function resetColor($str, $p='F'){
+        if(isset(self::$options[$p]) && self::$options[$p]!=$str){
+            self::$options[$p]=$str;
+            $array=array();
+            if($this->is_hex($str)){
             $array=$this->hextodec($str);
-         }
-         elseif($this->is_rgb($str)){
+            }
+            elseif($this->is_rgb($str)){
             $array=explode(',', trim($str, ','));
             for($i=0; $i<3; $i++){
-               if(!isset($array[$i])){
-                  $array[$i]=0;
-               }
+                if(!isset($array[$i])){
+                    $array[$i]=0;
+                }
+            }
             }
-         }
-         else{
+            else{
             $array=array(null, null, null);
             $i=0;
             $tmp=explode(' ', $str);
             foreach($tmp as $c){
-               if(is_numeric($c)){
-                  $array[$i]=$c*256;
-                  $i++;
-               }
+                if(is_numeric($c)){
+                    $array[$i]=$c*256;
+                    $i++;
+                }
             }
-         }
-         if($p=='T'){
+            }
+            if($p=='T'){
             $this->SetTextColor($array[0],$array[1],$array[2]);
-         }
-         elseif($p=='D'){
+            }
+            elseif($p=='D'){
             $this->SetDrawColor($array[0],$array[1], $array[2]);
-         }
-         elseif($p=='F'){
+            }
+            elseif($p=='F'){
             $this->SetFillColor($array[0],$array[1],$array[2]);
-         }
-      }
-   }
-   static private $font_def='';
+            }
+        }
+    }
+    static private $font_def='';
 
-   public function resetFont($font_family, $font_style, $font_size){
-      if(self::$font_def!=$font_family .'-' . $font_style . '-' .$font_size){
-         self::$font_def=$font_family .'-' . $font_style . '-' .$font_size;
-         $this->SetFont($font_family, $font_style, $font_size);
-      }
-   }
+    public function resetFont($font_family, $font_style, $font_size){
+        if(self::$font_def!=$font_family .'-' . $font_style . '-' .$font_size){
+            self::$font_def=$font_family .'-' . $font_style . '-' .$font_size;
+            $this->SetFont($font_family, $font_style, $font_size);
+        }
+    }
 
-   public function resetStaticData(){
-      self::$font_def='';
-      self::$options=array('F'=>'', 'T'=>'', 'D'=>'');
-   }
-   /***********************************************************************
+    public function resetStaticData(){
+        self::$font_def='';
+        self::$options=array('F'=>'', 'T'=>'', 'D'=>'');
+    }
+    /***********************************************************************
    *
    * Based on FPDF method SetFont
    *
    ************************************************************************/
 
-   private function &FontData($family, $style, $size){
-      if($family=='')
-      $family = $this->FontFamily;
-      else
-      $family = strtolower($family);
-      $style = strtoupper($style);
-      if(strpos($style,'U')!==false){
-         $this->underline = true;
-         $style = str_replace('U','',$style);
-      }
-      if($style=='IB')
-      $style = 'BI';
-      $fontkey = $family.$style;
-      if(!isset($this->fonts[$fontkey])){
-         if($family=='arial')
-         $family = 'helvetica';
-         if(in_array($family,$this->CoreFonts)){
+    private function &FontData($family, $style, $size){
+        if($family=='')
+        $family = $this->FontFamily;
+        else
+        $family = strtolower($family);
+        $style = strtoupper($style);
+        if(strpos($style,'U')!==false){
+            $this->underline = true;
+            $style = str_replace('U','',$style);
+        }
+        if($style=='IB')
+        $style = 'BI';
+        $fontkey = $family.$style;
+        if(!isset($this->fonts[$fontkey])){
+            if($family=='arial')
+            $family = 'helvetica';
+            if(in_array($family,$this->CoreFonts)){
             if($family=='symbol' || $family=='zapfdingbats')
             $style = '';
             $fontkey = $family.$style;
             if(!isset($this->fonts[$fontkey]))
             $this->AddFont($family,$style);
-         }
-         else
-         $this->Error('Undefined font: '.$family.' '.$style);
-      }
-      $result['FontSize'] = $size/$this->k;
-      $result['CurrentFont']=&$this->fonts[$fontkey];
-      return $result;
-   }
+            }
+            else
+            $this->Error('Undefined font: '.$family.' '.$style);
+        }
+        $result['FontSize'] = $size/$this->k;
+        $result['CurrentFont']=&$this->fonts[$fontkey];
+        return $result;
+    }
     
 
-   private function setLines(&$fstring, $p, $q){
-      $parced_str=& $fstring->parced_str;
-      $lines=& $fstring->lines;
-      $linesmap=& $fstring->linesmap;
-      $cfty=$fstring->get_current_style($p);
-      $ffs=$cfty['font-family'] . $cfty['style'];
-      if(!isset($fstring->used_fonts[$ffs])){
-         $fstring->used_fonts[$ffs]=& $this->FontData($cfty['font-family'], $cfty['style'], $cfty['font-size']);
-      }
-      $cw=& $fstring->used_fonts[$ffs]['CurrentFont']['cw'];
-      $wmax = $fstring->width*1000*$this->k;
-      $j=count($lines)-1;
-      $k=strlen($lines[$j]);
-         if(!isset($linesmap[$j][0])) {
-         $linesmap[$j]=array($p,$p, 0);
-      }
-      $sl=$cw[' ']*$cfty['font-size'];
-      $x=$a=$linesmap[$j][2];
-      if($k>0){
-         $x+=$sl;
-         $lines[$j].=' ';
-         $linesmap[$j][2]+=$sl;
-      }
-      $u=$p;
-      $t='';
-      $l=$p+$q;
-      $ftmp='';
-      for($i=$p; $i<$l; $i++){
+    private function setLines(&$fstring, $p, $q){
+        $parced_str=& $fstring->parced_str;
+        $lines=& $fstring->lines;
+        $linesmap=& $fstring->linesmap;
+        $cfty=$fstring->get_current_style($p);
+        $ffs=$cfty['font-family'] . $cfty['style'];
+        if(!isset($fstring->used_fonts[$ffs])){
+            $fstring->used_fonts[$ffs]=& $this->FontData($cfty['font-family'], $cfty['style'], $cfty['font-size']);
+        }
+        $cw=& $fstring->used_fonts[$ffs]['CurrentFont']['cw'];
+        $wmax = $fstring->width*1000*$this->k;
+        $j=count($lines)-1;
+        $k=strlen($lines[$j]);
+            if(!isset($linesmap[$j][0])) {
+            $linesmap[$j]=array($p,$p, 0);
+        }
+        $sl=$cw[' ']*$cfty['font-size'];
+        $x=$a=$linesmap[$j][2];
+        if($k>0){
+            $x+=$sl;
+            $lines[$j].=' ';
+            $linesmap[$j][2]+=$sl;
+        }
+        $u=$p;
+        $t='';
+        $l=$p+$q;
+        $ftmp='';
+        for($i=$p; $i<$l; $i++){
             if($ftmp!=$ffs){
             $cfty=$fstring->get_current_style($i);
             $ffs=$cfty['font-family'] . $cfty['style'];
             if(!isset($fstring->used_fonts[$ffs])){
-               $fstring->used_fonts[$ffs]=& $this->FontData($cfty['font-family'], $cfty['style'], $cfty['font-size']);
+                $fstring->used_fonts[$ffs]=& $this->FontData($cfty['font-family'], $cfty['style'], $cfty['font-size']);
             }
             $cw=& $fstring->used_fonts[$ffs]['CurrentFont']['cw'];
             $ftmp=$ffs;
-         }
-         $x+=$cw[$parced_str[$i]]*$cfty['font-size'];
-         if($x>$wmax){
+            }
+            $x+=$cw[$parced_str[$i]]*$cfty['font-size'];
+            if($x>$wmax){
             if($a>0){
-               $t=substr($parced_str,$p, $i-$p);
-               $lines[$j]=substr($lines[$j],0,$k);
-               $linesmap[$j][1]=$p-1;
-               $linesmap[$j][2]=$a;
-               $x-=($a+$sl);
-               $a=0;
-               $u=$p;
+                $t=substr($parced_str,$p, $i-$p);
+                $lines[$j]=substr($lines[$j],0,$k);
+                $linesmap[$j][1]=$p-1;
+                $linesmap[$j][2]=$a;
+                $x-=($a+$sl);
+                $a=0;
+                $u=$p;
             }
             else{
-               $x=$cw[$parced_str[$i]]*$cfty['font-size'];
-               $t='';
-               $u=$i;
+                $x=$cw[$parced_str[$i]]*$cfty['font-size'];
+                $t='';
+                $u=$i;
             }
             $j++;
             $lines[$j]=$t;
             $linesmap[$j]=array();
             $linesmap[$j][0]=$u;
             $linesmap[$j][2]=0;
-         }
-         $lines[$j].=$parced_str[$i];
-         $linesmap[$j][1]=$i;
-         $linesmap[$j][2]=$x;
-      }
-      return;
-   }
+            }
+            $lines[$j].=$parced_str[$i];
+            $linesmap[$j][1]=$i;
+            $linesmap[$j][2]=$x;
+        }
+        return;
+    }
 
-   public function &extMultiCell($font_family, $font_style, $font_size, $font_color, $w, $txt){
-      $result=array();
-      if($w==0){
-         return $result;
-      }
-      $this->current_font=array('font-family'=>$font_family, 'style'=>$font_style, 'font-size'=>$font_size, 'font-color'=>$font_color);
-      $fstring=new formatedString($txt, $w, $this->current_font);
-      $word='';
-      $p=0;
-      $i=0;
-      $n=strlen($fstring->parced_str);
-      while($i<$n){
-         $word.=$fstring->parced_str[$i];
-         if($fstring->parced_str[$i]=="\n" || $fstring->parced_str[$i]==' ' || $i==$n-1){
+    public function &extMultiCell($font_family, $font_style, $font_size, $font_color, $w, $txt){
+        $result=array();
+        if($w==0){
+            return $result;
+        }
+        $this->current_font=array('font-family'=>$font_family, 'style'=>$font_style, 'font-size'=>$font_size, 'font-color'=>$font_color);
+        $fstring=new formatedString($txt, $w, $this->current_font);
+        $word='';
+        $p=0;
+        $i=0;
+        $n=strlen($fstring->parced_str);
+        while($i<$n){
+            $word.=$fstring->parced_str[$i];
+            if($fstring->parced_str[$i]=="\n" || $fstring->parced_str[$i]==' ' || $i==$n-1){
             $word=trim($word);
             $this->setLines($fstring, $p, strlen($word));
             $p=$i+1;
             $word='';
             if($fstring->parced_str[$i]=="\n" && $i<$n-1){
-               $z=0;
-               $j=count($fstring->lines);
-               $fstring->lines[$j]='';
-               $fstring->linesmap[$j]=array();
+                $z=0;
+                $j=count($fstring->lines);
+                $fstring->lines[$j]='';
+                $fstring->linesmap[$j]=array();
             }
-         }
-         $i++;
-      }
-      if($n==0){
-         return $result;
-      }
-      $n=count($fstring->lines);
-         for($i=0; $i<$n; $i++){
-         $result[$i]=$fstring->break_by_style($i);
-      }
-      return $result;
-   }
+            }
+            $i++;
+        }
+        if($n==0){
+            return $result;
+        }
+        $n=count($fstring->lines);
+            for($i=0; $i<$n; $i++){
+            $result[$i]=$fstring->break_by_style($i);
+        }
+        return $result;
+    }
 
-   private function GetMixStringWidth($line){
-      $w = 0;
-      foreach($line['chunks'] as $i=>$chunk){
-         $t=0;
-         $cf=& $this->FontData($line['style'][$i]['font-family'], $line['style'][$i]['style'], $line['style'][$i]['font-size']);
-         $cw=& $cf['CurrentFont']['cw'];
-         $s=implode('', explode(' ',$chunk));
-         $l = strlen($s);
-         for($j=0;$j<$l;$j++){
+    private function GetMixStringWidth($line){
+        $w = 0;
+        foreach($line['chunks'] as $i=>$chunk){
+            $t=0;
+            $cf=& $this->FontData($line['style'][$i]['font-family'], $line['style'][$i]['style'], $line['style'][$i]['font-size']);
+            $cw=& $cf['CurrentFont']['cw'];
+            $s=implode('', explode(' ',$chunk));
+            $l = strlen($s);
+            for($j=0;$j<$l;$j++){
             $t+=$cw[$s[$j]];
-         }
-         $w+=$t*$line['style'][$i]['font-size'];
-      }
-      return $w;
-   }
+            }
+            $w+=$t*$line['style'][$i]['font-size'];
+        }
+        return $w;
+    }
 
-   public function CellBlock($w, $lh, &$lines, $align='J'){
-      if($w==0){
-         return;
-      }
-      $ctmp='';
-      $ftmp='';
-      foreach($lines as $i=>$line){
-         $k = $this->k;
-         if($this->y+$lh*$line['height']>$this->PageBreakTrigger){
+    public function CellBlock($w, $lh, &$lines, $align='J'){
+        if($w==0){
+            return;
+        }
+        $ctmp='';
+        $ftmp='';
+        foreach($lines as $i=>$line){
+            $k = $this->k;
+            if($this->y+$lh*$line['height']>$this->PageBreakTrigger){
             break;
-         }
-         $dx=0;
-         $dw=0;
-         if($line['width']!=0){
+            }
+            $dx=0;
+            $dw=0;
+            if($line['width']!=0){
             if($align=='R'){
-               $dx = $w-$line['width']/($this->k*1000);
+                $dx = $w-$line['width']/($this->k*1000);
             }
             elseif($align=='C'){
-               $dx = ($w-$line['width']/($this->k*1000))/2;
+                $dx = ($w-$line['width']/($this->k*1000))/2;
             }
             if($align=='J'){
-               $tmp=explode(' ', implode('',$line['chunks']));
-               $ns=count($tmp);
-               if($ns>1){
-                  $sx=implode('',$tmp);
-                  $delta=$this->GetMixStringWidth($line)/($this->k*1000);
-                  $dw=($w-$delta)*(1/($ns-1));
-               }
+                $tmp=explode(' ', implode('',$line['chunks']));
+                $ns=count($tmp);
+                if($ns>1){
+                    $sx=implode('',$tmp);
+                    $delta=$this->GetMixStringWidth($line)/($this->k*1000);
+                    $dw=($w-$delta)*(1/($ns-1));
+                }
             }
-         }
-         $xx=$this->x+$dx;
-         foreach($line['chunks'] as $tj=>$txt){
+            }
+            $xx=$this->x+$dx;
+            foreach($line['chunks'] as $tj=>$txt){
             $this->resetFont($line['style'][$tj]['font-family'], $line['style'][$tj]['style'], $line['style'][$tj]['font-size']);
             $this->resetColor($line['style'][$tj]['font-color'], 'T');
             $y=$this->y+0.5*$lh*$line['height'] +0.3*$line['height']/$this->k;
             if($dw){
-               $tmp=explode(' ', $txt);
-               foreach($tmp as $e=>$tt){
-                  if($e>0){
-                     $xx+=$dw;
-                     if($tt==''){
+                $tmp=explode(' ', $txt);
+                foreach($tmp as $e=>$tt){
+                    if($e>0){
+                        $xx+=$dw;
+                        if($tt==''){
                         continue;
-                     }
-                  }
-                  $this->Text($xx, $y, $tt);
-                     if($line['style'][$tj]['href']){
-                     $yr=$this->y+0.5*($lh*$line['height']-$line['height']/$this->k);
-                     $this->Link($xx, $yr, $this->GetStringWidth($txt),$line['height']/$this->k, $line['style'][$tj]['href']);
-                  }
-                  $xx+=$this->GetStringWidth($tt);
-               }
+                        }
+                    }
+                    $this->Text($xx, $y, $tt);
+                        if($line['style'][$tj]['href']){
+                        $yr=$this->y+0.5*($lh*$line['height']-$line['height']/$this->k);
+                        $this->Link($xx, $yr, $this->GetStringWidth($txt),$line['height']/$this->k, $line['style'][$tj]['href']);
+                    }
+                    $xx+=$this->GetStringWidth($tt);
+                }
             }
             else{
-               $this->Text($xx, $y, $txt);
-                  if($line['style'][$tj]['href']){
-                  $yr=$this->y+0.5*($lh*$line['height']-$line['height']/$this->k);
-                  $this->Link($xx, $yr, $this->GetStringWidth($txt),$line['height']/$this->k, $line['style'][$tj]['href']);
-               }
-               $xx+=$this->GetStringWidth($txt);
+                $this->Text($xx, $y, $txt);
+                    if($line['style'][$tj]['href']){
+                    $yr=$this->y+0.5*($lh*$line['height']-$line['height']/$this->k);
+                    $this->Link($xx, $yr, $this->GetStringWidth($txt),$line['height']/$this->k, $line['style'][$tj]['href']);
+                }
+                $xx+=$this->GetStringWidth($txt);
+            }
             }
-         }
-         unset($lines[$i]);
-         $this->y += $lh*$line['height'];
-      }
-   }
+            unset($lines[$i]);
+            $this->y += $lh*$line['height'];
+        }
+    }
    
 }
 ?>

Spacing +210 added lines, -210 removed lines

@@ -10,152 +10,152 @@ 
  include 'formatedstring.php';
  class exFPDF extends FPDF
  {
-    public function PageBreak(){
+    public function PageBreak() {
        return $this->PageBreakTrigger;
    }
 
-   public function current_font($c){
-      if($c=='family'){
+   public function current_font($c) {
+      if ($c == 'family') {
          return $this->FontFamily;
       }
-      elseif($c=='style'){
+      elseif ($c == 'style') {
          return $this->FontStyle;
       }
-      elseif($c=='size'){
+      elseif ($c == 'size') {
          return $this->FontSizePt;
       }
    }
 
-   public function get_color($c){
-      if($c=='fill'){
+   public function get_color($c) {
+      if ($c == 'fill') {
          return $this->FillColor;
       }
-      elseif($c=='text'){
+      elseif ($c == 'text') {
          return $this->TextColor;
       }
    }
 
-   public function get_page_width(){
+   public function get_page_width() {
       return $this->w;
    }
 
-   public function get_margin($c){
-      if($c=='l'){
+   public function get_margin($c) {
+      if ($c == 'l') {
          return $this->lMargin;
       }
-      elseif($c=='r'){
+      elseif ($c == 'r') {
          return $this->rMargin;
       }
-      elseif($c=='t'){
+      elseif ($c == 't') {
          return $this->tMargin;
       }
    }
 
-   public function get_linewidth(){
+   public function get_linewidth() {
       return $this->LineWidth;
    }
 
-   public function get_orientation(){
+   public function get_orientation() {
       return $this->CurOrientation;
    }
-   static private $hex=array('0'=>0,'1'=>1,'2'=>2,'3'=>3,'4'=>4,'5'=>5,'6'=>6,'7'=>7,'8'=>8,'9'=>9,
-   'A'=>10,'B'=>11,'C'=>12,'D'=>13,'E'=>14,'F'=>15);
+   static private $hex = array('0'=>0, '1'=>1, '2'=>2, '3'=>3, '4'=>4, '5'=>5, '6'=>6, '7'=>7, '8'=>8, '9'=>9,
+   'A'=>10, 'B'=>11, 'C'=>12, 'D'=>13, 'E'=>14, 'F'=>15);
 
-   public function is_rgb($str){
-      $a=true;
-      $tmp=explode(',', trim($str, ','));
-      foreach($tmp as $color){
-         if(!is_numeric($color) || $color<0 || $color>255){
-            $a=false;
+   public function is_rgb($str) {
+      $a = true;
+      $tmp = explode(',', trim($str, ','));
+      foreach ($tmp as $color) {
+         if (!is_numeric($color) || $color < 0 || $color > 255) {
+            $a = false;
             break;
          }
       }
       return $a;
    }
 
-   public function is_hex($str){
-      $a=true;
-      $str=strtoupper($str);
-      $n=strlen($str);
-      if(($n==7 || $n==4) && $str[0]=='#'){
-         for($i=1; $i<$n; $i++){
-            if(!isset(self::$hex[$str[$i]])){
-               $a=false;
+   public function is_hex($str) {
+      $a = true;
+      $str = strtoupper($str);
+      $n = strlen($str);
+      if (($n == 7 || $n == 4) && $str[0] == '#') {
+         for ($i = 1; $i < $n; $i++) {
+            if (!isset(self::$hex[$str[$i]])) {
+               $a = false;
                break;
             }
          }
       }
-      else{
-         $a=false;
+      else {
+         $a = false;
       }
       return $a;
    }
 
-   public function hextodec($str){
-      $result=array();
-      $str=strtoupper(substr($str,1));
-      $n=strlen($str);
-      for($i=0; $i<3; $i++){
-         if($n==6){
-            $result[$i]=self::$hex[$str[2*$i]]*16+self::$hex[$str[2*$i+1]];
+   public function hextodec($str) {
+      $result = array();
+      $str = strtoupper(substr($str, 1));
+      $n = strlen($str);
+      for ($i = 0; $i < 3; $i++) {
+         if ($n == 6) {
+            $result[$i] = self::$hex[$str[2 * $i]] * 16 + self::$hex[$str[2 * $i + 1]];
          }
-         else{
-            $result[$i]=self::$hex[$str[$i]]*16+self::$hex[$str[$i]];
+         else {
+            $result[$i] = self::$hex[$str[$i]] * 16 + self::$hex[$str[$i]];
          }
       }
       return $result;
    }
-   static private $options=array('F'=>'', 'T'=>'', 'D'=>'');
+   static private $options = array('F'=>'', 'T'=>'', 'D'=>'');
 
-   public function resetColor($str, $p='F'){
-      if(isset(self::$options[$p]) && self::$options[$p]!=$str){
-         self::$options[$p]=$str;
-         $array=array();
-         if($this->is_hex($str)){
-            $array=$this->hextodec($str);
+   public function resetColor($str, $p = 'F') {
+      if (isset(self::$options[$p]) && self::$options[$p] != $str) {
+         self::$options[$p] = $str;
+         $array = array();
+         if ($this->is_hex($str)) {
+            $array = $this->hextodec($str);
          }
-         elseif($this->is_rgb($str)){
-            $array=explode(',', trim($str, ','));
-            for($i=0; $i<3; $i++){
-               if(!isset($array[$i])){
-                  $array[$i]=0;
+         elseif ($this->is_rgb($str)) {
+            $array = explode(',', trim($str, ','));
+            for ($i = 0; $i < 3; $i++) {
+               if (!isset($array[$i])) {
+                  $array[$i] = 0;
                }
             }
          }
-         else{
-            $array=array(null, null, null);
-            $i=0;
-            $tmp=explode(' ', $str);
-            foreach($tmp as $c){
-               if(is_numeric($c)){
-                  $array[$i]=$c*256;
+         else {
+            $array = array(null, null, null);
+            $i = 0;
+            $tmp = explode(' ', $str);
+            foreach ($tmp as $c) {
+               if (is_numeric($c)) {
+                  $array[$i] = $c * 256;
                   $i++;
                }
             }
          }
-         if($p=='T'){
-            $this->SetTextColor($array[0],$array[1],$array[2]);
+         if ($p == 'T') {
+            $this->SetTextColor($array[0], $array[1], $array[2]);
          }
-         elseif($p=='D'){
-            $this->SetDrawColor($array[0],$array[1], $array[2]);
+         elseif ($p == 'D') {
+            $this->SetDrawColor($array[0], $array[1], $array[2]);
          }
-         elseif($p=='F'){
-            $this->SetFillColor($array[0],$array[1],$array[2]);
+         elseif ($p == 'F') {
+            $this->SetFillColor($array[0], $array[1], $array[2]);
          }
       }
    }
-   static private $font_def='';
+   static private $font_def = '';
 
-   public function resetFont($font_family, $font_style, $font_size){
-      if(self::$font_def!=$font_family .'-' . $font_style . '-' .$font_size){
-         self::$font_def=$font_family .'-' . $font_style . '-' .$font_size;
+   public function resetFont($font_family, $font_style, $font_size) {
+      if (self::$font_def != $font_family.'-'.$font_style.'-'.$font_size) {
+         self::$font_def = $font_family.'-'.$font_style.'-'.$font_size;
          $this->SetFont($font_family, $font_style, $font_size);
       }
    }
 
-   public function resetStaticData(){
-      self::$font_def='';
-      self::$options=array('F'=>'', 'T'=>'', 'D'=>'');
+   public function resetStaticData() {
+      self::$font_def = '';
+      self::$options = array('F'=>'', 'T'=>'', 'D'=>'');
    }
    /***********************************************************************
    *
@@ -164,219 +164,219 @@ 
    ************************************************************************/
 
    private function &FontData($family, $style, $size){
-      if($family=='')
+      if ($family == '')
       $family = $this->FontFamily;
       else
       $family = strtolower($family);
       $style = strtoupper($style);
-      if(strpos($style,'U')!==false){
+      if (strpos($style, 'U') !== false) {
          $this->underline = true;
-         $style = str_replace('U','',$style);
+         $style = str_replace('U', '', $style);
       }
-      if($style=='IB')
+      if ($style == 'IB')
       $style = 'BI';
       $fontkey = $family.$style;
-      if(!isset($this->fonts[$fontkey])){
-         if($family=='arial')
+      if (!isset($this->fonts[$fontkey])) {
+         if ($family == 'arial')
          $family = 'helvetica';
-         if(in_array($family,$this->CoreFonts)){
-            if($family=='symbol' || $family=='zapfdingbats')
+         if (in_array($family, $this->CoreFonts)) {
+            if ($family == 'symbol' || $family == 'zapfdingbats')
             $style = '';
             $fontkey = $family.$style;
-            if(!isset($this->fonts[$fontkey]))
-            $this->AddFont($family,$style);
+            if (!isset($this->fonts[$fontkey]))
+            $this->AddFont($family, $style);
          }
          else
          $this->Error('Undefined font: '.$family.' '.$style);
       }
-      $result['FontSize'] = $size/$this->k;
-      $result['CurrentFont']=&$this->fonts[$fontkey];
+      $result['FontSize'] = $size / $this->k;
+      $result['CurrentFont'] = &$this->fonts[$fontkey];
       return $result;
    }
     
 
-   private function setLines(&$fstring, $p, $q){
-      $parced_str=& $fstring->parced_str;
-      $lines=& $fstring->lines;
-      $linesmap=& $fstring->linesmap;
-      $cfty=$fstring->get_current_style($p);
-      $ffs=$cfty['font-family'] . $cfty['style'];
-      if(!isset($fstring->used_fonts[$ffs])){
-         $fstring->used_fonts[$ffs]=& $this->FontData($cfty['font-family'], $cfty['style'], $cfty['font-size']);
+   private function setLines(&$fstring, $p, $q) {
+      $parced_str = & $fstring->parced_str;
+      $lines = & $fstring->lines;
+      $linesmap = & $fstring->linesmap;
+      $cfty = $fstring->get_current_style($p);
+      $ffs = $cfty['font-family'].$cfty['style'];
+      if (!isset($fstring->used_fonts[$ffs])) {
+         $fstring->used_fonts[$ffs] = & $this->FontData($cfty['font-family'], $cfty['style'], $cfty['font-size']);
       }
-      $cw=& $fstring->used_fonts[$ffs]['CurrentFont']['cw'];
-      $wmax = $fstring->width*1000*$this->k;
-      $j=count($lines)-1;
-      $k=strlen($lines[$j]);
-         if(!isset($linesmap[$j][0])) {
-         $linesmap[$j]=array($p,$p, 0);
+      $cw = & $fstring->used_fonts[$ffs]['CurrentFont']['cw'];
+      $wmax = $fstring->width * 1000 * $this->k;
+      $j = count($lines) - 1;
+      $k = strlen($lines[$j]);
+         if (!isset($linesmap[$j][0])) {
+         $linesmap[$j] = array($p, $p, 0);
       }
-      $sl=$cw[' ']*$cfty['font-size'];
-      $x=$a=$linesmap[$j][2];
-      if($k>0){
-         $x+=$sl;
-         $lines[$j].=' ';
-         $linesmap[$j][2]+=$sl;
+      $sl = $cw[' '] * $cfty['font-size'];
+      $x = $a = $linesmap[$j][2];
+      if ($k > 0) {
+         $x += $sl;
+         $lines[$j] .= ' ';
+         $linesmap[$j][2] += $sl;
       }
-      $u=$p;
-      $t='';
-      $l=$p+$q;
-      $ftmp='';
-      for($i=$p; $i<$l; $i++){
-            if($ftmp!=$ffs){
-            $cfty=$fstring->get_current_style($i);
-            $ffs=$cfty['font-family'] . $cfty['style'];
-            if(!isset($fstring->used_fonts[$ffs])){
-               $fstring->used_fonts[$ffs]=& $this->FontData($cfty['font-family'], $cfty['style'], $cfty['font-size']);
+      $u = $p;
+      $t = '';
+      $l = $p + $q;
+      $ftmp = '';
+      for ($i = $p; $i < $l; $i++) {
+            if ($ftmp != $ffs) {
+            $cfty = $fstring->get_current_style($i);
+            $ffs = $cfty['font-family'].$cfty['style'];
+            if (!isset($fstring->used_fonts[$ffs])) {
+               $fstring->used_fonts[$ffs] = & $this->FontData($cfty['font-family'], $cfty['style'], $cfty['font-size']);
             }
-            $cw=& $fstring->used_fonts[$ffs]['CurrentFont']['cw'];
-            $ftmp=$ffs;
+            $cw = & $fstring->used_fonts[$ffs]['CurrentFont']['cw'];
+            $ftmp = $ffs;
          }
-         $x+=$cw[$parced_str[$i]]*$cfty['font-size'];
-         if($x>$wmax){
-            if($a>0){
-               $t=substr($parced_str,$p, $i-$p);
-               $lines[$j]=substr($lines[$j],0,$k);
-               $linesmap[$j][1]=$p-1;
-               $linesmap[$j][2]=$a;
-               $x-=($a+$sl);
-               $a=0;
-               $u=$p;
+         $x += $cw[$parced_str[$i]] * $cfty['font-size'];
+         if ($x > $wmax) {
+            if ($a > 0) {
+               $t = substr($parced_str, $p, $i - $p);
+               $lines[$j] = substr($lines[$j], 0, $k);
+               $linesmap[$j][1] = $p - 1;
+               $linesmap[$j][2] = $a;
+               $x -= ($a + $sl);
+               $a = 0;
+               $u = $p;
             }
-            else{
-               $x=$cw[$parced_str[$i]]*$cfty['font-size'];
-               $t='';
-               $u=$i;
+            else {
+               $x = $cw[$parced_str[$i]] * $cfty['font-size'];
+               $t = '';
+               $u = $i;
             }
             $j++;
-            $lines[$j]=$t;
-            $linesmap[$j]=array();
-            $linesmap[$j][0]=$u;
-            $linesmap[$j][2]=0;
+            $lines[$j] = $t;
+            $linesmap[$j] = array();
+            $linesmap[$j][0] = $u;
+            $linesmap[$j][2] = 0;
          }
-         $lines[$j].=$parced_str[$i];
-         $linesmap[$j][1]=$i;
-         $linesmap[$j][2]=$x;
+         $lines[$j] .= $parced_str[$i];
+         $linesmap[$j][1] = $i;
+         $linesmap[$j][2] = $x;
       }
       return;
    }
 
    public function &extMultiCell($font_family, $font_style, $font_size, $font_color, $w, $txt){
-      $result=array();
-      if($w==0){
+      $result = array();
+      if ($w == 0) {
          return $result;
       }
-      $this->current_font=array('font-family'=>$font_family, 'style'=>$font_style, 'font-size'=>$font_size, 'font-color'=>$font_color);
-      $fstring=new formatedString($txt, $w, $this->current_font);
-      $word='';
-      $p=0;
-      $i=0;
-      $n=strlen($fstring->parced_str);
-      while($i<$n){
-         $word.=$fstring->parced_str[$i];
-         if($fstring->parced_str[$i]=="\n" || $fstring->parced_str[$i]==' ' || $i==$n-1){
-            $word=trim($word);
+      $this->current_font = array('font-family'=>$font_family, 'style'=>$font_style, 'font-size'=>$font_size, 'font-color'=>$font_color);
+      $fstring = new formatedString($txt, $w, $this->current_font);
+      $word = '';
+      $p = 0;
+      $i = 0;
+      $n = strlen($fstring->parced_str);
+      while ($i < $n) {
+         $word .= $fstring->parced_str[$i];
+         if ($fstring->parced_str[$i] == "\n" || $fstring->parced_str[$i] == ' ' || $i == $n - 1) {
+            $word = trim($word);
             $this->setLines($fstring, $p, strlen($word));
-            $p=$i+1;
-            $word='';
-            if($fstring->parced_str[$i]=="\n" && $i<$n-1){
-               $z=0;
-               $j=count($fstring->lines);
-               $fstring->lines[$j]='';
-               $fstring->linesmap[$j]=array();
+            $p = $i + 1;
+            $word = '';
+            if ($fstring->parced_str[$i] == "\n" && $i < $n - 1) {
+               $z = 0;
+               $j = count($fstring->lines);
+               $fstring->lines[$j] = '';
+               $fstring->linesmap[$j] = array();
             }
          }
          $i++;
       }
-      if($n==0){
+      if ($n == 0) {
          return $result;
       }
-      $n=count($fstring->lines);
-         for($i=0; $i<$n; $i++){
-         $result[$i]=$fstring->break_by_style($i);
+      $n = count($fstring->lines);
+         for ($i = 0; $i < $n; $i++) {
+         $result[$i] = $fstring->break_by_style($i);
       }
       return $result;
    }
 
-   private function GetMixStringWidth($line){
+   private function GetMixStringWidth($line) {
       $w = 0;
-      foreach($line['chunks'] as $i=>$chunk){
-         $t=0;
-         $cf=& $this->FontData($line['style'][$i]['font-family'], $line['style'][$i]['style'], $line['style'][$i]['font-size']);
-         $cw=& $cf['CurrentFont']['cw'];
-         $s=implode('', explode(' ',$chunk));
+      foreach ($line['chunks'] as $i=>$chunk) {
+         $t = 0;
+         $cf = & $this->FontData($line['style'][$i]['font-family'], $line['style'][$i]['style'], $line['style'][$i]['font-size']);
+         $cw = & $cf['CurrentFont']['cw'];
+         $s = implode('', explode(' ', $chunk));
          $l = strlen($s);
-         for($j=0;$j<$l;$j++){
-            $t+=$cw[$s[$j]];
+         for ($j = 0; $j < $l; $j++) {
+            $t += $cw[$s[$j]];
          }
-         $w+=$t*$line['style'][$i]['font-size'];
+         $w += $t * $line['style'][$i]['font-size'];
       }
       return $w;
    }
 
-   public function CellBlock($w, $lh, &$lines, $align='J'){
-      if($w==0){
+   public function CellBlock($w, $lh, &$lines, $align = 'J') {
+      if ($w == 0) {
          return;
       }
-      $ctmp='';
-      $ftmp='';
-      foreach($lines as $i=>$line){
+      $ctmp = '';
+      $ftmp = '';
+      foreach ($lines as $i=>$line) {
          $k = $this->k;
-         if($this->y+$lh*$line['height']>$this->PageBreakTrigger){
+         if ($this->y + $lh * $line['height'] > $this->PageBreakTrigger) {
             break;
          }
-         $dx=0;
-         $dw=0;
-         if($line['width']!=0){
-            if($align=='R'){
-               $dx = $w-$line['width']/($this->k*1000);
+         $dx = 0;
+         $dw = 0;
+         if ($line['width'] != 0) {
+            if ($align == 'R') {
+               $dx = $w - $line['width'] / ($this->k * 1000);
             }
-            elseif($align=='C'){
-               $dx = ($w-$line['width']/($this->k*1000))/2;
+            elseif ($align == 'C') {
+               $dx = ($w - $line['width'] / ($this->k * 1000)) / 2;
             }
-            if($align=='J'){
-               $tmp=explode(' ', implode('',$line['chunks']));
-               $ns=count($tmp);
-               if($ns>1){
-                  $sx=implode('',$tmp);
-                  $delta=$this->GetMixStringWidth($line)/($this->k*1000);
-                  $dw=($w-$delta)*(1/($ns-1));
+            if ($align == 'J') {
+               $tmp = explode(' ', implode('', $line['chunks']));
+               $ns = count($tmp);
+               if ($ns > 1) {
+                  $sx = implode('', $tmp);
+                  $delta = $this->GetMixStringWidth($line) / ($this->k * 1000);
+                  $dw = ($w - $delta) * (1 / ($ns - 1));
                }
             }
          }
-         $xx=$this->x+$dx;
-         foreach($line['chunks'] as $tj=>$txt){
+         $xx = $this->x + $dx;
+         foreach ($line['chunks'] as $tj=>$txt) {
             $this->resetFont($line['style'][$tj]['font-family'], $line['style'][$tj]['style'], $line['style'][$tj]['font-size']);
             $this->resetColor($line['style'][$tj]['font-color'], 'T');
-            $y=$this->y+0.5*$lh*$line['height'] +0.3*$line['height']/$this->k;
-            if($dw){
-               $tmp=explode(' ', $txt);
-               foreach($tmp as $e=>$tt){
-                  if($e>0){
-                     $xx+=$dw;
-                     if($tt==''){
+            $y = $this->y + 0.5 * $lh * $line['height'] + 0.3 * $line['height'] / $this->k;
+            if ($dw) {
+               $tmp = explode(' ', $txt);
+               foreach ($tmp as $e=>$tt) {
+                  if ($e > 0) {
+                     $xx += $dw;
+                     if ($tt == '') {
                         continue;
                      }
                   }
                   $this->Text($xx, $y, $tt);
-                     if($line['style'][$tj]['href']){
-                     $yr=$this->y+0.5*($lh*$line['height']-$line['height']/$this->k);
-                     $this->Link($xx, $yr, $this->GetStringWidth($txt),$line['height']/$this->k, $line['style'][$tj]['href']);
+                     if ($line['style'][$tj]['href']) {
+                     $yr = $this->y + 0.5 * ($lh * $line['height'] - $line['height'] / $this->k);
+                     $this->Link($xx, $yr, $this->GetStringWidth($txt), $line['height'] / $this->k, $line['style'][$tj]['href']);
                   }
-                  $xx+=$this->GetStringWidth($tt);
+                  $xx += $this->GetStringWidth($tt);
                }
             }
-            else{
+            else {
                $this->Text($xx, $y, $txt);
-                  if($line['style'][$tj]['href']){
-                  $yr=$this->y+0.5*($lh*$line['height']-$line['height']/$this->k);
-                  $this->Link($xx, $yr, $this->GetStringWidth($txt),$line['height']/$this->k, $line['style'][$tj]['href']);
+                  if ($line['style'][$tj]['href']) {
+                  $yr = $this->y + 0.5 * ($lh * $line['height'] - $line['height'] / $this->k);
+                  $this->Link($xx, $yr, $this->GetStringWidth($txt), $line['height'] / $this->k, $line['style'][$tj]['href']);
                }
-               $xx+=$this->GetStringWidth($txt);
+               $xx += $this->GetStringWidth($txt);
             }
          }
          unset($lines[$i]);
-         $this->y += $lh*$line['height'];
+         $this->y += $lh * $line['height'];
       }
    }
    

Braces +33 added lines, -42 removed lines

@@ -17,11 +17,9 @@ 
    public function current_font($c){
       if($c=='family'){
          return $this->FontFamily;
-      }
-      elseif($c=='style'){
+      } elseif($c=='style'){
          return $this->FontStyle;
-      }
-      elseif($c=='size'){
+      } elseif($c=='size'){
          return $this->FontSizePt;
       }
    }
@@ -29,8 +27,7 @@ 
    public function get_color($c){
       if($c=='fill'){
          return $this->FillColor;
-      }
-      elseif($c=='text'){
+      } elseif($c=='text'){
          return $this->TextColor;
       }
    }
@@ -42,11 +39,9 @@ 
    public function get_margin($c){
       if($c=='l'){
          return $this->lMargin;
-      }
-      elseif($c=='r'){
+      } elseif($c=='r'){
          return $this->rMargin;
-      }
-      elseif($c=='t'){
+      } elseif($c=='t'){
          return $this->tMargin;
       }
    }
@@ -84,8 +79,7 @@ 
                break;
             }
          }
-      }
-      else{
+      } else{
          $a=false;
       }
       return $a;
@@ -98,8 +92,7 @@ 
       for($i=0; $i<3; $i++){
          if($n==6){
             $result[$i]=self::$hex[$str[2*$i]]*16+self::$hex[$str[2*$i+1]];
-         }
-         else{
+         } else{
             $result[$i]=self::$hex[$str[$i]]*16+self::$hex[$str[$i]];
          }
       }
@@ -113,16 +106,14 @@ 
          $array=array();
          if($this->is_hex($str)){
             $array=$this->hextodec($str);
-         }
-         elseif($this->is_rgb($str)){
+         } elseif($this->is_rgb($str)){
             $array=explode(',', trim($str, ','));
             for($i=0; $i<3; $i++){
                if(!isset($array[$i])){
                   $array[$i]=0;
                }
             }
-         }
-         else{
+         } else{
             $array=array(null, null, null);
             $i=0;
             $tmp=explode(' ', $str);
@@ -135,11 +126,9 @@ 
          }
          if($p=='T'){
             $this->SetTextColor($array[0],$array[1],$array[2]);
-         }
-         elseif($p=='D'){
+         } elseif($p=='D'){
             $this->SetDrawColor($array[0],$array[1], $array[2]);
-         }
-         elseif($p=='F'){
+         } elseif($p=='F'){
             $this->SetFillColor($array[0],$array[1],$array[2]);
          }
       }
@@ -164,30 +153,35 @@ 
    ************************************************************************/
 
    private function &FontData($family, $style, $size){
-      if($family=='')
-      $family = $this->FontFamily;
-      else
-      $family = strtolower($family);
+      if($family=='') {
+            $family = $this->FontFamily;
+      } else {
+            $family = strtolower($family);
+      }
       $style = strtoupper($style);
       if(strpos($style,'U')!==false){
          $this->underline = true;
          $style = str_replace('U','',$style);
       }
-      if($style=='IB')
-      $style = 'BI';
+      if($style=='IB') {
+            $style = 'BI';
+      }
       $fontkey = $family.$style;
       if(!isset($this->fonts[$fontkey])){
-         if($family=='arial')
-         $family = 'helvetica';
+         if($family=='arial') {
+                  $family = 'helvetica';
+         }
          if(in_array($family,$this->CoreFonts)){
-            if($family=='symbol' || $family=='zapfdingbats')
-            $style = '';
+            if($family=='symbol' || $family=='zapfdingbats') {
+                        $style = '';
+            }
             $fontkey = $family.$style;
-            if(!isset($this->fonts[$fontkey]))
-            $this->AddFont($family,$style);
+            if(!isset($this->fonts[$fontkey])) {
+                        $this->AddFont($family,$style);
+            }
+         } else {
+                  $this->Error('Undefined font: '.$family.' '.$style);
          }
-         else
-         $this->Error('Undefined font: '.$family.' '.$style);
       }
       $result['FontSize'] = $size/$this->k;
       $result['CurrentFont']=&$this->fonts[$fontkey];
@@ -242,8 +236,7 @@ 
                $x-=($a+$sl);
                $a=0;
                $u=$p;
-            }
-            else{
+            } else{
                $x=$cw[$parced_str[$i]]*$cfty['font-size'];
                $t='';
                $u=$i;
@@ -330,8 +323,7 @@ 
          if($line['width']!=0){
             if($align=='R'){
                $dx = $w-$line['width']/($this->k*1000);
-            }
-            elseif($align=='C'){
+            } elseif($align=='C'){
                $dx = ($w-$line['width']/($this->k*1000))/2;
             }
             if($align=='J'){
@@ -365,8 +357,7 @@ 
                   }
                   $xx+=$this->GetStringWidth($tt);
                }
-            }
-            else{
+            } else{
                $this->Text($xx, $y, $txt);
                   if($line['style'][$tj]['href']){
                   $yr=$this->y+0.5*($lh*$line['height']-$line['height']/$this->k);

extras/fpdf183/ResidentesFpdf.php

Spacing +51 added lines, -51 removed lines

@@ -55,7 +55,7 @@ 
 
     public function setPdfLogo()
     {
-        if (!file_exists(FS_MYDOCS . 'images') && !mkdir($concurrentDirectory = FS_MYDOCS . 'images', 0777, true) && !is_dir($concurrentDirectory)) {
+        if (!file_exists(FS_MYDOCS.'images') && !mkdir($concurrentDirectory = FS_MYDOCS.'images', 0777, true) && !is_dir($concurrentDirectory)) {
             throw new \RuntimeException(sprintf('Directory "%s" was not created', $concurrentDirectory));
         }
 
@@ -63,17 +63,17 @@ 
          * Antes se guardaba el logo en el temporal.
          * Mala decisión, lo movemos.
          */
-        if (file_exists('tmp/' . FS_TMP_NAME . 'logo.png')) {
-            rename('tmp/' . FS_TMP_NAME . 'logo.png', FS_MYDOCS . 'images/logo.png');
-        } elseif (file_exists('tmp/' . FS_TMP_NAME . 'logo.jpg')) {
-            rename('tmp/' . FS_TMP_NAME . 'logo.jpg', FS_MYDOCS . 'images/logo.jpg');
+        if (file_exists('tmp/'.FS_TMP_NAME.'logo.png')) {
+            rename('tmp/'.FS_TMP_NAME.'logo.png', FS_MYDOCS.'images/logo.png');
+        } elseif (file_exists('tmp/'.FS_TMP_NAME.'logo.jpg')) {
+            rename('tmp/'.FS_TMP_NAME.'logo.jpg', FS_MYDOCS.'images/logo.jpg');
         }
 
         $this->logo = false;
-        if (file_exists(FS_MYDOCS . 'images/logo.png')) {
-            $this->logo = FS_MYDOCS . 'images/logo.png';
-        } elseif (file_exists(FS_MYDOCS . 'images/logo.jpg')) {
-            $this->logo = FS_MYDOCS . 'images/logo.jpg';
+        if (file_exists(FS_MYDOCS.'images/logo.png')) {
+            $this->logo = FS_MYDOCS.'images/logo.png';
+        } elseif (file_exists(FS_MYDOCS.'images/logo.jpg')) {
+            $this->logo = FS_MYDOCS.'images/logo.jpg';
         }
         if ($this->logo) {
             $this->Image($this->logo, 5, 5, 30);
@@ -91,24 +91,24 @@ 
         $this->SetXY(140, $localTopLine);
         $this->Cell(60, 8, $documentHeader['codigo'], 0, 0, 'C');
         $localHeight += 4;
-        $this->SetXY(140, $localTopLine+($localSpaceBetweenLine*$localLine));
+        $this->SetXY(140, $localTopLine + ($localSpaceBetweenLine * $localLine));
         $this->Cell(60, 8, $documentHeader['numero2'], 0, 0, 'C');
         $localHeight += 4;
         $localLine++;
-        $this->SetXY(140, $localTopLine+($localSpaceBetweenLine*$localLine));
+        $this->SetXY(140, $localTopLine + ($localSpaceBetweenLine * $localLine));
         if (isset($documentHeader['tiponcf'])) {
             $this->Cell(60, 8, $documentHeader['tiponcf'], 0, 0, 'C');
             $localHeight += 4;
             $localLine++;
-            $this->SetXY(140, $localTopLine+($localSpaceBetweenLine*$localLine));
+            $this->SetXY(140, $localTopLine + ($localSpaceBetweenLine * $localLine));
             if (substr($documentHeader['numero2'], -10, 2) !== '02') {
                 $this->Cell(60, 8, "Valido hasta el: ".$documentHeader['vencimientoncf'], 0, 0, 'C');
                 $localHeight += 4;
                 $localLine++;
-                $this->SetXY(140, $localTopLine*$localSpaceBetweenLine*$localLine);
+                $this->SetXY(140, $localTopLine * $localSpaceBetweenLine * $localLine);
             }
         }
-        $this->Cell(60, 8, "Fecha: " . $documentHeader['fecha'], 0, 0, 'C');
+        $this->Cell(60, 8, "Fecha: ".$documentHeader['fecha'], 0, 0, 'C');
         $localHeight += 4;
         $this->Rect(140, $localTopLine, 60, $localHeight, "D");
     }
@@ -122,7 +122,7 @@ 
         // Subtotal, Impuestos y Total
         $number_to_words = new NumberToLetterConverter();
         $words = $number_to_words->to_word($documentFooter['neto'], 'DOP');
-        $subtotal = "Son: " . $words;
+        $subtotal = "Son: ".$words;
         $this->SetFont($this->font, '', 8);
         $this->SetXY($x, $y);
         $this->Cell(95, 8, $subtotal, 0, 0, 'L');
@@ -133,24 +133,24 @@ 
 
         // trait vertical cadre totaux, 8 de hauteur -> 213 + 8 = 221
         $this->SetFont($this->font, 'B', 8);
-        $this->Rect($x, $y+6, 95, 6, "D");
+        $this->Rect($x, $y + 6, 95, 6, "D");
         // Forma de Pago
-        $this->SetXY($x, $y+6);
+        $this->SetXY($x, $y + 6);
         $this->Cell(38, 5, "Forma de Pago:", 0, 0, 'L');
         $this->Cell(55, 5, utf8_decode($documentFooter['codpago']), 0, 0, 'L');
         // Fecha de Vencimiento
         //$date_ech = date_format($documentFooter['vencimiento'], 'd/m/Y');
 
-        $this->Rect($x, $y+12, 95, 6, "D");
-        $this->SetXY($x, $y+12);
+        $this->Rect($x, $y + 12, 95, 6, "D");
+        $this->SetXY($x, $y + 12);
         $this->Cell(38, 5, "Fecha de Vencimiento:", 0, 0, 'R');
         $this->Cell(38, 5, $documentFooter['vencimiento'], 0, 0, 'L');
 
         $this->SetFont($this->font, "BU", 8);
-        $this->SetXY($x, $y+30);
+        $this->SetXY($x, $y + 30);
         $this->Cell($this->GetStringWidth("Observaciones"), 0, "Observaciones", 0, "L");
         $this->SetFont($this->font, "", 8);
-        $this->SetXY($x, $y+35);
+        $this->SetXY($x, $y + 35);
         $this->MultiCell(190, 4, utf8_decode($documentFooter['observaciones']), 0, "L");
         //$y += 5;
         $this->setDocumentFooterTotalsBase($x, $y);
@@ -170,7 +170,7 @@ 
     {
         $x += 130;
         $this->SetLineWidth(0.1);
-        $this->Rect($x, $y, 60, (5*5), "D");
+        $this->Rect($x, $y, 60, (5 * 5), "D");
 //        // Lineas Verticales
 //        $this->Line(147, 221, 147, 245);
 //        $this->Line(164, 221, 164, 245);
@@ -183,13 +183,13 @@ 
         $this->SetFont($this->font, 'B', 8);
         $this->SetXY($x, $y);
         $this->Cell(30, 6, "Importe", 0, 0, 'R');
-        $this->SetXY($x, $y+5);
+        $this->SetXY($x, $y + 5);
         $this->Cell(30, 6, "Descuento", 0, 0, 'R');
-        $this->SetXY($x, $y+10);
+        $this->SetXY($x, $y + 10);
         $this->Cell(30, 6, "Subtotal", 0, 0, 'R');
-        $this->SetXY($x, $y+15);
+        $this->SetXY($x, $y + 15);
         $this->Cell(30, 6, FS_IVA, 0, 0, 'R');
-        $this->SetXY($x, $y+20);
+        $this->SetXY($x, $y + 20);
         $this->Cell(30, 6, "Total", 0, 0, 'R');
     }
 
@@ -202,21 +202,21 @@ 
         $taux = $documentFooter['neto'];
 
         $totalDescuento = number_format($documentFooter['total_descuento'], FS_NF0, FS_NF1, FS_NF2);
-        $this->SetXY($x, $y+5);
+        $this->SetXY($x, $y + 5);
         $this->Cell(30, 6, $totalDescuento, 0, 0, 'R');
 
         $col_ht = $documentFooter['totaliva'];
-        $col_tva = $col_ht - ($col_ht * (1-($taux/100)));
+        $col_tva = $col_ht - ($col_ht * (1 - ($taux / 100)));
         $totalImpuesto = number_format($col_tva, FS_NF0, FS_NF1, FS_NF2);
         $totalNeto = number_format($documentFooter['neto'], FS_NF0, FS_NF1, FS_NF2);
-        $this->SetXY($x, $y+10);
+        $this->SetXY($x, $y + 10);
         $this->Cell(30, 6, $totalNeto, 0, 0, 'R');
-        $this->SetXY($x, $y+15);
+        $this->SetXY($x, $y + 15);
         $this->Cell(30, 6, $totalImpuesto, 0, 0, 'R');
 
         $col_ttc = $documentFooter['total'];
         $totalGeneral = number_format($col_ttc, 2, ',', ' ');
-        $this->SetXY($x, $y+20);
+        $this->SetXY($x, $y + 20);
         $this->Cell(30, 6, $totalGeneral, 0, 0, 'R');
     }
 
@@ -226,12 +226,12 @@ 
         $this->SetFont($this->font, 'B', 8);
         $this->SetXY($x, $y);
         $this->Cell(25, 8, utf8_decode("Residente:"), 0, 0, 'R');
-        $this->SetXY($x+100, $y);
+        $this->SetXY($x + 100, $y);
         $this->Cell(25, 8, utf8_decode($tipoDocumentoFiscal.":"), 0, 0, 'R');
         $y += 4;
         $this->SetXY($x, $y);
         $this->Cell(25, 8, utf8_decode("Dirección:"), 0, 0, 'R');
-        $this->SetXY($x+100, $y);
+        $this->SetXY($x + 100, $y);
         $this->Cell(25, 8, utf8_decode("Teléfono:"), 0, 0, 'R');
         $y += 4;
         $this->SetXY($x, $y);
@@ -268,12 +268,12 @@ 
     public function setDocumentLinesHeader($x, $y)
     {
         $this->SetLineWidth(0.1);
-        $this->Rect(10, $y, 190, ($this->max_lines*7), "D");
-        $this->Line(10, $y+5, 200, $y+5);
+        $this->Rect(10, $y, 190, ($this->max_lines * 7), "D");
+        $this->Line(10, $y + 5, 200, $y + 5);
         //Lineas Verticales
         $arrayLineas = [105, 120, 140, 160, 180];
         foreach ($arrayLineas as $lineaX) {
-                $this->Line($lineaX, $y, $lineaX, $y+($this->max_lines*7));
+                $this->Line($lineaX, $y, $lineaX, $y + ($this->max_lines * 7));
         }
         $arrayDatosLineas = ["Descripción", "Cantidad", "Precio", "Descuento", FS_IVA, "Importe"];
         $arrayAnchoLineas = [95, 15, 20, 20, 20, 20];
@@ -300,34 +300,34 @@ 
         $linesSubtotal = 0;
         for ($i; $i < ($pageNumber * $this->max_lines); $i++) {
             if (isset($documentLines[$i])) {
-                $this->SetXY($x, $y+5);
+                $this->SetXY($x, $y + 5);
                 $line = $documentLines[$i];
                 $linesSubtotal += $line['pvptotal'];
                 $this->Cell(95, 5, utf8_decode($line['descripcion']), 0, 0, 'L');
                 // qte
-                $this->SetXY(105, $y+6);
+                $this->SetXY(105, $y + 6);
                 $this->Cell(15, 5, strrev(wordwrap(strrev($line['cantidad']), 3, ' ', true)), 0, 0, 'R');
                 // PU
                 $numero_formateado = number_format($line['pvpunitario'], FS_NF0, FS_NF1, FS_NF2);
-                $this->SetXY(120, $y+6);
+                $this->SetXY(120, $y + 6);
                 $this->Cell(20, 5, $numero_formateado, 0, 0, 'R');
                 //Descuento
                 $numero_formateado = number_format(($line['pvpsindto'] - $line['pvptotal']), FS_NF0, FS_NF1, FS_NF2);
-                $this->SetXY(140, $y+6);
+                $this->SetXY(140, $y + 6);
                 $this->Cell(20, 5, $numero_formateado, 0, 0, 'R');
                 // Impuesto
                 $numero_formateado = number_format($line['iva'], FS_NF0, FS_NF1, FS_NF2);
-                $this->SetXY(160, $y+6);
+                $this->SetXY(160, $y + 6);
                 $this->Cell(20, 5, $numero_formateado, 0, 0, 'R');
                 // total
                 $numero_formateado = number_format($line['pvptotal'], FS_NF0, FS_NF1, FS_NF2);
-                $this->SetXY(180, $y+6);
+                $this->SetXY(180, $y + 6);
                 $this->Cell(20, 5, $numero_formateado, 0, 0, 'R');
                 //$this->Line($x, $y+13, 200, $y+13);
                 $y += 6;
             }
         }
-        $this->setDocumentLinesSubtotal($linesSubtotal, $pageNumber, $numberOfPages, $x, ($y+($this->max_lines)));
+        $this->setDocumentLinesSubtotal($linesSubtotal, $pageNumber, $numberOfPages, $x, ($y + ($this->max_lines)));
         $this->setDocumentPageNumber($pageNumber, $numberOfPages);
     }
 
@@ -340,7 +340,7 @@ 
             $this->SetFont($this->font, '', 8);
             $this->SetXY($x, $y);
             $this->Cell(30, 6, utf8_decode("Subtotal página: "), 0, 0, 'R');
-            $this->SetXY($x+30, $y);
+            $this->SetXY($x + 30, $y);
             $this->Cell(30, 6, number_format($linesSubtotal, FS_NF0, FS_NF1, FS_NF2), 0, 0, 'R');
         }
     }
@@ -348,11 +348,11 @@ 
     public function setDocumentPageNumber($pageNumber, $numberOfPages)
     {
         $x = $this->GetPageHeight();
-        $y = $this->GetPageWidth()-70;
+        $y = $this->GetPageWidth() - 70;
         //print_r($x);
         $this->SetXY($x, $y);
         $this->SetFont($this->font, 'B', 7);
-        $this->Cell(52, 5, utf8_decode("Página " . $pageNumber . " de " . $numberOfPages), 0, 0, 'R');
+        $this->Cell(52, 5, utf8_decode("Página ".$pageNumber." de ".$numberOfPages), 0, 0, 'R');
     }
 
     public function setCompanyInfo($companyInfo)
@@ -375,24 +375,24 @@ 
         $this->Cell($this->GetPageWidth(), 5, utf8_decode($companyInfo['telefono']), 0, 0, 'L');
         $localLineHeight += 4;
         $this->SetXY($x1, $y1 + $localLineHeight);
-        $this->Cell($this->GetPageWidth(), 5, utf8_decode($companyInfo['web']) . ' - ' .
+        $this->Cell($this->GetPageWidth(), 5, utf8_decode($companyInfo['web']).' - '.
                         utf8_decode($companyInfo['email']), 0, 0, 'L');
     }
 
     public function createDocument($companyInformation, $documentHeader, $documentLines, $customerInfo)
     {
-        $numberOfPages = (int) ceil(count($documentLines)/$this->max_lines);
+        $numberOfPages = (int) ceil(count($documentLines) / $this->max_lines);
 //        var_dump($this->max_lines);
 //        var_dump(count($documentLines));
 //        var_dump($numberOfPages);
-        for ($pageNumber=0; $pageNumber < $numberOfPages; $pageNumber++) {
+        for ($pageNumber = 0; $pageNumber < $numberOfPages; $pageNumber++) {
             $this->AddPage();
             $this->setPdfLogo();
             $this->setCompanyInfo($companyInformation);
             $this->setPdfCustomerInfo($customerInfo);
             $this->setDocumentHeaderInfo($documentHeader);
-            $this->setDocumentLinesInfo($documentLines, $pageNumber+1, $numberOfPages);
-            if ($pageNumber === ($numberOfPages-1)) {
+            $this->setDocumentLinesInfo($documentLines, $pageNumber + 1, $numberOfPages);
+            if ($pageNumber === ($numberOfPages - 1)) {
                 $this->setDocumentFooterInfo($documentHeader);
                 $this->setDocumentFooterCompanyText($companyInformation['pie_factura']);
             }

extras/fpdf183/formatedstring.php

Indentation +154 added lines, -154 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- /**********************************************************************
+    /**********************************************************************
  * formateString                                                       *
  *                                                                     *
  * Version: 1.2                                                        *
@@ -7,8 +7,8 @@ 
  * Author:  Dan Machado                                                *
  * Use within exfpdf class                                             *
  **********************************************************************/
- class formatedString
- {
+    class formatedString
+    {
     public $parced_str;
     public $style_map;
     public $positions;
@@ -20,191 +20,191 @@ 
     public $used_fonts;
 
     private function get_style($str){
-       $style=array('font-family'=>false, 'font-weight'=>false, 'font-style'=>false,
-       'font-size'=>false, 'font-color'=>false, 'href'=>'');
-       $tmp=explode(';', trim($str, '",\', '));
-       foreach($tmp as $x){
-          if($x && strpos($x,':')>0){
-             $r=explode(':',$x);
-             $r[0]=trim($r[0]);
-             $r[1]=trim($r[1]);
-             if(isset($style[$r[0]]) || $r[0]=='style'){
+        $style=array('font-family'=>false, 'font-weight'=>false, 'font-style'=>false,
+        'font-size'=>false, 'font-color'=>false, 'href'=>'');
+        $tmp=explode(';', trim($str, '",\', '));
+        foreach($tmp as $x){
+            if($x && strpos($x,':')>0){
+                $r=explode(':',$x);
+                $r[0]=trim($r[0]);
+                $r[1]=trim($r[1]);
+                if(isset($style[$r[0]]) || $r[0]=='style'){
                 if($r[0]=='style' || $r[0]=='font-style'){
-                   $r[1]=strtoupper($r[1]);
-                   if(strpos($r[1], 'B')!==false){
-                      $style['font-weight']='B';
-                  }
-                  if(strpos($r[1], 'I')!==false){
-                     $style['font-style']='I';
-                  }
-                  if(strpos($r[1], 'U')!==false){
-                     $style['font-style'].='U';
-                  }
-               }
-               elseif($r[1]){
-                  if($r[0]=='href'){
-                     $style[$r[0]]=implode(':', array_slice($r,1));
-                  }
-                  else{
-                     $style[$r[0]]=$r[1];
-                  }
-               }
+                    $r[1]=strtoupper($r[1]);
+                    if(strpos($r[1], 'B')!==false){
+                        $style['font-weight']='B';
+                    }
+                    if(strpos($r[1], 'I')!==false){
+                        $style['font-style']='I';
+                    }
+                    if(strpos($r[1], 'U')!==false){
+                        $style['font-style'].='U';
+                    }
+                }
+                elseif($r[1]){
+                    if($r[0]=='href'){
+                        $style[$r[0]]=implode(':', array_slice($r,1));
+                    }
+                    else{
+                        $style[$r[0]]=$r[1];
+                    }
+                }
             }
-         }
-      }
-      return $style;
-   }
+            }
+        }
+        return $style;
+    }
     
 
-   private function style_merge($style1, $style2){
-      $result=$style1;
-      foreach($style2 as $k=>$v){
-         if($v){
+    private function style_merge($style1, $style2){
+        $result=$style1;
+        foreach($style2 as $k=>$v){
+            if($v){
             $result[$k]=$v;
-         }
-      }
-      return $result;
-   }
+            }
+        }
+        return $result;
+    }
 
-   private function style_parcer($text, &$font_data){
-      $str=trim(strtr($text, array("\r"=>'', "\t"=>'')));
-      $rep=array('[bB]{1}'=>'B', '[iI]{1}'=>'I', '[iI]{1}[ ]*[bB]{1}'=>'BI', '[bB]{1}[ ]*[iI]{1}'=>'BI' );
-      foreach($rep as $a=>$v){
-         $str=preg_replace('/<[ ]*'.$a.'[ ]*>/', "<$v>", $str);
-         $str=preg_replace('/<[ ]*\/+[ ]*'.$a.'[ ]*>/', "</$v>", $str);
-      }
-      $str=preg_replace('/<BI>/', '<s "font-weight:B;font-style:I">', $str);
-      $str=preg_replace('/<\/BI>/', "</s>", $str);
-      $str=preg_replace('/<B>/', '<s "font-weight:B;">', $str);
-      $str=preg_replace('/<\/B>/', "</s>", $str);
-      $str=preg_replace('/<I>/', '<s "font-style:I;">', $str);
-      $str=preg_replace('/<\/I>/', "</s>", $str);
-      $open=array();
-      $total=array();
-      $lt="<s";
-      $rt="</s>";
-      $j=strpos($str, $lt, 0);
-      while($j!==false){
+    private function style_parcer($text, &$font_data){
+        $str=trim(strtr($text, array("\r"=>'', "\t"=>'')));
+        $rep=array('[bB]{1}'=>'B', '[iI]{1}'=>'I', '[iI]{1}[ ]*[bB]{1}'=>'BI', '[bB]{1}[ ]*[iI]{1}'=>'BI' );
+        foreach($rep as $a=>$v){
+            $str=preg_replace('/<[ ]*'.$a.'[ ]*>/', "<$v>", $str);
+            $str=preg_replace('/<[ ]*\/+[ ]*'.$a.'[ ]*>/', "</$v>", $str);
+        }
+        $str=preg_replace('/<BI>/', '<s "font-weight:B;font-style:I">', $str);
+        $str=preg_replace('/<\/BI>/', "</s>", $str);
+        $str=preg_replace('/<B>/', '<s "font-weight:B;">', $str);
+        $str=preg_replace('/<\/B>/', "</s>", $str);
+        $str=preg_replace('/<I>/', '<s "font-style:I;">', $str);
+        $str=preg_replace('/<\/I>/', "</s>", $str);
+        $open=array();
+        $total=array();
+        $lt="<s";
+        $rt="</s>";
+        $j=strpos($str, $lt, 0);
+        while($j!==false){
             if($j>0 && ord($str[$j-1])==92){
             $j=strpos($str, $lt, $j+1);
             continue;
-         }
-         $k=strpos($str, '>',$j+1);
-         $open[$j]=substr($str, $j+2, $k-($j+2));
-         $total[]=$j;
-         $j=strpos($str, $lt, $j+1);
-      }
-      $j=strpos($str, $rt, 0);
-      while($j!==false){
-         $total[]=$j;
-         $j=strpos($str, $rt, $j+1);
-      }
-      sort($total);
+            }
+            $k=strpos($str, '>',$j+1);
+            $open[$j]=substr($str, $j+2, $k-($j+2));
+            $total[]=$j;
+            $j=strpos($str, $lt, $j+1);
+        }
+        $j=strpos($str, $rt, 0);
+        while($j!==false){
+            $total[]=$j;
+            $j=strpos($str, $rt, $j+1);
+        }
+        sort($total);
       
-      $cs='';
-      foreach($font_data as $k=>$v){
-         $cs.=$k . ':'. $v . '; ';
-      }
-      $cs=$this->get_style($cs);
-      $tmp=array($cs);
-      $blocks=array();
-      $blockstyle=array();
-      $n=count($total);
-      $k=0;
-      for($i=0; $i<$n; $i++){
-         $blocks[]=substr($str, $k, $total[$i]-$k);
-         $blockstyle[]=$cs;
-         if(isset($open[$total[$i]])){
+        $cs='';
+        foreach($font_data as $k=>$v){
+            $cs.=$k . ':'. $v . '; ';
+        }
+        $cs=$this->get_style($cs);
+        $tmp=array($cs);
+        $blocks=array();
+        $blockstyle=array();
+        $n=count($total);
+        $k=0;
+        for($i=0; $i<$n; $i++){
+            $blocks[]=substr($str, $k, $total[$i]-$k);
+            $blockstyle[]=$cs;
+            if(isset($open[$total[$i]])){
             $cs=$this->style_merge($cs, $this->get_style($open[$total[$i]]));
             array_push($tmp, $cs);
             $k=strpos($str, '>',$total[$i]+1)+1;
-         }
-         else{
+            }
+            else{
             $k=$total[$i]+4;
             array_pop($tmp);
             $l=count($tmp)-1;
             $cs=$tmp[$l];
-         }
-      }
-      if($k<strlen($str)){
-         $blocks[]=substr($str, $k);
-         $blockstyle[]=$cs;
-      }
-      $n=count($blocks);
-      for($i=0; $i<$n; $i++){
-         $this->parced_str.=strtr($blocks[$i], array('\<s'=>'<s'));
-         if(strlen($blocks[$i])>0){
+            }
+        }
+        if($k<strlen($str)){
+            $blocks[]=substr($str, $k);
+            $blockstyle[]=$cs;
+        }
+        $n=count($blocks);
+        for($i=0; $i<$n; $i++){
+            $this->parced_str.=strtr($blocks[$i], array('\<s'=>'<s'));
+            if(strlen($blocks[$i])>0){
             $blockstyle[$i]['style']=$blockstyle[$i]['font-weight'] . $blockstyle[$i]['font-style'];
             unset($blockstyle[$i]['font-weight']);
             unset($blockstyle[$i]['font-style']);
             $this->style_map[strlen($this->parced_str)-1]=$blockstyle[$i];
-         }
-      }
-   }
+            }
+        }
+    }
 
-   public function __construct($text, $width, &$font_data){
-      $this->iterator=0;
-      $this->parced_str='';
-      $this->style_map=array();
-      $this->style_parcer($text, $font_data);
-      $this->positions=array_keys($this->style_map);
-      $this->np=(bool)count($this->positions);
-      $this->width=$width;
-      $this->lines=array('');
-      $this->linesmap[0]=array(0, 0, 0);
-      $this->used_fonts=array();
-   }
+    public function __construct($text, $width, &$font_data){
+        $this->iterator=0;
+        $this->parced_str='';
+        $this->style_map=array();
+        $this->style_parcer($text, $font_data);
+        $this->positions=array_keys($this->style_map);
+        $this->np=(bool)count($this->positions);
+        $this->width=$width;
+        $this->lines=array('');
+        $this->linesmap[0]=array(0, 0, 0);
+        $this->used_fonts=array();
+    }
 
-   public function get_str(){
-      return $this->parced_str;
-   }
+    public function get_str(){
+        return $this->parced_str;
+    }
 
-   public function get_current_style($i){
-      if(!$this->np){
-         return '';
-      }
-      while($this->positions[$this->iterator]<$i){
-         $this->iterator++;
-      }
-      return $this->style_map[$this->positions[$this->iterator]];
-   }
+    public function get_current_style($i){
+        if(!$this->np){
+            return '';
+        }
+        while($this->positions[$this->iterator]<$i){
+            $this->iterator++;
+        }
+        return $this->style_map[$this->positions[$this->iterator]];
+    }
    
 
-      public function break_by_style($t){
-      $i=$this->linesmap[$t][0];
-      $j=$this->linesmap[$t][1];
-      $this->iterator=0;
-      $result=array('chunks'=>array(), 'style'=>array(), 'height'=>0, 'width'=>$this->linesmap[$t][2]);
-      if(strlen($this->parced_str)==0){
-         return $result;
-      }
-      $cs=$this->get_current_style($i);
-      $result['height']=$cs['font-size'];
-      $r=0;
-      $result['chunks'][$r]='';
-      $result['style'][$r]=$cs;
-      while($this->parced_str[$j]==' '){
-         $j--;
-      }
-      $tmp=$i;
-         for($k=$i; $k<=$j; $k++){
-         if($this->parced_str[$tmp]==' ' && $this->parced_str[$k]==' '){
+        public function break_by_style($t){
+        $i=$this->linesmap[$t][0];
+        $j=$this->linesmap[$t][1];
+        $this->iterator=0;
+        $result=array('chunks'=>array(), 'style'=>array(), 'height'=>0, 'width'=>$this->linesmap[$t][2]);
+        if(strlen($this->parced_str)==0){
+            return $result;
+        }
+        $cs=$this->get_current_style($i);
+        $result['height']=$cs['font-size'];
+        $r=0;
+        $result['chunks'][$r]='';
+        $result['style'][$r]=$cs;
+        while($this->parced_str[$j]==' '){
+            $j--;
+        }
+        $tmp=$i;
+            for($k=$i; $k<=$j; $k++){
+            if($this->parced_str[$tmp]==' ' && $this->parced_str[$k]==' '){
             $tmp=$k;
             continue;
-         }
+            }
             if($cs!=$this->get_current_style($k)) {
             $r++;
             $cs=$this->get_current_style($k);
             $result['chunks'][$r]='';
             $result['style'][$r]=$cs;
             if($result['height']<$cs['font-size']){
-               $result['height']=$cs['font-size'];
+                $result['height']=$cs['font-size'];
             }
-         }
-         $result['chunks'][$r].=$this->parced_str[$k];
-         $tmp=$k;
-      }
-      return $result;
-   }
+            }
+            $result['chunks'][$r].=$this->parced_str[$k];
+            $tmp=$k;
+        }
+        return $result;
+    }
 }
 ?>

Spacing +121 added lines, -121 removed lines

@@ -19,34 +19,34 @@ 
     public $linesmap;
     public $used_fonts;
 
-    private function get_style($str){
-       $style=array('font-family'=>false, 'font-weight'=>false, 'font-style'=>false,
+    private function get_style($str) {
+       $style = array('font-family'=>false, 'font-weight'=>false, 'font-style'=>false,
        'font-size'=>false, 'font-color'=>false, 'href'=>'');
-       $tmp=explode(';', trim($str, '",\', '));
-       foreach($tmp as $x){
-          if($x && strpos($x,':')>0){
-             $r=explode(':',$x);
-             $r[0]=trim($r[0]);
-             $r[1]=trim($r[1]);
-             if(isset($style[$r[0]]) || $r[0]=='style'){
-                if($r[0]=='style' || $r[0]=='font-style'){
-                   $r[1]=strtoupper($r[1]);
-                   if(strpos($r[1], 'B')!==false){
-                      $style['font-weight']='B';
+       $tmp = explode(';', trim($str, '",\', '));
+       foreach ($tmp as $x) {
+          if ($x && strpos($x, ':') > 0) {
+             $r = explode(':', $x);
+             $r[0] = trim($r[0]);
+             $r[1] = trim($r[1]);
+             if (isset($style[$r[0]]) || $r[0] == 'style') {
+                if ($r[0] == 'style' || $r[0] == 'font-style') {
+                   $r[1] = strtoupper($r[1]);
+                   if (strpos($r[1], 'B') !== false) {
+                      $style['font-weight'] = 'B';
                   }
-                  if(strpos($r[1], 'I')!==false){
-                     $style['font-style']='I';
+                  if (strpos($r[1], 'I') !== false) {
+                     $style['font-style'] = 'I';
                   }
-                  if(strpos($r[1], 'U')!==false){
-                     $style['font-style'].='U';
+                  if (strpos($r[1], 'U') !== false) {
+                     $style['font-style'] .= 'U';
                   }
                }
-               elseif($r[1]){
-                  if($r[0]=='href'){
-                     $style[$r[0]]=implode(':', array_slice($r,1));
+               elseif ($r[1]) {
+                  if ($r[0] == 'href') {
+                     $style[$r[0]] = implode(':', array_slice($r, 1));
                   }
-                  else{
-                     $style[$r[0]]=$r[1];
+                  else {
+                     $style[$r[0]] = $r[1];
                   }
                }
             }
@@ -56,153 +56,153 @@ 
    }
     
 
-   private function style_merge($style1, $style2){
-      $result=$style1;
-      foreach($style2 as $k=>$v){
-         if($v){
-            $result[$k]=$v;
+   private function style_merge($style1, $style2) {
+      $result = $style1;
+      foreach ($style2 as $k=>$v) {
+         if ($v) {
+            $result[$k] = $v;
          }
       }
       return $result;
    }
 
-   private function style_parcer($text, &$font_data){
-      $str=trim(strtr($text, array("\r"=>'', "\t"=>'')));
-      $rep=array('[bB]{1}'=>'B', '[iI]{1}'=>'I', '[iI]{1}[ ]*[bB]{1}'=>'BI', '[bB]{1}[ ]*[iI]{1}'=>'BI' );
-      foreach($rep as $a=>$v){
-         $str=preg_replace('/<[ ]*'.$a.'[ ]*>/', "<$v>", $str);
-         $str=preg_replace('/<[ ]*\/+[ ]*'.$a.'[ ]*>/', "</$v>", $str);
+   private function style_parcer($text, &$font_data) {
+      $str = trim(strtr($text, array("\r"=>'', "\t"=>'')));
+      $rep = array('[bB]{1}'=>'B', '[iI]{1}'=>'I', '[iI]{1}[ ]*[bB]{1}'=>'BI', '[bB]{1}[ ]*[iI]{1}'=>'BI');
+      foreach ($rep as $a=>$v) {
+         $str = preg_replace('/<[ ]*'.$a.'[ ]*>/', "<$v>", $str);
+         $str = preg_replace('/<[ ]*\/+[ ]*'.$a.'[ ]*>/', "</$v>", $str);
       }
-      $str=preg_replace('/<BI>/', '<s "font-weight:B;font-style:I">', $str);
-      $str=preg_replace('/<\/BI>/', "</s>", $str);
-      $str=preg_replace('/<B>/', '<s "font-weight:B;">', $str);
-      $str=preg_replace('/<\/B>/', "</s>", $str);
-      $str=preg_replace('/<I>/', '<s "font-style:I;">', $str);
-      $str=preg_replace('/<\/I>/', "</s>", $str);
-      $open=array();
-      $total=array();
-      $lt="<s";
-      $rt="</s>";
-      $j=strpos($str, $lt, 0);
-      while($j!==false){
-            if($j>0 && ord($str[$j-1])==92){
-            $j=strpos($str, $lt, $j+1);
+      $str = preg_replace('/<BI>/', '<s "font-weight:B;font-style:I">', $str);
+      $str = preg_replace('/<\/BI>/', "</s>", $str);
+      $str = preg_replace('/<B>/', '<s "font-weight:B;">', $str);
+      $str = preg_replace('/<\/B>/', "</s>", $str);
+      $str = preg_replace('/<I>/', '<s "font-style:I;">', $str);
+      $str = preg_replace('/<\/I>/', "</s>", $str);
+      $open = array();
+      $total = array();
+      $lt = "<s";
+      $rt = "</s>";
+      $j = strpos($str, $lt, 0);
+      while ($j !== false) {
+            if ($j > 0 && ord($str[$j - 1]) == 92) {
+            $j = strpos($str, $lt, $j + 1);
             continue;
          }
-         $k=strpos($str, '>',$j+1);
-         $open[$j]=substr($str, $j+2, $k-($j+2));
-         $total[]=$j;
-         $j=strpos($str, $lt, $j+1);
+         $k = strpos($str, '>', $j + 1);
+         $open[$j] = substr($str, $j + 2, $k - ($j + 2));
+         $total[] = $j;
+         $j = strpos($str, $lt, $j + 1);
       }
-      $j=strpos($str, $rt, 0);
-      while($j!==false){
-         $total[]=$j;
-         $j=strpos($str, $rt, $j+1);
+      $j = strpos($str, $rt, 0);
+      while ($j !== false) {
+         $total[] = $j;
+         $j = strpos($str, $rt, $j + 1);
       }
       sort($total);
       
-      $cs='';
-      foreach($font_data as $k=>$v){
-         $cs.=$k . ':'. $v . '; ';
+      $cs = '';
+      foreach ($font_data as $k=>$v) {
+         $cs .= $k.':'.$v.'; ';
       }
-      $cs=$this->get_style($cs);
-      $tmp=array($cs);
-      $blocks=array();
-      $blockstyle=array();
-      $n=count($total);
-      $k=0;
-      for($i=0; $i<$n; $i++){
-         $blocks[]=substr($str, $k, $total[$i]-$k);
-         $blockstyle[]=$cs;
-         if(isset($open[$total[$i]])){
-            $cs=$this->style_merge($cs, $this->get_style($open[$total[$i]]));
+      $cs = $this->get_style($cs);
+      $tmp = array($cs);
+      $blocks = array();
+      $blockstyle = array();
+      $n = count($total);
+      $k = 0;
+      for ($i = 0; $i < $n; $i++) {
+         $blocks[] = substr($str, $k, $total[$i] - $k);
+         $blockstyle[] = $cs;
+         if (isset($open[$total[$i]])) {
+            $cs = $this->style_merge($cs, $this->get_style($open[$total[$i]]));
             array_push($tmp, $cs);
-            $k=strpos($str, '>',$total[$i]+1)+1;
+            $k = strpos($str, '>', $total[$i] + 1) + 1;
          }
-         else{
-            $k=$total[$i]+4;
+         else {
+            $k = $total[$i] + 4;
             array_pop($tmp);
-            $l=count($tmp)-1;
-            $cs=$tmp[$l];
+            $l = count($tmp) - 1;
+            $cs = $tmp[$l];
          }
       }
-      if($k<strlen($str)){
-         $blocks[]=substr($str, $k);
-         $blockstyle[]=$cs;
+      if ($k < strlen($str)) {
+         $blocks[] = substr($str, $k);
+         $blockstyle[] = $cs;
       }
-      $n=count($blocks);
-      for($i=0; $i<$n; $i++){
-         $this->parced_str.=strtr($blocks[$i], array('\<s'=>'<s'));
-         if(strlen($blocks[$i])>0){
-            $blockstyle[$i]['style']=$blockstyle[$i]['font-weight'] . $blockstyle[$i]['font-style'];
+      $n = count($blocks);
+      for ($i = 0; $i < $n; $i++) {
+         $this->parced_str .= strtr($blocks[$i], array('\<s'=>'<s'));
+         if (strlen($blocks[$i]) > 0) {
+            $blockstyle[$i]['style'] = $blockstyle[$i]['font-weight'].$blockstyle[$i]['font-style'];
             unset($blockstyle[$i]['font-weight']);
             unset($blockstyle[$i]['font-style']);
-            $this->style_map[strlen($this->parced_str)-1]=$blockstyle[$i];
+            $this->style_map[strlen($this->parced_str) - 1] = $blockstyle[$i];
          }
       }
    }
 
-   public function __construct($text, $width, &$font_data){
-      $this->iterator=0;
-      $this->parced_str='';
-      $this->style_map=array();
+   public function __construct($text, $width, &$font_data) {
+      $this->iterator = 0;
+      $this->parced_str = '';
+      $this->style_map = array();
       $this->style_parcer($text, $font_data);
-      $this->positions=array_keys($this->style_map);
-      $this->np=(bool)count($this->positions);
-      $this->width=$width;
-      $this->lines=array('');
-      $this->linesmap[0]=array(0, 0, 0);
-      $this->used_fonts=array();
+      $this->positions = array_keys($this->style_map);
+      $this->np = (bool) count($this->positions);
+      $this->width = $width;
+      $this->lines = array('');
+      $this->linesmap[0] = array(0, 0, 0);
+      $this->used_fonts = array();
    }
 
-   public function get_str(){
+   public function get_str() {
       return $this->parced_str;
    }
 
-   public function get_current_style($i){
-      if(!$this->np){
+   public function get_current_style($i) {
+      if (!$this->np) {
          return '';
       }
-      while($this->positions[$this->iterator]<$i){
+      while ($this->positions[$this->iterator] < $i) {
          $this->iterator++;
       }
       return $this->style_map[$this->positions[$this->iterator]];
    }
    
 
-      public function break_by_style($t){
-      $i=$this->linesmap[$t][0];
-      $j=$this->linesmap[$t][1];
-      $this->iterator=0;
-      $result=array('chunks'=>array(), 'style'=>array(), 'height'=>0, 'width'=>$this->linesmap[$t][2]);
-      if(strlen($this->parced_str)==0){
+      public function break_by_style($t) {
+      $i = $this->linesmap[$t][0];
+      $j = $this->linesmap[$t][1];
+      $this->iterator = 0;
+      $result = array('chunks'=>array(), 'style'=>array(), 'height'=>0, 'width'=>$this->linesmap[$t][2]);
+      if (strlen($this->parced_str) == 0) {
          return $result;
       }
-      $cs=$this->get_current_style($i);
-      $result['height']=$cs['font-size'];
-      $r=0;
-      $result['chunks'][$r]='';
-      $result['style'][$r]=$cs;
-      while($this->parced_str[$j]==' '){
+      $cs = $this->get_current_style($i);
+      $result['height'] = $cs['font-size'];
+      $r = 0;
+      $result['chunks'][$r] = '';
+      $result['style'][$r] = $cs;
+      while ($this->parced_str[$j] == ' ') {
          $j--;
       }
-      $tmp=$i;
-         for($k=$i; $k<=$j; $k++){
-         if($this->parced_str[$tmp]==' ' && $this->parced_str[$k]==' '){
-            $tmp=$k;
+      $tmp = $i;
+         for ($k = $i; $k <= $j; $k++) {
+         if ($this->parced_str[$tmp] == ' ' && $this->parced_str[$k] == ' ') {
+            $tmp = $k;
             continue;
          }
-            if($cs!=$this->get_current_style($k)) {
+            if ($cs != $this->get_current_style($k)) {
             $r++;
-            $cs=$this->get_current_style($k);
-            $result['chunks'][$r]='';
-            $result['style'][$r]=$cs;
-            if($result['height']<$cs['font-size']){
-               $result['height']=$cs['font-size'];
+            $cs = $this->get_current_style($k);
+            $result['chunks'][$r] = '';
+            $result['style'][$r] = $cs;
+            if ($result['height'] < $cs['font-size']) {
+               $result['height'] = $cs['font-size'];
             }
          }
-         $result['chunks'][$r].=$this->parced_str[$k];
-         $tmp=$k;
+         $result['chunks'][$r] .= $this->parced_str[$k];
+         $tmp = $k;
       }
       return $result;
    }

Braces +3 added lines, -6 removed lines

@@ -40,12 +40,10 @@ 
                   if(strpos($r[1], 'U')!==false){
                      $style['font-style'].='U';
                   }
-               }
-               elseif($r[1]){
+               } elseif($r[1]){
                   if($r[0]=='href'){
                      $style[$r[0]]=implode(':', array_slice($r,1));
-                  }
-                  else{
+                  } else{
                      $style[$r[0]]=$r[1];
                   }
                }
@@ -118,8 +116,7 @@ 
             $cs=$this->style_merge($cs, $this->get_style($open[$total[$i]]));
             array_push($tmp, $cs);
             $k=strpos($str, '>',$total[$i]+1)+1;
-         }
-         else{
+         } else{
             $k=$total[$i]+4;
             array_pop($tmp);
             $l=count($tmp)-1;