(no commit message)

diff --git a/inc/config.inc.php b/inc/config.inc.php
index 65fe2ee43378755dedf1913bce12680e9b1d26ec..beb71061e8543120cf6a72b77b36adce5a95cc10 100644 (file)
--- a/inc/config.inc.php
+++ b/inc/config.inc.php
@@ -24,7 +24,7 @@ if (in_array($_SERVER['HTTP_HOST'], array_merge($localrel, $localabs))) {
        }\r
 } else {\r
        // Définition des variables dans l'environnement de production\r
-       define('DB_HOST', '127.0.0.1');\r
+       define('DB_HOST', 'localhost');\r
        define('DB_NAME', 'extranet');\r
        define('DB_USER', 'ws');\r
        define('DB_PASSWORD', '*arica*2');\r

diff --git a/inc/extranet/Controlleur/class.extranet.core.php b/inc/extranet/Controlleur/class.extranet.core.php
index f74949e96d3c28f541f02e28e3292839735c517c..aeaa862dad1a97c61660ccc73ecef713a4b5cd7d 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.core.php
+++ b/inc/extranet/Controlleur/class.extranet.core.php
@@ -426,7 +426,7 @@ class extranetCore extends cubeCore {
                $this->createView('order_timereport', 'SELECT utilisateur_id,projet AS projet_id,MAX(date) AS derniere_activite FROM timereport,taches,projets WHERE taches.tache_id=timereport.tache_id AND taches.projet=projets.projet_id AND projets.status=0 GROUP BY utilisateur_id,taches.projet ORDER BY utilisateur_id ASC,MAX(date) DESC');\r
                $this->createView('ca', 'SELECT SUM(total_ht) AS ca, YEAR(FROM_UNIXTIME(date_creation)) annee FROM factures WHERE status IN(1,2) GROUP BY annee');\r
                $this->createView('ftpaccess', 'SELECT email AS userid,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 '\r
                         . 'UNION '\r
                         . 'SELECT email AS userid,ws_password AS passwd,utilisateur_id AS uid,'\r

diff --git a/index.php b/index.php
index 077defc819e92bece2272aec316d3b782f5c3507..ff351a73a3e61761922a284120afdb5de8c00704 100644 (file)
--- a/index.php
+++ b/index.php
@@ -10,8 +10,8 @@ $js[] = (JS_PATH . '/extranet.js');
 $jsvar['IMG'] = IMG;\r
 $jsvar['SITE_PATH'] = SITE_PATH;\r
 $css[] = CSS_PATH . '/style.css';\r
-//$css['IE'] = CSS_PATH . '/ie.css';\r
-\r
+// $css['IE'] = CSS_PATH . '/ie.css';\r
 echo cubePage::page($buffer, $js, $jsvar, $css, array(), 6);\r
+fb($core->debug());\r
 \r
 ?>
\ No newline at end of file