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

Revert "Corrected non-static usages of Form::multiselectarray function"

Browse Source 
This reverts commit 0a53cdd88f.
This commit is contained in:
Laurent Destailleur 2016-03-25 15:34:43 +01:00
parent 630f5a632d
commit a2e9832c8d
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/adherents/card.php
View File

@ -913,7 +913,7 @@ else
{
print '<tr><td>' . fieldLabel('Categories', 'memcars') . '</td><td>';
$cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, null, 'parent', null, null, 1);
print Form::multiselectarray('memcats', $cate_arbo, GETPOST('memcats', 'array'), null, null, null, null, '100%');
print $form->multiselectarray('memcats', $cate_arbo, GETPOST('memcats', 'array'), null, null, null, null, '100%');
print "</td></tr>";
}
@ -1173,7 +1173,7 @@ else
foreach ($cats as $cat) {
$arrayselected[] = $cat->id;
}
print Form::multiselectarray('memcats', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
print $form->multiselectarray('memcats', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
print "</td></tr>";
}

4
htdocs/contact/card.php
View File

@ -662,7 +662,7 @@ else
if (! empty($conf->categorie->enabled) && ! empty($user->rights->categorie->lire)) {
print '<tr><td>' . fieldLabel( 'Categories', 'contcats' ) . '</td><td colspan="3">';
$cate_arbo = $form->select_all_categories( Categorie::TYPE_CONTACT, null, 'parent', null, null, 1 );
print Form::multiselectarray( 'contcats', $cate_arbo, GETPOST( 'contcats', 'array' ), null, null, null,
print $form->multiselectarray( 'contcats', $cate_arbo, GETPOST( 'contcats', 'array' ), null, null, null,
null, '90%' );
print "</td></tr>";
}
@ -922,7 +922,7 @@ else
foreach ($cats as $cat) {
$arrayselected[] = $cat->id;
}
print Form::multiselectarray( 'contcats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%' );
print $form->multiselectarray( 'contcats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%' );
print "</td></tr>";
}

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

@ -4853,7 +4853,7 @@ class Form
* @return string HTML multiselect string
* @see selectarray
*/
public static function multiselectarray($htmlname, array $array, array $selected = array(), $key_in_label=0, $value_as_key=0, $morecss='', $translate=0, $width=0, $moreattrib='',$elemtype='')
static function multiselectarray($htmlname, $array, $selected=array(), $key_in_label=0, $value_as_key=0, $morecss='', $translate=0, $width=0, $moreattrib='',$elemtype='')
{
global $conf, $langs;

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

@ -273,7 +273,7 @@ class FormActions
if (! empty($multiselect))
{
if(!is_array($selected) && !empty($selected)) $selected = explode(',', $selected);
print Form::multiselectarray($htmlname, $arraylist, $selected, 0, 0, 'centpercent', 0, 0);
print $form->multiselectarray($htmlname, $arraylist, $selected, 0, 0, 'centpercent', 0, 0);
}
else
{

4
htdocs/product/card.php
View File

@ -1040,7 +1040,7 @@ else
// Categories
print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 64, 0, 1);
print Form::multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
print "</td></tr>";
}
@ -1343,7 +1343,7 @@ else
foreach($cats as $cat) {
$arrayselected[] = $cat->id;
}
print Form::multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
print "</td></tr>";
}

2
htdocs/public/test/test_forms.php
View File

@ -86,7 +86,7 @@ print '<br><br>'."\n";
print "Test 5c: a multiselect<br>\n";
$array=array(1=>'Value 1',2=>'Value 2',3=>'Value 3');
$arrayselected=array(1,3);
print Form::multiselectarray('testmulti', $array, $arrayselected, '', 0, '', 0, 250);
print $form->multiselectarray('testmulti', $array, $arrayselected, '', 0, '', 0, 250);
llxFooter();

8
htdocs/societe/soc.php
View File

@ -1242,7 +1242,7 @@ else
if ($object->prospect || $object->client) {
print '<tr><td class="toptd">' . fieldLabel('CustomersCategoriesShort', 'custcats') . '</td><td colspan="3">';
$cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, 'parent', null, null, 1);
print Form::multiselectarray('custcats', $cate_arbo, GETPOST('custcats', 'array'), null, null, null,
print $form->multiselectarray('custcats', $cate_arbo, GETPOST('custcats', 'array'), null, null, null,
null, "90%");
print "</td></tr>";
}
@ -1251,7 +1251,7 @@ else
if ($object->fournisseur) {
print '<tr><td class="toptd">' . fieldLabel('SuppliersCategoriesShort', 'suppcats') . '</td><td colspan="3">';
$cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, 'parent', null, null, 1);
print Form::multiselectarray('suppcats', $cate_arbo, GETPOST('suppcats', 'array'), null, null, null,
print $form->multiselectarray('suppcats', $cate_arbo, GETPOST('suppcats', 'array'), null, null, null,
null, "90%");
print "</td></tr>";
}
@ -1800,7 +1800,7 @@ else
foreach ($cats as $cat) {
$arrayselected[] = $cat->id;
}
print Form::multiselectarray('custcats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%');
print $form->multiselectarray('custcats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%');
print "</td></tr>";
}
@ -1814,7 +1814,7 @@ else
foreach ($cats as $cat) {
$arrayselected[] = $cat->id;
}
print Form::multiselectarray('suppcats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%');
print $form->multiselectarray('suppcats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%');
print "</td></tr>";
}
}

4
htdocs/user/card.php
View File

@ -1087,7 +1087,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
{
print '<tr><td>' . fieldLabel( 'Categories', 'usercats' ) . '</td><td colspan="3">';
$cate_arbo = $form->select_all_categories( Categorie::TYPE_USER, null, 'parent', null, null, 1 );
print Form::multiselectarray( 'usercats', $cate_arbo, GETPOST( 'usercats', 'array' ), null, null, null,
print $form->multiselectarray( 'usercats', $cate_arbo, GETPOST( 'usercats', 'array' ), null, null, null,
null, '90%' );
print "</td></tr>";
}
@ -2231,7 +2231,7 @@ else
foreach ($cats as $cat) {
$arrayselected[] = $cat->id;
}
print Form::multiselectarray( 'usercats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%' );
print $form->multiselectarray( 'usercats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%' );
print "</td></tr>";
}