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

add visibility

Browse Source
This commit is contained in:
Frédéric FRANCE 2019-02-27 23:55:18 +01:00
parent 9b165f6b3f
commit cc1ee2d883
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
11 changed files with 219 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/CMailFile.class.php
View File

@ -1251,7 +1251,7 @@ class CMailFile
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Try to create a socket connection * Try to create a socket connection
* *

12
htdocs/core/class/CSMSFile.class.php
View File

@ -59,7 +59,7 @@ class CSMSFile
* @param int $priority Priority * @param int $priority Priority
* @param int $class Class * @param int $class Class
*/ */
function __construct($to, $from, $msg, $deliveryreceipt = 0, $deferred = 0, $priority = 3, $class = 1) public function __construct($to, $from, $msg, $deliveryreceipt = 0, $deferred = 0, $priority = 3, $class = 1)
{ {
global $conf; global $conf;
@ -94,7 +94,7 @@ class CSMSFile
* *
* @return boolean True if sms sent, false otherwise * @return boolean True if sms sent, false otherwise
*/ */
function sendfile() public function sendfile()
{ {
global $conf; global $conf;
@ -195,14 +195,14 @@ class CSMSFile
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Write content of a SendSms request into a dump file (mode = all) * Write content of a SendSms request into a dump file (mode = all)
* Used for debugging. * Used for debugging.
* *
* @return void * @return void
*/ */
function dump_sms() public function dump_sms()
{ {
// phpcs:enable // phpcs:enable
global $conf,$dolibarr_main_data_root; global $conf,$dolibarr_main_data_root;
@ -226,7 +226,7 @@ class CSMSFile
} }
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Write content of a SendSms result into a dump file (mode = all) * Write content of a SendSms result into a dump file (mode = all)
* Used for debugging. * Used for debugging.
@ -234,7 +234,7 @@ class CSMSFile
* @param int $result Result of sms sending * @param int $result Result of sms sending
* @return void * @return void
*/ */
function dump_sms_result($result) public function dump_sms_result($result)
{ {
// phpcs:enable // phpcs:enable
global $conf,$dolibarr_main_data_root; global $conf,$dolibarr_main_data_root;

10
htdocs/core/class/conf.class.php
View File

@ -251,12 +251,10 @@ class Conf
} }
// Object $mc // Object $mc
if (! defined('NOREQUIREMC') && ! empty($this->multicompany->enabled)) if (! defined('NOREQUIREMC') && ! empty($this->multicompany->enabled)) {
{
global $mc; global $mc;
$ret = @dol_include_once('/multicompany/class/actions_multicompany.class.php'); $ret = @dol_include_once('/multicompany/class/actions_multicompany.class.php');
if ($ret) if ($ret) {
{
$mc = new ActionsMulticompany($db); $mc = new ActionsMulticompany($db);
$this->mc = $mc; $this->mc = $mc;
} }
@ -592,7 +590,9 @@ class Conf
$this->adherent->subscription = new stdClass(); $this->adherent->subscription = new stdClass();
$this->adherent->subscription->warning_delay=(isset($this->global->MAIN_DELAY_MEMBERS)?$this->global->MAIN_DELAY_MEMBERS:0)*24*60*60; $this->adherent->subscription->warning_delay=(isset($this->global->MAIN_DELAY_MEMBERS)?$this->global->MAIN_DELAY_MEMBERS:0)*24*60*60;
} }
if (isset($this->agenda)) $this->agenda->warning_delay=(isset($this->global->MAIN_DELAY_ACTIONS_TODO)?$this->global->MAIN_DELAY_ACTIONS_TODO:7)*24*60*60; if (isset($this->agenda)) {
$this->agenda->warning_delay=(isset($this->global->MAIN_DELAY_ACTIONS_TODO)?$this->global->MAIN_DELAY_ACTIONS_TODO:7)*24*60*60;
}
if (isset($this->projet)) if (isset($this->projet))
{ {
$this->projet->warning_delay=(isset($this->global->MAIN_DELAY_PROJECT_TO_CLOSE)?$this->global->MAIN_DELAY_PROJECT_TO_CLOSE:7)*24*60*60; $this->projet->warning_delay=(isset($this->global->MAIN_DELAY_PROJECT_TO_CLOSE)?$this->global->MAIN_DELAY_PROJECT_TO_CLOSE:7)*24*60*60;

2
htdocs/core/class/fileupload.class.php
View File

@ -41,7 +41,7 @@ class FileUpload
* @param int $fk_element fk_element * @param int $fk_element fk_element
* @param string $element element * @param string $element element
*/ */
function __construct($options = null, $fk_element = null, $element = null) public function __construct($options = null, $fk_element = null, $element = null)
{ {
global $db, $conf; global $db, $conf;
global $object; global $object;

16
htdocs/core/class/html.form.class.php
View File

@ -3693,7 +3693,7 @@ class Form
* @param string $moreattrib To add more attribute on select * @param string $moreattrib To add more attribute on select
* @return int <0 if error, Num of establishment found if OK (0, 1, 2, ...) * @return int <0 if error, Num of establishment found if OK (0, 1, 2, ...)
*/ */
function selectEstablishments($selected = '', $htmlname = 'entity', $statut = 0, $filtre = '', $useempty = 0, $moreattrib = '') public function selectEstablishments($selected = '', $htmlname = 'entity', $statut = 0, $filtre = '', $useempty = 0, $moreattrib = '')
{ {
// phpcs:enable // phpcs:enable
global $langs, $conf; global $langs, $conf;
@ -5143,7 +5143,7 @@ class Form
* @deprecated * @deprecated
* @see form_date, select_month, select_year, select_dayofweek * @see form_date, select_month, select_year, select_dayofweek
*/ */
function select_date($set_time = '', $prefix = 're', $h = 0, $m = 0, $empty = 0, $form_name = "", $d = 1, $addnowlink = 0, $nooutput = 0, $disabled = 0, $fullday = '', $addplusone = '', $adddateof = '') public function select_date($set_time = '', $prefix = 're', $h = 0, $m = 0, $empty = 0, $form_name = "", $d = 1, $addnowlink = 0, $nooutput = 0, $disabled = 0, $fullday = '', $addplusone = '', $adddateof = '')
{ {
// phpcs:enable // phpcs:enable
$retstring = $this->selectDate($set_time, $prefix, $h, $m, $empty, $form_name, $d, $addnowlink, $disabled, $fullday, $addplusone, $adddateof); $retstring = $this->selectDate($set_time, $prefix, $h, $m, $empty, $form_name, $d, $addnowlink, $disabled, $fullday, $addplusone, $adddateof);
@ -5834,7 +5834,7 @@ class Form
* @return string HTML select string. * @return string HTML select string.
* @see multiselectarray, selectArrayAjax, selectArrayFilter * @see multiselectarray, selectArrayAjax, selectArrayFilter
*/ */
static function selectarray($htmlname, $array, $id = '', $show_empty = 0, $key_in_label = 0, $value_as_key = 0, $moreparam = '', $translate = 0, $maxlen = 0, $disabled = 0, $sort = '', $morecss = '', $addjscombo = 0, $moreparamonempty = '', $disablebademail = 0, $nohtmlescape = 0) public static function selectarray($htmlname, $array, $id = '', $show_empty = 0, $key_in_label = 0, $value_as_key = 0, $moreparam = '', $translate = 0, $maxlen = 0, $disabled = 0, $sort = '', $morecss = '', $addjscombo = 0, $moreparamonempty = '', $disablebademail = 0, $nohtmlescape = 0)
{ {
global $conf, $langs; global $conf, $langs;
@ -5944,7 +5944,7 @@ class Form
* @return string HTML select string * @return string HTML select string
* @see selectArrayFilter, ajax_combobox in ajax.lib.php * @see selectArrayFilter, ajax_combobox in ajax.lib.php
*/ */
static function selectArrayAjax($htmlname, $url, $id = '', $moreparam = '', $moreparamtourl = '', $disabled = 0, $minimumInputLength = 1, $morecss = '', $callurlonselect = 0, $placeholder = '', $acceptdelayedhtml = 0) public static function selectArrayAjax($htmlname, $url, $id = '', $moreparam = '', $moreparamtourl = '', $disabled = 0, $minimumInputLength = 1, $morecss = '', $callurlonselect = 0, $placeholder = '', $acceptdelayedhtml = 0)
{ {
global $conf, $langs; global $conf, $langs;
global $delayedhtmlcontent; global $delayedhtmlcontent;
@ -6046,7 +6046,7 @@ class Form
* @return string HTML select string * @return string HTML select string
* @see selectArrayAjax, ajax_combobox in ajax.lib.php * @see selectArrayAjax, ajax_combobox in ajax.lib.php
*/ */
static function selectArrayFilter($htmlname, $array, $id = '', $moreparam = '', $disableFiltering = 0, $disabled = 0, $minimumInputLength = 1, $morecss = '', $callurlonselect = 0, $placeholder = '', $acceptdelayedhtml = 0) public static function selectArrayFilter($htmlname, $array, $id = '', $moreparam = '', $disableFiltering = 0, $disabled = 0, $minimumInputLength = 1, $morecss = '', $callurlonselect = 0, $placeholder = '', $acceptdelayedhtml = 0)
{ {
global $conf, $langs; global $conf, $langs;
global $delayedhtmlcontent; global $delayedhtmlcontent;
@ -6164,7 +6164,7 @@ class Form
* @return string HTML multiselect string * @return string HTML multiselect string
* @see selectarray, selectArrayAjax, selectArrayFilter * @see selectarray, selectArrayAjax, selectArrayFilter
*/ */
static function multiselectarray($htmlname, $array, $selected = array(), $key_in_label = 0, $value_as_key = 0, $morecss = '', $translate = 0, $width = 0, $moreattrib = '', $elemtype = '', $placeholder = '', $addjscombo = -1) public static function multiselectarray($htmlname, $array, $selected = array(), $key_in_label = 0, $value_as_key = 0, $morecss = '', $translate = 0, $width = 0, $moreattrib = '', $elemtype = '', $placeholder = '', $addjscombo = -1)
{ {
global $conf, $langs; global $conf, $langs;
@ -6274,7 +6274,7 @@ class Form
* @return string HTML multiselect string * @return string HTML multiselect string
* @see selectarray * @see selectarray
*/ */
static function multiSelectArrayWithCheckbox($htmlname, &$array, $varpage) public static function multiSelectArrayWithCheckbox($htmlname, &$array, $varpage)
{ {
global $conf,$langs,$user; global $conf,$langs,$user;
@ -7015,7 +7015,7 @@ class Form
* @param string $forcecapture Force parameter capture on HTML input file element to ask a smartphone to allow to open camera to take photo. Auto if empty. * @param string $forcecapture Force parameter capture on HTML input file element to ask a smartphone to allow to open camera to take photo. Auto if empty.
* @return string HTML code to output photo * @return string HTML code to output photo
*/ */
static function showphoto($modulepart, $object, $width = 100, $height = 0, $caneditfield = 0, $cssclass = 'photowithmargin', $imagesize = '', $addlinktofullsize = 1, $cache = 0, $forcecapture = '') public static function showphoto($modulepart, $object, $width = 100, $height = 0, $caneditfield = 0, $cssclass = 'photowithmargin', $imagesize = '', $addlinktofullsize = 1, $cache = 0, $forcecapture = '')
{ {
global $conf,$langs; global $conf,$langs;

24
htdocs/core/class/html.formaccounting.class.php
View File

@ -55,7 +55,7 @@ class FormAccounting extends Form
$this->db = $db; $this->db = $db;
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Return list of journals with label by nature * Return list of journals with label by nature
* *
@ -70,7 +70,7 @@ class FormAccounting extends Form
* @param int $disabledajaxcombo Disable ajax combo box. * @param int $disabledajaxcombo Disable ajax combo box.
* @return string String with HTML select * @return string String with HTML select
*/ */
function select_journal($selectid, $htmlname = 'journal', $nature = 0, $showempty = 0, $select_in = 0, $select_out = 0, $morecss = 'maxwidth300 maxwidthonsmartphone', $usecache = '', $disabledajaxcombo = 0) public function select_journal($selectid, $htmlname = 'journal', $nature = 0, $showempty = 0, $select_in = 0, $select_out = 0, $morecss = 'maxwidth300 maxwidthonsmartphone', $usecache = '', $disabledajaxcombo = 0)
{ {
// phpcs:enable // phpcs:enable
global $conf,$langs; global $conf,$langs;
@ -138,7 +138,7 @@ class FormAccounting extends Form
return $out; return $out;
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Return list of accounting category. * Return list of accounting category.
* Use mysoc->country_id or mysoc->country_code so they must be defined. * Use mysoc->country_id or mysoc->country_code so they must be defined.
@ -151,7 +151,7 @@ class FormAccounting extends Form
* @param int $allcountries All countries * @param int $allcountries All countries
* @return void * @return void
*/ */
function select_accounting_category($selected = '', $htmlname = 'account_category', $useempty = 0, $maxlen = 0, $help = 1, $allcountries = 0) public function select_accounting_category($selected = '', $htmlname = 'account_category', $useempty = 0, $maxlen = 0, $help = 1, $allcountries = 0)
{ {
// phpcs:enable // phpcs:enable
global $db,$langs,$user,$mysoc; global $db,$langs,$user,$mysoc;
@ -220,7 +220,7 @@ class FormAccounting extends Form
print $out; print $out;
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Return select filter with date of transaction * Return select filter with date of transaction
* *
@ -228,7 +228,7 @@ class FormAccounting extends Form
* @param string $selectedkey Value * @param string $selectedkey Value
* @return string HTML edit field * @return string HTML edit field
*/ */
function select_bookkeeping_importkey($htmlname = 'importkey', $selectedkey = '') public function select_bookkeeping_importkey($htmlname = 'importkey', $selectedkey = '')
{ {
// phpcs:enable // phpcs:enable
$options = array(); $options = array();
@ -253,7 +253,7 @@ class FormAccounting extends Form
return Form::selectarray($htmlname, $options, $selectedkey); return Form::selectarray($htmlname, $options, $selectedkey);
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Return list of accounts with label by chart of accounts * Return list of accounts with label by chart of accounts
* *
@ -267,7 +267,7 @@ class FormAccounting extends Form
* @param string $usecache Key to use to store result into a cache. Next call with same key will reuse the cache. * @param string $usecache Key to use to store result into a cache. Next call with same key will reuse the cache.
* @return string String with HTML select * @return string String with HTML select
*/ */
function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $morecss = 'maxwidth300 maxwidthonsmartphone', $usecache = '') public function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $morecss = 'maxwidth300 maxwidthonsmartphone', $usecache = '')
{ {
// phpcs:enable // phpcs:enable
global $conf, $langs; global $conf, $langs;
@ -346,7 +346,7 @@ class FormAccounting extends Form
return $out; return $out;
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Return list of auxilary thirdparty accounts * Return list of auxilary thirdparty accounts
* *
@ -356,7 +356,7 @@ class FormAccounting extends Form
* @param string $morecss More css * @param string $morecss More css
* @return string String with HTML select * @return string String with HTML select
*/ */
function select_auxaccount($selectid, $htmlname = 'account_num_aux', $showempty = 0, $morecss = 'maxwidth200') public function select_auxaccount($selectid, $htmlname = 'account_num_aux', $showempty = 0, $morecss = 'maxwidth200')
{ {
// phpcs:enable // phpcs:enable
@ -429,7 +429,7 @@ class FormAccounting extends Form
return $out; return $out;
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Return HTML combo list of years existing into book keepping * Return HTML combo list of years existing into book keepping
* *
@ -439,7 +439,7 @@ class FormAccounting extends Form
* @param string $output_format (html/opton (for option html only)/array (to return options arrays * @param string $output_format (html/opton (for option html only)/array (to return options arrays
* @return string/array * @return string/array
*/ */
function selectyear_accountancy_bookkepping($selected = '', $htmlname = 'yearid', $useempty = 0, $output_format = 'html') public function selectyear_accountancy_bookkepping($selected = '', $htmlname = 'yearid', $useempty = 0, $output_format = 'html')
{ {
// phpcs:enable // phpcs:enable
global $conf; global $conf;

12
htdocs/core/class/html.formactions.class.php
View File

@ -45,13 +45,13 @@ class FormActions
* *
* @param DoliDB $db Database handler * @param DoliDB $db Database handler
*/ */
function __construct($db) public function __construct($db)
{ {
$this->db = $db; $this->db = $db;
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Show list of action status * Show list of action status
* *
@ -64,7 +64,7 @@ class FormActions
* @param string $morecss More css on select field * @param string $morecss More css on select field
* @return void * @return void
*/ */
function form_select_status_action($formname, $selected, $canedit = 1, $htmlname = 'complete', $showempty = 0, $onlyselect = 0, $morecss = 'maxwidth100') public function form_select_status_action($formname, $selected, $canedit = 1, $htmlname = 'complete', $showempty = 0, $onlyselect = 0, $morecss = 'maxwidth100')
{ {
// phpcs:enable // phpcs:enable
global $langs,$conf; global $langs,$conf;
@ -168,7 +168,7 @@ class FormActions
* @param string $morehtmlright More html text on right of title line * @param string $morehtmlright More html text on right of title line
* @return int <0 if KO, >=0 if OK * @return int <0 if KO, >=0 if OK
*/ */
function showactions($object, $typeelement, $socid = 0, $forceshowtitle = 0, $morecss = 'listactions', $max = 0, $moreparambacktopage = '', $morehtmlright = '') public function showactions($object, $typeelement, $socid = 0, $forceshowtitle = 0, $morecss = 'listactions', $max = 0, $moreparambacktopage = '', $morehtmlright = '')
{ {
global $langs,$conf,$user; global $langs,$conf,$user;
global $bc; global $bc;
@ -314,7 +314,7 @@ class FormActions
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Output html select list of type of event * Output html select list of type of event
* *
@ -327,7 +327,7 @@ class FormActions
* @param int $nooutput 1=No output * @param int $nooutput 1=No output
* @return string * @return string
*/ */
function select_type_actions($selected = '', $htmlname = 'actioncode', $excludetype = '', $onlyautoornot = 0, $hideinfohelp = 0, $multiselect = 0, $nooutput = 0) public function select_type_actions($selected = '', $htmlname = 'actioncode', $excludetype = '', $onlyautoornot = 0, $hideinfohelp = 0, $multiselect = 0, $nooutput = 0)
{ {
// phpcs:enable // phpcs:enable
global $langs,$user,$form,$conf; global $langs,$user,$form,$conf;

31
htdocs/core/class/html.formadmin.class.php
View File

@ -29,8 +29,8 @@
*/ */
class FormAdmin class FormAdmin
{ {
var $db; public $db;
var $error; public $error;
/** /**
@ -38,12 +38,12 @@ class FormAdmin
* *
* @param DoliDB $db Database handler * @param DoliDB $db Database handler
*/ */
function __construct($db) public function __construct($db)
{ {
$this->db = $db; $this->db = $db;
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Return html select list with available languages (key='en_US', value='United States' for example) * Return html select list with available languages (key='en_US', value='United States' for example)
* *
@ -59,7 +59,7 @@ class FormAdmin
* @param int $forcecombo Force to use combo box (so no ajax beautify effect) * @param int $forcecombo Force to use combo box (so no ajax beautify effect)
* @return string Return HTML select string with list of languages * @return string Return HTML select string with list of languages
*/ */
function select_language($selected = '', $htmlname = 'lang_id', $showauto = 0, $filter = null, $showempty = '', $showwarning = 0, $disabled = 0, $morecss = '', $showcode = 0, $forcecombo = 0) public function select_language($selected = '', $htmlname = 'lang_id', $showauto = 0, $filter = null, $showempty = '', $showwarning = 0, $disabled = 0, $morecss = '', $showcode = 0, $forcecombo = 0)
{ {
// phpcs:enable // phpcs:enable
global $langs; global $langs;
@ -121,7 +121,7 @@ class FormAdmin
return $out; return $out;
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Return list of available menus (eldy_backoffice, ...) * Return list of available menus (eldy_backoffice, ...)
* *
@ -131,7 +131,7 @@ class FormAdmin
* @param string $moreattrib More attributes on html select tag * @param string $moreattrib More attributes on html select tag
* @return integer|null * @return integer|null
*/ */
function select_menu($selected, $htmlname, $dirmenuarray, $moreattrib = '') public function select_menu($selected, $htmlname, $dirmenuarray, $moreattrib = '')
{ {
// phpcs:enable // phpcs:enable
global $langs,$conf; global $langs,$conf;
@ -212,7 +212,7 @@ class FormAdmin
print '</select>'; print '</select>';
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Return combo list of available menu families * Return combo list of available menu families
* *
@ -221,7 +221,7 @@ class FormAdmin
* @param string[] $dirmenuarray Directories to scan * @param string[] $dirmenuarray Directories to scan
* @return void * @return void
*/ */
function select_menu_families($selected, $htmlname, $dirmenuarray) public function select_menu_families($selected, $htmlname, $dirmenuarray)
{ {
// phpcs:enable // phpcs:enable
global $langs,$conf; global $langs,$conf;
@ -285,7 +285,7 @@ class FormAdmin
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Return a HTML select list of timezones * Return a HTML select list of timezones
* *
@ -293,7 +293,7 @@ class FormAdmin
* @param string $htmlname Nom de la zone select * @param string $htmlname Nom de la zone select
* @return void * @return void
*/ */
function select_timezone($selected, $htmlname) public function select_timezone($selected, $htmlname)
{ {
// phpcs:enable // phpcs:enable
global $langs,$conf; global $langs,$conf;
@ -301,7 +301,7 @@ class FormAdmin
print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">'; print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
print '<option value="-1">&nbsp;</option>'; print '<option value="-1">&nbsp;</option>';
$arraytz=array( $arraytz = array(
"Pacific/Midway"=>"GMT-11:00", "Pacific/Midway"=>"GMT-11:00",
"Pacific/Fakaofo"=>"GMT-10:00", "Pacific/Fakaofo"=>"GMT-10:00",
"America/Anchorage"=>"GMT-09:00", "America/Anchorage"=>"GMT-09:00",
@ -328,8 +328,7 @@ class FormAdmin
"Pacific/Auckland"=>"GMT+12:00", "Pacific/Auckland"=>"GMT+12:00",
"Pacific/Enderbury"=>"GMT+13:00" "Pacific/Enderbury"=>"GMT+13:00"
); );
foreach ($arraytz as $lib => $gmt) foreach ($arraytz as $lib => $gmt) {
{
print '<option value="'.$lib.'"'; print '<option value="'.$lib.'"';
if ($selected == $lib || $selected == $gmt) print ' selected'; if ($selected == $lib || $selected == $gmt) print ' selected';
print '>'.$gmt.'</option>'."\n"; print '>'.$gmt.'</option>'."\n";
@ -339,7 +338,7 @@ class FormAdmin
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Return html select list with available languages (key='en_US', value='United States' for example) * Return html select list with available languages (key='en_US', value='United States' for example)
* *
@ -349,7 +348,7 @@ class FormAdmin
* @param int $showempty Add empty value * @param int $showempty Add empty value
* @return string Return HTML output * @return string Return HTML output
*/ */
function select_paper_format($selected = '', $htmlname = 'paperformat_id', $filter = 0, $showempty = 0) public function select_paper_format($selected = '', $htmlname = 'paperformat_id', $filter = 0, $showempty = 0)
{ {
// phpcs:enable // phpcs:enable
global $langs; global $langs;

16
htdocs/core/class/html.formbarcode.class.php
View File

@ -45,7 +45,7 @@ class FormBarCode
* *
* @param DoliDB $db Database handler * @param DoliDB $db Database handler
*/ */
function __construct($db) public function __construct($db)
{ {
$this->db = $db; $this->db = $db;
} }
@ -60,7 +60,7 @@ class FormBarCode
* @param int $idForm Id du formulaire * @param int $idForm Id du formulaire
* @return string HTML select string * @return string HTML select string
*/ */
function setBarcodeEncoder($selected, $barcodelist, $code_id, $idForm = 'formbarcode') public function setBarcodeEncoder($selected, $barcodelist, $code_id, $idForm = 'formbarcode')
{ {
global $conf, $langs; global $conf, $langs;
@ -113,7 +113,7 @@ class FormBarCode
return $select_encoder; return $select_encoder;
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Print form to select type of barcode * Print form to select type of barcode
* *
@ -123,7 +123,7 @@ class FormBarCode
* @return void * @return void
* @deprecated * @deprecated
*/ */
function select_barcode_type($selected = '', $htmlname = 'barcodetype_id', $useempty = 0) public function select_barcode_type($selected = '', $htmlname = 'barcodetype_id', $useempty = 0)
{ {
// phpcs:enable // phpcs:enable
print $this->selectBarcodeType($selected, $htmlname, $useempty); print $this->selectBarcodeType($selected, $htmlname, $useempty);
@ -137,7 +137,7 @@ class FormBarCode
* @param int $useempty Display empty value in select * @param int $useempty Display empty value in select
* @return string * @return string
*/ */
function selectBarcodeType($selected = '', $htmlname = 'barcodetype_id', $useempty = 0) public function selectBarcodeType($selected = '', $htmlname = 'barcodetype_id', $useempty = 0)
{ {
global $langs, $conf; global $langs, $conf;
@ -183,7 +183,7 @@ class FormBarCode
return $out; return $out;
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Show form to select type of barcode * Show form to select type of barcode
* *
@ -193,7 +193,7 @@ class FormBarCode
* @return void * @return void
* @deprecated * @deprecated
*/ */
function form_barcode_type($page, $selected = '', $htmlname = 'barcodetype_id') public function form_barcode_type($page, $selected = '', $htmlname = 'barcodetype_id')
{ {
// phpcs:enable // phpcs:enable
print $this->formBarcodeType($page, $selected, $htmlname); print $this->formBarcodeType($page, $selected, $htmlname);
@ -207,7 +207,7 @@ class FormBarCode
* @param string $htmlname Nom du formulaire select * @param string $htmlname Nom du formulaire select
* @return string * @return string
*/ */
function formBarcodeType($page, $selected = '', $htmlname = 'barcodetype_id') public function formBarcodeType($page, $selected = '', $htmlname = 'barcodetype_id')
{ {
global $langs, $conf; global $langs, $conf;
$out = ''; $out = '';

10
htdocs/core/class/html.formcron.class.php
View File

@ -18,7 +18,7 @@
*/ */
/** /**
* \file core/class/html.formcron.class.php * \file htdocs/core/class/html.formcron.class.php
* \brief Fichier de la classe des fonctions predefinie de composants html cron * \brief Fichier de la classe des fonctions predefinie de composants html cron
*/ */
@ -43,13 +43,13 @@ class FormCron extends Form
* *
* @param DoliDB $db Database handler * @param DoliDB $db Database handler
*/ */
function __construct($db) public function __construct($db)
{ {
$this->db = $db; $this->db = $db;
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Display On Off selector * Display On Off selector
* *
@ -58,7 +58,7 @@ class FormCron extends Form
* @param integer $readonly Select is read only or not * @param integer $readonly Select is read only or not
* @return string HTML select field * @return string HTML select field
*/ */
function select_typejob($htmlname, $selected = 0, $readonly = 0) public function select_typejob($htmlname, $selected = 0, $readonly = 0)
{ {
// phpcs:enable // phpcs:enable
global $langs; global $langs;
@ -76,7 +76,7 @@ class FormCron extends Form
$out.= '<OPTION value="method" selected>'.$langs->trans('CronType_method').'</OPTION>'; $out.= '<OPTION value="method" selected>'.$langs->trans('CronType_method').'</OPTION>';
$out.='</SELECT>'; $out.='</SELECT>';
} }
}else { } else {
$out='<SELECT class="flat" name="'.$htmlname.'" id="'.$htmlname.'" />'; $out='<SELECT class="flat" name="'.$htmlname.'" id="'.$htmlname.'" />';

4
htdocs/core/class/ldap.class.php
View File

@ -381,7 +381,7 @@ class Ldap
* *
* @return boolean version * @return boolean version
*/ */
function setVersion() public function setVersion()
{ {
// LDAP_OPT_PROTOCOL_VERSION est une constante qui vaut 17 // LDAP_OPT_PROTOCOL_VERSION est une constante qui vaut 17
$ldapsetversion = ldap_set_option($this->connection, LDAP_OPT_PROTOCOL_VERSION, $this->ldapProtocolVersion); $ldapsetversion = ldap_set_option($this->connection, LDAP_OPT_PROTOCOL_VERSION, $this->ldapProtocolVersion);
@ -393,7 +393,7 @@ class Ldap
* *
* @return boolean referrals * @return boolean referrals
*/ */
function setReferrals() public function setReferrals()
{ {
// LDAP_OPT_REFERRALS est une constante qui vaut ? // LDAP_OPT_REFERRALS est une constante qui vaut ?
$ldapreferrals = ldap_set_option($this->connection, LDAP_OPT_REFERRALS, 0); $ldapreferrals = ldap_set_option($this->connection, LDAP_OPT_REFERRALS, 0);