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

Remove duplicate code

Browse Source
This commit is contained in:
Laurent Destailleur 2010-01-19 09:54:04 +00:00
parent 839892ba9f
commit ba5e5d0702
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/categories/fiche.php
View File

@ -38,6 +38,7 @@ if (! empty($_REQUEST['socid_id']))
} }
// Security check // Security check
$socid=isset($_GET['socid'])?$_GET['socid']:$_POST['socid'];
if (!$user->rights->categorie->lire) accessforbidden(); if (!$user->rights->categorie->lire) accessforbidden();
if (isset ($_REQUEST['choix'])) if (isset ($_REQUEST['choix']))
@ -61,18 +62,11 @@ if ($_REQUEST['catorigin'])
if ($_GET['type'] == 0) $idCatOrigin = $_REQUEST['catorigin']; if ($_GET['type'] == 0) $idCatOrigin = $_REQUEST['catorigin'];
} }
// If socid provided by ajax company selector
if (! empty($_REQUEST['socid_id']))
{
$_GET['socid'] = $_GET['socid_id'];
$_POST['socid'] = $_POST['socid_id'];
$_REQUEST['socid'] = $_REQUEST['socid_id'];
}
/* /*
* Actions * Actions
*/ */
if ($_POST["action"] == 'add' && $user->rights->categorie->creer) if ($_POST["action"] == 'add' && $user->rights->categorie->creer)
{ {
@ -247,7 +241,7 @@ if ($user->rights->categorie->creer)
else else
{ {
print '<tr><td>'.$langs->trans ("AssignedToCustomer").'</td><td>'; print '<tr><td>'.$langs->trans ("AssignedToCustomer").'</td><td>';
print $html->select_societes($_REQUEST['socid_id'],'socid','s.client IN (1, 3) AND s.fournisseur = 0',1); print $html->select_societes($socid,'socid','s.client IN (1, 3) AND s.fournisseur = 0',1);
print '</td></tr>'; print '</td></tr>';
print '<input type="hidden" name="catMere" value="-1">'; print '<input type="hidden" name="catMere" value="-1">';
print '<input type="hidden" name="visible" value="1">'; print '<input type="hidden" name="visible" value="1">';

7
htdocs/comm/action/fiche.php
View File

@ -64,13 +64,6 @@ $cactioncomm = new CActionComm($db);
$actioncomm = new ActionComm($db); $actioncomm = new ActionComm($db);
$contact = new Contact($db); $contact = new Contact($db);
// If socid provided by ajax company selector
if (! empty($_REQUEST['socid_id']))
{
$_GET['socid'] = $_GET['socid_id'];
$_POST['socid'] = $_POST['socid_id'];
$_REQUEST['socid'] = $_REQUEST['socid_id'];
}
/* /*