From b31bf68376e282bc04050295c2307437cc95858a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 28 Jul 2014 00:47:27 +0200 Subject: [PATCH] New: Start to work on data check for dictionnary tables. --- htdocs/admin/dict.php | 31 ++++++++++++++++++++++++++++++- htdocs/core/lib/admin.lib.php | 4 +++- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 788483196e4..654d8cf10ba 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -364,8 +364,37 @@ $tabhelp[24] = array(); $tabhelp[25] = array(); $tabhelp[26] = array(); +// List of check for fields (NOT USED YET) +$tabfieldcheck=array(); +$tabfieldcheck[1] = array(); +$tabfieldcheck[2] = array(); +$tabfieldcheck[3] = array(); +$tabfieldcheck[4] = array(); +$tabfieldcheck[5] = array(); +$tabfieldcheck[6] = array(); +$tabfieldcheck[7] = array(); +$tabfieldcheck[8] = array(); +$tabfieldcheck[9] = array(); +$tabfieldcheck[10] = array(); +$tabfieldcheck[11] = array(); +$tabfieldcheck[12] = array(); +$tabfieldcheck[13] = array(); +$tabfieldcheck[14] = array(); +$tabfieldcheck[15] = array(); +$tabfieldcheck[16] = array(); +$tabfieldcheck[17] = array(); +$tabfieldcheck[18] = array(); +$tabfieldcheck[19] = array(); +$tabfieldcheck[20] = array(); +$tabfieldcheck[21] = array(); +$tabfieldcheck[22] = array(); +$tabfieldcheck[23] = array(); +$tabfieldcheck[24] = array(); +$tabfieldcheck[25] = array(); +$tabfieldcheck[26] = array(); + // Complete all arrays with entries found into modules -complete_dictionary_with_modules($taborder,$tabname,$tablib,$tabsql,$tabsqlsort,$tabfield,$tabfieldvalue,$tabfieldinsert,$tabrowid,$tabcond,$tabhelp); +complete_dictionary_with_modules($taborder,$tabname,$tablib,$tabsql,$tabsqlsort,$tabfield,$tabfieldvalue,$tabfieldinsert,$tabrowid,$tabcond,$tabhelp,$tabfieldcheck); // Define elementList and sourceList (used for dictionary "type of contacts") diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php index 899de9a5ec1..b6f2b02567a 100644 --- a/htdocs/core/lib/admin.lib.php +++ b/htdocs/core/lib/admin.lib.php @@ -862,9 +862,10 @@ function unActivateModule($value, $requiredby=1) * @param array &$tabrowid Tabrowid * @param array &$tabcond Tabcond * @param array &$tabhelp Tabhelp + * @param array &$tabfieldcheck Tabfieldcheck * @return int 1 */ -function complete_dictionary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsql,&$tabsqlsort,&$tabfield,&$tabfieldvalue,&$tabfieldinsert,&$tabrowid,&$tabcond,&$tabhelp) +function complete_dictionary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsql,&$tabsqlsort,&$tabfield,&$tabfieldvalue,&$tabfieldinsert,&$tabrowid,&$tabcond,&$tabhelp,&$tabfieldcheck) { global $db, $modules, $conf, $langs; @@ -977,6 +978,7 @@ function complete_dictionary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsql foreach($objMod->dictionaries['tabfieldinsert'] as $val) $tabfieldinsert[] = $val; foreach($objMod->dictionaries['tabrowid'] as $val) $tabrowid[] = $val; foreach($objMod->dictionaries['tabcond'] as $val) $tabcond[] = $val; + foreach($objMod->dictionaries['tabfieldcheck'] as $val) $tabfieldcheck[] = $val; if (! empty($objMod->dictionaries['tabhelp'])) foreach($objMod->dictionaries['tabhelp'] as $val) $tabhelp[] = $val; //foreach($objMod->dictionaries['tabsqlsort'] as $val) $tablib[] = $val; //$tabname = array_merge ($tabname, $objMod->dictionaries['tabname']);