From ee5990c7a30d1b922366c1cafaf2081466fececb Mon Sep 17 00:00:00 2001 From: x2000habouzit Date: Mon, 31 Jul 2006 20:20:44 +0000 Subject: [PATCH] path fixes git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@763 839d8a87-29fc-0310-9880-83ba4fa771e5 --- modules/carnet.php | 2 +- modules/carnet/contacts.pdf.inc.php | 4 ++-- {include => modules/carnet}/fonts/README | 0 {include => modules/carnet}/fonts/Vera.php | 0 {include => modules/carnet}/fonts/Vera.z | Bin {include => modules/carnet}/fonts/VeraBI.php | 0 {include => modules/carnet}/fonts/VeraBI.z | Bin {include => modules/carnet}/fonts/VeraBd.php | 0 {include => modules/carnet}/fonts/VeraBd.z | Bin {include => modules/carnet}/fonts/VeraIt.php | 0 {include => modules/carnet}/fonts/VeraIt.z | Bin {include => modules/carnet}/fonts/VeraMoBI.php | 0 {include => modules/carnet}/fonts/VeraMoBI.z | Bin {include => modules/carnet}/fonts/VeraMoBd.php | 0 {include => modules/carnet}/fonts/VeraMoBd.z | Bin {include => modules/carnet}/fonts/VeraMoIt.php | 0 {include => modules/carnet}/fonts/VeraMoIt.z | Bin {include => modules/carnet}/fonts/VeraMono.php | 0 {include => modules/carnet}/fonts/VeraMono.z | Bin {include => modules/carnet}/fonts/VeraSe.php | 0 {include => modules/carnet}/fonts/VeraSe.z | Bin {include => modules/carnet}/fonts/VeraSeBd.php | 0 {include => modules/carnet}/fonts/VeraSeBd.z | Bin 23 files changed, 3 insertions(+), 3 deletions(-) rename {include => modules/carnet}/fonts/README (100%) rename {include => modules/carnet}/fonts/Vera.php (100%) rename {include => modules/carnet}/fonts/Vera.z (100%) rename {include => modules/carnet}/fonts/VeraBI.php (100%) rename {include => modules/carnet}/fonts/VeraBI.z (100%) rename {include => modules/carnet}/fonts/VeraBd.php (100%) rename {include => modules/carnet}/fonts/VeraBd.z (100%) rename {include => modules/carnet}/fonts/VeraIt.php (100%) rename {include => modules/carnet}/fonts/VeraIt.z (100%) rename {include => modules/carnet}/fonts/VeraMoBI.php (100%) rename {include => modules/carnet}/fonts/VeraMoBI.z (100%) rename {include => modules/carnet}/fonts/VeraMoBd.php (100%) rename {include => modules/carnet}/fonts/VeraMoBd.z (100%) rename {include => modules/carnet}/fonts/VeraMoIt.php (100%) rename {include => modules/carnet}/fonts/VeraMoIt.z (100%) rename {include => modules/carnet}/fonts/VeraMono.php (100%) rename {include => modules/carnet}/fonts/VeraMono.z (100%) rename {include => modules/carnet}/fonts/VeraSe.php (100%) rename {include => modules/carnet}/fonts/VeraSe.z (100%) rename {include => modules/carnet}/fonts/VeraSeBd.php (100%) rename {include => modules/carnet}/fonts/VeraSeBd.z (100%) diff --git a/modules/carnet.php b/modules/carnet.php index e8ead00..fc9710f 100644 --- a/modules/carnet.php +++ b/modules/carnet.php @@ -295,7 +295,7 @@ class CarnetModule extends PLModule function handler_pdf(&$page, $arg0 = null, $arg1 = null) { - require_once dirname(__FILE__).'/contacts/contacts.pdf.inc.php'; + require_once dirname(__FILE__).'/carnet/contacts.pdf.inc.php'; require_once 'user.func.inc.php'; session_write_close(); diff --git a/modules/carnet/contacts.pdf.inc.php b/modules/carnet/contacts.pdf.inc.php index 7eaea17..3529835 100644 --- a/modules/carnet/contacts.pdf.inc.php +++ b/modules/carnet/contacts.pdf.inc.php @@ -21,7 +21,7 @@ define ('FPDF_FONTPATH', dirname(__FILE__).'/fonts/'); require_once '/usr/share/fpdf/fpdf.php'; -require_once dirname(__FILE__).'/../classes/VarStream.php'; +require_once dirname(__FILE__).'/../../classes/VarStream.php'; class ContactsPDF extends FPDF { @@ -94,7 +94,7 @@ class ContactsPDF extends FPDF $this->SetLineWidth(0.2); $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->Image(dirname(__FILE__).'/../../htdocs/images/logo.png', 5, 5, 10, 10, 'png', 'https://www.polytechnique.org/'); $this->Ln(10); $this->y0 = $this->GetY(); diff --git a/include/fonts/README b/modules/carnet/fonts/README similarity index 100% rename from include/fonts/README rename to modules/carnet/fonts/README diff --git a/include/fonts/Vera.php b/modules/carnet/fonts/Vera.php similarity index 100% rename from include/fonts/Vera.php rename to modules/carnet/fonts/Vera.php diff --git a/include/fonts/Vera.z b/modules/carnet/fonts/Vera.z similarity index 100% rename from include/fonts/Vera.z rename to modules/carnet/fonts/Vera.z diff --git a/include/fonts/VeraBI.php b/modules/carnet/fonts/VeraBI.php similarity index 100% rename from include/fonts/VeraBI.php rename to modules/carnet/fonts/VeraBI.php diff --git a/include/fonts/VeraBI.z b/modules/carnet/fonts/VeraBI.z similarity index 100% rename from include/fonts/VeraBI.z rename to modules/carnet/fonts/VeraBI.z diff --git a/include/fonts/VeraBd.php b/modules/carnet/fonts/VeraBd.php similarity index 100% rename from include/fonts/VeraBd.php rename to modules/carnet/fonts/VeraBd.php diff --git a/include/fonts/VeraBd.z b/modules/carnet/fonts/VeraBd.z similarity index 100% rename from include/fonts/VeraBd.z rename to modules/carnet/fonts/VeraBd.z diff --git a/include/fonts/VeraIt.php b/modules/carnet/fonts/VeraIt.php similarity index 100% rename from include/fonts/VeraIt.php rename to modules/carnet/fonts/VeraIt.php diff --git a/include/fonts/VeraIt.z b/modules/carnet/fonts/VeraIt.z similarity index 100% rename from include/fonts/VeraIt.z rename to modules/carnet/fonts/VeraIt.z diff --git a/include/fonts/VeraMoBI.php b/modules/carnet/fonts/VeraMoBI.php similarity index 100% rename from include/fonts/VeraMoBI.php rename to modules/carnet/fonts/VeraMoBI.php diff --git a/include/fonts/VeraMoBI.z b/modules/carnet/fonts/VeraMoBI.z similarity index 100% rename from include/fonts/VeraMoBI.z rename to modules/carnet/fonts/VeraMoBI.z diff --git a/include/fonts/VeraMoBd.php b/modules/carnet/fonts/VeraMoBd.php similarity index 100% rename from include/fonts/VeraMoBd.php rename to modules/carnet/fonts/VeraMoBd.php diff --git a/include/fonts/VeraMoBd.z b/modules/carnet/fonts/VeraMoBd.z similarity index 100% rename from include/fonts/VeraMoBd.z rename to modules/carnet/fonts/VeraMoBd.z diff --git a/include/fonts/VeraMoIt.php b/modules/carnet/fonts/VeraMoIt.php similarity index 100% rename from include/fonts/VeraMoIt.php rename to modules/carnet/fonts/VeraMoIt.php diff --git a/include/fonts/VeraMoIt.z b/modules/carnet/fonts/VeraMoIt.z similarity index 100% rename from include/fonts/VeraMoIt.z rename to modules/carnet/fonts/VeraMoIt.z diff --git a/include/fonts/VeraMono.php b/modules/carnet/fonts/VeraMono.php similarity index 100% rename from include/fonts/VeraMono.php rename to modules/carnet/fonts/VeraMono.php diff --git a/include/fonts/VeraMono.z b/modules/carnet/fonts/VeraMono.z similarity index 100% rename from include/fonts/VeraMono.z rename to modules/carnet/fonts/VeraMono.z diff --git a/include/fonts/VeraSe.php b/modules/carnet/fonts/VeraSe.php similarity index 100% rename from include/fonts/VeraSe.php rename to modules/carnet/fonts/VeraSe.php diff --git a/include/fonts/VeraSe.z b/modules/carnet/fonts/VeraSe.z similarity index 100% rename from include/fonts/VeraSe.z rename to modules/carnet/fonts/VeraSe.z diff --git a/include/fonts/VeraSeBd.php b/modules/carnet/fonts/VeraSeBd.php similarity index 100% rename from include/fonts/VeraSeBd.php rename to modules/carnet/fonts/VeraSeBd.php diff --git a/include/fonts/VeraSeBd.z b/modules/carnet/fonts/VeraSeBd.z similarity index 100% rename from include/fonts/VeraSeBd.z rename to modules/carnet/fonts/VeraSeBd.z -- 2.1.4