lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean: Remove fields for social networks (merged into "socialnetworks")

Browse Source
This commit is contained in:
Laurent Destailleur 2021-10-27 16:39:34 +02:00
parent 4bde20dd8d
commit 97d97af932
11 changed files with 96 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/action/card.php
View File

@ -972,7 +972,7 @@ if ($action == 'create') {
print '<input type="hidden" name="donotclearsession" value="1">'; print '<input type="hidden" name="donotclearsession" value="1">';
print '<input type="hidden" name="page_y" value="">'; print '<input type="hidden" name="page_y" value="">';
if ($backtopage) { if ($backtopage) {
print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : htmlentities($_SERVER["HTTP_REFERER"])).'">'; print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : dol_htmlentities($_SERVER["HTTP_REFERER"])).'">';
} }
if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) { if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
print '<input type="hidden" name="actioncode" value="'.dol_getIdFromCode($db, 'AC_OTH', 'c_actioncomm').'">'; print '<input type="hidden" name="actioncode" value="'.dol_getIdFromCode($db, 'AC_OTH', 'c_actioncomm').'">';

2
htdocs/core/lib/functions.lib.php
View File

@ -6677,7 +6677,7 @@ function dol_html_entity_decode($a, $b, $c = 'UTF-8', $keepsomeentities = 0)
* @param bool $double_encode When double_encode is turned off, PHP will not encode existing html entities * @param bool $double_encode When double_encode is turned off, PHP will not encode existing html entities
* @return string $ret Encoded string * @return string $ret Encoded string
*/ */
function dol_htmlentities($string, $flags = null, $encoding = 'UTF-8', $double_encode = false) function dol_htmlentities($string, $flags = ENT_QUOTES|ENT_SUBSTITUTE, $encoding = 'UTF-8', $double_encode = false)
{ {
return htmlentities($string, $flags, $encoding, $double_encode); return htmlentities($string, $flags, $encoding, $double_encode);
} }

46
htdocs/install/mysql/migration/14.0.0-15.0.0.sql
View File

@ -384,3 +384,49 @@ ALTER TABLE llx_projet_task ADD COLUMN budget_amount double(24,8) AFTER priority
-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT 'box_graph_nb_ticket_last_x_days.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_graph_nb_ticket_last_x_days.php' AND entity = 1); -- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT 'box_graph_nb_ticket_last_x_days.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_graph_nb_ticket_last_x_days.php' AND entity = 1);
-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT 'box_graph_nb_tickets_type.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_graph_nb_tickets_type.php' AND entity = 1); -- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT 'box_graph_nb_tickets_type.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_graph_nb_tickets_type.php' AND entity = 1);
-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT 'box_graph_new_vs_close_ticket.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_graph_new_vs_close_ticket.php' AND entity = 1); -- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT 'box_graph_new_vs_close_ticket.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_graph_new_vs_close_ticket.php' AND entity = 1);
ALTER TABLE llx_user DROP COLUMN jabberid;
ALTER TABLE llx_user DROP COLUMN skype;
ALTER TABLE llx_user DROP COLUMN twitter;
ALTER TABLE llx_user DROP COLUMN facebook;
ALTER TABLE llx_user DROP COLUMN linkedin;
ALTER TABLE llx_user DROP COLUMN instagram;
ALTER TABLE llx_user DROP COLUMN snapchat;
ALTER TABLE llx_user DROP COLUMN googleplus;
ALTER TABLE llx_user DROP COLUMN youtube;
ALTER TABLE llx_user DROP COLUMN whatsapp;
ALTER TABLE llx_adherent DROP COLUMN jabberid;
ALTER TABLE llx_adherent DROP COLUMN skype;
ALTER TABLE llx_adherent DROP COLUMN twitter;
ALTER TABLE llx_adherent DROP COLUMN facebook;
ALTER TABLE llx_adherent DROP COLUMN linkedin;
ALTER TABLE llx_adherent DROP COLUMN instagram;
ALTER TABLE llx_adherent DROP COLUMN snapchat;
ALTER TABLE llx_adherent DROP COLUMN googleplus;
ALTER TABLE llx_adherent DROP COLUMN youtube;
ALTER TABLE llx_adherent DROP COLUMN whatsapp;
ALTER TABLE llx_societe DROP COLUMN jabberid;
ALTER TABLE llx_societe DROP COLUMN skype;
ALTER TABLE llx_societe DROP COLUMN twitter;
ALTER TABLE llx_societe DROP COLUMN facebook;
ALTER TABLE llx_societe DROP COLUMN linkedin;
ALTER TABLE llx_societe DROP COLUMN instagram;
ALTER TABLE llx_societe DROP COLUMN snapchat;
ALTER TABLE llx_societe DROP COLUMN googleplus;
ALTER TABLE llx_societe DROP COLUMN youtube;
ALTER TABLE llx_societe DROP COLUMN whatsapp;
ALTER TABLE llx_socpeople DROP COLUMN jabberid;
ALTER TABLE llx_socpeople DROP COLUMN skype;
ALTER TABLE llx_socpeople DROP COLUMN twitter;
ALTER TABLE llx_socpeople DROP COLUMN facebook;
ALTER TABLE llx_socpeople DROP COLUMN linkedin;
ALTER TABLE llx_socpeople DROP COLUMN instagram;
ALTER TABLE llx_socpeople DROP COLUMN snapchat;
ALTER TABLE llx_socpeople DROP COLUMN googleplus;
ALTER TABLE llx_socpeople DROP COLUMN youtube;
ALTER TABLE llx_socpeople DROP COLUMN whatsapp;

18
htdocs/install/mysql/tables/llx_adherent.sql
View File

@ -51,15 +51,15 @@ create table llx_adherent
url varchar(255) NULL, url varchar(255) NULL,
socialnetworks text DEFAULT NULL, -- json with socialnetworks socialnetworks text DEFAULT NULL, -- json with socialnetworks
skype varchar(255), -- deprecated --skype varchar(255), -- deprecated
twitter varchar(255), -- deprecated --twitter varchar(255), -- deprecated
facebook varchar(255), -- deprecated --facebook varchar(255), -- deprecated
linkedin varchar(255), -- deprecated --linkedin varchar(255), -- deprecated
instagram varchar(255), -- deprecated --instagram varchar(255), -- deprecated
snapchat varchar(255), -- deprecated --snapchat varchar(255), -- deprecated
googleplus varchar(255), -- deprecated --googleplus varchar(255), -- deprecated
youtube varchar(255), -- deprecated --youtube varchar(255), -- deprecated
whatsapp varchar(255), -- deprecated --whatsapp varchar(255), -- deprecated
phone varchar(30), phone varchar(30),
phone_perso varchar(30), phone_perso varchar(30),

18
htdocs/install/mysql/tables/llx_societe.sql
View File

@ -52,15 +52,15 @@ create table llx_societe
email varchar(128), -- email varchar(128), --
socialnetworks text DEFAULT NULL, -- json with socialnetworks socialnetworks text DEFAULT NULL, -- json with socialnetworks
skype varchar(255), -- deprecated --skype varchar(255), -- deprecated
twitter varchar(255), -- deprecated --twitter varchar(255), -- deprecated
facebook varchar(255), -- deprecated --facebook varchar(255), -- deprecated
linkedin varchar(255), -- deprecated --linkedin varchar(255), -- deprecated
instagram varchar(255), -- deprecated --instagram varchar(255), -- deprecated
snapchat varchar(255), -- deprecated --snapchat varchar(255), -- deprecated
googleplus varchar(255), -- deprecated --googleplus varchar(255), -- deprecated
youtube varchar(255), -- deprecated --youtube varchar(255), -- deprecated
whatsapp varchar(255), -- deprecated --whatsapp varchar(255), -- deprecated
fk_effectif integer DEFAULT 0, -- fk_effectif integer DEFAULT 0, --
fk_typent integer DEFAULT NULL, -- type ent fk_typent integer DEFAULT NULL, -- type ent

20
htdocs/install/mysql/tables/llx_socpeople.sql
View File

@ -44,16 +44,16 @@ create table llx_socpeople
email varchar(255), email varchar(255),
socialnetworks text DEFAULT NULL, -- json with socialnetworks socialnetworks text DEFAULT NULL, -- json with socialnetworks
jabberid varchar(255), --jabberid varchar(255),
skype varchar(255), --skype varchar(255),
twitter varchar(255), -- --twitter varchar(255), --
facebook varchar(255), -- --facebook varchar(255), --
linkedin varchar(255), -- --linkedin varchar(255), --
instagram varchar(255), -- --instagram varchar(255), --
snapchat varchar(255), -- --snapchat varchar(255), --
googleplus varchar(255), -- --googleplus varchar(255), --
youtube varchar(255), -- --youtube varchar(255), --
whatsapp varchar(255), -- --whatsapp varchar(255), --
photo varchar(255), photo varchar(255),
no_email smallint NOT NULL DEFAULT 0, -- deprecated. Use table llx_mailing_unsubscribe instead no_email smallint NOT NULL DEFAULT 0, -- deprecated. Use table llx_mailing_unsubscribe instead

6
htdocs/install/upgrade2.php
View File

@ -4537,7 +4537,8 @@ and rowid in (...)
*/ */
/** /**
* Migrate users fields facebook and co to socialnetworks * Migrate users fields facebook and co to socialnetworks.
* Can be called only when version is 10.0.* or lower. Fields does not exists after.
* *
* @return void * @return void
*/ */
@ -4628,6 +4629,7 @@ function migrate_users_socialnetworks()
/** /**
* Migrate members fields facebook and co to socialnetworks * Migrate members fields facebook and co to socialnetworks
* Can be called only when version is 10.0.* or lower. Fields does not exists after.
* *
* @return void * @return void
*/ */
@ -4719,6 +4721,7 @@ function migrate_members_socialnetworks()
/** /**
* Migrate contacts fields facebook and co to socialnetworks * Migrate contacts fields facebook and co to socialnetworks
* Can be called only when version is 10.0.* or lower. Fields does not exists after.
* *
* @return void * @return void
*/ */
@ -4814,6 +4817,7 @@ function migrate_contacts_socialnetworks()
/** /**
* Migrate thirdparties fields facebook and co to socialnetworks * Migrate thirdparties fields facebook and co to socialnetworks
* Can be called only when version is 10.0.* or lower. Fields does not exists after.
* *
* @return void * @return void
*/ */

20
htdocs/societe/card.php
View File

@ -204,7 +204,7 @@ if (empty($reshook)) {
$object->client = $object->client | $soc_origin->client; $object->client = $object->client | $soc_origin->client;
$object->fournisseur = $object->fournisseur | $soc_origin->fournisseur; $object->fournisseur = $object->fournisseur | $soc_origin->fournisseur;
$listofproperties = array( $listofproperties = array(
'address', 'zip', 'town', 'state_id', 'country_id', 'phone', 'phone_pro', 'fax', 'email', 'skype', 'twitter', 'facebook', 'linkedin', 'socialnetworks', 'url', 'barcode', 'address', 'zip', 'town', 'state_id', 'country_id', 'phone', 'phone_pro', 'fax', 'email', 'socialnetworks', 'url', 'barcode',
'idprof1', 'idprof2', 'idprof3', 'idprof4', 'idprof5', 'idprof6', 'idprof1', 'idprof2', 'idprof3', 'idprof4', 'idprof5', 'idprof6',
'tva_intra', 'effectif_id', 'forme_juridique', 'remise_percent', 'remise_supplier_percent', 'mode_reglement_supplier_id', 'cond_reglement_supplier_id', 'name_bis', 'tva_intra', 'effectif_id', 'forme_juridique', 'remise_percent', 'remise_supplier_percent', 'mode_reglement_supplier_id', 'cond_reglement_supplier_id', 'name_bis',
'stcomm_id', 'outstanding_limit', 'price_level', 'parent', 'default_lang', 'ref', 'ref_ext', 'import_key', 'fk_incoterms', 'fk_multicurrency', 'stcomm_id', 'outstanding_limit', 'price_level', 'parent', 'default_lang', 'ref', 'ref_ext', 'import_key', 'fk_incoterms', 'fk_multicurrency',
@ -458,10 +458,7 @@ if (empty($reshook)) {
$object->town = GETPOST('town', 'alphanohtml'); $object->town = GETPOST('town', 'alphanohtml');
$object->country_id = GETPOST('country_id', 'int'); $object->country_id = GETPOST('country_id', 'int');
$object->state_id = GETPOST('state_id', 'int'); $object->state_id = GETPOST('state_id', 'int');
//$object->skype = GETPOST('skype', 'alpha');
//$object->twitter = GETPOST('twitter', 'alpha');
//$object->facebook = GETPOST('facebook', 'alpha');
//$object->linkedin = GETPOST('linkedin', 'alpha');
$object->socialnetworks = array(); $object->socialnetworks = array();
if (!empty($conf->socialnetworks->enabled)) { if (!empty($conf->socialnetworks->enabled)) {
foreach ($socialnetworks as $key => $value) { foreach ($socialnetworks as $key => $value) {
@ -470,6 +467,7 @@ if (empty($reshook)) {
} }
} }
} }
$object->phone = GETPOST('phone', 'alpha'); $object->phone = GETPOST('phone', 'alpha');
$object->fax = GETPOST('fax', 'alpha'); $object->fax = GETPOST('fax', 'alpha');
$object->email = trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL)); $object->email = trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL));
@ -1045,10 +1043,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
$object->zip = GETPOST('zipcode', 'alphanohtml'); $object->zip = GETPOST('zipcode', 'alphanohtml');
$object->town = GETPOST('town', 'alphanohtml'); $object->town = GETPOST('town', 'alphanohtml');
$object->state_id = GETPOST('state_id', 'int'); $object->state_id = GETPOST('state_id', 'int');
//$object->skype = GETPOST('skype', 'alpha');
//$object->twitter = GETPOST('twitter', 'alpha');
//$object->facebook = GETPOST('facebook', 'alpha');
//$object->linkedin = GETPOST('linkedin', 'alpha');
$object->socialnetworks = array(); $object->socialnetworks = array();
if (!empty($conf->socialnetworks->enabled)) { if (!empty($conf->socialnetworks->enabled)) {
foreach ($socialnetworks as $key => $value) { foreach ($socialnetworks as $key => $value) {
@ -1057,6 +1052,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
} }
} }
} }
$object->phone = GETPOST('phone', 'alpha'); $object->phone = GETPOST('phone', 'alpha');
$object->fax = GETPOST('fax', 'alpha'); $object->fax = GETPOST('fax', 'alpha');
$object->email = GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL); $object->email = GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
@ -1785,10 +1781,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
$object->town = GETPOST('town', 'alphanohtml'); $object->town = GETPOST('town', 'alphanohtml');
$object->country_id = GETPOST('country_id') ?GETPOST('country_id', 'int') : $mysoc->country_id; $object->country_id = GETPOST('country_id') ?GETPOST('country_id', 'int') : $mysoc->country_id;
$object->state_id = GETPOST('state_id', 'int'); $object->state_id = GETPOST('state_id', 'int');
//$object->skype = GETPOST('skype', 'alpha');
//$object->twitter = GETPOST('twitter', 'alpha');
//$object->facebook = GETPOST('facebook', 'alpha');
//$object->linkedin = GETPOST('linkedin', 'alpha');
$object->socialnetworks = array(); $object->socialnetworks = array();
if (!empty($conf->socialnetworks->enabled)) { if (!empty($conf->socialnetworks->enabled)) {
foreach ($socialnetworks as $key => $value) { foreach ($socialnetworks as $key => $value) {
@ -1797,6 +1790,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
} }
} }
} }
$object->phone = GETPOST('phone', 'alpha'); $object->phone = GETPOST('phone', 'alpha');
$object->fax = GETPOST('fax', 'alpha'); $object->fax = GETPOST('fax', 'alpha');
$object->email = GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL); $object->email = GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);

5
htdocs/societe/class/api_thirdparties.class.php
View File

@ -1799,6 +1799,11 @@ class Thirdparties extends DolibarrApi
unset($object->twitter); unset($object->twitter);
unset($object->facebook); unset($object->facebook);
unset($object->linkedin); unset($object->linkedin);
unset($object->instagram);
unset($object->snapchat);
unset($object->googleplus);
unset($object->youtube);
unset($object->whatsapp);
return $object; return $object;
} }

10
htdocs/user/card.php
View File

@ -262,10 +262,6 @@ if (empty($reshook)) {
$object->office_fax = GETPOST("office_fax", 'alphanohtml'); $object->office_fax = GETPOST("office_fax", 'alphanohtml');
$object->user_mobile = GETPOST("user_mobile", 'alphanohtml'); $object->user_mobile = GETPOST("user_mobile", 'alphanohtml');
//$object->skype = GETPOST("skype", 'alphanohtml');
//$object->twitter = GETPOST("twitter", 'alphanohtml');
//$object->facebook = GETPOST("facebook", 'alphanohtml');
//$object->linkedin = GETPOST("linkedin", 'alphanohtml');
if (!empty($conf->socialnetworks->enabled)) { if (!empty($conf->socialnetworks->enabled)) {
$object->socialnetworks = array(); $object->socialnetworks = array();
foreach ($socialnetworks as $key => $value) { foreach ($socialnetworks as $key => $value) {
@ -424,10 +420,7 @@ if (empty($reshook)) {
$object->office_phone = GETPOST("office_phone", 'alphanohtml'); $object->office_phone = GETPOST("office_phone", 'alphanohtml');
$object->office_fax = GETPOST("office_fax", 'alphanohtml'); $object->office_fax = GETPOST("office_fax", 'alphanohtml');
$object->user_mobile = GETPOST("user_mobile", 'alphanohtml'); $object->user_mobile = GETPOST("user_mobile", 'alphanohtml');
//$object->skype = GETPOST("skype", 'alphanohtml');
//$object->twitter = GETPOST("twitter", 'alphanohtml');
//$object->facebook = GETPOST("facebook", 'alphanohtml');
//$object->linkedin = GETPOST("linkedin", 'alphanohtml');
if (!empty($conf->socialnetworks->enabled)) { if (!empty($conf->socialnetworks->enabled)) {
$object->socialnetworks = array(); $object->socialnetworks = array();
foreach ($socialnetworks as $key => $value) { foreach ($socialnetworks as $key => $value) {
@ -436,6 +429,7 @@ if (empty($reshook)) {
} }
} }
} }
$object->email = preg_replace('/\s+/', '', GETPOST("email", 'alphanohtml')); $object->email = preg_replace('/\s+/', '', GETPOST("email", 'alphanohtml'));
$object->job = GETPOST("job", 'alphanohtml'); $object->job = GETPOST("job", 'alphanohtml');
$object->signature = GETPOST("signature", 'restricthtml'); $object->signature = GETPOST("signature", 'restricthtml');

1
htdocs/user/class/api_users.class.php
View File

@ -688,6 +688,7 @@ class Users extends DolibarrApi
unset($object->lines); unset($object->lines);
unset($object->model_pdf); unset($object->model_pdf);
unset($object->skype); unset($object->skype);
unset($object->twitter); unset($object->twitter);
unset($object->facebook); unset($object->facebook);