wip #5418

diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index 1c804520b79fdb14d1dbf3f16dfb7ff2327528dd..e9fdf7c6ab79bdb4aa65ed9e89a0a09aa84083bf 100644 (file)
--- a/inc/commons/class.common.core.php
+++ b/inc/commons/class.common.core.php
@@ -555,19 +555,19 @@ class commonCore extends cubeCore
 \r
         $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,\r
  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,\r
- JSON_UNQUOTE(address->"$.address") AS adresse,\r
- JSON_UNQUOTE(address->"$.postcode") AS code_postal,\r
- JSON_UNQUOTE(address->"$.country") AS pays,\r
- JSON_UNQUOTE(address->"$.city") AS ville,\r
- IF(company = 7, JSON_UNQUOTE(address->"$.city"), \'\') AS agence, e1_notes AS notes, \r
+ JSON_VALUE(address,"$.address") AS adresse,\r
+ JSON_VALUE(address,"$.postcode") AS code_postal,\r
+ JSON_VALUE(address,"$.country") AS pays,\r
+ JSON_VALUE(address,"$.city") AS ville,\r
+ IF(company = 7, JSON_VALUE(address,"$.city"), \'\') AS agence, e1_notes AS notes, \r
  company AS entreprise, UNIX_TIMESTAMP(created_at) AS date_creation FROM extranet_users.user');\r
 \r
         $this->views->createView('e2_c', 'SELECT id AS entreprise_id, name AS nom, \r
- JSON_UNQUOTE(address->"$.address") AS adresse,\r
- JSON_UNQUOTE(address->"$.postcode") AS code_postal,\r
- JSON_UNQUOTE(address->"$.country") AS pays,\r
- JSON_UNQUOTE(address->"$.city") AS ville,\r
- JSON_UNQUOTE(billing_address->"$.address") AS adresse_facturation,\r
+ JSON_VALUE(address,"$.address") AS adresse,\r
+ JSON_VALUE(address,"$.postcode") AS code_postal,\r
+ JSON_VALUE(address,"$.country") AS pays,\r
+ JSON_VALUE(address,"$.city") AS ville,\r
+ JSON_VALUE(billing_address,"$.address") AS adresse_facturation,\r
  vat_number AS tva_intra,\r
  UNIX_TIMESTAMP(created_at) AS date_creation,\r
  admin AS ws_admin,\r
@@ -718,7 +718,6 @@ LEFT JOIN e2_u a ON ri.administrateur_id=a.utilisateur_id');
             . 'WHERE p.client_id=e.utilisateur_id '\r
             . 'GROUP BY e.type, p.annee_fin');\r
         $this->views->createView('signatures', 'SELECT * FROM fluidbook_toolbox.signature');\r
-        //cubeDb::mysqlConvert($this->con, 'UTF8', 'utf8_general_ci', 'MYISAM');\r
         touch($cache);\r
     }\r
 \r

diff --git a/inc/postconfig.inc.php b/inc/postconfig.inc.php
index 0828106d7dff95cd96de6e55ac3b0163995db5cb..1517beea423ff6e7fda710768c1b3bb523057dd7 100644 (file)
--- a/inc/postconfig.inc.php
+++ b/inc/postconfig.inc.php
@@ -29,12 +29,12 @@ define('DEV', $dev);
 \r
 define('SERVER', 'alien');\r
 //define('DB_HOST', '127.0.0.1');\r
-define('DB_HOST', 'localhost');\r
+define('DB_HOST', '127.0.0.1:12330');\r
 //define('DB_HOST', ':/var/run/mysqld/mysqld.sock');\r
 define('AMARCORD', false);\r
 define('DB_NAME', 'extranet_clean');\r
-define('DB_USER', 'extranet');\r
-define('DB_PASSWORD', 'WvcAeYBDnrB93RXa');\r
+define('DB_USER', 'root');\r
+define('DB_PASSWORD', '9xHw8nyRuphyTvqC');\r
 \r
 define('EXTRANET_URL', SCHEME . '://extranet.cubedesigners.com');\r
 define('WS_URL', SCHEME . '://workshop.fluidbook.com');\r