Fix: Error management
This commit is contained in:
parent
337b4380ab
commit
e5afc7c416
@ -26,7 +26,7 @@
|
|||||||
* \file htdocs/commande/fiche.php
|
* \file htdocs/commande/fiche.php
|
||||||
* \ingroup commande
|
* \ingroup commande
|
||||||
* \brief Page to show customer order
|
* \brief Page to show customer order
|
||||||
* \version $Id: fiche.php,v 1.521 2011/06/30 13:27:21 hregis Exp $
|
* \version $Id: fiche.php,v 1.522 2011/07/02 13:09:52 eldy Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require("../main.inc.php");
|
require("../main.inc.php");
|
||||||
@ -90,7 +90,7 @@ if (! empty($object->hooks))
|
|||||||
$reshook+=$module->doActions($object);
|
$reshook+=$module->doActions($object);
|
||||||
if (! empty($module->error) || (! empty($module->errors) && sizeof($module->errors) > 0))
|
if (! empty($module->error) || (! empty($module->errors) && sizeof($module->errors) > 0))
|
||||||
{
|
{
|
||||||
$mesg=$module->error; $mesgs[]=$module->errors;
|
$mesg=$module->error; $mesgs=$module->errors;
|
||||||
if ($action=='add') $action='create';
|
if ($action=='add') $action='create';
|
||||||
if ($action=='update') $action='edit';
|
if ($action=='update') $action='edit';
|
||||||
}
|
}
|
||||||
@ -2134,5 +2134,5 @@ else
|
|||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter('$Date: 2011/06/30 13:27:21 $ - $Revision: 1.521 $');
|
llxFooter('$Date: 2011/07/02 13:09:52 $ - $Revision: 1.522 $');
|
||||||
?>
|
?>
|
||||||
|
|||||||
@ -26,7 +26,7 @@
|
|||||||
* \file htdocs/compta/facture.php
|
* \file htdocs/compta/facture.php
|
||||||
* \ingroup facture
|
* \ingroup facture
|
||||||
* \brief Page to create/see an invoice
|
* \brief Page to create/see an invoice
|
||||||
* \version $Id: facture.php,v 1.842 2011/06/30 21:53:02 eldy Exp $
|
* \version $Id: facture.php,v 1.843 2011/07/02 13:09:52 eldy Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require('../main.inc.php');
|
require('../main.inc.php');
|
||||||
@ -101,7 +101,7 @@ if (! empty($object->hooks))
|
|||||||
$reshook+=$module->doActions($object);
|
$reshook+=$module->doActions($object);
|
||||||
if (! empty($module->error) || (! empty($module->errors) && sizeof($module->errors) > 0))
|
if (! empty($module->error) || (! empty($module->errors) && sizeof($module->errors) > 0))
|
||||||
{
|
{
|
||||||
$mesg=$module->error; $mesgs[]=$module->errors;
|
$mesg=$module->error; $mesgs=$module->errors;
|
||||||
if ($action=='add') $action='create';
|
if ($action=='add') $action='create';
|
||||||
if ($action=='update') $action='edit';
|
if ($action=='update') $action='edit';
|
||||||
}
|
}
|
||||||
@ -3235,5 +3235,5 @@ else
|
|||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter('$Date: 2011/06/30 21:53:02 $ - $Revision: 1.842 $');
|
llxFooter('$Date: 2011/07/02 13:09:52 $ - $Revision: 1.843 $');
|
||||||
?>
|
?>
|
||||||
|
|||||||
@ -24,7 +24,7 @@
|
|||||||
* \file htdocs/contact/fiche.php
|
* \file htdocs/contact/fiche.php
|
||||||
* \ingroup societe
|
* \ingroup societe
|
||||||
* \brief Card of a contact
|
* \brief Card of a contact
|
||||||
* \version $Id: fiche.php,v 1.217 2011/07/01 23:11:12 eldy Exp $
|
* \version $Id: fiche.php,v 1.218 2011/07/02 13:09:52 eldy Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require("../main.inc.php");
|
require("../main.inc.php");
|
||||||
@ -95,7 +95,7 @@ if (! empty($object->hooks))
|
|||||||
$resaction+=$module->doActions($object,$action);
|
$resaction+=$module->doActions($object,$action);
|
||||||
if ($resaction < 0 || ! empty($module->error) || (! empty($module->errors) && sizeof($module->errors) > 0))
|
if ($resaction < 0 || ! empty($module->error) || (! empty($module->errors) && sizeof($module->errors) > 0))
|
||||||
{
|
{
|
||||||
$mesg=$module->error; $mesgs[]=$module->errors;
|
$error=$module->error; $errors=$module->errors;
|
||||||
if ($action=='add') $action='create';
|
if ($action=='add') $action='create';
|
||||||
if ($action=='update') $action='edit';
|
if ($action=='update') $action='edit';
|
||||||
}
|
}
|
||||||
@ -974,5 +974,5 @@ else
|
|||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter('$Date: 2011/07/01 23:11:12 $ - $Revision: 1.217 $');
|
llxFooter('$Date: 2011/07/02 13:09:52 $ - $Revision: 1.218 $');
|
||||||
?>
|
?>
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
* \file htdocs/core/class/canvas.class.php
|
* \file htdocs/core/class/canvas.class.php
|
||||||
* \ingroup core
|
* \ingroup core
|
||||||
* \brief File of class to manage canvas
|
* \brief File of class to manage canvas
|
||||||
* \version $Id$
|
* \version $Id: canvas.class.php,v 1.43 2011/07/02 13:09:52 eldy Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
@ -135,7 +135,8 @@ class Canvas
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Execute actions
|
* Execute actions
|
||||||
* @param id Id of object (may be empty for creation)
|
* @param id Id of object (may be empty for creation)
|
||||||
|
* @deprecated Use actions with hooks instead
|
||||||
*/
|
*/
|
||||||
function doActions($id)
|
function doActions($id)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -26,7 +26,7 @@
|
|||||||
* \file htdocs/societe/soc.php
|
* \file htdocs/societe/soc.php
|
||||||
* \ingroup societe
|
* \ingroup societe
|
||||||
* \brief Third party card page
|
* \brief Third party card page
|
||||||
* \version $Id: soc.php,v 1.116 2011/07/01 23:11:30 eldy Exp $
|
* \version $Id: soc.php,v 1.117 2011/07/02 13:09:53 eldy Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require("../main.inc.php");
|
require("../main.inc.php");
|
||||||
@ -105,7 +105,7 @@ if (! empty($object->hooks))
|
|||||||
$resaction+=$module->doActions($object,$action);
|
$resaction+=$module->doActions($object,$action);
|
||||||
if ($resaction < 0 || ! empty($module->error) || (! empty($module->errors) && sizeof($module->errors) > 0))
|
if ($resaction < 0 || ! empty($module->error) || (! empty($module->errors) && sizeof($module->errors) > 0))
|
||||||
{
|
{
|
||||||
$mesg=$module->error; $mesgs[]=$module->errors;
|
$error=$module->error; $errors=$module->errors;
|
||||||
if ($action=='add') $action='create';
|
if ($action=='add') $action='create';
|
||||||
if ($action=='update') $action='edit';
|
if ($action=='update') $action='edit';
|
||||||
}
|
}
|
||||||
@ -1971,5 +1971,5 @@ else
|
|||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter('$Date: 2011/07/01 23:11:30 $ - $Revision: 1.116 $');
|
llxFooter('$Date: 2011/07/02 13:09:53 $ - $Revision: 1.117 $');
|
||||||
?>
|
?>
|
||||||
Loading…
Reference in New Issue
Block a user