Move to getDolGlobalString

htdocs/asset/agenda.php

@@ -129,7 +129,6 @@
 
 if ($object->id > 0) {
  $title = $langs->trans("Agenda");
- //if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
  $help_url = 'EN:Module_Agenda_En|DE:Modul_Terminplanung';
  llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-asset page-card_agenda');
 

htdocs/asset/class/asset.class.php

@@ -70,7 +70,7 @@ class Asset extends CommonObject
  * Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
  * 'label' the translation key.
  * 'picto' is code of a picto to show before value in forms
- * 'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+ * 'enabled' is a condition when the field must be managed (Example: 1 or 'getDolGlobalString("MY_SETUP_PARAM")'
  * 'position' is the sort order of field.
  * 'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
  * 'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
@@ -1001,8 +1001,8 @@ public function calculationDepreciation()
 
  // futures depreciation lines
  //-----------------------------------------------------
- $nb_days_in_year = getDolGlobalString('ASSET_DEPRECIATION_DURATION_PER_YEAR') ? $conf->global->ASSET_DEPRECIATION_DURATION_PER_YEAR : 365;
- $nb_days_in_month = getDolGlobalString('ASSET_DEPRECIATION_DURATION_PER_MONTH') ? $conf->global->ASSET_DEPRECIATION_DURATION_PER_MONTH : 30;
+ $nb_days_in_year = getDolGlobalInt('ASSET_DEPRECIATION_DURATION_PER_YEAR', 365);
+ $nb_days_in_month = getDolGlobalInt('ASSET_DEPRECIATION_DURATION_PER_MONTH', 30);
  $period_amount = (float) price2num($depreciation_period_amount / $fields['duration'], 'MT');
  $first_period_found = false;
  // TODO fix declaration of $begin_period
@@ -1576,43 +1576,4 @@ public function getNextNumRef()
  return "";
  }
  }
-
- /**
- * Create a document onto disk according to template module.
- *
- * @param string $modele Force template to use ('' to not force)
- * @param Translate $outputlangs object lang a utiliser pour traduction
- * @param int $hidedetails Hide details of lines
- * @param int $hidedesc Hide description
- * @param int $hideref Hide ref
- * @param null|array $moreparams Array to provide more information
- * @return int 0 if KO, 1 if OK
- */
- // public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
- // {
- // global $conf, $langs;
- //
- // $result = 0;
- // $includedocgeneration = 1;
- //
- // $langs->load("assets");
- //
- // if (!dol_strlen($modele)) {
- // $modele = 'standard_asset';
- //
- // if (!empty($this->model_pdf)) {
- // $modele = $this->model_pdf;
- // } elseif (!empty($conf->global->ASSET_ADDON_PDF)) {
- // $modele = $conf->global->ASSET_ADDON_PDF;
- // }
- // }
- //
- // $modelpath = "core/modules/asset/doc/";
- //
- // if ($includedocgeneration && !empty($modele)) {
- // $result = $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
- // }
- //
- // return $result;
- // }
 }

htdocs/asset/class/assetdepreciationoptions.class.php

@@ -39,7 +39,7 @@ class AssetDepreciationOptions extends CommonObject
  * Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
  * 'label' the translation key.
  * 'picto' is code of a picto to show before value in forms
- * 'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+ * 'enabled' is a condition when the field must be managed (Example: 1 or 'getDolGlobalString("MY_SETUP_PARAM")'
  * 'position' is the sort order of field.
  * 'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
  * 'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)

htdocs/asset/class/assetmodel.class.php

@@ -76,7 +76,7 @@ class AssetModel extends CommonObject
  * Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
  * 'label' the translation key.
  * 'picto' is code of a picto to show before value in forms
- * 'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+ * 'enabled' is a condition when the field must be managed (Example: 1 or 'getDolGlobalString("MY_SETUP_PARAM")'
  * 'position' is the sort order of field.
  * 'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
  * 'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
@@ -796,7 +796,7 @@ public function getLinesArray()
  */
  public function doScheduledJob()
  {
- global $conf, $langs;
+ //global $conf, $langs;
 
  //$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
 

htdocs/asset/model/agenda.php

@@ -135,7 +135,6 @@
 
 if ($object->id > 0) {
  $title = $langs->trans("Agenda");
- //if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
  $help_url = 'EN:Module_Agenda_En|DE:Modul_Terminplanung';
  llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-asset page-model-card_agenda');
 

htdocs/bom/bom_agenda.php

@@ -131,7 +131,6 @@
 
 if ($object->id > 0) {
  $title = $langs->trans("Agenda");
- //if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
  $help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:Módulo_Agenda|DE:Modul_Agenda';
  llxHeader('', $title, $help_url);
 

htdocs/bom/class/bom.class.php

@@ -88,7 +88,7 @@ class BOM extends CommonObject
  * Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
  * 'label' the translation key.
  * 'picto' is code of a picto to show before value in forms
- * 'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+ * 'enabled' is a condition when the field must be managed (Example: 1 or 'getDolGlobalString("MY_SETUP_PARAM")'
  * 'position' is the sort order of field.
  * 'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
  * 'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)

htdocs/bookcal/availabilities_agenda.php

@@ -143,7 +143,6 @@
 
 if ($object->id > 0) {
  $title = $langs->trans("Agenda");
- //if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
  $help_url = 'EN:Module_Agenda_En|DE:Modul_Terminplanung';
  llxHeader('', $title, $help_url);
 

htdocs/comm/card.php

@@ -313,15 +313,14 @@
 $formcompany = new FormCompany($db);
 
 $title = $langs->trans("ThirdParty")." - ".$langs->trans('Customer');
-if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/', getDolGlobalString('MAIN_HTML_TITLE')) && $object->name) {
  $title = $object->name." - ".$langs->trans('Customer');
 }
 
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas|DE:Modul_Geschäftspartner';
 
 llxHeader('', $title, $help_url);
 
-
 if ($object->id > 0) {
  $head = societe_prepare_head($object);
 

htdocs/comm/propal/agenda.php

@@ -126,7 +126,6 @@
 
 if ($object->id > 0) {
  $title = $langs->trans("Agenda");
- //if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
  $help_url = 'EN:Module_Agenda_En|DE:Modul_Terminplanung';
  llxHeader('', $title, $help_url);
 

htdocs/commande/agenda.php

@@ -126,7 +126,6 @@
 
 if ($object->id > 0) {
  $title = $langs->trans("Agenda");
- //if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
  $help_url = 'EN:Module_Agenda_En|DE:Modul_Terminplanung';
  llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-order page-card_agenda');
 

htdocs/compta/bank/class/paymentvarious.class.php

@@ -175,7 +175,7 @@ class PaymentVarious extends CommonObject
  * 'type' if the field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
  * Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
  * 'label' the translation key.
- * 'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+ * 'enabled' is a condition when the field must be managed (Example: 1 or 'getDolGlobalString("MY_SETUP_PARAM")'
  * 'position' is the sort order of field.
  * 'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
  * 'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)

htdocs/compta/cashcontrol/class/cashcontrol.class.php

@@ -60,7 +60,7 @@ class CashControl extends CommonObject
  * Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
  * 'label' the translation key.
  * 'picto' is code of a picto to show before value in forms
- * 'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+ * 'enabled' is a condition when the field must be managed (Example: 1 or 'getDolGlobalString("MY_SETUP_PARAM")'
  * 'position' is the sort order of field.
  * 'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
  * 'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)

htdocs/compta/facture/agenda.php

@@ -126,7 +126,6 @@
 
 if ($object->id > 0) {
  $title = $langs->trans("Agenda");
- //if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
  $help_url = 'EN:Module_Agenda_En|DE:Modul_Terminplanung';
  llxHeader('', $title, $help_url);
 

htdocs/compta/recap-compta.php

@@ -98,7 +98,7 @@
 $userstatic = new User($db);
 
 $title = $langs->trans("ThirdParty").' - '.$langs->trans("Summary");
-if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/', getDolGlobalString('MAIN_HTML_TITLE')) && $object->name) {
  $title = $object->name.' - '.$langs->trans("Summary");
 }
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';

htdocs/contact/agenda.php

@@ -145,7 +145,7 @@
 $form = new Form($db);
 
 $title = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
-if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/contactnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->lastname) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/contactnameonly/', getDolGlobalString('MAIN_HTML_TITLE')) && $object->lastname) {
  $title = $object->lastname;
 }
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas|DE:Modul_Partner';

htdocs/contact/card.php

@@ -570,7 +570,7 @@
 }
 
 $title = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
-if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/contactnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->lastname) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/contactnameonly/', getDolGlobalString('MAIN_HTML_TITLE')) && $object->lastname) {
  $title = $object->lastname;
 }
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';

htdocs/contact/document.php

@@ -111,7 +111,7 @@
 $form = new Form($db);
 
 $title = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
-if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/contactnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->lastname) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/contactnameonly/', getDolGlobalString('MAIN_HTML_TITLE')) && $object->lastname) {
  $title = $object->lastname;
 }
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';

htdocs/contact/perso.php

@@ -120,7 +120,7 @@
 $now = dol_now();
 
 $title = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
-if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/contactnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->lastname) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/contactnameonly/', getDolGlobalString('MAIN_HTML_TITLE')) && $object->lastname) {
  $title = $object->lastname;
 }
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';

htdocs/contact/project.php

@@ -63,7 +63,7 @@
  }
  $socid = !empty($object->thirdparty->id) ? $object->thirdparty->id : null;
  $title = $langs->trans("Projects");
- if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+ if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/', getDolGlobalString('MAIN_HTML_TITLE')) && $object->name) {
  $title = $object->name." - ".$title;
  }
  llxHeader('', $title);

htdocs/contrat/agenda.php

@@ -146,7 +146,7 @@
  $object->fetch_thirdparty();
 
  $title = $langs->trans("Agenda");
- if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/contractrefonly/', $conf->global->MAIN_HTML_TITLE) && $object->ref) {
+ if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/contractrefonly/', getDolGlobalString('MAIN_HTML_TITLE')) && $object->ref) {
  $title = $object->ref." - ".$title;
  }
  $help_url = 'EN:Module_Contracts|FR:Module_Contrat';

htdocs/contrat/messaging.php

@@ -145,7 +145,7 @@
 $object->fetch_thirdparty();
 
 $title = $langs->trans("Agenda");
-if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/contractrefonly/', $conf->global->MAIN_HTML_TITLE) && $object->ref) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/contractrefonly/', getDolGlobalString('MAIN_HTML_TITLE')) && $object->ref) {
  $title = $object->ref." - ".$title;
 }
 $help_url = 'EN:Module_Contracts|FR:Module_Contrat';

htdocs/core/class/conf.class.php

@@ -754,7 +754,7 @@ public function setValues($db)
 
  // MAIN_HTML_TITLE
  if (!isset($this->global->MAIN_HTML_TITLE)) {
- $this->global->MAIN_HTML_TITLE = 'noapp,thirdpartynameonly,contactnameonly,projectnameonly';
+ $this->global->MAIN_HTML_TITLE = 'thirdpartynameonly,contactnameonly,projectnameonly';
  }
 
  // conf->liste_limit = constante de taille maximale des listes

htdocs/core/class/defaultvalues.class.php

@@ -64,7 +64,7 @@ class DefaultValues extends CommonObject
  * Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
  * 'label' the translation key.
  * 'picto' is code of a picto to show before value in forms
- * 'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+ * 'enabled' is a condition when the field must be managed (Example: 1 or 'getDolGlobalString("MY_SETUP_PARAM")'
  * 'position' is the sort order of field.
  * 'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
  * 'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)

htdocs/core/lib/functions.lib.php

@@ -4001,7 +4001,7 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
  }
  }
 
- if (!empty($conf->global->CONTACT_PHONEMOBILE_SHOW_LINK_TO_WHATSAPP) && $withpicto == 'mobile') {
+ if (getDolGlobalString('CONTACT_PHONEMOBILE_SHOW_LINK_TO_WHATSAPP') && $withpicto == 'mobile') {
  // Link to Whatsapp
  $newphone .= ' <a href="https://wa.me/'.$newphonewa.'" target="_blank"';// Use api to whatasapp contacts
  $newphone .= '><span class="paddingright fab fa-whatsapp" style="color:#25D366;" title="WhatsApp"></span></a>';

htdocs/eventorganization/class/conferenceorbooth.class.php

@@ -89,7 +89,7 @@ class ConferenceOrBooth extends ActionComm
  * Note: Filter must be a Dolibarr Universal Filter syntax string. Example: "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.status:!=:0) or (t.nature:is:NULL)"
  * 'label' the translation key.
  * 'picto' is code of a picto to show before value in forms
- * 'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+ * 'enabled' is a condition when the field must be managed (Example: 1 or 'getDolGlobalString("MY_SETUP_PARAM")'
  * 'position' is the sort order of field.
  * 'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
  * 'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)

htdocs/eventorganization/conferenceorbooth_list.php

@@ -296,7 +296,7 @@
 
  $help_url = "EN:Module_Projects|FR:Module_Projets|ES:Módulo_Proyectos";
  $title = $langs->trans("Project") . ' - ' . $langs->trans("EventOrganizationConfOrBoothes") . ' - ' . $project->ref . ' ' . $project->name;
- if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $project->name) {
+ if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/projectnameonly/', getDolGlobalString('MAIN_HTML_TITLE')) && $project->name) {
  $title = $project->ref . ' ' . $project->name . ' - ' . $langs->trans("ListOfConferencesOrBooths");
  }
 }