From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 12 Nov 2009 15:14:04 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=de525154c1de185eb954787b013fdc095fa726dd;p=cubeextranet.git

---

diff --git a/inc/config.inc.php b/inc/config.inc.php
index 842431562..beb71061e 100644
--- a/inc/config.inc.php
+++ b/inc/config.inc.php
@@ -4,7 +4,7 @@ define('ROOT', dirname(__FILE__) . '/..');
 $localrel = array('localhost', 'paris.fluidbook.com');
 $localabs = array('dev.ws.fluidbook.com', 'dev.extranet.fluidbook.com');
 $ws = array('ws.fluidbook.com', 'dev.ws.fluidbook.com');
-$extranet = array('extranet.cubedesigners.com', 'dev.extranet.fluidbook.com', 'paris.fluidbook.com', 'localhost');
+$extranet = array('extranet.cubedesigners.com', 'dev.extranet.fluidbook.com', 'paris.fluidbook.com', 'localhost','xtn.fluidbook.com');
 if (in_array($_SERVER['HTTP_HOST'], array_merge($localrel, $localabs))) {
 	// Définition de la configuration sur l'environnement de développement
 	define('DB_HOST', 'localhost');
@@ -31,7 +31,7 @@ if (in_array($_SERVER['HTTP_HOST'], array_merge($localrel, $localabs))) {
 	define('WEBROOT', '');
 	define('SITE_PATH', WEBROOT . '/');
 
-	define('FTPROOT', '/usb/ftpextranet/');
+	define('FTPROOT', '/home/extranet/ftp/');
 	define('DEV', false);
 	define('WINDOWS',false);
 }
@@ -43,7 +43,7 @@ if (in_array($_SERVER['HTTP_HOST'], $ws)) {
 } else {
 	define('MODE', 'extranet');
 	define('GA', 'UA-4339912-4');
-	define('TITLE', 'Extranet - Cubedesigners');
+	define('TITLE', 'Extranet Cubedesigners');
 }
 
 define('SESSION_LIFETIME', 3600 * 10);
diff --git a/inc/extranet/Controlleur/class.extranet.core.php b/inc/extranet/Controlleur/class.extranet.core.php
index 433def2cf..f74949e96 100644
--- a/inc/extranet/Controlleur/class.extranet.core.php
+++ b/inc/extranet/Controlleur/class.extranet.core.php
@@ -430,7 +430,7 @@ class extranetCore extends cubeCore {
 			 . 'FROM utilisateurs WHERE grade=0 '
 			 . 'UNION '
 			 . 'SELECT email AS userid,ws_password AS passwd,utilisateur_id AS uid,'
-			 . '\'1000\' AS gid,CONCAT(\'/usb/ftpextranet/\',utilisateur_id) AS homedir, \'/bin/false\' AS shell '
+			 . '\'1000\' AS gid,CONCAT(\''.FTPROOT.'\',utilisateur_id) AS homedir, \'/bin/false\' AS shell '
 			 . 'FROM utilisateurs WHERE grade=0 AND ws_password!=\'\'');
 		$this->createView('chiffres_categories', 'SELECT p.annee_fin AS annee, t.categorie, SUM(t.budget) AS ca '
 			 . 'FROM projets_vue p, taches_vue t '
diff --git a/inc/extranet/DAO/class.extranet.dao.fichier.php b/inc/extranet/DAO/class.extranet.dao.fichier.php
index 219747d81..3913d0382 100644
--- a/inc/extranet/DAO/class.extranet.dao.fichier.php
+++ b/inc/extranet/DAO/class.extranet.dao.fichier.php
@@ -4,7 +4,7 @@ class extranetDAOFichier extends extranetDAO {
 	public function singleton($infos)
 	{
 		$path = path::real($infos['path']);
-		$rel_path = str_replace('/usb/ftpextranet', '', $path);
+		$rel_path = str_replace(FTPROOT, '', $path);
 		$fichier = new extranetFichier();
 		$fichier->contact = $infos['contact'];
 		$fichier->destinataire=$infos['destinataire'];
diff --git a/typo/extranet/desc.xml b/typo/extranet/desc.xml
index ea114779e..758ed4334 100644
--- a/typo/extranet/desc.xml
+++ b/typo/extranet/desc.xml
@@ -20,7 +20,7 @@
 			<font_family>Univers-CondensedBold.ttf</font_family>
 			<font_size>9.5</font_size>
 			<color>ffffff</color>
-			<top>8</top>
+			<top>5</top>
 			<left>auto</left>
 			<bottom>0</bottom>
 			<texte>$texte</texte>
@@ -31,7 +31,7 @@
 			<font_family>Univers-CondensedBold.ttf</font_family>
 			<font_size>9.5</font_size>
 			<color>5f6162</color>
-			<top>41</top>
+			<top>38</top>
 			<left>auto</left>
 			<bottom>0</bottom>
 			<texte>$texte</texte>
@@ -72,7 +72,7 @@
 			<font_family>Univers-CondensedBold.ttf</font_family>
 			<font_size>11</font_size>
 			<color>7a560a</color>
-			<top>5</top>
+			<top>2</top>
 			<left>33</left>
 			<right>13</right>
 			<dim>1</dim>
@@ -114,7 +114,7 @@
 			<font_family>Univers-CondensedBold.ttf</font_family>
 			<font_size>11</font_size>
 			<color>7a560a</color>
-			<top>5</top>
+			<top>2</top>
 			<left>33</left>
 			<right>13</right>
 			<dim>1</dim>
@@ -156,7 +156,7 @@
 			<font_family>Univers-CondensedBold.ttf</font_family>
 			<font_size>11</font_size>
 			<color>7a560a</color>
-			<top>5</top>
+			<top>2</top>
 			<left>12</left>
 			<right>36</right>
 			<dim>1</dim>
@@ -198,7 +198,7 @@
 			<font_family>Univers-CondensedBold.ttf</font_family>
 			<font_size>10</font_size>
 			<color>7a560a</color>
-			<top>5</top>
+			<top>2</top>
 			<left>14</left>
 			<right>34</right>
 			<dim>1</dim>
@@ -240,7 +240,7 @@
 			<font_family>Univers-CondensedBold.ttf</font_family>
 			<font_size>10</font_size>
 			<color>7a560a</color>
-			<top>5</top>
+			<top>2</top>
 			<left>34</left>
 			<right>14</right>
 			<dim>1</dim>
@@ -282,7 +282,7 @@
 			<font_family>Univers-CondensedBold.ttf</font_family>
 			<font_size>11</font_size>
 			<color>5f6162</color>
-			<top>13</top>
+			<top>9</top>
 			<left>40</left>
 			<right>75</right>
 			<dim>1</dim>
@@ -325,7 +325,7 @@
 			<font_family>Univers-CondensedBold.ttf</font_family>
 			<font_size>11</font_size>
 			<color>5f6162</color>
-			<top>13</top>
+			<top>9</top>
 			<left>20</left>
 			<right>20</right>
 			<dim>1</dim>
@@ -343,10 +343,10 @@
 			<font_family>Univers-CondensedBold.ttf</font_family>
 			<font_size>13</font_size>
 			<color>ffffff</color>
-			<top>0</top>
+			<top>-5</top>
 			<left>0</left>
 			<right>2</right>
-			<bottom>0</bottom>
+			<bottom>5</bottom>
 			<texte>$texte</texte>
 			<dim>1</dim>
 		</layer>