';
@@ -183,8 +194,7 @@ print '
'.$langs->trans("Color").' | ';
print "";
$i = 1;
-while ($i <= $MAXAGENDA)
-{
+while ($i <= $MAXAGENDA) {
$key = $i;
$name = 'AGENDA_EXT_NAME_'.$id.'_'.$key;
$src = 'AGENDA_EXT_SRC_'.$id.'_'.$key;
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index 20369e37d69..65bf7c5c8ac 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -32,9 +32,15 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/user/class/userbankaccount.class.php';
-if (!empty($conf->holiday->enabled)) require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
-if (!empty($conf->expensereport->enabled)) require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
-if (!empty($conf->salaries->enabled)) require_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
+if (!empty($conf->holiday->enabled)) {
+ require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
+}
+if (!empty($conf->expensereport->enabled)) {
+ require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+}
+if (!empty($conf->salaries->enabled)) {
+ require_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
+}
// Load translation files required by page
$langs->loadLangs(array('companies', 'commercial', 'banks', 'bills', 'trips', 'holiday', 'salaries'));
@@ -47,35 +53,44 @@ $cancel = GETPOST('cancel', 'alpha');
// Security check
$socid = 0;
-if ($user->socid > 0) $socid = $user->socid;
+if ($user->socid > 0) {
+ $socid = $user->socid;
+}
$feature2 = (($socid && $user->rights->user->self->creer) ? '' : 'user');
// Ok if user->rights->salaries->read or user->rights->hrm->read
//$result = restrictedArea($user, 'salaries|hrm', $id, 'user&user', $feature2);
$ok = false;
-if ($user->id == $id) $ok = true; // A user can always read its own card
-if (!empty($user->rights->salaries->read)) $ok = true;
-if (!empty($user->rights->hrm->read)) $ok = true;
-if (!empty($user->rights->expensereport->lire) && ($user->id == $object->id || $user->rights->expensereport->readall)) $ok = true;
-if (!$ok)
-{
+if ($user->id == $id) {
+ $ok = true; // A user can always read its own card
+}
+if (!empty($user->rights->salaries->read)) {
+ $ok = true;
+}
+if (!empty($user->rights->hrm->read)) {
+ $ok = true;
+}
+if (!empty($user->rights->expensereport->lire) && ($user->id == $object->id || $user->rights->expensereport->readall)) {
+ $ok = true;
+}
+if (!$ok) {
accessforbidden();
}
$object = new User($db);
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
$result = $object->fetch($id, $ref, '', 1);
$object->getrights();
}
$account = new UserBankAccount($db);
-if (!$bankid)
-{
+if (!$bankid) {
$account->fetch(0, '', $id);
} else {
$account->fetch($bankid);
}
-if (empty($account->userid)) $account->userid = $object->id;
+if (empty($account->userid)) {
+ $account->userid = $object->id;
+}
$permissiontoaddbankaccount = (!empty($user->rights->salaries->write) || !empty($user->rights->hrm->employee->write) || !empty($user->rights->user->creer));
@@ -84,8 +99,7 @@ $permissiontoaddbankaccount = (!empty($user->rights->salaries->write) || !empty(
* Actions
*/
-if ($action == 'add' && !$cancel)
-{
+if ($action == 'add' && !$cancel) {
$account->userid = $object->id;
$account->bank = GETPOST('bank', 'alpha');
@@ -103,8 +117,7 @@ if ($action == 'add' && !$cancel)
$result = $account->create($user);
- if (!$result)
- {
+ if (!$result) {
setEventMessages($account->error, $account->errors, 'errors');
$action = 'edit'; // Force chargement page edition
} else {
@@ -113,52 +126,51 @@ if ($action == 'add' && !$cancel)
}
}
-if ($action == 'update' && !$cancel)
-{
+if ($action == 'update' && !$cancel) {
$account->userid = $object->id;
/*
- if ($action == 'update' && !$cancel)
- {
- require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+ if ($action == 'update' && !$cancel)
+ {
+ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
- if ($canedituser) // Case we can edit all field
- {
- $error = 0;
+ if ($canedituser) // Case we can edit all field
+ {
+ $error = 0;
- if (!$error)
- {
- $objectuser->fetch($id);
+ if (!$error)
+ {
+ $objectuser->fetch($id);
- $objectuser->oldcopy = clone $objectuser;
+ $objectuser->oldcopy = clone $objectuser;
- $db->begin();
+ $db->begin();
- $objectuser->default_range = GETPOST('default_range');
- $objectuser->default_c_exp_tax_cat = GETPOST('default_c_exp_tax_cat');
+ $objectuser->default_range = GETPOST('default_range');
+ $objectuser->default_c_exp_tax_cat = GETPOST('default_c_exp_tax_cat');
- if (!$error) {
- $ret = $objectuser->update($user);
- if ($ret < 0) {
- $error++;
- if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
- $langs->load("errors");
- setEventMessages($langs->trans("ErrorLoginAlreadyExists", $objectuser->login), null, 'errors');
- } else {
- setEventMessages($objectuser->error, $objectuser->errors, 'errors');
- }
- }
- }
+ if (!$error) {
+ $ret = $objectuser->update($user);
+ if ($ret < 0) {
+ $error++;
+ if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+ $langs->load("errors");
+ setEventMessages($langs->trans("ErrorLoginAlreadyExists", $objectuser->login), null, 'errors');
+ } else {
+ setEventMessages($objectuser->error, $objectuser->errors, 'errors');
+ }
+ }
+ }
- if (!$error && !count($objectuser->errors)) {
- setEventMessages($langs->trans("UserModified"), null, 'mesgs');
- $db->commit();
- } else {
- $db->rollback();
- }
- }
- }
- }*/
+ if (!$error && !count($objectuser->errors)) {
+ setEventMessages($langs->trans("UserModified"), null, 'mesgs');
+ $db->commit();
+ } else {
+ $db->rollback();
+ }
+ }
+ }
+ }*/
$account->bank = GETPOST('bank', 'alpha');
$account->label = GETPOST('label', 'alpha');
@@ -188,28 +200,36 @@ if ($action == 'update' && !$cancel)
if ($action == 'setpersonal_email') {
$object->personal_email = (string) GETPOST('personal_email', 'alphanohtml');
$result = $object->update($user);
- if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+ if ($result < 0) {
+ setEventMessages($object->error, $object->errors, 'errors');
+ }
}
// update personal mobile
if ($action == 'setpersonal_mobile') {
$object->personal_mobile = (string) GETPOST('personal_mobile', 'alphanohtml');
$result = $object->update($user);
- if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+ if ($result < 0) {
+ setEventMessages($object->error, $object->errors, 'errors');
+ }
}
// update default_c_exp_tax_cat
if ($action == 'setdefault_c_exp_tax_cat') {
$object->default_c_exp_tax_cat = GETPOST('default_c_exp_tax_cat', 'int');
$result = $object->update($user);
- if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+ if ($result < 0) {
+ setEventMessages($object->error, $object->errors, 'errors');
+ }
}
// update default range
if ($action == 'setdefault_range') {
$object->default_range = GETPOST('default_range', 'int');
$result = $object->update($user);
- if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+ if ($result < 0) {
+ setEventMessages($object->error, $object->errors, 'errors');
+ }
}
@@ -226,16 +246,14 @@ llxHeader(null, $langs->trans("BankAccounts"));
$head = user_prepare_head($object);
-if ($id && $bankid && $action == 'edit' && $user->rights->user->user->creer)
-{
+if ($id && $bankid && $action == 'edit' && $user->rights->user->user->creer) {
print '