merge xmlrpc stuff, and put it in classes/

[platal.git] / include / contacts.pdf.inc.php

diff --git a/include/contacts.pdf.inc.php b/include/contacts.pdf.inc.php
index ad74af0..7eaea17 100644 (file)
--- a/include/contacts.pdf.inc.php
+++ b/include/contacts.pdf.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2004 Polytechnique.org                              *
+ *  Copyright (C) 2003-2006 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -20,8 +20,8 @@
  ***************************************************************************/
 
 define ('FPDF_FONTPATH', dirname(__FILE__).'/fonts/');
-require_once('/usr/share/fpdf/fpdf.php');
-require_once('xorg.varstream.inc.php');
+require_once '/usr/share/fpdf/fpdf.php';
+require_once dirname(__FILE__).'/../classes/VarStream.php';
 
 class ContactsPDF extends FPDF
 {
@@ -38,9 +38,9 @@ class ContactsPDF extends FPDF
         $this->AddFont('Vera Sans', '',  'Vera.php');
         $this->AddFont('Vera Sans', 'I', 'VeraIt.php');
         $this->AddFont('Vera Sans', 'B', 'VeraBd.php');
-        
+
         $this->AddFont('Vera Mono', '',  'VeraMono.php');
-        
+
         $this->SetTitle($this->title);
         $this->SetCreator('Site Polytechnique.org');
         $this->AddPage();
@@ -74,7 +74,7 @@ class ContactsPDF extends FPDF
             $this->_out(sprintf('q %.5f %.5f %.5f %.5f %.2f %.2f cm 1 0 0 1 %.2f %.2f cm',$c,$s,-$s,$c,$cx,$cy,-$cx,-$cy));
         }
     }
-    
+
     function Header()
     {
 
@@ -84,7 +84,7 @@ class ContactsPDF extends FPDF
         $this->Text(55,190,"informations limitées à un usage");
         $this->Text(40,210,"strictement personnel et non commercial");
         $this->Rotate(0);
-        
+
         $this->setLeftMargin(5);
         $this->setRightMargin(5);
         $this->SetFont('Vera Sans', 'B', 16);
@@ -95,7 +95,7 @@ class ContactsPDF extends FPDF
         $this->SetFillColor(245, 248, 252);
         $this->Cell(200, 10, $this->title, 1, 1, 'C', 1);
         $this->Image(dirname(dirname(__FILE__)).'/htdocs/images/logo.png', 5, 5, 10, 10, 'png', 'https://www.polytechnique.org/');
-        
+
         $this->Ln(10);
         $this->y0 = $this->GetY();
         $this->ColSetup(false);
@@ -155,10 +155,10 @@ class ContactsPDF extends FPDF
         $this->SetFont('Vera '.$font, '', 8);
         $this->setY($y);
         $first = 1;
-        
+
         $this->setX($x+25);
         $this->MultiCell(65, 4, $r, '', 1);
-       
+
         $this->setY(max($y1, $this->getY())+0.5);
         $this->setX($x);
     }
@@ -182,12 +182,10 @@ class ContactsPDF extends FPDF
 
         $this->TableRow($l, $r);
 
-        if ($a['tel']) {
-            $this->TableRow('Téléphone', $a['tel'], 'Mono');
-        }
-        if ($a['fax']) {
-            $this->TableRow('Fax', $a['fax'], 'Mono');
-        }
+        foreach ($a['tels'] as $tel)
+            if ($tel['tel']) {
+                $this->TableRow($tel['tel_type'], $tel['tel'], 'Mono');
+            }
     }
 
     function AddressPro($a)
@@ -195,7 +193,7 @@ class ContactsPDF extends FPDF
         if ($a['entreprise']) {
             $this->TableRow('Entreprise', $a['entreprise']);
         }
-        
+
         if ($a['adr1'] || $a['adr2'] || $a['adr3'] || $a['postcode'] || $a['city']) {
             $r = '';
             $r = trim("$r\n".$a['adr1']);
@@ -250,7 +248,6 @@ class ContactsPDF extends FPDF
 
     function AddContact($x, $wp = true)
     {
-        global $globals;
         /* infamous hack :
            1- we store the current state.
            2- at the end, we find out if we triggered the page break,
@@ -268,18 +265,18 @@ class ContactsPDF extends FPDF
         $ok  = false;
 
         if ($wp) {
-            $res = $globals->xdb->query("SELECT * FROM photo WHERE attachmime IN ('jpeg','png') AND uid={?}", $x['user_id']);
+            $res = XDB::query("SELECT * FROM photo WHERE attachmime IN ('jpeg','png') AND uid={?}", $x['user_id']);
             if ($i = $res->numRows()) {
                 $old2  = $this;
                 $photo = $res->fetchOneAssoc();
                 $width = $photo['x'] * 20/$photo['y'];
                 $GLOBALS["p{$x['user_id']}"] = $photo['attach'];
-               
+
                 $_x = $this->getX();
                 $_y = $this->getY();
                 $this->Cell(0, 20, '', '', 0, '', 1);
                 $this->Image("var://p{$x['user_id']}", $_x, $_y, $width, 20, $photo['attachmime']);
-                
+
                 if ($this->error) {
                     $this = $old2;
                 } else {
@@ -294,7 +291,7 @@ class ContactsPDF extends FPDF
         if (!$ok) {
             $this->MultiCell(0, 6, $nom, "T", 'C', 1);
         }
-        
+
         if ($x['mobile']) {
             $this->Space();
             $this->TableRow('mobile', $x['mobile'], 'Mono');
@@ -304,7 +301,7 @@ class ContactsPDF extends FPDF
             $this->Space();
             $this->Address($a);
         }
-        
+
         foreach ($x['adr_pro'] as $a) {
             if ( ! ($a['entreprise'] || $a['tel'] || $a['fax']
                     || $a['adr1'] || $a['adr2'] || $a['adr3'] || $a['postcode'] || $a['city']) )