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

Merge pull request #4254 from grandoc/develop

Browse Source 
[Qual] Uniformize code
This commit is contained in:
Laurent Destailleur 2015-12-18 17:13:22 +01:00
commit dc8e5f45ae
12 changed files with 57 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/barcode.php
View File

@ -97,7 +97,7 @@ if ($action == 'setModuleOptions')
if (! $error)
{
setEventMessages($langs->trans("SetupSaved"), null, 'msgs');
setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
}
else
{

14
htdocs/core/modules/DolibarrModules.class.php
View File

@ -32,7 +32,7 @@
*
* Parent class for module descriptor class files
*/
class DolibarrModules // Can not be abstract, because we need to instantiant it into unActivateModule to be able to disable a module whose files were removed.
class DolibarrModules // Can not be abstract, because we need to instantiate it into unActivateModule to be able to disable a module whose files were removed.
{
/**
* @var DoliDb Database handler
@ -432,7 +432,7 @@ class DolibarrModules // Can not be abstract, because we need to insta
}
else
{
// If module description translation using it's unique id does not exists, we take use its name to find translation
// If module description translation does not exist using its unique id, we can use its name to find translation
if (is_array($this->langfiles))
{
foreach($this->langfiles as $val)
@ -510,12 +510,12 @@ class DolibarrModules // Can not be abstract, because we need to insta
$langstring="ExportDataset_".$this->export_code[$r];
if ($langs->trans($langstring) == $langstring)
{
// Traduction non trouvee
// Translation not found
return $langs->trans($this->export_label[$r]);
}
else
{
// Traduction trouvee
// Translation found
return $langs->trans($langstring);
}
}
@ -536,12 +536,12 @@ class DolibarrModules // Can not be abstract, because we need to insta
//print "x".$langstring;
if ($langs->trans($langstring) == $langstring)
{
// Traduction non trouvee
// Translation not found
return $langs->trans($this->import_label[$r]);
}
else
{
// Traduction trouvee
// Translation found
return $langs->trans($langstring);
}
}
@ -1223,7 +1223,7 @@ print $sql;
$obj=$this->db->fetch_object($resql);
if ($obj !== null && ! empty($obj->value) && ! empty($this->rights))
{
// Si module actif
// If the module is active
foreach ($this->rights as $key => $value)
{
$r_id = $this->rights[$key][0];

2
htdocs/product/card.php
View File

@ -188,7 +188,7 @@ if (empty($reshook))
}
if (! empty($duration_value) && empty($duration_unit))
{
setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentities('Unit')), 'errors');
setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentities('Unit')), null, 'errors');
$action = "create";
$error++;
}

6
htdocs/projet/activity/perday.php
View File

@ -116,7 +116,7 @@ if ($action == 'assign')
if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
{
$langs->load("errors");
setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'warnings');
setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'warnings');
}
else
{
@ -195,7 +195,7 @@ if ($action == 'addtime' && $user->rights->projet->creer)
if (! $error)
{
setEventMessage($langs->trans("RecordSaved"));
setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
// Redirect to avoid submit twice on back
header('Location: '.$_SERVER["PHP_SELF"].($projectid?'?id='.$projectid:'?').($mode?'&mode='.$mode:'').'&year='.$yearofday.'&month='.$monthofday.'&day='.$dayofday);
@ -204,7 +204,7 @@ if ($action == 'addtime' && $user->rights->projet->creer)
}
else
{
setEventMessage($langs->trans("ErrorTimeSpentIsEmpty"), 'errors');
setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors');
}
}

6
htdocs/projet/activity/perweek.php
View File

@ -129,7 +129,7 @@ if ($action == 'assign')
if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
{
$langs->load("errors");
setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'warnings');
setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'warnings');
}
else
{
@ -150,7 +150,7 @@ if ($action == 'addtime' && $user->rights->projet->creer)
$timetoadd=$_POST['task'];
if (empty($timetoadd))
{
setEventMessage($langs->trans("ErrorTimeSpentIsEmpty"), 'errors');
setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors');
}
else
{
@ -189,7 +189,7 @@ if ($action == 'addtime' && $user->rights->projet->creer)
if (! $error)
{
setEventMessage($langs->trans("RecordSaved"));
setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
// Redirect to avoid submit twice on back
header('Location: '.$_SERVER["PHP_SELF"].($projectid?'?id='.$projectid:'?').($mode?'&mode='.$mode:''));

20
htdocs/projet/admin/project.php
View File

@ -71,11 +71,11 @@ else if ($action == 'updateMask')
if (! $error)
{
setEventMessage($langs->trans("SetupSaved"));
setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
}
else
{
setEventMessage($langs->trans("Error"), 'errors');
setEventMessages($langs->trans("Error"), null, 'errors');
}
}
@ -90,11 +90,11 @@ if ($action == 'updateMaskTask')
if (! $error)
{
setEventMessage($langs->trans("SetupSaved"));
setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
}
else
{
setEventMessage($langs->trans("Error"), 'errors');
setEventMessages($langs->trans("Error"), null, 'errors');
}
}
@ -132,13 +132,13 @@ else if ($action == 'specimen')
}
else
{
setEventMessage($obj->error, 'errors');
setEventMessages($obj->error, $obj->errors, 'errors');
dol_syslog($obj->error, LOG_ERR);
}
}
else
{
setEventMessage($langs->trans("ErrorModuleNotFound"), 'errors');
setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
}
}
@ -177,13 +177,13 @@ else if ($action == 'specimentask')
}
else
{
setEventMessage($obj->error, 'errors');
setEventMessages($obj->error, $obj->errors, 'errors');
dol_syslog($obj->error, LOG_ERR);
}
}
else
{
setEventMessage($langs->trans("ErrorModuleNotFound"), 'errors');
setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
}
}
@ -208,12 +208,12 @@ if ($action == 'setModuleOptions')
if (! $error)
{
$db->commit();
setEventMessage($langs->trans("SetupSaved"));
setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
}
else
{
$db->rollback();
setEventMessage($langs->trans("Error"),'errors');
setEventMessages($langs->trans("Error"), null, 'errors');
}
}

16
htdocs/projet/card.php
View File

@ -101,7 +101,7 @@ if (empty($reshook))
else
{
dol_syslog($object->error,LOG_DEBUG);
setEventMessage($langs->trans("CantRemoveProject"), 'errors');
setEventMessages($langs->trans("CantRemoveProject"), null, 'errors');
}
}
if ($backtopage)
@ -158,14 +158,14 @@ if (empty($reshook))
if ($result < 0)
{
$langs->load("errors");
setEventMessage($langs->trans($object->error), 'errors');
setEventMessages($langs->trans($object->error), null, 'errors');
$error++;
}
}
else
{
$langs->load("errors");
setEventMessage($langs->trans($object->error), 'errors');
setEventMessage($langs->trans($object->error), null, 'errors');
$error++;
}
@ -241,7 +241,7 @@ if (empty($reshook))
if ($object->opp_amount && ($object->opp_status <= 0))
{
$error++;
setEventMessage($langs->trans("ErrorOppStatusRequiredIfAmount"),'errors');
setEventMessages($langs->trans("ErrorOppStatusRequiredIfAmount"), null, 'errors');
}
if (! $error)
@ -262,7 +262,7 @@ if (empty($reshook))
if ($result < 0)
{
$error++;
setEventMessage($langs->trans("ErrorShiftTaskDate").':'.$object->error, 'errors');
setEventMessages($langs->trans("ErrorShiftTaskDate").':'.$object->error, $langs->trans("ErrorShiftTaskDate").':'.$object->errors, 'errors');
}
}
}
@ -313,8 +313,8 @@ if (empty($reshook))
$urlfile=GETPOST('urlfile','alpha');
$file = $upload_dir . '/' . $filetodelete;
$ret=dol_delete_file($file);
if ($ret) setEventMessage($langs->trans("FileWasRemoved", $urlfile));
else setEventMessage($langs->trans("ErrorFailToDeleteFile", $urlfile), 'errors');
if ($ret) setEventMessages($langs->trans("FileWasRemoved", $urlfile), null, 'mesgs');
else setEventMessages($langs->trans("ErrorFailToDeleteFile", $urlfile), null, 'errors');
}
}
@ -352,7 +352,7 @@ if (empty($reshook))
$result=$object->delete($user);
if ($result > 0)
{
setEventMessage($langs->trans("RecordDeleted"), 'info');
setEventMessagess($langs->trans("RecordDeleted"), null, 'mesgs');
header("Location: index.php");
exit;
}

4
htdocs/projet/contact.php
View File

@ -76,11 +76,11 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
{
$langs->load("errors");
setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors');
setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
}
else
{
setEventMessage($object->error, 'errors');
setEventMessages($object->error, $object->errors, 'errors');
}
}
}

14
htdocs/projet/element.php
View File

@ -293,17 +293,21 @@ if ($action=="addelement")
$tablename = GETPOST("tablename");
$elementselectid = GETPOST("elementselect");
$result=$object->update_element($tablename, $elementselectid);
if ($result<0) {
setEventMessage($object->error,'errors');
if ($result<0)
{
setEventMessages($object->error, $object->errors, 'errors');
}
}elseif ($action == "unlink") {
}
elseif ($action == "unlink")
{
$tablename = GETPOST("tablename");
$elementselectid = GETPOST("elementselect");
$result = $object->remove_element($tablename, $elementselectid);
if ($result < 0) {
setEventMessage($object->error, 'errors');
if ($result < 0)
{
setEventMessages($object->error, $object->errors, 'errors');
}
}

4
htdocs/projet/tasks/contact.php
View File

@ -94,11 +94,11 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
{
$langs->load("errors");
setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors');
setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
}
else
{
setEventMessage($object->error, 'errors');
setEventMessages($object->error, $object->errors, 'errors');
}
}
}

4
htdocs/projet/tasks/task.php
View File

@ -180,8 +180,8 @@ if ($action == 'remove_file' && $user->rights->projet->creer)
$file = $upload_dir . '/' . GETPOST('file');
$ret=dol_delete_file($file);
if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
}
}

18
htdocs/projet/tasks/time.php
View File

@ -61,13 +61,13 @@ if ($action == 'addtimespent' && $user->rights->projet->creer)
$timespent_durationmin = GETPOST('timespent_durationmin','int');
if (empty($timespent_durationhour) && empty($timespent_durationmin))
{
setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Duration")),'errors');
setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Duration")), null, 'errors');
$error++;
}
if (empty($_POST["userid"]))
{
$langs->load("errors");
setEventMessage($langs->trans('ErrorUserNotAssignedToTask'),'errors');
setEventMessages($langs->trans('ErrorUserNotAssignedToTask'), null, 'errors');
$error++;
}
@ -78,7 +78,7 @@ if ($action == 'addtimespent' && $user->rights->projet->creer)
if (empty($object->projet->statut))
{
setEventMessage($langs->trans("ProjectMustBeValidatedFirst"),'errors');
setEventMessages($langs->trans("ProjectMustBeValidatedFirst"), null, 'errors');
$error++;
}
else
@ -100,11 +100,11 @@ if ($action == 'addtimespent' && $user->rights->projet->creer)
$result=$object->addTimeSpent($user);
if ($result >= 0)
{
setEventMessage($langs->trans("RecordSaved"));
setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
}
else
{
setEventMessage($langs->trans($object->error),'errors');
setEventMessages($langs->trans($object->error), null, 'errors');
$error++;
}
}
@ -121,7 +121,7 @@ if ($action == 'updateline' && ! $_POST["cancel"] && $user->rights->projet->cree
if (empty($_POST["new_durationhour"]) && empty($_POST["new_durationmin"]))
{
setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Duration")),'errors');
setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Duration")), null, 'errors');
$error++;
}
@ -148,11 +148,11 @@ if ($action == 'updateline' && ! $_POST["cancel"] && $user->rights->projet->cree
$result=$object->updateTimeSpent($user);
if ($result >= 0)
{
setEventMessage($langs->trans("RecordSaved"));
setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
}
else
{
setEventMessage($langs->trans($object->error),'errors');
setEventMessages($langs->trans($object->error), null, 'errors');
$error++;
}
}
@ -170,7 +170,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->c
if ($result < 0)
{
$langs->load("errors");
setEventMessage($langs->trans($object->error),'errors');
setEventMessages($langs->trans($object->error), null, 'errors');
$error++;
$action='';
}