(no commit message)

diff --git a/inc/config.inc.php b/inc/config.inc.php
index 8424315623106bee5a8edd81da139395a6fdcb9d..beb71061e8543120cf6a72b77b36adce5a95cc10 100644 (file)
--- a/inc/config.inc.php
+++ b/inc/config.inc.php
@@ -4,7 +4,7 @@ define('ROOT', dirname(__FILE__) . '/..');
 $localrel = array('localhost', 'paris.fluidbook.com');\r
 $localabs = array('dev.ws.fluidbook.com', 'dev.extranet.fluidbook.com');\r
 $ws = array('ws.fluidbook.com', 'dev.ws.fluidbook.com');\r
-$extranet = array('extranet.cubedesigners.com', 'dev.extranet.fluidbook.com', 'paris.fluidbook.com', 'localhost');\r
+$extranet = array('extranet.cubedesigners.com', 'dev.extranet.fluidbook.com', 'paris.fluidbook.com', 'localhost','xtn.fluidbook.com');\r
 if (in_array($_SERVER['HTTP_HOST'], array_merge($localrel, $localabs))) {\r
        // Définition de la configuration sur l'environnement de développement\r
        define('DB_HOST', 'localhost');\r
@@ -31,7 +31,7 @@ if (in_array($_SERVER['HTTP_HOST'], array_merge($localrel, $localabs))) {
        define('WEBROOT', '');\r
        define('SITE_PATH', WEBROOT . '/');\r
 \r
-       define('FTPROOT', '/usb/ftpextranet/');\r
+       define('FTPROOT', '/home/extranet/ftp/');\r
        define('DEV', false);\r
        define('WINDOWS',false);\r
 }\r
@@ -43,7 +43,7 @@ if (in_array($_SERVER['HTTP_HOST'], $ws)) {
 } else {\r
        define('MODE', 'extranet');\r
        define('GA', 'UA-4339912-4');\r
-       define('TITLE', 'Extranet - Cubedesigners');\r
+       define('TITLE', 'Extranet Cubedesigners');\r
 }\r
 \r
 define('SESSION_LIFETIME', 3600 * 10);\r

diff --git a/inc/extranet/Controlleur/class.extranet.core.php b/inc/extranet/Controlleur/class.extranet.core.php
index 433def2cf428ffb48ba80d5d5656a121b1dd774d..f74949e96d3c28f541f02e28e3292839735c517c 100644 (file)
--- 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 '\r
                         . 'UNION '\r
                         . 'SELECT email AS userid,ws_password AS passwd,utilisateur_id AS uid,'\r
-                        . '\'1000\' AS gid,CONCAT(\'/usb/ftpextranet/\',utilisateur_id) AS homedir, \'/bin/false\' AS shell '\r
+                        . '\'1000\' AS gid,CONCAT(\''.FTPROOT.'\',utilisateur_id) AS homedir, \'/bin/false\' AS shell '\r
                         . 'FROM utilisateurs WHERE grade=0 AND ws_password!=\'\'');\r
                $this->createView('chiffres_categories', 'SELECT p.annee_fin AS annee, t.categorie, SUM(t.budget) AS ca '\r
                         . 'FROM projets_vue p, taches_vue t '\r

diff --git a/inc/extranet/DAO/class.extranet.dao.fichier.php b/inc/extranet/DAO/class.extranet.dao.fichier.php
index 219747d81fef26c1f2122c972197d0f74e27bcb5..3913d0382efaae5a404ae30379be8bc28d1c832f 100644 (file)
--- 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)\r
        {\r
                $path = path::real($infos['path']);\r
-               $rel_path = str_replace('/usb/ftpextranet', '', $path);\r
+               $rel_path = str_replace(FTPROOT, '', $path);\r
                $fichier = new extranetFichier();\r
                $fichier->contact = $infos['contact'];\r
                $fichier->destinataire=$infos['destinataire'];\r

diff --git a/typo/extranet/desc.xml b/typo/extranet/desc.xml
index ea114779ec89b3b177b66bb45644750a494fafd2..758ed4334ffc9cc902b639cc03b77c70b40c7ca6 100644 (file)
--- a/typo/extranet/desc.xml
+++ b/typo/extranet/desc.xml
@@ -20,7 +20,7 @@
                        <font_family>Univers-CondensedBold.ttf</font_family>\r
                        <font_size>9.5</font_size>\r
                        <color>ffffff</color>\r
-                       <top>8</top>\r
+                       <top>5</top>\r
                        <left>auto</left>\r
                        <bottom>0</bottom>\r
                        <texte>$texte</texte>\r
@@ -31,7 +31,7 @@
                        <font_family>Univers-CondensedBold.ttf</font_family>\r
                        <font_size>9.5</font_size>\r
                        <color>5f6162</color>\r
-                       <top>41</top>\r
+                       <top>38</top>\r
                        <left>auto</left>\r
                        <bottom>0</bottom>\r
                        <texte>$texte</texte>\r
@@ -72,7 +72,7 @@
                        <font_family>Univers-CondensedBold.ttf</font_family>\r
                        <font_size>11</font_size>\r
                        <color>7a560a</color>\r
-                       <top>5</top>\r
+                       <top>2</top>\r
                        <left>33</left>\r
                        <right>13</right>\r
                        <dim>1</dim>\r
@@ -114,7 +114,7 @@
                        <font_family>Univers-CondensedBold.ttf</font_family>\r
                        <font_size>11</font_size>\r
                        <color>7a560a</color>\r
-                       <top>5</top>\r
+                       <top>2</top>\r
                        <left>33</left>\r
                        <right>13</right>\r
                        <dim>1</dim>\r
@@ -156,7 +156,7 @@
                        <font_family>Univers-CondensedBold.ttf</font_family>\r
                        <font_size>11</font_size>\r
                        <color>7a560a</color>\r
-                       <top>5</top>\r
+                       <top>2</top>\r
                        <left>12</left>\r
                        <right>36</right>\r
                        <dim>1</dim>\r
@@ -198,7 +198,7 @@
                        <font_family>Univers-CondensedBold.ttf</font_family>\r
                        <font_size>10</font_size>\r
                        <color>7a560a</color>\r
-                       <top>5</top>\r
+                       <top>2</top>\r
                        <left>14</left>\r
                        <right>34</right>\r
                        <dim>1</dim>\r
@@ -240,7 +240,7 @@
                        <font_family>Univers-CondensedBold.ttf</font_family>\r
                        <font_size>10</font_size>\r
                        <color>7a560a</color>\r
-                       <top>5</top>\r
+                       <top>2</top>\r
                        <left>34</left>\r
                        <right>14</right>\r
                        <dim>1</dim>\r
@@ -282,7 +282,7 @@
                        <font_family>Univers-CondensedBold.ttf</font_family>\r
                        <font_size>11</font_size>\r
                        <color>5f6162</color>\r
-                       <top>13</top>\r
+                       <top>9</top>\r
                        <left>40</left>\r
                        <right>75</right>\r
                        <dim>1</dim>\r
@@ -325,7 +325,7 @@
                        <font_family>Univers-CondensedBold.ttf</font_family>\r
                        <font_size>11</font_size>\r
                        <color>5f6162</color>\r
-                       <top>13</top>\r
+                       <top>9</top>\r
                        <left>20</left>\r
                        <right>20</right>\r
                        <dim>1</dim>\r
@@ -343,10 +343,10 @@
                        <font_family>Univers-CondensedBold.ttf</font_family>\r
                        <font_size>13</font_size>\r
                        <color>ffffff</color>\r
-                       <top>0</top>\r
+                       <top>-5</top>\r
                        <left>0</left>\r
                        <right>2</right>\r
-                       <bottom>0</bottom>\r
+                       <bottom>5</bottom>\r
                        <texte>$texte</texte>\r
                        <dim>1</dim>\r
                </layer>\r