From 010b2723b68cc245d98c5332922758214ce6cd03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 1 Oct 2019 20:14:06 +0200 Subject: [PATCH] work on migration script --- htdocs/adherents/class/adherent.class.php | 54 ++---------------- htdocs/contact/class/contact.class.php | 47 +--------------- htdocs/install/upgrade2.php | 68 +++++++++++++++++------ htdocs/societe/class/societe.class.php | 58 +------------------ 4 files changed, 60 insertions(+), 167 deletions(-) diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index eb07cddd4d7..5063af6c960 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -576,10 +576,6 @@ class Adherent extends CommonObject $sql.= ", state_id = ".($this->state_id>0?$this->db->escape($this->state_id):"null"); $sql.= ", email = '".$this->db->escape($this->email)."'"; $sql.= ", socialnetworks = '".$this->db->escape(json_encode($this->socialnetworks))."'"; - // $sql.= ", skype = '".$this->db->escape($this->skype)."'"; - // $sql.= ", twitter = '".$this->db->escape($this->twitter)."'"; - // $sql.= ", facebook = '".$this->db->escape($this->facebook)."'"; - // $sql.= ", linkedin = '".$this->db->escape($this->linkedin)."'"; $sql.= ", phone = ".($this->phone?"'".$this->db->escape($this->phone)."'":"null"); $sql.= ", phone_perso = ".($this->phone_perso?"'".$this->db->escape($this->phone_perso)."'":"null"); $sql.= ", phone_mobile = ".($this->phone_mobile?"'".$this->db->escape($this->phone_mobile)."'":"null"); @@ -703,10 +699,7 @@ class Adherent extends CommonObject $luser->state_id=$this->state_id; $luser->email=$this->email; - $luser->skype=$this->skype; - $luser->twitter=$this->twitter; - $luser->facebook=$this->facebook; - $luser->linkedin=$this->linkedin; + $luser->socialnetworks=$this->socialnetworks; $luser->office_phone=$this->phone; $luser->user_mobile=$this->phone_mobile; @@ -745,10 +738,7 @@ class Adherent extends CommonObject $lthirdparty->zip=$this->zip; $lthirdparty->town=$this->town; $lthirdparty->email=$this->email; - $lthirdparty->skype=$this->skype; - $lthirdparty->twitter=$this->twitter; - $lthirdparty->facebook=$this->facebook; - $lthirdparty->linkedin=$this->linkedin; + $lthirdparty->socialnetworks=$this->socialnetworks; $lthirdparty->phone=$this->phone; $lthirdparty->state_id=$this->state_id; $lthirdparty->country_id=$this->country_id; @@ -1237,7 +1227,7 @@ class Adherent extends CommonObject $sql = "SELECT d.rowid, d.ref_ext, d.civility as civility_code, d.gender, d.firstname, d.lastname, d.societe as company, d.fk_soc, d.statut, d.public, d.address, d.zip, d.town, d.note_private,"; $sql.= " d.note_public,"; - $sql.= " d.email, d.socialnetworks, d.skype, d.twitter, d.facebook, d.linkedin, d.phone, d.phone_perso, d.phone_mobile, d.login, d.pass, d.pass_crypted,"; + $sql.= " d.email, d.socialnetworks, d.phone, d.phone_perso, d.phone_mobile, d.login, d.pass, d.pass_crypted,"; $sql.= " d.photo, d.fk_adherent_type, d.morphy, d.entity,"; $sql.= " d.datec as datec,"; $sql.= " d.tms as datem,"; @@ -1316,39 +1306,7 @@ class Adherent extends CommonObject $this->phone_mobile = $obj->phone_mobile; $this->email = $obj->email; - $arraysocialnetworks = array(); - $updatesocial = false; - if (!empty($obj->skype)) { - $arraysocialnetworks['skype'] = $obj->skype; - $updatesocial = true; - } - if (!empty($obj->twitter)) { - $arraysocialnetworks['twitter'] = $obj->twitter; - $updatesocial = true; - } - if (!empty($obj->facebook)) { - $arraysocialnetworks['facebook'] = $obj->facebook; - $updatesocial = true; - } - if (!empty($obj->linkedin)) { - $arraysocialnetworks['linkedin'] = $obj->linkedin; - $updatesocial = true; - } - $socialarray = ($obj->socialnetworks==''?array():json_decode($obj->socialnetworks, true)); - $this->socialnetworks = array_merge($arraysocialnetworks, $socialarray); - if ($updatesocial) { - $sqlupd = 'UPDATE '.MAIN_DB_PREFIX.'adherent SET skype=null'; - $sqlupd .= ', twitter=null'; - $sqlupd .= ', facebook=null'; - $sqlupd .= ', linkedin=null'; - $sqlupd .= ', socialnetworks="'.$this->db->escape(json_encode($this->socialnetworks)).'"'; - $sqlupd .= ' WHERE rowid='.$this->id; - $this->db->query($sqlupd); - } - $this->skype = $this->socialnetworks['skype']; - $this->twitter = $this->socialnetworks['twitter']; - $this->facebook = $this->socialnetworks['facebook']; - $this->linkedin = $this->socialnetworks['linkedin']; + $this->socialnetworks = (array) json_decode($obj->socialnetworks, true); $this->photo = $obj->photo; $this->statut = $obj->statut; @@ -2444,10 +2402,6 @@ class Adherent extends CommonObject $this->country = 'France'; $this->morphy = 'mor'; $this->email = 'specimen@specimen.com'; - $this->skype = 'skypepseudo'; - $this->twitter = 'twitterpseudo'; - $this->facebook = 'facebookpseudo'; - $this->linkedin = 'linkedinpseudo'; $this->socialnetworks = array( 'skype' => 'skypepseudo', 'twitter' => 'twitterpseudo', diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index a3e026c37f5..1f6fc8f34ae 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -386,11 +386,6 @@ class Contact extends CommonObject $sql .= ", fax='".$this->db->escape($this->fax)."'"; $sql .= ", email='".$this->db->escape($this->email)."'"; $sql .= ", socialnetworks = '".$this->db->escape(json_encode($this->socialnetworks))."'"; - //$sql .= ", jabberid = ".(isset($this->jabberid)?"'".$this->db->escape($this->jabberid)."'":"null"); - //$sql .= ", skype='".$this->db->escape($this->skype)."'"; - //$sql .= ", twitter='".$this->db->escape($this->twitter)."'"; - //$sql .= ", facebook='".$this->db->escape($this->facebook)."'"; - //$sql .= ", linkedin='".$this->db->escape($this->linkedin)."'"; $sql .= ", photo='".$this->db->escape($this->photo)."'"; $sql .= ", birthday=".($this->birthday ? "'".$this->db->idate($this->birthday)."'" : "null"); $sql .= ", note_private = ".(isset($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null"); @@ -751,7 +746,7 @@ class Contact extends CommonObject $sql.= " c.fk_departement as state_id,"; $sql.= " c.birthday,"; $sql.= " c.poste, c.phone, c.phone_perso, c.phone_mobile, c.fax, c.email,"; - $sql.= " c.socialnetworks, c.jabberid, c.skype, c.twitter, c.facebook, c.linkedin,"; + $sql.= " c.socialnetworks,"; $sql.= " c.photo,"; $sql.= " c.priv, c.note_private, c.note_public, c.default_lang, c.canvas,"; $sql.= " c.import_key,"; @@ -820,45 +815,7 @@ class Contact extends CommonObject $this->phone_mobile = trim($obj->phone_mobile); $this->email = $obj->email; - $arraysocialnetworks = array(); - $updatesocial = false; - if (!empty($obj->jabberid)) { - $arraysocialnetworks['jabber'] = $obj->jabberid; - $updatesocial = true; - } - if (!empty($obj->skype)) { - $arraysocialnetworks['skype'] = $obj->skype; - $updatesocial = true; - } - if (!empty($obj->twitter)) { - $arraysocialnetworks['twitter'] = $obj->twitter; - $updatesocial = true; - } - if (!empty($obj->facebook)) { - $arraysocialnetworks['facebook'] = $obj->facebook; - $updatesocial = true; - } - if (!empty($obj->linkedin)) { - $arraysocialnetworks['linkedin'] = $obj->linkedin; - $updatesocial = true; - } - $socialarray = ($obj->socialnetworks==''?array():json_decode($obj->socialnetworks, true)); - $this->socialnetworks = array_merge($arraysocialnetworks, $socialarray); - if ($updatesocial) { - $sqlupd = 'UPDATE '.MAIN_DB_PREFIX.'socpeople SET skype=null'; - $sqlupd .= ', twitter=null'; - $sqlupd .= ', facebook=null'; - $sqlupd .= ', linkedin=null'; - $sqlupd .= ', jabberid=null'; - $sqlupd .= ', socialnetworks="'.$this->db->escape(json_encode($this->socialnetworks)).'"'; - $sqlupd .= ' WHERE rowid='.$this->id; - $this->db->query($sqlupd); - } - $this->jabberid = $this->socialnetworks['jabber']; - $this->skype = $this->socialnetworks['skype']; - $this->twitter = $this->socialnetworks['twitter']; - $this->facebook = $this->socialnetworks['facebook']; - $this->linkedin = $this->socialnetworks['linkedin']; + $this->socialnetworks = (array) json_decode($obj->socialnetworks, true); $this->photo = $obj->photo; $this->priv = $obj->priv; $this->mail = $obj->email; diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index 26646937656..3a6d76e30ef 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -4944,21 +4944,21 @@ and rowid in (...) function migrate_users_socialnetworks() { global $db, $langs; - // jabberid,skype,twitter,facebook,linkedin,instagram,snapchat,googleplus,youtube,whatsapp + // skype,twitter,facebook,linkedin,instagram,snapchat,googleplus,youtube,whatsapp print ''; - $sql = 'UPDATE '.MAIN_DB_PREFIX.'user SET socialnetworks=JSON_OBJECT('; - $sql.= '"skype", skype,'; - $sql.= '"twitter", twitter,'; - $sql.= '"facebook", facebook,'; - $sql.= '"linkedin", linkedin,'; - $sql.= '"instagram", instagram,'; - $sql.= '"snapchat", snapchat,'; - $sql.= '"googleplus", googleplus,'; - $sql.= '"youtube", youtube,'; - $sql.= '"whatsapp", whatsapp)'; - //print $sql; - $db->query($sql); + $sql = 'UPDATE '.MAIN_DB_PREFIX.'user SET socialnetworks=JSON_OBJECT('; + $sql.= '"skype", skype,'; + $sql.= '"twitter", twitter,'; + $sql.= '"facebook", facebook,'; + $sql.= '"linkedin", linkedin,'; + $sql.= '"instagram", instagram,'; + $sql.= '"snapchat", snapchat,'; + $sql.= '"googleplus", googleplus,'; + $sql.= '"youtube", youtube,'; + $sql.= '"whatsapp", whatsapp)'; + //print $sql; + $db->query($sql); print ''.$langs->trans('MigrationUsersSocialNetworks')."
\n"; print ''; } @@ -4973,7 +4973,18 @@ function migrate_members_socialnetworks() global $db, $langs; print ''; - + $sql = 'UPDATE '.MAIN_DB_PREFIX.'adherent SET socialnetworks=JSON_OBJECT('; + $sql.= '"skype", skype,'; + $sql.= '"twitter", twitter,'; + $sql.= '"facebook", facebook,'; + $sql.= '"linkedin", linkedin,'; + $sql.= '"instagram", instagram,'; + $sql.= '"snapchat", snapchat,'; + $sql.= '"googleplus", googleplus,'; + $sql.= '"youtube", youtube,'; + $sql.= '"whatsapp", whatsapp)'; + //print $sql; + $db->query($sql); print ''.$langs->trans('MigrationMembersSocialNetworks')."
\n"; print ''; } @@ -4986,9 +4997,21 @@ function migrate_members_socialnetworks() function migrate_contacts_socialnetworks() { global $db, $langs; - + // jabberid,skype,twitter,facebook,linkedin,instagram,snapchat,googleplus,youtube,whatsapp print ''; - + $sql = 'UPDATE '.MAIN_DB_PREFIX.'socpeople SET socialnetworks=JSON_OBJECT('; + $sql.= '"jabber", jabberid,'; + $sql.= '"skype", skype,'; + $sql.= '"twitter", twitter,'; + $sql.= '"facebook", facebook,'; + $sql.= '"linkedin", linkedin,'; + $sql.= '"instagram", instagram,'; + $sql.= '"snapchat", snapchat,'; + $sql.= '"googleplus", googleplus,'; + $sql.= '"youtube", youtube,'; + $sql.= '"whatsapp", whatsapp)'; + //print $sql; + $db->query($sql); print ''.$langs->trans('MigrationContactsSocialNetworks')."
\n"; print ''; } @@ -5004,7 +5027,18 @@ function migrate_thirdparties_socialnetworks() // skype,twitter,facebook,linkedin,instagram,snapchat,googleplus,youtube,whatsapp print ''; - + $sql = 'UPDATE '.MAIN_DB_PREFIX.'societe SET socialnetworks=JSON_OBJECT('; + $sql.= '"skype", skype,'; + $sql.= '"twitter", twitter,'; + $sql.= '"facebook", facebook,'; + $sql.= '"linkedin", linkedin,'; + $sql.= '"instagram", instagram,'; + $sql.= '"snapchat", snapchat,'; + $sql.= '"googleplus", googleplus,'; + $sql.= '"youtube", youtube,'; + $sql.= '"whatsapp", whatsapp)'; + //print $sql; + $db->query($sql); print ''.$langs->trans('MigrationThirdpartiesSocialNetworks')."
\n"; print ''; } diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 5b173707b74..32e7fc468f8 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -871,10 +871,6 @@ class Societe extends CommonObject $this->fax = preg_replace("/\s/", "", $this->fax); $this->fax = preg_replace("/\./", "", $this->fax); $this->email = trim($this->email); - $this->skype = trim($this->skype); - $this->twitter = trim($this->twitter); - $this->facebook = trim($this->facebook); - $this->linkedin = trim($this->linkedin); $this->url = $this->url?clean_url($this->url, 0):''; $this->note_private = trim($this->note_private); $this->note_public = trim($this->note_public); @@ -1016,10 +1012,6 @@ class Societe extends CommonObject $sql .= ",fax = ".(! empty($this->fax)?"'".$this->db->escape($this->fax)."'":"null"); $sql .= ",email = ".(! empty($this->email)?"'".$this->db->escape($this->email)."'":"null"); $sql .= ", socialnetworks = '".$this->db->escape(json_encode($this->socialnetworks))."'"; - //$sql .= ",skype = ".(! empty($this->skype)?"'".$this->db->escape($this->skype)."'":"null"); - //$sql .= ",twitter = ".(! empty($this->twitter)?"'".$this->db->escape($this->twitter)."'":"null"); - //$sql .= ",facebook = ".(! empty($this->facebook)?"'".$this->db->escape($this->facebook)."'":"null"); - //$sql .= ",linkedin = ".(! empty($this->linkedin)?"'".$this->db->escape($this->linkedin)."'":"null"); $sql .= ",url = ".(! empty($this->url)?"'".$this->db->escape($this->url)."'":"null"); $sql .= ",parent = " . ($this->parent > 0 ? $this->parent : "null"); @@ -1160,10 +1152,7 @@ class Societe extends CommonObject $lmember->zip=$this->zip; $lmember->town=$this->town; $lmember->email=$this->email; - $lmember->skype=$this->skype; - $lmember->twitter=$this->twitter; - $lmember->facebook=$this->facebook; - $lmember->linkedin=$this->linkedin; + $lmember->socialnetworks=$this->socialnetworks; $lmember->phone=$this->phone; $lmember->state_id=$this->state_id; $lmember->country_id=$this->country_id; @@ -1271,7 +1260,7 @@ class Societe extends CommonObject $sql .= ', s.price_level'; $sql .= ', s.tms as date_modification, s.fk_user_creat, s.fk_user_modif'; $sql .= ', s.phone, s.fax, s.email'; - $sql .= ', s.socialnetworks, s.skype, s.twitter, s.facebook, s.linkedin'; + $sql .= ', s.socialnetworks'; $sql .= ', s.url, s.zip, s.town, s.note_private, s.note_public, s.model_pdf, s.client, s.fournisseur'; $sql .= ', s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6'; $sql .= ', s.capital, s.tva_intra'; @@ -1366,40 +1355,7 @@ class Societe extends CommonObject $this->statut_commercial = $libelle; // libelle statut commercial $this->email = $obj->email; - $arraysocialnetworks = array(); - $updatesocial = false; - if (!empty($obj->skype)) { - $arraysocialnetworks['skype'] = $obj->skype; - $updatesocial = true; - } - if (!empty($obj->twitter)) { - $arraysocialnetworks['twitter'] = $obj->twitter; - $updatesocial = true; - } - if (!empty($obj->facebook)) { - $arraysocialnetworks['facebook'] = $obj->facebook; - $updatesocial = true; - } - if (!empty($obj->linkedin)) { - $arraysocialnetworks['linkedin'] = $obj->linkedin; - $updatesocial = true; - } - $socialarray = (array) json_decode($obj->socialnetworks, true); - $this->socialnetworks = array_merge($arraysocialnetworks, $socialarray); - if ($updatesocial) { - $sqlupd = 'UPDATE '.MAIN_DB_PREFIX.'societe SET skype=null'; - $sqlupd .= ', twitter=null'; - $sqlupd .= ', facebook=null'; - $sqlupd .= ', linkedin=null'; - $sqlupd .= ', socialnetworks="'.$this->db->escape(json_encode($this->socialnetworks)).'"'; - $sqlupd .= ' WHERE rowid='.$this->id; - $this->db->query($sqlupd); - } - - $this->skype = $this->socialnetworks['skype']; - $this->twitter = $this->socialnetworks['twitter']; - $this->facebook = $this->socialnetworks['facebook']; - $this->linkedin = $this->socialnetworks['linkedin']; + $this->socialnetworks = (array) json_decode($obj->socialnetworks, true); $this->url = $obj->url; $this->phone = $obj->phone; @@ -3438,10 +3394,6 @@ class Societe extends CommonObject $this->country_id=$member->country_id; $this->phone=$member->phone; // Prof phone $this->email=$member->email; - $this->skype=$member->skype; - $this->twitter=$member->twitter; - $this->facebook=$member->facebook; - $this->linkedin=$member->linkedin; $this->socialnetworks = $member->socialnetworks; $this->client = 1; // A member is a customer by default @@ -3607,10 +3559,6 @@ class Societe extends CommonObject $this->country_id=1; $this->country_code='FR'; $this->email='specimen@specimen.com'; - $this->skype='tom.hanson'; - $this->twitter='tomhanson'; - $this->facebook='tomhanson'; - $this->linkedin='tomhanson'; $this->socialnetworks = array( 'skype' => 'tom.hanson', 'twitter' => 'tomhanson',