From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Sat, 27 Aug 2022 14:02:44 +0000 (+0000)
Subject: wip #5418
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=bdbe0885fcc28cc7315608f15bed4891dd7fb8d9;p=cubeextranet.git

wip #5418
---

diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index 1c804520b..e9fdf7c6a 100644
--- a/inc/commons/class.common.core.php
+++ b/inc/commons/class.common.core.php
@@ -555,19 +555,19 @@ class commonCore extends cubeCore
 
         $this->views->createView('e2_u', 'SELECT id AS utilisateur_id, enabled, email, password, api_token, e1_ws_password AS ws_password, firstname AS prenom, lastname AS nom, phone AS telephone,e1_mobile AS mobile,e1_fax as fax, locale AS lang,
  e1_ws_settings AS ws_settings, e1_settings AS settings, e1_ws_rights AS ws_rights, e1_ws_domains AS ws_domains, e1_ws_count AS ws_count, e1_login AS login,e1_grade AS grade,e1_resetpassword AS reset_password,
- JSON_UNQUOTE(address->"$.address") AS adresse,
- JSON_UNQUOTE(address->"$.postcode") AS code_postal,
- JSON_UNQUOTE(address->"$.country") AS pays,
- JSON_UNQUOTE(address->"$.city") AS ville,
- IF(company = 7, JSON_UNQUOTE(address->"$.city"), \'\') AS agence, e1_notes AS notes, 
+ JSON_VALUE(address,"$.address") AS adresse,
+ JSON_VALUE(address,"$.postcode") AS code_postal,
+ JSON_VALUE(address,"$.country") AS pays,
+ JSON_VALUE(address,"$.city") AS ville,
+ IF(company = 7, JSON_VALUE(address,"$.city"), \'\') AS agence, e1_notes AS notes, 
  company AS entreprise, UNIX_TIMESTAMP(created_at) AS date_creation FROM extranet_users.user');
 
         $this->views->createView('e2_c', 'SELECT id AS entreprise_id, name AS nom, 
- JSON_UNQUOTE(address->"$.address") AS adresse,
- JSON_UNQUOTE(address->"$.postcode") AS code_postal,
- JSON_UNQUOTE(address->"$.country") AS pays,
- JSON_UNQUOTE(address->"$.city") AS ville,
- JSON_UNQUOTE(billing_address->"$.address") AS adresse_facturation,
+ JSON_VALUE(address,"$.address") AS adresse,
+ JSON_VALUE(address,"$.postcode") AS code_postal,
+ JSON_VALUE(address,"$.country") AS pays,
+ JSON_VALUE(address,"$.city") AS ville,
+ JSON_VALUE(billing_address,"$.address") AS adresse_facturation,
  vat_number AS tva_intra,
  UNIX_TIMESTAMP(created_at) AS date_creation,
  admin AS ws_admin,
@@ -718,7 +718,6 @@ LEFT JOIN e2_u a ON ri.administrateur_id=a.utilisateur_id');
             . 'WHERE p.client_id=e.utilisateur_id '
             . 'GROUP BY e.type, p.annee_fin');
         $this->views->createView('signatures', 'SELECT * FROM fluidbook_toolbox.signature');
-        //cubeDb::mysqlConvert($this->con, 'UTF8', 'utf8_general_ci', 'MYISAM');
         touch($cache);
     }
 
diff --git a/inc/postconfig.inc.php b/inc/postconfig.inc.php
index 0828106d7..1517beea4 100644
--- a/inc/postconfig.inc.php
+++ b/inc/postconfig.inc.php
@@ -29,12 +29,12 @@ define('DEV', $dev);
 
 define('SERVER', 'alien');
 //define('DB_HOST', '127.0.0.1');
-define('DB_HOST', 'localhost');
+define('DB_HOST', '127.0.0.1:12330');
 //define('DB_HOST', ':/var/run/mysqld/mysqld.sock');
 define('AMARCORD', false);
 define('DB_NAME', 'extranet_clean');
-define('DB_USER', 'extranet');
-define('DB_PASSWORD', 'WvcAeYBDnrB93RXa');
+define('DB_USER', 'root');
+define('DB_PASSWORD', '9xHw8nyRuphyTvqC');
 
 define('EXTRANET_URL', SCHEME . '://extranet.cubedesigners.com');
 define('WS_URL', SCHEME . '://workshop.fluidbook.com');