Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 09:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: On fait apparaitre clairement les triggers en doublons.

Browse Source
This commit is contained in:
Laurent Destailleur
2007-10-12 23:38:31 +00:00
parent 22798b329c
commit fd9e1cf5e2
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/admin/triggers.php
View File

@@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2005-2006 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2005-2007 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* $Id$ * $Id$
* $Source$
*/ */
/** /**
@@ -37,6 +36,7 @@ if ($_GET["action"] == 'set' && $user->admin)
Activate($_GET["value"]); Activate($_GET["value"]);
Header("Location: modules.php?spe=".$_GET["spe"]); Header("Location: modules.php?spe=".$_GET["spe"]);
exit;
} }
if ($_GET["action"] == 'reset' && $user->admin) if ($_GET["action"] == 'reset' && $user->admin)
@@ -44,6 +44,7 @@ if ($_GET["action"] == 'reset' && $user->admin)
UnActivate($_GET["value"]); UnActivate($_GET["value"]);
Header("Location: modules.php?spe=".$_GET["spe"]); Header("Location: modules.php?spe=".$_GET["spe"]);
exit;
} }
@@ -99,6 +100,7 @@ function UnActivate($value)
} }
Header("Location: modules.php"); Header("Location: modules.php");
exit;
} }
@@ -138,7 +140,14 @@ while (($file = readdir($handle))!==false)
{ {
if (in_array($modName,$modules)) if (in_array($modName,$modules))
{ {
print "Error: Un fichier triggers du nom de '$modName' est deja charg<72>. Supprimer le doublon."; $langs->load("errors");
print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateTrigger",$modName,"/htdocs/includes/triggers/").'</div>';
$objMod = new $modName($db);
$modules[$i] = $modName;
$files[$i] = $file;
$orders[$i] = "$objMod->family"; // Tri par famille
$i++;
} }
else else
{ {