]*src=")\/?image\//', '\1/medias/image/', $content, -1, $nbrep);
$content = preg_replace('/(url\(["\']?)\/?image\//', '\1/medias/image/', $content, -1, $nbrep);
@@ -426,8 +424,7 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
{
$containerref = $tmpwebsitepage->pageurl;
}
- else
- {
+ else {
print "Error, page contains a redirect to the alternative alias '".$containeraliasalt."' that does not exists in web site (".$website->id." / ".$website->ref.")";
exit;
}
@@ -464,18 +461,16 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
print "Error, page with uri '.$currenturi.' try a redirect to the same alias page '".$containerref."' in web site '".$website->ref."'";
exit;
}
- else
- {
+ else {
$newurl = preg_replace('/&pageref=([^&]+)/', '&pageref='.$containerref, $currenturi);
}
}
- else
- {
+ else {
$newurl = $currenturi.'&pageref='.urlencode($containerref);
}
}
}
- else // When page called from virtual host server
+ else // When page called from virtual host server
{
$newurl = '/'.$containerref.'.php';
}
@@ -488,8 +483,7 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
header("Location: ".$newurl);
exit;
}
- else
- {
+ else {
print "Error, page contains a redirect to the alias page '".$containerref."' that does not exists in web site (".$website->id." / ".$website->ref.")";
exit;
}
@@ -601,7 +595,7 @@ function getStructuredData($type, $data = array())
if (is_array($mysoc->socialnetworks) && count($mysoc->socialnetworks) > 0) {
$ret .= '"sameAs": [';
$i = 0;
- foreach($mysoc->socialnetworks as $key => $value) {
+ foreach ($mysoc->socialnetworks as $key => $value) {
if ($key == 'linkedin') {
$ret.= '"https://www.'.$key.'.com/company/'.dol_escape_json($value).'"';
} elseif ($key == 'youtube') {
@@ -670,7 +664,7 @@ function getStructuredData($type, $data = array())
$ret .= '"keywords": [';
$i = 0;
$arrayofkeywords = explode(',', $websitepage->keywords);
- foreach($arrayofkeywords as $keyword) {
+ foreach ($arrayofkeywords as $keyword) {
$ret.= '"'.dol_escape_json($keyword).'"';
$i++;
if ($i < count($arrayofkeywords)) $ret .= ', ';
@@ -810,8 +804,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
$arrayresult['code'] = 'KO';
$arrayresult['message'] = $weblangs->trans("ErrorSearchCriteriaTooSmall");
}
- else
- {
+ else {
$tmparrayoftype = explode(',', $type);
foreach ($tmparrayoftype as $tmptype) {
if (!in_array($tmptype, array('', 'page', 'blogpost'))) {
@@ -873,8 +866,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
$i++;
}
}
- else
- {
+ else {
$error++;
$arrayresult['code'] = $db->lasterrno();
$arrayresult['message'] = $db->lasterror();
@@ -934,8 +926,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
$arrayresult['message'] = $weblangs->trans("NoRecordFound");
}
}
- else
- {
+ else {
$error++;
$arrayresult['code'] = 'KO';
$arrayresult['message'] = 'No supported algorithm found';
@@ -985,8 +976,7 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
$urltograbdirrootwithoutslash = getRootURLFromURL($urltograb);
$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key]; // We use dirroot
}
- else
- {
+ else {
$urltograbbis = $urltograb.'/'.$regs[2][$key]; // We use dir of grabbed file
}
@@ -1029,8 +1019,7 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
$action = 'create';
}
- else
- {
+ else {
$alreadygrabbed[$urltograbbis] = 1; // Track that file was alreay grabbed.
dol_mkdir(dirname($filetosave));
@@ -1062,8 +1051,7 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
$urltograbdirrootwithoutslash = getRootURLFromURL($urltograb);
$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key]; // We use dirroot
}
- else
- {
+ else {
$urltograbbis = $urltograb.'/'.$regs[2][$key]; // We use dir of grabbed file
}
@@ -1108,8 +1096,7 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
$action = 'create';
}
- else
- {
+ else {
$alreadygrabbed[$urltograbbis] = 1; // Track that file was alreay grabbed.
dol_mkdir(dirname($filetosave));
diff --git a/htdocs/core/lib/xcal.lib.php b/htdocs/core/lib/xcal.lib.php
index 440f1147cbf..33db8490a75 100644
--- a/htdocs/core/lib/xcal.lib.php
+++ b/htdocs/core/lib/xcal.lib.php
@@ -230,8 +230,7 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
$enddate = dol_time_plus_duree($startdate, 1, "d");
}
}
- else
- {
+ else {
if (empty($enddate))
{
$enddate = $startdate + $duration;
@@ -316,8 +315,7 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
}
}
- else
- {
+ else {
dol_syslog("xcal.lib.php::build_calfile Failed to open file ".$outputfile." for writing");
return -2;
}
@@ -526,8 +524,7 @@ function calEncode($line)
$out .= $newpara;
}
- else
- {
+ else {
$strlength = dol_strlen($line);
for ($j = 0; $j < $strlength; $j++)
diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php
index ea3fa2f3a19..333e4741cd1 100644
--- a/htdocs/core/login/functions_dolibarr.php
+++ b/htdocs/core/login/functions_dolibarr.php
@@ -107,8 +107,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
{
$login = $obj->login;
}
- else
- {
+ else {
sleep(2); // Anti brut force protection
dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO bad password for '".$usertotest."', cryptType=".$cryptType, LOG_NOTICE);
@@ -124,8 +123,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
global $mc;
if (!isset($mc)) $conf->multicompany->enabled = false; // Global not available, disable $conf->multicompany->enabled for safety
- else
- {
+ else {
$ret = $mc->checkRight($obj->rowid, $entitytotest);
if ($ret < 0)
{
@@ -135,8 +133,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
}
}
}
- else
- {
+ else {
dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO user not found for '".$usertotest."'", LOG_NOTICE);
sleep(1);
@@ -146,8 +143,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
$_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
}
}
- else
- {
+ else {
dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO db error for '".$usertotest."' error=".$db->lasterror(), LOG_ERR);
sleep(1);
$_SESSION["dol_loginmesg"] = $db->lasterror();
diff --git a/htdocs/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php
index 3a8b274c109..9f7f5f1d81c 100644
--- a/htdocs/core/login/functions_ldap.php
+++ b/htdocs/core/login/functions_ldap.php
@@ -127,8 +127,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
return '';
}
}
- else
- {
+ else {
if ($ldapdebug) print "DEBUG: ".$ldap->error."\n"; } $ldap->close(); @@ -219,8 +218,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest) $_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword"); } } - else - { + else { /* Login failed. Return false, together with the error code and text from ** the LDAP server. The common error codes and reasons are listed below : ** (for iPlanet, other servers may differ) diff --git a/htdocs/core/login/functions_openid.php b/htdocs/core/login/functions_openid.php index a401dfd7764..c354d2d8d0e 100644 --- a/htdocs/core/login/functions_openid.php +++ b/htdocs/core/login/functions_openid.php @@ -57,8 +57,7 @@ function check_user_password_openid($usertotest, $passwordtotest, $entitytotest) $openid->SetApprovedURL($protocol.$_SERVER["HTTP_HOST"].$_SERVER["SCRIPT_NAME"]); // Send Response from OpenID server to this script $openid->Redirect(); // This will redirect user to OpenID Server } - else - { + else { $error = $openid->GetError(); return false; } @@ -96,8 +95,7 @@ function check_user_password_openid($usertotest, $passwordtotest, $entitytotest) $error = $openid->GetError(); return false; } - else - { + else { // Signature Verification Failed //echo "INVALID AUTHORIZATION"; return false; diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php index 4b4a4c54151..c58c8049c27 100644 --- a/htdocs/core/menus/standard/auguria.lib.php +++ b/htdocs/core/menus/standard/auguria.lib.php @@ -145,8 +145,7 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout { $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_mini); }*/ - else - { + else { $urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo_squarred_alpha.png'; $logoContainerAdditionalClass = ''; } @@ -411,8 +410,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t $i++; } } - else - { + else { // Should not happend. Entries are added $newmenu->add('', $langs->trans("NoJournalDefined"), 2, $user->rights->accounting->comptarapport->lire); } @@ -474,8 +472,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t { print '
'."\n";
}
- else
- {
+ else {
print '
'."\n";
}
}
@@ -539,8 +536,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
print ''."\n";
$lastlevel0 = 'greyed';
}
- else
- {
+ else {
$lastlevel0 = 'hidden';
}
if ($showmenu)
diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index 2a67d43c1e3..c654e823b5c 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -79,8 +79,7 @@ class MenuManager
$_SESSION["mainmenu"] = $mainmenu;
$_SESSION["leftmenuopened"] = "";
}
- else
- {
+ else {
// On va le chercher en session si non defini par le lien
$mainmenu = isset($_SESSION["mainmenu"]) ? $_SESSION["mainmenu"] : '';
}
@@ -97,8 +96,7 @@ class MenuManager
//$leftmenu="";
$_SESSION["leftmenuopened"] = "";
}
- else
- {
+ else {
$_SESSION["leftmenuopened"] = $leftmenu;
}
} else {
@@ -146,8 +144,7 @@ class MenuManager
if ($mode == 'top') print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
if ($mode == 'left') print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata);
}
- else
- {
+ else {
$conf->global->MAIN_SHOW_LOGO = 0;
if ($mode == 'top') print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0);
if ($mode == 'left') print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
@@ -226,8 +223,7 @@ class MenuManager
{
$lastlevel[0] = 'greyed';
}
- else
- {
+ else {
$lastlevel[0] = 'hidden';
}
}
@@ -259,8 +255,7 @@ class MenuManager
{
$relurl2 = dol_buildpath($val2['url'], 1);
}
- else
- {
+ else {
$relurl2 = $val2['url'];
}
$canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);
@@ -286,20 +281,18 @@ class MenuManager
print '>';
$lastlevel2[$val2['level']] = 'enabled';
}
- else // Not allowed but visible (greyed)
+ else // Not allowed but visible (greyed)
{
print '';
$lastlevel2[$val2['level']] = 'greyed';
}
}
- else
- {
+ else {
if ($val2['enabled']) // Allowed
{
$lastlevel2[$val2['level']] = 'enabled';
}
- else
- {
+ else {
$lastlevel2[$val2['level']] = 'greyed';
}
}
@@ -308,8 +301,7 @@ class MenuManager
{
if ($val2['enabled']) // Allowed
print '';
- else
- print '';
+ else print '';
}
print ''."\n";
}
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 3f539260856..39f94d6eb2f 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -440,8 +440,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
$mtitle .= $langs->trans($item);
}
}
- else
- {
+ else {
$mtitle = $langs->trans($smenu->title);
}
// Add item
@@ -512,8 +511,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
{
$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_mini);
}*/
- else
- {
+ else {
$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo_squarred_alpha.png';
$logoContainerAdditionalClass = '';
}
@@ -1309,8 +1307,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
$i++;
}
}
- else
- {
+ else {
// Should not happend. Entries are added
$newmenu->add('', $langs->trans("NoJournalDefined"), 2, $user->rights->accounting->comptarapport->lire);
}
@@ -1625,8 +1622,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
$newmenu->add("/product/inventory/card.php?action=create", $langs->trans("NewInventory"), 1, $user->rights->stock->creer);
$newmenu->add("/product/inventory/list.php", $langs->trans("List"), 1, $user->rights->stock->lire);
}
- else
- {
+ else {
$newmenu->add("/product/inventory/list.php?leftmenu=stock", $langs->trans("Inventory"), 0, $user->rights->stock->inventory_advance->read, '', $mainmenu, 'stock');
$newmenu->add("/product/inventory/card.php?action=create", $langs->trans("NewInventory"), 1, $user->rights->stock->inventory_advance->write);
$newmenu->add("/product/inventory/list.php", $langs->trans("List"), 1, $user->rights->stock->inventory_advance->read);
@@ -1987,8 +1983,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
{
print '
'."\n";
}
- else
- {
+ else {
print '
"; } } - else - { + else { dol_print_error($db); } } diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php index ded5d9ca2bf..eba1db92a94 100644 --- a/htdocs/supplier_proposal/list.php +++ b/htdocs/supplier_proposal/list.php @@ -359,8 +359,7 @@ if ($resql) $soc->fetch($socid); $title = $langs->trans('ListOfSupplierProposals').' - '.$soc->name; } - else - { + else { $title = $langs->trans('ListOfSupplierProposals'); } @@ -951,8 +950,7 @@ if ($resql) print $formfile->showdocuments('massfilesarea_supplier_proposal', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty); } -else -{ +else { dol_print_error($db); } diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php index 7e5b6aaf531..3f09ac541d3 100644 --- a/htdocs/support/inc.php +++ b/htdocs/support/inc.php @@ -111,13 +111,11 @@ if (!defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile) > } } } - else - { + else { $includeconferror = 'ErrorBadValueForDolibarrMainDocumentRoot'; } } - else - { + else { $includeconferror = 'ErrorBadFormatForConfFile'; } } diff --git a/htdocs/takepos/admin/bar.php b/htdocs/takepos/admin/bar.php index 2508ab56040..a33f337cc96 100644 --- a/htdocs/takepos/admin/bar.php +++ b/htdocs/takepos/admin/bar.php @@ -53,8 +53,7 @@ if (GETPOST('action', 'alpha') == 'set') $db->commit(); setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } - else - { + else { $db->rollback(); setEventMessages($langs->trans("Error"), null, 'errors'); } diff --git a/htdocs/takepos/admin/orderprinters.php b/htdocs/takepos/admin/orderprinters.php index 566f18ac1a4..f0410f812d9 100644 --- a/htdocs/takepos/admin/orderprinters.php +++ b/htdocs/takepos/admin/orderprinters.php @@ -147,8 +147,7 @@ if ($nbofentries > 0) } print ''; } -else -{ +else { print '';
print '
";
}
- else
- {
+ else {
dol_print_error($db);
}
}
@@ -395,8 +390,7 @@ if ($action != 'edit' && $action != 'create') // If not bank account yet, $acco
if ($num <= 0) print ''.$langs->trans("None").'';
print "";
}
- else
- {
+ else {
dol_print_error($db);
}
}
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index cd115dbe292..3e7b36e5189 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -295,8 +295,7 @@ if (empty($reshook)) {
header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
exit;
}
- else
- {
+ else {
$langs->load("errors");
$db->rollback();
setEventMessages($object->error, $object->errors, 'errors');
@@ -326,8 +325,7 @@ if (empty($reshook)) {
header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
exit;
}
- else
- {
+ else {
setEventMessages($object->error, $object->errors, 'errors');
}
}
@@ -429,13 +427,11 @@ if (empty($reshook)) {
{
$object->entity = 1; // all users in master entity
}
- else
- {
+ else {
$object->entity = (!GETPOST('entity', 'int') ? 0 : GETPOST('entity', 'int'));
}
}
- else
- {
+ else {
$object->entity = (!GETPOST('entity', 'int') ? 0 : GETPOST('entity', 'int'));
}
@@ -455,8 +451,7 @@ if (empty($reshook)) {
{
$object->photo = dol_sanitizeFileName($_FILES['photo']['name']);
}
- else
- {
+ else {
$error++;
$langs->load("errors");
setEventMessages($langs->trans("ErrorBadImageFormat"), null, 'errors');
@@ -472,8 +467,7 @@ if (empty($reshook)) {
$langs->load("errors");
setEventMessages($langs->trans("ErrorLoginAlreadyExists", $object->login), null, 'errors');
}
- else
- {
+ else {
setEventMessages($object->error, $object->errors, 'errors');
}
}
@@ -565,8 +559,7 @@ if (empty($reshook)) {
}
}
}
- else
- {
+ else {
if ($caneditpassword) // Case we can edit only password
{
dol_syslog("Not allowed to change fields, only password");
@@ -603,13 +596,11 @@ if (empty($reshook)) {
{
setEventMessages($langs->trans("PasswordChangedAndSentTo", $object->email), null, 'mesgs');
}
- else
- {
+ else {
setEventMessages($object->error, $object->errors, 'errors');
}
}
- else
- {
+ else {
setEventMessages($langs->trans("PasswordChangedTo", $newpassword), null, 'warnings');
}
}
@@ -666,8 +657,7 @@ if (empty($reshook)) {
}
}
}
- else
- {
+ else {
setEventMessages($ldap->error, $ldap->errors, 'errors');
}
}
@@ -765,13 +755,11 @@ if ($action == 'create' || $action == 'adduserldap')
$liste[$key] = $label;
}
}
- else
- {
+ else {
setEventMessages($ldap->error, $ldap->errors, 'errors');
}
}
- else
- {
+ else {
setEventMessages($ldap->error, $ldap->errors, 'errors');
}
@@ -822,8 +810,7 @@ if ($action == 'create' || $action == 'adduserldap')
print '';
print $ldap_lastname;
}
- else
- {
+ else {
print '';
}
print ' ';
@@ -836,8 +823,7 @@ if ($action == 'create' || $action == 'adduserldap')
print '';
print $ldap_firstname;
}
- else
- {
+ else {
print '';
}
print '';
@@ -855,8 +841,7 @@ if ($action == 'create' || $action == 'adduserldap')
print '';
print $ldap_loginsmb;
}
- else
- {
+ else {
print '';
}
print '';
@@ -887,8 +872,7 @@ if ($action == 'create' || $action == 'adduserldap')
$valuetoshow .= ($valuetoshow ? ', ' : '').''; // Dolibarr password is preffiled with LDAP known password
$valuetoshow .= preg_replace('/./i', '*', $ldap_pass);
}
- else
- {
+ else {
// We do not use a field password but a field text to show new password to use.
$valuetoshow .= ($valuetoshow ? ', ' : '').'';
}
@@ -914,8 +898,7 @@ if ($action == 'create' || $action == 'adduserldap')
print ' '.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject"');
print '';
}
- else
- {
+ else {
// PARTIAL WORKAROUND
$generated_fake_api_key = getRandomPassword(false);
print '';
@@ -1060,8 +1043,7 @@ if ($action == 'create' || $action == 'adduserldap')
print '';
print $ldap_phone;
}
- else
- {
+ else {
print '';
}
print '';
@@ -1074,8 +1056,7 @@ if ($action == 'create' || $action == 'adduserldap')
print '';
print $ldap_mobile;
}
- else
- {
+ else {
print '';
}
print '';
@@ -1088,8 +1069,7 @@ if ($action == 'create' || $action == 'adduserldap')
print '';
print $ldap_fax;
}
- else
- {
+ else {
print '';
}
print '';
@@ -1102,8 +1082,7 @@ if ($action == 'create' || $action == 'adduserldap')
print '';
print $ldap_mail;
}
- else
- {
+ else {
print '';
}
print '';
@@ -1237,8 +1216,7 @@ if ($action == 'create' || $action == 'adduserldap')
print "".$mc->select_entities($conf->entity);
print " \n";
}
- else
- {
+ else {
print '';
}
}
@@ -1358,8 +1336,7 @@ if ($action == 'create' || $action == 'adduserldap')
print "";
}
-else
-{
+else {
/* ************************************************************************** */
/* */
/* View and edition */
@@ -1411,8 +1388,7 @@ else
}
}
}
- else
- {
+ else {
$userDisabled = 1;
$statutUACF = "ACCOUNTDISABLE";
}
@@ -1430,8 +1406,7 @@ else
$title = $langs->trans("Employee");
$linkback = ''.$langs->trans("BackToList").'';
}
- else
- {
+ else {
$title = $langs->trans("User");
$linkback = '';
@@ -1503,8 +1478,7 @@ else
{
print ''.$langs->trans("LoginAccountDisableInDolibarr").' ';
}
- else
- {
+ else {
print ''.$object->login.' ';
}
print ''."\n";
@@ -1530,13 +1504,11 @@ else
{
$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').''.$langs->trans("LdapUacf_".$statutUACF, $ldap->domainFQDN).'';
}
- else
- {
+ else {
$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("PasswordOfUserInLDAP");
}
}
- else
- {
+ else {
$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("PasswordOfUserInLDAP");
}
}
@@ -1547,8 +1519,7 @@ else
if (preg_match('/dolibarr/', $dolibarr_main_authentication))
{
if ($object->pass) $valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').preg_replace('/./i', '*', $object->pass);
- else
- {
+ else {
if ($user->admin) $valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("Crypted").': '.$object->pass_indatabase_crypted;
else $valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').''.$langs->trans("Hidden").'';
}
@@ -1582,8 +1553,7 @@ else
{
print $form->textwithpicto(yn($object->admin), $langs->trans("AdministratorDesc"), 1, "admin");
}
- else
- {
+ else {
print yn($object->admin);
}
print ''."\n";
@@ -1826,8 +1796,7 @@ else
$societe->fetch($object->socid);
print $societe->getNomUrl(1, '');
}
- else
- {
+ else {
print $langs->trans("ThisUserIsNot");
}
if (!empty($object->contactid))
@@ -1855,8 +1824,7 @@ else
$adh->ref = $adh->getFullname($langs); // Force to show login instead of id
print $adh->getNomUrl(1);
}
- else
- {
+ else {
print $langs->trans("UserNotLinkedToMember");
}
print '';
@@ -1894,8 +1862,7 @@ else
$langs->load("mails");
print '';
}
- else
- {
+ else {
$langs->load("mails");
print '';
}
@@ -1907,8 +1874,7 @@ else
{
print '';
}
- else
- {
+ else {
print '';
}
}
@@ -1955,8 +1921,7 @@ else
{
print '';
}
- else
- {
+ else {
if ($user->id == $id)
{
print '';
@@ -1970,8 +1935,7 @@ else
{
print '';
}
- else
- {
+ else {
print '';
}
}
@@ -2055,8 +2019,7 @@ else
{
print $group->getNomUrl(1);
}
- else
- {
+ else {
print img_object($langs->trans("ShowGroup"), "group").' '.$group->name;
}
print '';
@@ -2067,15 +2030,13 @@ else
print img_picto($langs->trans("RemoveFromGroup"), 'unlink');
print '';
}
- else
- {
+ else {
print " ";
}
print "\n";
}
}
- else
- {
+ else {
print ''.$langs->trans("None").' ';
$nbAdmin = $user->getNbOfUsers('active', '', 1);
$nbSuperAdmin = $user->getNbOfUsers('active', 'superadmin', 1);
@@ -2276,8 +2232,7 @@ else
print ' '.$langs->trans("SuperAdministrator");
}
}
- else
- {
+ else {
$yn = yn($object->admin);
print '';
print '';
@@ -2298,8 +2253,7 @@ else
print $form->textwithpicto($type, $langs->trans("InternalExternalDesc"));
if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
}
- else
- {
+ else {
// Select mode
$type = 0;
if ($object->contactid) $type = $object->contactid;
@@ -2351,8 +2305,7 @@ else
{
print $form->select_dolusers($object->fk_user, 'fk_user', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
}
- else
- {
+ else {
print '';
$huser = new User($db);
$huser->fetch($object->fk_user);
@@ -2371,8 +2324,7 @@ else
{
print $form->select_dolusers($object->fk_user_expense_validator, 'fk_user_expense_validator', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
}
- else
- {
+ else {
print '';
$evuser = new User($db);
$evuser->fetch($object->fk_user_expense_validator);
@@ -2391,8 +2343,7 @@ else
{
print $form->select_dolusers($object->fk_user_holiday_validator, 'fk_user_holiday_validator', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
}
- else
- {
+ else {
print '';
$hvuser = new User($db);
$hvuser->fetch($object->fk_user_holiday_validator);
@@ -2461,8 +2412,7 @@ else
{
print '';
}
- else
- {
+ else {
print '';
print $object->office_phone;
}
@@ -2475,8 +2425,7 @@ else
{
print '';
}
- else
- {
+ else {
print '';
print $object->user_mobile;
}
@@ -2489,8 +2438,7 @@ else
{
print '';
}
- else
- {
+ else {
print '';
print $object->office_fax;
}
@@ -2503,8 +2451,7 @@ else
{
print '';
}
- else
- {
+ else {
print '';
print $object->email;
}
@@ -2538,8 +2485,7 @@ else
{
print '';
}
- else
- {
+ else {
print '';
print $object->openid;
}
@@ -2558,8 +2504,7 @@ else
{
print '';
}
- else
- {
+ else {
print '';
print $object->accountancy_code;
}
@@ -2632,8 +2577,7 @@ else
print ' / '.img_object($langs->trans("ShowContact"), 'contact').' '.dol_trunc($contact->getFullName($langs), 32).'';
}
}
- else
- {
+ else {
print $langs->trans("ThisUserIsNot");
}
print ' ('.$langs->trans("UseTypeFieldToChange").')';
@@ -2654,8 +2598,7 @@ else
$adh->ref = $adh->login; // Force to show login instead of id
print $adh->getNomUrl(1);
}
- else
- {
+ else {
print $langs->trans("UserNotLinkedToMember");
}
print ' ';
@@ -2675,8 +2618,7 @@ else
print "".$mc->select_entities($object->entity, 'entity', '', 0, 1, false, false, 1); // last parameter 1 means, show also a choice 0=>'all entities'
print " \n";
}
- else
- {
+ else {
print '';
}
}
@@ -2705,8 +2647,7 @@ else
$doleditor = new DolEditor('signature', $object->signature, '', 138, 'dolibarr_notes', 'In', false, true, empty($conf->global->FCKEDITOR_ENABLE_USERSIGN) ? 0 : 1, ROWS_4, '90%');
print $doleditor->Create(1);
}
- else
- {
+ else {
print dol_htmlentitiesbr($object->signature);
}
print '';
@@ -2733,8 +2674,7 @@ else
{
print '';
}
- else
- {
+ else {
print '';
print $object->job;
}
diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index 46022d066f3..54681974e04 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -289,8 +289,7 @@ class Users extends DolibarrApi
{
return $this->get($id);
}
- else
- {
+ else {
throw new RestException(500, $this->useraccount->error);
}
}
@@ -364,8 +363,7 @@ class Users extends DolibarrApi
{
$entity = (!empty($entity) ? $entity : $conf->entity);
}
- else
- {
+ else {
// When using API, action is done on entity of logged user because a user of entity X with permission to create user should not be able to
// hack the security by giving himself permissions on another entity.
$entity = (DolibarrApiAccess::$user->entity > 0 ? DolibarrApiAccess::$user->entity : $conf->entity);
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 11d0cec3654..a4daebe3b9a 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -295,17 +295,15 @@ class User extends CommonObject
{
$sql .= " WHERE u.entity IN (0,".$conf->entity.")";
}
- else
- {
+ else {
$sql .= " WHERE u.entity IS NOT NULL"; // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database
}
}
- else // The fetch was forced on an entity
+ else // The fetch was forced on an entity
{
if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
$sql .= " WHERE u.entity IS NOT NULL"; // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database
- else
- $sql .= " WHERE u.entity IN (0, ".(($entity != '' && $entity >= 0) ? $entity : $conf->entity).")"; // search in entity provided in parameter
+ else $sql .= " WHERE u.entity IN (0, ".(($entity != '' && $entity >= 0) ? $entity : $conf->entity).")"; // search in entity provided in parameter
}
if ($sid) // permet une recherche du user par son SID ActiveDirectory ou Samba
@@ -320,8 +318,7 @@ class User extends CommonObject
{
$sql .= " AND u.email = '".$this->db->escape($email)."'";
}
- else
- {
+ else {
$sql .= " AND u.rowid = ".$id;
}
$sql .= " ORDER BY u.entity ASC"; // Avoid random result when there is 2 login in 2 different entities
@@ -420,8 +417,7 @@ class User extends CommonObject
$this->db->free($result);
}
- else
- {
+ else {
$this->error = "USERNOTFOUND";
dol_syslog(get_class($this)."::fetch user not found", LOG_DEBUG);
@@ -429,8 +425,7 @@ class User extends CommonObject
return 0;
}
}
- else
- {
+ else {
$this->error = $this->db->lasterror();
return -1;
}
@@ -457,8 +452,7 @@ class User extends CommonObject
}
$this->db->free($resql);
}
- else
- {
+ else {
$this->error = $this->db->lasterror();
return -2;
}
@@ -525,8 +519,7 @@ class User extends CommonObject
return 1;
}
- else
- {
+ else {
dol_print_error($this->db);
return -1;
}
@@ -592,8 +585,7 @@ class User extends CommonObject
{
$whereforadd = 'allmodules';
}
- else
- {
+ else {
$whereforadd = "module='".$this->db->escape($allmodule)."'";
if (!empty($allperms)) $whereforadd .= " AND perms='".$this->db->escape($allperms)."'";
}
@@ -629,8 +621,7 @@ class User extends CommonObject
$i++;
}
}
- else
- {
+ else {
$error++;
dol_print_error($this->db);
}
@@ -713,8 +704,7 @@ class User extends CommonObject
{
$wherefordel = 'allmodules';
}
- else
- {
+ else {
$wherefordel = "module='".$this->db->escape($allmodule)."'";
if (!empty($allperms)) $whereforadd .= " AND perms='".$this->db->escape($allperms)."'";
}
@@ -750,8 +740,7 @@ class User extends CommonObject
$i++;
}
}
- else
- {
+ else {
$error++;
dol_print_error($this->db);
}
@@ -833,8 +822,7 @@ class User extends CommonObject
{
$sql .= " AND r.entity IN (0,".(!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) ? "1," : "").$conf->entity.")";
}
- else
- {
+ else {
$sql .= " AND ur.entity = ".$conf->entity;
}
$sql .= " AND ur.fk_user= ".$this->id;
@@ -866,8 +854,7 @@ class User extends CommonObject
if (empty($this->rights->$module->$perms->$subperms)) $this->nb_rights++;
$this->rights->$module->$perms->$subperms = 1;
}
- else
- {
+ else {
if (empty($this->rights->$module->$perms)) $this->nb_rights++;
$this->rights->$module->$perms = 1;
}
@@ -892,8 +879,7 @@ class User extends CommonObject
$sql .= " AND r.entity = ".$conf->entity;
}
}
- else
- {
+ else {
$sql .= " AND gr.entity = ".$conf->entity;
$sql .= " AND gu.entity = ".$conf->entity;
$sql .= " AND r.entity = ".$conf->entity;
@@ -926,8 +912,7 @@ class User extends CommonObject
if (empty($this->rights->$module->$perms->$subperms)) $this->nb_rights++;
$this->rights->$module->$perms->$subperms = 1;
}
- else
- {
+ else {
if (empty($this->rights->$module->$perms)) $this->nb_rights++;
// if we have already define a subperm like this $this->rights->$module->level1->level2 with llx_user_rights, we don't want override level1 because the level2 can be not define on user group
if (!is_object($this->rights->$module->$perms)) $this->rights->$module->$perms = 1;
@@ -948,8 +933,7 @@ class User extends CommonObject
// que les droits sont en cache (car tous charges) pour cet instance de user
$this->all_permissions_are_loaded = 1;
}
- else
- {
+ else {
// If module defined, we flag it as loaded into cache
$this->_tab_loaded[$moduletag] = 1;
}
@@ -993,8 +977,7 @@ class User extends CommonObject
$this->db->rollback();
return -$error;
}
- else
- {
+ else {
$this->db->commit();
return 1;
}
@@ -1133,8 +1116,7 @@ class User extends CommonObject
$this->db->commit();
return 1;
}
- else
- {
+ else {
$this->db->rollback();
return -1;
}
@@ -1200,8 +1182,7 @@ class User extends CommonObject
$this->db->rollback();
return -6;
}
- else
- {
+ else {
$sql = "INSERT INTO ".MAIN_DB_PREFIX."user (datec,login,ldap_sid,entity)";
$sql .= " VALUES('".$this->db->idate($this->datec)."','".$this->db->escape($this->login)."','".$this->db->escape($this->ldap_sid)."',".$this->db->escape($this->entity).")";
$result = $this->db->query($sql);
@@ -1253,24 +1234,21 @@ class User extends CommonObject
$this->db->commit();
return $this->id;
}
- else
- {
+ else {
//$this->error=$interface->error;
dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
$this->db->rollback();
return -3;
}
}
- else
- {
+ else {
$this->error = $this->db->lasterror();
$this->db->rollback();
return -2;
}
}
}
- else
- {
+ else {
$this->error = $this->db->lasterror();
$this->db->rollback();
return -1;
@@ -1339,16 +1317,14 @@ class User extends CommonObject
$this->db->commit();
return $this->id;
}
- else
- {
+ else {
$this->error = $this->db->error();
$this->db->rollback();
return -1;
}
}
- else
- {
+ else {
// $this->error deja positionne
dol_syslog(get_class($this)."::create_from_contact - 0");
@@ -1424,8 +1400,7 @@ class User extends CommonObject
$this->db->commit();
return $this->id;
}
- else
- {
+ else {
$this->error = $this->db->lasterror();
$this->db->rollback();
@@ -1439,8 +1414,7 @@ class User extends CommonObject
$this->db->commit();
return $this->id;
}
- else
- {
+ else {
// $this->error deja positionne
$this->db->rollback();
return -2;
@@ -1752,8 +1726,7 @@ class User extends CommonObject
$error++;
}
}
- else
- {
+ else {
$this->error = $tmpobj->error;
$this->errors = $tmpobj->errors;
$error++;
@@ -1786,15 +1759,13 @@ class User extends CommonObject
$this->db->commit();
return $nbrowsaffected;
}
- else
- {
+ else {
dol_syslog(get_class($this)."::update error=".$this->error, LOG_ERR);
$this->db->rollback();
return -1;
}
}
- else
- {
+ else {
$this->error = $this->db->lasterror();
$this->db->rollback();
return -2;
@@ -1827,8 +1798,7 @@ class User extends CommonObject
$this->datelastlogin = $now;
return 1;
}
- else
- {
+ else {
$this->error = $this->db->lasterror().' sql='.$sql;
return -1;
}
@@ -1877,8 +1847,7 @@ class User extends CommonObject
{
$sql .= ", pass = null";
}
- else
- {
+ else {
$sql .= ", pass = '".$this->db->escape($password)."'";
}
$sql .= " WHERE rowid = ".$this->id;
@@ -1912,8 +1881,7 @@ class User extends CommonObject
$error++;
}
}
- else
- {
+ else {
$this->error = $adh->error;
$error++;
}
@@ -1932,21 +1900,18 @@ class User extends CommonObject
$this->db->commit();
return $this->pass;
}
- else
- {
+ else {
$this->db->rollback();
return 0;
}
}
- else
- {
+ else {
$this->db->rollback();
dol_print_error($this->db);
return -1;
}
}
- else
- {
+ else {
// We store clear password in password temporary field.
// After receiving confirmation link, we will crypt it and store it in pass_crypted
$sql = "UPDATE ".MAIN_DB_PREFIX."user";
@@ -1959,8 +1924,7 @@ class User extends CommonObject
{
return $password;
}
- else
- {
+ else {
dol_print_error($this->db);
return -3;
}
@@ -2001,8 +1965,7 @@ class User extends CommonObject
if ($this->conf->MAIN_LANG_DEFAULT) {
$outputlangs->setDefaultLang($this->conf->MAIN_LANG_DEFAULT);
}
- else
- { // If user has not defined its own language, we used current language
+ else { // If user has not defined its own language, we used current language
$outputlangs = $langs;
}
@@ -2033,8 +1996,7 @@ class User extends CommonObject
dol_syslog(get_class($this)."::send_password changelater is off, url=".$url);
}
- else
- {
+ else {
$url = $urlwithroot.'/user/passwordforgotten.php?action=validatenewpassword&username='.urlencode($this->login)."&passwordhash=".dol_hash($password);
$mesg .= $outputlangs->transnoentitiesnoconv("RequestToResetPasswordReceived")."\n";
@@ -2072,8 +2034,7 @@ class User extends CommonObject
{
return 1;
}
- else
- {
+ else {
$langs->trans("errors");
$this->error = $langs->trans("ErrorFailedToSendPassword").' '.$mailfile->error;
return -1;
@@ -2122,8 +2083,7 @@ class User extends CommonObject
$this->db->free($resql);
return 1;
}
- else
- {
+ else {
$this->error = $this->db->error();
return -1;
}
@@ -2161,8 +2121,7 @@ class User extends CommonObject
$this->db->commit();
return 1;
}
- else
- {
+ else {
$this->db->rollback();
$this->error = $this->db->lasterror();
return -1;
@@ -2217,15 +2176,13 @@ class User extends CommonObject
$this->db->commit();
return 1;
}
- else
- {
+ else {
dol_syslog(get_class($this)."::SetInGroup ".$this->error, LOG_ERR);
$this->db->rollback();
return -2;
}
}
- else
- {
+ else {
$this->error = $this->db->lasterror();
$this->db->rollback();
return -1;
@@ -2274,15 +2231,13 @@ class User extends CommonObject
$this->db->commit();
return 1;
}
- else
- {
+ else {
dol_syslog(get_class($this)."::RemoveFromGroup ".$this->error, LOG_ERR);
$this->db->rollback();
return -2;
}
}
- else
- {
+ else {
$this->error = $this->db->lasterror();
$this->db->rollback();
return -1;
@@ -2774,8 +2729,7 @@ class User extends CommonObject
$this->db->free($result);
}
- else
- {
+ else {
dol_print_error($this->db);
}
}
@@ -2802,8 +2756,7 @@ class User extends CommonObject
$this->db->free($resql);
return $nb;
}
- else
- {
+ else {
$this->error = $this->db->error();
return -1;
}
@@ -2828,8 +2781,7 @@ class User extends CommonObject
$sql .= " WHERE entity = 0";
if ($admin >= 0) $sql .= " AND admin = ".$admin;
}
- else
- {
+ else {
$sql .= " WHERE entity IN (".getEntity('user', 0).")";
if ($limitTo == 'active') $sql .= " AND statut = 1";
if ($admin >= 0) $sql .= " AND admin = ".$admin;
@@ -2844,8 +2796,7 @@ class User extends CommonObject
$this->db->free($resql);
return $nb;
}
- else
- {
+ else {
$this->error = $this->db->lasterror();
return -1;
}
@@ -2917,8 +2868,7 @@ class User extends CommonObject
}
return $users;
}
- else
- {
+ else {
dol_print_error($this->db);
return -1;
}
@@ -2952,8 +2902,7 @@ class User extends CommonObject
}
return 1;
}
- else
- {
+ else {
dol_print_error($this->db);
return -1;
}
@@ -3023,8 +2972,7 @@ class User extends CommonObject
$i++;
}
}
- else
- {
+ else {
dol_print_error($this->db);
return -1;
}
@@ -3083,8 +3031,7 @@ class User extends CommonObject
{
$childids = $this->cache_childids[$this->id];
}
- else
- {
+ else {
// Init this->users
$this->get_full_tree();
@@ -3196,8 +3143,7 @@ class User extends CommonObject
$this->db->free($resql);
return 1;
}
- else
- {
+ else {
dol_print_error($this->db);
$this->error = $this->db->error();
return -1;
@@ -3228,8 +3174,7 @@ class User extends CommonObject
{
$modele = $conf->global->USER_ADDON_PDF;
}
- else
- {
+ else {
$modele = 'bluesky';
}
}
@@ -3272,8 +3217,7 @@ class User extends CommonObject
}
return $user_property;
}
- else
- {
+ else {
dol_print_error($this->db);
}
}
@@ -3310,13 +3254,11 @@ class User extends CommonObject
$sql .= " OR t.entity = 0)"; // Show always superadmin
}
}
- else
- {
+ else {
$sql .= " WHERE t.entity IN (".getEntity('user').")";
}
}
- else
- {
+ else {
$sql .= " WHERE 1";
}
@@ -3365,8 +3307,7 @@ class User extends CommonObject
}
return $num;
}
- else
- {
+ else {
$this->errors[] = $this->db->lasterror();
return -1;
}
diff --git a/htdocs/user/class/userbankaccount.class.php b/htdocs/user/class/userbankaccount.class.php
index 79df9d287ec..02a046a60ad 100644
--- a/htdocs/user/class/userbankaccount.class.php
+++ b/htdocs/user/class/userbankaccount.class.php
@@ -105,8 +105,7 @@ class UserBankAccount extends Account
return $this->update($user);
}
}
- else
- {
+ else {
print $this->db->error();
return 0;
}
@@ -142,8 +141,7 @@ class UserBankAccount extends Account
if (trim($this->label) != '')
$sql .= ",label = '".$this->db->escape($this->label)."'";
- else
- $sql .= ",label = NULL";
+ else $sql .= ",label = NULL";
$sql .= " WHERE rowid = ".$this->id;
$result = $this->db->query($sql);
@@ -151,8 +149,7 @@ class UserBankAccount extends Account
{
return 1;
}
- else
- {
+ else {
dol_print_error($this->db);
return 0;
}
@@ -204,8 +201,7 @@ class UserBankAccount extends Account
return 1;
}
- else
- {
+ else {
dol_print_error($this->db);
return -1;
}
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index bc5396e9f51..f56358963c9 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -155,8 +155,7 @@ class UserGroup extends CommonObject
{
$result = $this->fetchCommon(0, '', ' AND nom = \''.$this->db->escape($groupname).'\'');
}
- else
- {
+ else {
$result = $this->fetchCommon($id);
}
@@ -171,8 +170,7 @@ class UserGroup extends CommonObject
return 1;
}
- else
- {
+ else {
$this->error = $this->db->lasterror();
return -1;
}
@@ -201,8 +199,7 @@ class UserGroup extends CommonObject
{
$sql .= " AND g.entity IS NOT NULL";
}
- else
- {
+ else {
$sql .= " AND g.entity IN (0,".$conf->entity.")";
}
$sql .= " ORDER BY g.nom";
@@ -227,8 +224,7 @@ class UserGroup extends CommonObject
return $ret;
}
- else
- {
+ else {
$this->error = $this->db->lasterror();
return -1;
}
@@ -258,8 +254,7 @@ class UserGroup extends CommonObject
{
$sql .= " AND u.entity IS NOT NULL";
}
- else
- {
+ else {
$sql .= " AND u.entity IN (0,".$conf->entity.")";
}
if (!empty($excludefilter)) $sql .= ' AND ('.$excludefilter.')';
@@ -290,8 +285,7 @@ class UserGroup extends CommonObject
return $ret;
}
- else
- {
+ else {
$this->error = $this->db->lasterror();
return -1;
}
@@ -357,8 +351,7 @@ class UserGroup extends CommonObject
{
$whereforadd = 'allmodules';
}
- else
- {
+ else {
$whereforadd = "module='".$this->db->escape($allmodule)."'";
if (!empty($allperms)) $whereforadd .= " AND perms='".$this->db->escape($allperms)."'";
}
@@ -394,8 +387,7 @@ class UserGroup extends CommonObject
$i++;
}
}
- else
- {
+ else {
$error++;
dol_print_error($this->db);
}
@@ -481,8 +473,7 @@ class UserGroup extends CommonObject
{
$wherefordel = 'allmodules';
}
- else
- {
+ else {
$wherefordel = "module='".$this->db->escape($allmodule)."'";
if (!empty($allperms)) $whereforadd .= " AND perms='".$this->db->escape($allperms)."'";
}
@@ -518,8 +509,7 @@ class UserGroup extends CommonObject
$i++;
}
}
- else
- {
+ else {
$error++;
dol_print_error($this->db);
}
@@ -605,8 +595,7 @@ class UserGroup extends CommonObject
if (empty($this->rights->$module->$perms->$subperms)) $this->nb_rights++;
$this->rights->$module->$perms->$subperms = 1;
}
- else
- {
+ else {
if (empty($this->rights->$module->$perms)) $this->nb_rights++;
$this->rights->$module->$perms = 1;
}
@@ -623,8 +612,7 @@ class UserGroup extends CommonObject
// que les droits sont en cache (car tous charges) pour cet instance de group
$this->all_permissions_are_loaded = 1;
}
- else
- {
+ else {
// If module defined, we flag it as loaded into cache
$this->_tab_loaded[$moduletag] = 1;
}
@@ -902,8 +890,7 @@ class UserGroup extends CommonObject
{
$modele = $conf->global->USERGROUP_ADDON_PDF;
}
- else
- {
+ else {
$modele = 'grass';
}
}
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index c81e4068558..302e0729bb8 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -122,8 +122,7 @@ if ($id > 0)
$langs->load("errors");
print ''.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("ClickToDial")).'';
}
- else
- {
+ else {
print ' '.$form->textwithpicto($langs->trans("KeepEmptyToUseDefault").': '.$conf->global->CLICKTODIAL_URL, $langs->trans("ClickToDialUrlDesc"));
}
print '';
@@ -147,7 +146,7 @@ if ($id > 0)
print '';
}
- else // View mode
+ else // View mode
{
print '';
@@ -162,8 +161,7 @@ if ($id > 0)
$langs->load("errors");
print ''.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("ClickToDial")).'';
}
- else
- {
+ else {
print $form->textwithpicto((empty($object->clicktodial_url) ? $langs->trans("DefaultLink").': ' : '').$url, $langs->trans("ClickToDialUrlDesc"));
}
print '';
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index 2b8c67d7ae6..912675dd636 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -172,8 +172,7 @@ if ($object->id)
$param = '&id='.$object->id;
include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
}
-else
-{
+else {
accessforbidden('', 0, 1);
}
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 1cd3b3edc37..524fc25b51a 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -115,8 +115,7 @@ if (empty($reshook)) {
header("Location: ".DOL_URL_ROOT."/user/group/list.php?restore_lastsearch_values=1");
exit;
}
- else
- {
+ else {
$langs->load("errors");
setEventMessages($langs->trans('ErrorForbidden'), null, 'errors');
}
@@ -153,8 +152,7 @@ if (empty($reshook)) {
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
}
- else
- {
+ else {
$db->rollback();
$langs->load("errors");
@@ -163,8 +161,7 @@ if (empty($reshook)) {
}
}
}
- else
- {
+ else {
$langs->load("errors");
setEventMessages($langs->trans('ErrorForbidden'), null, 'errors');
}
@@ -190,14 +187,12 @@ if (empty($reshook)) {
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
}
- else
- {
+ else {
setEventMessages($edituser->error, $edituser->errors, 'errors');
}
}
}
- else
- {
+ else {
$langs->load("errors");
setEventMessages($langs->trans('ErrorForbidden'), null, 'errors');
}
@@ -232,14 +227,12 @@ if (empty($reshook)) {
setEventMessages($langs->trans("GroupModified"), null, 'mesgs');
$db->commit();
}
- else
- {
+ else {
setEventMessages($object->error, $object->errors, 'errors');
$db->rollback();
}
}
- else
- {
+ else {
$langs->load("errors");
setEventMessages($langs->trans('ErrorForbidden'), null, 'mesgs');
}
@@ -287,8 +280,7 @@ if ($action == 'create')
print "
";
@@ -557,8 +546,7 @@ else
print "".$mc->select_entities($object->entity);
print " \n";
}
- else
- {
+ else {
print '';
}
}
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index 5462167b4af..b72fc7718f9 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -84,8 +84,7 @@ if ($action == 'dolibarr2ldap')
{
setEventMessages($langs->trans("GroupSynchronized"), null, 'mesgs');
}
- else
- {
+ else {
setEventMessages($ldap->error, $ldap->errors, 'errors');
}
}
@@ -196,20 +195,17 @@ if ($result > 0)
{
print ''.$langs->trans("ErrorFailedToReadLDAP").' '.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.') ';
}
}
- else
- {
+ else {
// Do not own permission
if ($caneditperms)
{
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index 3a05bb3d640..520821ad84f 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -80,8 +80,7 @@ if (!is_array($user_arbo) && $user_arbo < 0)
{
setEventMessages($userstatic->error, $userstatic->errors, 'warnings');
}
-else
-{
+else {
// Define fulltree array
$fulltree = $user_arbo;
//var_dump($fulltree);
@@ -113,8 +112,7 @@ else
{
$entitystring = $langs->trans("AllEntities");
}
- else
- {
+ else {
$mc->getInfo($entity);
$entitystring = $mc->label;
}
@@ -197,8 +195,7 @@ else
print '';
print '';
print '
';
diff --git a/htdocs/variants/create.php b/htdocs/variants/create.php
index 55bf1c81f34..567dc902a5a 100644
--- a/htdocs/variants/create.php
+++ b/htdocs/variants/create.php
@@ -43,8 +43,7 @@ if ($_POST) {
{
header('Location: '.$backtopage);
}
- else
- {
+ else {
header('Location: '.DOL_URL_ROOT.'/variants/card.php?id='.$resid.'&backtopage='.urlencode($backtopage));
}
exit;
diff --git a/htdocs/webservices/admin/index.php b/htdocs/webservices/admin/index.php
index 819694f5041..cb0940bb61c 100644
--- a/htdocs/webservices/admin/index.php
+++ b/htdocs/webservices/admin/index.php
@@ -48,8 +48,7 @@ if ($actionsave)
$db->commit();
setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
}
- else
- {
+ else {
$db->rollback();
setEventMessages($langs->trans("Error"), null, 'errors');
}
diff --git a/htdocs/webservices/server_actioncomm.php b/htdocs/webservices/server_actioncomm.php
index 39ed3b3cdf5..10ef9cfbd7e 100644
--- a/htdocs/webservices/server_actioncomm.php
+++ b/htdocs/webservices/server_actioncomm.php
@@ -328,14 +328,12 @@ function getActionComm($authentication, $id)
'result'=>array('result_code'=>'OK', 'result_label'=>''),
'actioncomm'=>$actioncomm_result_fields);
}
- else
- {
+ else {
$error++;
$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
}
}
- else
- {
+ else {
$error++;
$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
}
@@ -389,14 +387,12 @@ function getListActionCommType($authentication)
'result'=>array('result_code'=>'OK', 'result_label'=>''),
'actioncommtypes'=>$resultarray);
}
- else
- {
+ else {
$error++;
$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
}
}
- else
- {
+ else {
$error++;
$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
}
@@ -482,8 +478,7 @@ function createActionComm($authentication, $actioncomm)
$db->commit();
$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id);
}
- else
- {
+ else {
$db->rollback();
$error++;
$errorcode = 'KO';
diff --git a/htdocs/webservices/server_category.php b/htdocs/webservices/server_category.php
index de1fb73d3c0..d7382447749 100644
--- a/htdocs/webservices/server_category.php
+++ b/htdocs/webservices/server_category.php
@@ -262,14 +262,12 @@ function getCategory($authentication, $id)
'categorie'=> $cat
);
}
- else
- {
+ else {
$error++;
$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id;
}
}
- else
- {
+ else {
$error++;
$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
}
diff --git a/htdocs/webservices/server_contact.php b/htdocs/webservices/server_contact.php
index 804cb3f7db1..023cdc1c4ac 100644
--- a/htdocs/webservices/server_contact.php
+++ b/htdocs/webservices/server_contact.php
@@ -333,14 +333,12 @@ function getContact($authentication, $id, $ref_ext)
'contact'=>$contact_result_fields
);
}
- else
- {
+ else {
$error++;
$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
}
}
- else
- {
+ else {
$error++;
$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref_ext='.$ref_ext;
}
@@ -451,8 +449,7 @@ function createContact($authentication, $contact)
$db->commit();
$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
}
- else
- {
+ else {
$db->rollback();
$error++;
$errorcode = 'KO';
@@ -584,8 +581,7 @@ function getContactsForThirdParty($authentication, $idthirdparty)
);
}
- else
- {
+ else {
$error++;
$errorcode = $db->lasterrno(); $errorlabel = $db->lasterror();
}
diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php
index 46590688f88..8b15ade0a6a 100644
--- a/htdocs/webservices/server_invoice.php
+++ b/htdocs/webservices/server_invoice.php
@@ -370,14 +370,12 @@ function getInvoice($authentication, $id = '', $ref = '', $ref_ext = '')
'lines' => $linesresp
));
}
- else
- {
+ else {
$error++;
$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
}
}
- else
- {
+ else {
$error++;
$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
}
@@ -511,8 +509,7 @@ function getInvoicesForThirdParty($authentication, $idthirdparty)
);
}
- else
- {
+ else {
$error++;
$errorcode = $db->lasterrno(); $errorlabel = $db->lasterror();
}
@@ -627,8 +624,7 @@ function createInvoice($authentication, $invoice)
$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$new_invoice->id,
'ref'=>$new_invoice->ref, 'ref_ext'=>$new_invoice->ref_ext);
}
- else
- {
+ else {
$db->rollback();
$error++;
$errorcode = 'KO';
@@ -707,14 +703,12 @@ function createInvoiceFromOrder($authentication, $id_order = '', $ref_order = ''
}
}
}
- else
- {
+ else {
$error++;
$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id_order.' nor ref='.$ref_order.' nor ref_ext='.$ref_ext_order;
}
}
- else
- {
+ else {
$error++;
$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
}
@@ -724,8 +718,7 @@ function createInvoiceFromOrder($authentication, $id_order = '', $ref_order = ''
{
$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
}
- else
- {
+ else {
$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref, 'ref_ext'=>$newobject->ref_ext);
}
diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php
index 0b22ea9aab6..7018f5fb5c8 100644
--- a/htdocs/webservices/server_order.php
+++ b/htdocs/webservices/server_order.php
@@ -473,15 +473,13 @@ function getOrder($authentication, $id = '', $ref = '', $ref_ext = '')
));
}
}
- else
- {
+ else {
$error++;
$errorcode = 'NOT_FOUND';
$errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
}
}
- else
- {
+ else {
$error++;
$errorcode = 'PERMISSION_DENIED';
$errorlabel = 'User does not have permission for this request';
@@ -640,8 +638,7 @@ function getOrdersForThirdParty($authentication, $idthirdparty)
);
}
- else
- {
+ else {
$error++;
$errorcode = $db->lasterrno(); $errorlabel = $db->lasterror();
}
@@ -786,8 +783,7 @@ function createOrder($authentication, $order)
$db->commit();
$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
}
- else
- {
+ else {
dol_syslog("Webservice server_order:: order creation or validation failed, rollback", LOG_ERR);
$db->rollback();
$error++;
@@ -848,24 +844,21 @@ function validOrder($authentication, $id = '', $id_warehouse = 0)
$outputlangs = $langs;
$order->generateDocument($order->modelpdf, $outputlangs);
}
- else
- {
+ else {
$db->rollback();
$error++;
$errorcode = 'KO';
$errorlabel = $order->error;
}
}
- else
- {
+ else {
$db->rollback();
$error++;
$errorcode = 'KO';
$errorlabel = $order->error;
}
}
- else
- {
+ else {
$db->rollback();
$error++;
$errorcode = 'KO';
@@ -877,8 +870,7 @@ function validOrder($authentication, $id = '', $id_warehouse = 0)
{
$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
}
- else
- {
+ else {
$db->commit();
$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''));
}
diff --git a/htdocs/webservices/server_other.php b/htdocs/webservices/server_other.php
index 4ae702ade15..71ee78d3c4d 100644
--- a/htdocs/webservices/server_other.php
+++ b/htdocs/webservices/server_other.php
@@ -304,8 +304,7 @@ function getDocument($authentication, $modulepart, $file, $refname = '')
'document'=>$objectret
);
}
- else
- {
+ else {
dol_syslog("File doesn't exist ".$original_file);
$errorcode = 'NOT_FOUND';
$errorlabel = '';
diff --git a/htdocs/webservices/server_payment.php b/htdocs/webservices/server_payment.php
index 38dab505bac..5145c4a3b7b 100644
--- a/htdocs/webservices/server_payment.php
+++ b/htdocs/webservices/server_payment.php
@@ -197,8 +197,7 @@ function createPayment($authentication, $payment)
$db->commit();
$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$new_payment->id);
}
- else
- {
+ else {
$db->rollback();
$error++;
$errorcode = 'KO';
diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php
index a98d8b2a6cd..68563bfab38 100644
--- a/htdocs/webservices/server_productorservice.php
+++ b/htdocs/webservices/server_productorservice.php
@@ -450,14 +450,12 @@ function getProductOrService($authentication, $id = '', $ref = '', $ref_ext = ''
'product'=>$productorservice_result_fields
);
}
- else
- {
+ else {
$error++;
$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
}
}
- else
- {
+ else {
$error++;
$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
}
@@ -613,8 +611,7 @@ function createProductOrService($authentication, $product)
$newobject->error = 'You set a different value for stock, but correction of stock count (before='.$getstockreal.', after='.$savstockreal.') fails with error '.$newobject->error;
}
}
- else
- {
+ else {
$error++;
$newobject->error = 'You set a different value for stock but we failed to find warehouse '.$product['warehouse_ref'].' to make correction.';
}
@@ -627,8 +624,7 @@ function createProductOrService($authentication, $product)
$db->commit();
$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
}
- else
- {
+ else {
$db->rollback();
$error++;
$errorcode = 'KO';
@@ -754,8 +750,7 @@ function updateProductOrService($authentication, $product)
{
$error++;
}
- else
- {
+ else {
// Update stock if stock count is provided and differs from database after creation or update
if (isset($product['stock_real']) && $product['stock_real'] != '' && !empty($conf->global->stock->enabled))
{
@@ -785,8 +780,7 @@ function updateProductOrService($authentication, $product)
$newobject->error = 'You set a different value for stock, but correction of stock count (before='.$getstockreal.', after='.$savstockreal.') fails with error '.$newobject->error;
}
}
- else
- {
+ else {
$error++;
$newobject->error = 'You set a different value for stock but we failed to find warehouse '.$product['warehouse_ref'].' to make correction.';
}
@@ -819,8 +813,7 @@ function updateProductOrService($authentication, $product)
$db->commit();
$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
}
- else
- {
+ else {
$db->rollback();
$error++;
$errorcode = 'KO';
@@ -890,8 +883,7 @@ function deleteProductOrService($authentication, $listofidstring)
$firsterror = 'Product or service with id '.$id.' not found';
break;
}
- else
- {
+ else {
$result = $newobject->delete($user);
if ($result <= 0)
{
@@ -910,8 +902,7 @@ function deleteProductOrService($authentication, $listofidstring)
//$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'listofid'=>$listofiddeleted);
$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'nbdeleted'=>count($listofiddeleted));
}
- else
- {
+ else {
$db->rollback();
$error++;
$errorcode = 'KO';
@@ -983,8 +974,7 @@ function getListOfProductsOrServices($authentication, $filterproduct)
$i++;
}
}
- else
- {
+ else {
$error++;
$errorcode = $db->lasterrno();
$errorlabel = $db->lasterror();
@@ -998,8 +988,7 @@ function getListOfProductsOrServices($authentication, $filterproduct)
'products'=>$arrayproducts
);
}
- else
- {
+ else {
$objectresp = array(
'result'=>array('result_code' => 'OK', 'result_label' => ''),
'products'=>$arrayproducts
@@ -1139,21 +1128,18 @@ function getProductsForCategory($authentication, $id, $lang = '')
'products'=> $products
);
}
- else
- {
+ else {
$errorcode = 'NORECORDS_FOR_ASSOCIATION'; $errorlabel = 'No products associated'.$sql;
$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
dol_syslog("getProductsForCategory:: ".$errorcode, LOG_DEBUG);
}
}
- else
- {
+ else {
$error++;
$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id;
}
}
- else
- {
+ else {
$error++;
$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
}
diff --git a/htdocs/webservices/server_project.php b/htdocs/webservices/server_project.php
index 5bbaaaf035a..dc8fc81db2c 100644
--- a/htdocs/webservices/server_project.php
+++ b/htdocs/webservices/server_project.php
@@ -298,8 +298,7 @@ function createProject($authentication, $project)
$error++;
}
}
- else
- {
+ else {
$error++;
}
@@ -308,16 +307,14 @@ function createProject($authentication, $project)
$db->commit();
$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
}
- else
- {
+ else {
$db->rollback();
$error++;
$errorcode = 'KO';
$errorlabel = $newobject->error;
}
}
- else
- {
+ else {
$error++;
$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
}
@@ -424,14 +421,12 @@ function getProject($authentication, $id = '', $ref = '')
'project'=>$project_result_fields
);
}
- else
- {
+ else {
$error++;
$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref;
}
}
- else
- {
+ else {
$error++;
$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
}
diff --git a/htdocs/webservices/server_supplier_invoice.php b/htdocs/webservices/server_supplier_invoice.php
index 78a00ced40e..ecf2c51fd1f 100644
--- a/htdocs/webservices/server_supplier_invoice.php
+++ b/htdocs/webservices/server_supplier_invoice.php
@@ -303,14 +303,12 @@ function getSupplierInvoice($authentication, $id = '', $ref = '', $ref_ext = '')
));
}
- else
- {
+ else {
$error++;
$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
}
}
- else
- {
+ else {
$error++;
$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
}
@@ -441,8 +439,7 @@ function getSupplierInvoicesForThirdParty($authentication, $idthirdparty)
);
}
- else
- {
+ else {
$error++;
$errorcode = $db->lasterrno(); $errorlabel = $db->lasterror();
}
diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index d69b481323e..1e9f8355d52 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -378,14 +378,12 @@ function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
'result'=>array('result_code'=>'OK', 'result_label'=>''),
'thirdparty'=>$thirdparty_result_fields);
}
- else
- {
+ else {
$error++;
$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
}
}
- else
- {
+ else {
$error++;
$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
}
@@ -515,8 +513,7 @@ function createThirdParty($authentication, $thirdparty)
$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
}
- else
- {
+ else {
$db->rollback();
$error++;
$errorcode = 'KO';
@@ -750,8 +747,7 @@ function getListOfThirdParties($authentication, $filterthirdparty)
$i++;
}
}
- else
- {
+ else {
$error++;
$errorcode = $db->lasterrno();
$errorlabel = $db->lasterror();
@@ -765,8 +761,7 @@ function getListOfThirdParties($authentication, $filterthirdparty)
'thirdparties'=>$arraythirdparties
);
}
- else
- {
+ else {
$objectresp = array(
'result'=>array('result_code' => 'OK', 'result_label' => ''),
'thirdparties'=>$arraythirdparties
@@ -828,8 +823,7 @@ function deleteThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''));
}
- else
- {
+ else {
$db->rollback();
$error++;
$errorcode = 'KO';
@@ -837,14 +831,12 @@ function deleteThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
dol_syslog("Function: deleteThirdParty cant delete");
}
}
- else
- {
+ else {
$error++;
$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
}
}
- else
- {
+ else {
$error++;
$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
}
diff --git a/htdocs/webservices/server_user.php b/htdocs/webservices/server_user.php
index 8793d2f02fa..c37e920f61d 100644
--- a/htdocs/webservices/server_user.php
+++ b/htdocs/webservices/server_user.php
@@ -372,14 +372,12 @@ function getUser($authentication, $id, $ref = '', $ref_ext = '')
)
);
}
- else
- {
+ else {
$error++;
$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
}
}
- else
- {
+ else {
$error++;
$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
}
@@ -426,8 +424,7 @@ function getListOfGroups($authentication)
{
$sql .= " WHERE g.entity IS NOT NULL";
}
- else
- {
+ else {
$sql .= " WHERE g.entity IN (0,".$conf->entity.")";
}
$sql .= " GROUP BY g.rowid, g.nom, g.entity, g.datec";
@@ -444,8 +441,7 @@ function getListOfGroups($authentication)
$i++;
}
}
- else
- {
+ else {
$error++;
$errorcode = $db->lasterrno();
$errorlabel = $db->lasterror();
@@ -459,8 +455,7 @@ function getListOfGroups($authentication)
'groups'=>$arraygroups
);
}
- else
- {
+ else {
$objectresp = array(
'result'=>array('result_code' => 'OK', 'result_label' => ''),
'groups'=>$arraygroups
@@ -526,8 +521,7 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
$error++;
$errorcode = 'ALREADY_EXIST'; $errorlabel = 'Object not create : company or contact exists '.$thirdpartywithuser['email'];
}
- else
- {
+ else {
$db->begin();
/*
* Company creation
@@ -633,14 +627,12 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
if ($thirdpartywithuser['group_id'] > 0)
$edituser->SetInGroup($thirdpartywithuser['group_id'], $conf->entity);
}
- else
- {
+ else {
$error++;
$errorcode = 'NOT_CREATE'; $errorlabel = 'Object not create : '.$edituser->error;
}
}
- else
- {
+ else {
$error++;
$errorcode = 'NOT_CREATE'; $errorlabel = 'Object not create : '.$contact->error;
}
@@ -651,22 +643,19 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
$error = 0;
}
}
- else
- {
+ else {
$error++;
$errors = ($thirdparty->error ? array($thirdparty->error) : $thirdparty->errors);
}
}
}
- else
- {
+ else {
// retour creation KO
$error++;
$errorcode = 'NOT_CREATE'; $errorlabel = 'Object not create';
}
}
- else
- {
+ else {
$error++;
$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
}
@@ -732,20 +721,17 @@ function setUserPassword($authentication, $shortuser)
'groups'=>$arraygroups
);
}
- else
- {
+ else {
$error++;
$errorcode = 'NOT_MODIFIED'; $errorlabel = 'Error when changing password';
}
}
- else
- {
+ else {
$error++;
$errorcode = 'NOT_FOUND'; $errorlabel = 'User not found';
}
}
- else
- {
+ else {
$error++;
$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
}
'."\n";
}
}
@@ -2052,8 +2047,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
print ''."\n";
$lastlevel0 = 'greyed';
}
- else
- {
+ else {
$lastlevel0 = 'hidden';
}
if ($showmenu)
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index 5276a509ae5..2d62f9f7275 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -78,8 +78,7 @@ class MenuManager
$_SESSION["mainmenu"] = $mainmenu;
$_SESSION["leftmenuopened"] = "";
}
- else
- {
+ else {
// On va le chercher en session si non defini par le lien
$mainmenu = isset($_SESSION["mainmenu"]) ? $_SESSION["mainmenu"] : '';
}
@@ -96,8 +95,7 @@ class MenuManager
//$leftmenu="";
$_SESSION["leftmenuopened"] = "";
}
- else
- {
+ else {
$_SESSION["leftmenuopened"] = $leftmenu;
}
} else {
@@ -147,8 +145,7 @@ class MenuManager
if ($mode == 'top') print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
if ($mode == 'left') print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata);
}
- else
- {
+ else {
$conf->global->MAIN_SHOW_LOGO = 0;
if ($mode == 'top') print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0);
if ($mode == 'left') print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
@@ -231,8 +228,7 @@ class MenuManager
{
$lastlevel[0] = 'greyed';
}
- else
- {
+ else {
$lastlevel[0] = 'hidden';
}
}
@@ -264,8 +260,7 @@ class MenuManager
{
$relurl2 = dol_buildpath($val2['url'], 1);
}
- else
- {
+ else {
$relurl2 = $val2['url'];
}
$canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);
@@ -291,20 +286,18 @@ class MenuManager
print '>';
$lastlevel2[$val2['level']] = 'enabled';
}
- else // Not allowed but visible (greyed)
+ else // Not allowed but visible (greyed)
{
print '';
$lastlevel2[$val2['level']] = 'greyed';
}
}
- else
- {
+ else {
if ($val2['enabled']) // Allowed
{
$lastlevel2[$val2['level']] = 'enabled';
}
- else
- {
+ else {
$lastlevel2[$val2['level']] = 'greyed';
}
}
@@ -313,8 +306,7 @@ class MenuManager
{
if ($val2['enabled']) // Allowed
print '';
- else
- print '';
+ else print '';
}
print ''."\n";
}
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 923f4e84965..2b2a000fa3b 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -231,8 +231,7 @@ class MenuManager
{
$lastlevel[0] = 'greyed';
}
- else
- {
+ else {
$lastlevel[0] = 'hidden';
}
}
@@ -282,20 +281,18 @@ class MenuManager
print '>';
$lastlevel2[$val2['level']] = 'enabled';
}
- else // Not allowed but visible (greyed)
+ else // Not allowed but visible (greyed)
{
print '';
$lastlevel2[$val2['level']] = 'greyed';
}
}
- else
- {
+ else {
if ($val2['enabled']) // Allowed
{
$lastlevel2[$val2['level']] = 'enabled';
}
- else
- {
+ else {
$lastlevel2[$val2['level']] = 'greyed';
}
}
@@ -376,8 +373,7 @@ class MenuManager
{
print '
"; } -else -{ +else { dol_print_error($db); } @@ -384,8 +383,7 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa print "
'."\n";
}
- else
- {
+ else {
print ''; // End comment-description
@@ -125,8 +124,7 @@ if (!empty($object->comments))
print '';
}
- else
- {
+ else {
if ($fk_user == $user->id || $user->admin == 1)
{
print '';
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 7e2dc1f420e..6087ca6e906 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -52,8 +52,7 @@ if ($action == 'presend')
{
$fileparams = dol_most_recent_file($diroutput.'/'.get_exdir($object->id, 2, 0, 0, $object, $object->element).$ref, preg_quote($ref, '/').'([^\-])+');
}
- else
- {
+ else {
$fileparams = dol_most_recent_file($diroutput.'/'.$ref, preg_quote($ref, '/').'[^\-]+');
}
@@ -104,8 +103,7 @@ if ($action == 'presend')
{
$fileparams = dol_most_recent_file($diroutput.'/'.get_exdir($object->id, 2, 0, 0, $object, $object->element).$ref, preg_quote($ref, '/').'([^\-])+');
}
- else
- {
+ else {
$fileparams = dol_most_recent_file($diroutput.'/'.$ref, preg_quote($ref, '/').'[^\-]+');
}
@@ -161,8 +159,7 @@ if ($action == 'presend')
{
$liste['thirdparty'] = $object->getFullName($outputlangs)." <".$object->email.">";
}
- else
- {
+ else {
if (is_object($object->thirdparty))
{
foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value) {
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index e9f881accd2..0c1931d480f 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -178,8 +178,7 @@ foreach (array('internal', 'external') as $source)
{
$contactlist = $objectsrc->liste_contact(-1, $source);
}
- else
- {
+ else {
$contactlist = $object->liste_contact(-1, $source);
}
diff --git a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
index 0d2949b4e24..efb89043b6b 100644
--- a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
@@ -36,8 +36,7 @@ if (!empty($extrafieldsobjectkey)) // $extrafieldsobject is the $object->table_e
}
$value = $datenotinstring;
}
- else
- {
+ else {
$value = $obj->$tmpkey;
}
// If field is a computed field, we make computation to get value
diff --git a/htdocs/core/tpl/extrafields_list_search_input.tpl.php b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
index d6ebb8b919f..b3512136a10 100644
--- a/htdocs/core/tpl/extrafields_list_search_input.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
@@ -39,8 +39,7 @@ if (!empty($extrafieldsobjectkey)) // $extrafieldsobject is the $object->table_e
// TODO
// Use showInputField in a particular manner to have input with a comparison operator, not input for a specific value date-hour-minutes
}
- else
- {
+ else {
// for the type as 'checkbox', 'chkbxlst', 'sellist' we should use code instead of id (example: I declare a 'chkbxlst' to have a link with dictionnairy, I have to extend it with the 'code' instead 'rowid')
$morecss = '';
if (in_array($typeofextrafield, array('link', 'sellist'))) $morecss = 'maxwidth200';
diff --git a/htdocs/core/tpl/extrafields_list_search_title.tpl.php b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
index 9a83cbb42aa..169dd34fee1 100644
--- a/htdocs/core/tpl/extrafields_list_search_title.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
@@ -27,8 +27,7 @@ if (!empty($extrafieldsobjectkey)) // $extrafieldsobject is the $object->table_e
if ($extrafields->attributes[$extrafieldsobjectkey]['type'][$key] == 'separate') {
print '';
print '';
}
-else
-{
+else {
print '';
print '
';
print '';
@@ -178,7 +177,7 @@ if (empty($action) || $action == 'editfile' || $action == 'file_manager' || preg
print ' ';
}
- else // Show filtree when ajax is disabled (rare)
+ else // Show filtree when ajax is disabled (rare)
{
print '';
diff --git a/htdocs/core/tpl/list_print_total.tpl.php b/htdocs/core/tpl/list_print_total.tpl.php
index 33be5fb99d1..f4f6974ac08 100644
--- a/htdocs/core/tpl/list_print_total.tpl.php
+++ b/htdocs/core/tpl/list_print_total.tpl.php
@@ -15,8 +15,7 @@ if (isset($totalarray['pos']))
{
$i++;
if (!empty($totalarray['pos'][$i])) print ' '.price($totalarray['val'][$totalarray['pos'][$i]]).' ';
- else
- {
+ else {
if ($i == 1)
{
if ($num < $limit) print ''.$langs->trans("Total").' ';
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 97bece99852..e0245175768 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -254,8 +254,7 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/', $conf->fil
$url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;
if (!empty($url)) print ''.$langs->trans("LoginUsingOpenID").'';
- else
- {
+ else {
$langs->load("errors");
print ''.$langs->trans("ErrorOpenIDSetupNotComplete", 'MAIN_AUTHENTICATION_OPENID_URL').'';
}
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index 492590c65e4..c507144b151 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -99,8 +99,7 @@ if ($massaction == 'presend')
$fuser->fetch($thirdpartyid);
$liste['thirdparty'] = $fuser->getFullName($langs)." <".$fuser->email.">";
}
- else
- {
+ else {
$soc = new Societe($db);
$soc->fetch($thirdpartyid);
foreach ($soc->thirdparty_and_contact_email_array(1) as $key => $value) {
@@ -159,8 +158,7 @@ if ($massaction == 'presend')
print ' - '.$langs->trans("GoBack").'';
$arrayofmassactions = array();
}
- else
- {
+ else {
print $formmail->get_form();
}
diff --git a/htdocs/core/tpl/object_discounts.tpl.php b/htdocs/core/tpl/object_discounts.tpl.php
index 8af029ce071..10db8476bef 100644
--- a/htdocs/core/tpl/object_discounts.tpl.php
+++ b/htdocs/core/tpl/object_discounts.tpl.php
@@ -43,8 +43,7 @@ if ($fixedDiscount > 0)
$translationKey = (!empty($discount_type)) ? 'HasRelativeDiscountFromSupplier' : 'CompanyHasRelativeDiscount';
print $langs->trans($translationKey, $fixedDiscount).'.';
}
-else
-{
+else {
$translationKey = (!empty($discount_type)) ? 'HasNoRelativeDiscountFromSupplier' : 'CompanyHasNoRelativeDiscount';
print $langs->trans($translationKey).'.';
}
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 0fb1aff011d..baa57c7d1c9 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -136,8 +136,7 @@ if ($nolinesbefore) {
print '';
if ($conf->global->MARGIN_TYPE == "1")
echo $langs->trans('BuyingPrice');
- else
- echo $langs->trans('CostPrice');
+ else echo $langs->trans('CostPrice');
echo ' ';
if (!empty($conf->global->DISPLAY_MARGIN_RATES)) echo ''.$langs->trans('MarginRate').' ';
if (!empty($conf->global->DISPLAY_MARK_RATES)) echo ''.$langs->trans('MarkRate').' ';
@@ -187,8 +186,7 @@ if ($nolinesbefore) {
echo '';
echo ' ';
}
- else
- {
+ else {
echo '';
// Show type selector
if ($forceall >= 0)
@@ -214,8 +212,7 @@ if ($nolinesbefore) {
elseif ((empty($conf->product->enabled) && !empty($conf->service->enabled)) || ($object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS))) echo $langs->trans('PredefinedServicesToSell');
else echo $langs->trans('PredefinedProductsAndServicesToSell');
}
- else
- {
+ else {
if (!empty($conf->product->enabled) && empty($conf->service->enabled)) echo $langs->trans('PredefinedProductsToPurchase');
elseif (empty($conf->product->enabled) && !empty($conf->service->enabled)) echo $langs->trans('PredefinedServicesToPurchase');
else echo $langs->trans('PredefinedProductsAndServicesToPurchase');
@@ -232,8 +229,7 @@ if ($nolinesbefore) {
// hide products in closed warehouse, but show products for internal transfer
$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, 'warehouseopen,warehouseinternal', GETPOST('combinations', 'array'));
}
- else
- {
+ else {
$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, '', GETPOST('combinations', 'array'));
}
if (!empty($conf->global->MAIN_AUTO_OPEN_SELECT2_ON_FOCUS_FOR_CUSTOMER_PRODUCTS))
@@ -255,8 +251,7 @@ if ($nolinesbefore) {
array('remise_percent' => 'discount') // html id tags that will be edited with each ajax json response key
);
@@ -449,8 +443,7 @@ if ((!empty($conf->service->enabled) || ($object->element == 'contrat')) && $dat
print ' '.$langs->trans("DateEndPlanned").' ';
print $form->selectDate($date_end, "date_end", $usehm, $usehm, 1, "addproduct");
}
- else
- {
+ else {
print $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' ';
print $form->selectDate($date_start, 'date_start', empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 0 : 1, empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 0 : 1, 1, "addproduct", 1, 0);
print ' '.$langs->trans('to').' ';
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index d316afb6966..8957021d359 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -231,8 +231,7 @@ $coldisplay++;
// if credit note, dont allow to modify margin
if ($line->subprice < 0)
echo ''.$margin_rate.'% ';
- else
- echo '% ';
+ else echo '% ';
$coldisplay++;
}
elseif (!empty($conf->global->DISPLAY_MARK_RATES))
@@ -241,8 +240,7 @@ $coldisplay++;
// if credit note, dont allow to modify margin
if ($line->subprice < 0)
echo ''.$mark_rate.'% ';
- else
- echo '% ';
+ else echo '% ';
$coldisplay++;
}
}
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 8849020b885..34f78ae7fcc 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -111,22 +111,19 @@ if (($line->info_bits & 2) == 2) {
$discount->fetch($line->fk_remise_except);
print ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
}
- else
- {
+ else {
print ($txt ? ' - ' : '').dol_htmlentitiesbr($line->description);
}
}
}
-else
-{
+else {
$format = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE ? 'dayhour' : 'day';
if ($line->fk_product > 0)
{
print $form->textwithtooltip($text, $description, 3, '', '', $i, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
}
- else
- {
+ else {
$type = (!empty($line->product_type) ? $line->product_type : $line->fk_product_type);
if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
else $text = img_object($langs->trans('Product'), 'product');
@@ -178,8 +175,7 @@ if ($user->rights->fournisseur->lire && $line->fk_fournprice > 0)
{
print $productfourn->getNomUrl();
}
- else
- {
+ else {
print $productfourn->ref_supplier;
}
}
diff --git a/htdocs/core/tpl/resource_view.tpl.php b/htdocs/core/tpl/resource_view.tpl.php
index 2680a763a59..3e92af33a4d 100644
--- a/htdocs/core/tpl/resource_view.tpl.php
+++ b/htdocs/core/tpl/resource_view.tpl.php
@@ -50,8 +50,7 @@ if ((array) $linked_resources && count($linked_resources) > 0)
print '';
print '';
}
- else
- {
+ else {
$class = '';
if ($linked_resource['rowid'] == GETPOST('lineid'))
$class = 'highlight';
diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php
index fceb1552f0b..591939c6156 100644
--- a/htdocs/core/triggers/interface_20_all_Logevents.class.php
+++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php
@@ -203,8 +203,7 @@ class InterfaceLogevents extends DolibarrTriggers
{
return 1;
}
- else
- {
+ else {
$error = "Failed to insert security event: ".$event->error;
$this->errors[] = $error;
$this->error = $error;
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 49939277f49..46a5df282d2 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -812,8 +812,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$tmpuser->fetch($object->oldcopy->fk_user_assign);
$object->actionmsg .= "\n".$langs->transnoentities("OldUser").': '.$tmpuser->getFullName($langs);
}
- else
- {
+ else {
$object->actionmsg .= "\n".$langs->transnoentities("OldUser").': '.$langs->trans("None");
}
if ($object->fk_user_assign > 0)
@@ -822,14 +821,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
$tmpuser->fetch($object->fk_user_assign);
$object->actionmsg .= "\n".$langs->transnoentities("NewUser").': '.$tmpuser->getFullName($langs);
}
- else
- {
+ else {
$object->actionmsg .= "\n".$langs->transnoentities("NewUser").': '.$langs->trans("None");
}
$object->sendtoid = 0;
}
// TODO Merge all previous cases into this generic one
- else // $action = BILL_DELETE, TICKET_CREATE, TICKET_MODIFY, TICKET_DELETE, ...
+ else // $action = BILL_DELETE, TICKET_CREATE, TICKET_MODIFY, TICKET_DELETE, ...
{
// Note: We are here only if $conf->global->MAIN_AGENDA_ACTIONAUTO_action is on (tested at begining of this function).
// Note that these key can be set in agenda setup, only if defined into c_action_trigger
@@ -867,8 +865,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
{
if (count($object->sendtoid) == 1) $contactforaction->fetch(reset($object->sendtoid));
}
- else
- {
+ else {
if ($object->sendtoid > 0) $contactforaction->fetch($object->sendtoid);
}
// Set societeforaction.
@@ -952,8 +949,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$_SESSION['LAST_ACTION_CREATED'] = $ret;
return 1;
}
- else
- {
+ else {
$this->error = "Failed to insert event : ".$actioncomm->error." ".join(',', $actioncomm->errors);
$this->errors = $actioncomm->errors;
diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
index 2135f463ca7..7740191c94b 100644
--- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -143,8 +143,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
$this->errors = $b->errors;
return -1;
}
- else
- {
+ else {
return 1;
}
}
diff --git a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
index be5465c06f2..ce9e156883d 100644
--- a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
@@ -72,8 +72,7 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
$this->errors = $object->context['linkto']->errors;
$return = -1;
}
- else
- {
+ else {
$return = 1;
}
@@ -90,8 +89,7 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
$this->errors = $object->context['unlinkoff']->errors;
$return = -1;
}
- else
- {
+ else {
$return = 1;
}
@@ -110,8 +108,7 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
if (!empty($object->error)) $this->errors[] = $object->error;
$return = -1;
}
- else
- {
+ else {
$return = 1;
}
@@ -133,8 +130,7 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
if (!empty($object->oldcopy->error)) $this->errors[] = $object->oldcopy->error;
$return = -1;
}
- else
- {
+ else {
$return = 1;
}
}
@@ -145,8 +141,7 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
if (!empty($object->error)) $this->errors[] = $object->error;
$return = -1;
}
- else
- {
+ else {
$return = 1;
}
}
@@ -165,8 +160,7 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
if (!empty($object->error)) $this->errors[] = $object->error;
$return = -1;
}
- else
- {
+ else {
$return = 1;
}
diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index 6bd33c5b2f9..b3625c09e47 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -171,8 +171,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
$ok = 1;
}
- else
- {
+ else {
$this->error = $userstat->error;
$this->errors = $userstat->errors;
}
diff --git a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
index e6c2df36ee1..303f4a523ad 100644
--- a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
+++ b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
@@ -178,8 +178,7 @@ class InterfaceStripe extends DolibarrTriggers
$customer->createTaxId($customer->id, array('type'=>'eu_vat', 'value'=>$vatcleaned));
}
}
- else
- {
+ else {
$taxids = $customer->allTaxIds($customer->id);
if (is_array($taxids->data))
{
diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index 5c618b089a3..4ac9d00ca53 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -118,8 +118,7 @@ if ($_SERVER['PHP_SELF'] != DOL_URL_ROOT.'/website/index.php') // If we browsing
header("Location: ".DOL_URL_ROOT.'/public/website/index.php?website='.$websitekey.'&pageid='.$newpageid.'&l='.GETPOST('l', 'aZ09'));
exit;
}
- else
- {
+ else {
$newpageref = $obj->pageurl;
header("Location: ".$newpageref.'.php?l='.GETPOST('l', 'aZ09'));
exit;
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index a8bca51dda3..f20ac732fd4 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -137,8 +137,7 @@ if ($action == "setlive")
if ($res > 0) {
setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
}
- else
- {
+ else {
setEventMessages($langs->trans("Error"), null, 'errors');
}
}
@@ -238,15 +237,13 @@ if (empty($conf->stripeconnect->enabled))
print '';
print img_picto($langs->trans("Activated"), 'switch_on');
}
- else
- {
+ else {
print '';
print img_picto($langs->trans("Disabled"), 'switch_off');
}
//print $endpoint;
}
- else
- {
+ else {
print img_picto($langs->trans("inactive"), 'statut5');
}
}
@@ -311,22 +308,19 @@ if (empty($conf->stripeconnect->enabled))
print '';
print img_picto($langs->trans("Activated"), 'switch_on');
}
- else
- {
+ else {
print '';
print img_picto($langs->trans("Disabled"), 'switch_off');
}
//print $endpoint;
}
- else
- {
+ else {
print img_picto($langs->trans("inactive"), 'statut5');
}
}
print ''.$langs->trans("StripeConnect").' ';
print ''.$langs->trans("StripeConnect_Mode").' '.$langs->trans("Total").' '.$total.'
';
print '';
@@ -178,7 +177,7 @@ if (empty($action) || $action == 'editfile' || $action == 'file_manager' || preg
print '"; } -else -{ +else { dol_print_error($db); } @@ -384,8 +383,7 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa print "
"; } } - else - { + else { dol_print_error($db); } } diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php index ded5d9ca2bf..eba1db92a94 100644 --- a/htdocs/supplier_proposal/list.php +++ b/htdocs/supplier_proposal/list.php @@ -359,8 +359,7 @@ if ($resql) $soc->fetch($socid); $title = $langs->trans('ListOfSupplierProposals').' - '.$soc->name; } - else - { + else { $title = $langs->trans('ListOfSupplierProposals'); } @@ -951,8 +950,7 @@ if ($resql) print $formfile->showdocuments('massfilesarea_supplier_proposal', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty); } -else -{ +else { dol_print_error($db); } diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php index 7e5b6aaf531..3f09ac541d3 100644 --- a/htdocs/support/inc.php +++ b/htdocs/support/inc.php @@ -111,13 +111,11 @@ if (!defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile) > } } } - else - { + else { $includeconferror = 'ErrorBadValueForDolibarrMainDocumentRoot'; } } - else - { + else { $includeconferror = 'ErrorBadFormatForConfFile'; } } diff --git a/htdocs/takepos/admin/bar.php b/htdocs/takepos/admin/bar.php index 2508ab56040..a33f337cc96 100644 --- a/htdocs/takepos/admin/bar.php +++ b/htdocs/takepos/admin/bar.php @@ -53,8 +53,7 @@ if (GETPOST('action', 'alpha') == 'set') $db->commit(); setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } - else - { + else { $db->rollback(); setEventMessages($langs->trans("Error"), null, 'errors'); } diff --git a/htdocs/takepos/admin/orderprinters.php b/htdocs/takepos/admin/orderprinters.php index 566f18ac1a4..f0410f812d9 100644 --- a/htdocs/takepos/admin/orderprinters.php +++ b/htdocs/takepos/admin/orderprinters.php @@ -147,8 +147,7 @@ if ($nbofentries > 0) } print ''; } -else -{ +else { print '
| '.img_picto_common('', 'treemenu/branchbottom.gif').' | '; print ''; @@ -177,8 +176,7 @@ if ($nbofentries > 0) } print ' | |||||||||||||||
| '.$langs->trans("None").''; print " | |||||||||||||||
';
echo '';
}
- else
- {
+ else {
echo '| ".$mc->select_entities($conf->entity); print " | \n"; } - else - { + else { print ''; } } @@ -318,8 +310,7 @@ if ($action == 'create') /* Visu et edition */ /* */ /* ************************************************************************** */ -else -{ +else { if ($id) { $res = $object->fetch_optionals(); @@ -488,15 +479,13 @@ else print img_picto($langs->trans("RemoveFromGroup"), 'unlink'); print ''; } - else - { + else { print "-"; } print "\n"; } } - else - { + else { print '|||||
| '.$langs->trans("None").' |
| '.img_picto_common('', 'treemenu/branchbottom.gif').' | '; diff --git a/htdocs/user/home.php b/htdocs/user/home.php index 4c46c502acc..cec26f72dcc 100644 --- a/htdocs/user/home.php +++ b/htdocs/user/home.php @@ -170,8 +170,7 @@ if ($resql) { print $companystatic->getNomUrl(1); } - else - { + else { print $langs->trans("InternalUser"); } if ($obj->ldap_sid) @@ -188,8 +187,7 @@ if ($resql) { $entitystring = $langs->trans("AllEntities"); } - else - { + else { $mc->getInfo($entity); $entitystring = $mc->label; } @@ -210,8 +208,7 @@ if ($resql) $db->free($resql); } -else -{ +else { dol_print_error($db); } @@ -229,8 +226,7 @@ if ($canreadperms) { $sql .= " WHERE g.entity IS NOT NULL"; } - else - { + else { $sql .= " WHERE g.entity IN (0,".$conf->entity.")"; } $sql .= $db->order("g.datec", "DESC"); @@ -284,8 +280,7 @@ if ($canreadperms) $db->free($resql); } - else - { + else { dol_print_error($db); } } diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php index 71410eb223a..674ef0f64b6 100644 --- a/htdocs/user/ldap.php +++ b/htdocs/user/ldap.php @@ -114,8 +114,7 @@ if ($object->ldap_sid) { print ''.$langs->trans("LoginAccountDisableInDolibarr").' | '; } -else -{ +else { print ''.$object->login.' | '; } print '|||||
| '.$langs->trans("ErrorFailedToReadLDAP").' | |||||||
| '.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.') | '.$langs->trans("LoginAccountDisableInDolibarr").' | '; } - else - { + else { print ''.$object->login.' | '; } print ''."\n"; @@ -228,8 +225,7 @@ if ($result > 0) { print ' <'.$object->email.'>'; } - else - { + else { $langs->load("errors"); print ' '.img_warning().' '.$langs->trans("ErrorBadEMail", $object->email); } @@ -244,8 +240,7 @@ if ($result > 0) print ''; print ''; } - else - { + else { print ' | ||||
| '; print $langs->trans("YouMustAssignUserMailFirst"); print ' | '; } } - else - { + else { // Do not own permission if ($caneditperms) { diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php index 15e019dd311..f29cc49f35b 100644 --- a/htdocs/variants/combinations.php +++ b/htdocs/variants/combinations.php @@ -106,8 +106,7 @@ if ($_POST) { if (!$features) { setEventMessages($langs->trans('ErrorFieldsRequired'), null, 'errors'); } - else - { + else { $reference = trim($reference); if (empty($reference)) { $reference = false; @@ -361,8 +360,7 @@ if (!empty($id) || !empty($ref)) { print $object->weight." ".measuringUnitString(0, "weight", $object->weight_units); } - else - { + else { print ' '; } print "\n"; @@ -628,8 +626,7 @@ if (!empty($id) || !empty($ref)) print ''; } - else - { + else { if ($action === 'delete') { if ($prodcomb->fetch($valueid) > 0) { $prodstatic->fetch($prodcomb->fk_product_child); @@ -801,8 +798,7 @@ if (!empty($id) || !empty($ref)) print ''; } } - else - { + else { print ' | ||||||
| '.$langs->trans("None").' | |||||||