@@ -244,7 +244,7 @@ |
||
| 244 | 244 | |
| 245 | 245 | $this->id = $obj->rowid; |
| 246 | 246 | $this->ref = $obj->rowid; |
| 247 | - $this->date_start = $this->db->jdate($obj->date_start); |
|
| 247 | + $this->date_start = $this->db->jdate($obj->date_start); |
|
| 248 | 248 | $this->date_end = $this->db->jdate($obj->date_end); |
| 249 | 249 | $this->label = $obj->label; |
| 250 | 250 | $this->statut = $obj->status; |
@@ -57,7 +57,7 @@ |
||
| 57 | 57 | //print $object->id.' - '.$object->module.' - '.$object->element.' - '.$object->table_element.' - '.$usesublevelpermission."\n"; |
| 58 | 58 | |
| 59 | 59 | // Security check |
| 60 | -$result = restrictedArea($user, $object->module, $object, $object->table_element, $usesublevelpermission, 'fk_soc', 'rowid', 0, 1); // Call with mode return |
|
| 60 | +$result = restrictedArea($user, $object->module, $object, $object->table_element, $usesublevelpermission, 'fk_soc', 'rowid', 0, 1); // Call with mode return |
|
| 61 | 61 | if (!$result) { |
| 62 | 62 | httponly_accessforbidden('Not allowed by restrictArea'); |
| 63 | 63 | } |
@@ -93,7 +93,7 @@ |
||
| 93 | 93 | $sql .= " WHERE u.entity IN (".getEntity('adherent').")"; |
| 94 | 94 | $sql .= " AND u.statut = ".Adherent::STATUS_VALIDATED; |
| 95 | 95 | $sql .= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], 0); |
| 96 | - $sql .= " ORDER BY daya ASC"; // We want to have date of the month sorted by the day without taking into consideration the year |
|
| 96 | + $sql .= " ORDER BY daya ASC"; // We want to have date of the month sorted by the day without taking into consideration the year |
|
| 97 | 97 | $sql .= $this->db->plimit($max, 0); |
| 98 | 98 | |
| 99 | 99 | dol_syslog(get_class($this)."::loadBox", LOG_DEBUG); |
@@ -150,7 +150,7 @@ |
||
| 150 | 150 | $userid = 0; // No filter on user creation |
| 151 | 151 | |
| 152 | 152 | $WIDTH = ($nbofgraph >= 2 || !empty($conf->dol_optimize_smallscreen)) ? '300' : '320'; |
| 153 | - $HEIGHT = '150'; // Height require to have 5+1 entries into legend visible. |
|
| 153 | + $HEIGHT = '150'; // Height require to have 5+1 entries into legend visible. |
|
| 154 | 154 | |
| 155 | 155 | if (isModEnabled("propal") && $user->hasRight('propal', 'lire')) { |
| 156 | 156 | // Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...) |
@@ -102,7 +102,7 @@ |
||
| 102 | 102 | $sql .= " AND u.statut = ".User::STATUS_ENABLED; |
| 103 | 103 | $sql .= dolSqlDateFilter('u.dateemployment', 0, $tmparray['mon'], 0); |
| 104 | 104 | $sql .= " AND u.dateemployment < '".$this->db->idate(dol_get_first_day($tmparray['year']))."'"; |
| 105 | - $sql .= " ORDER BY daya ASC"; // We want to have date of the month sorted by the day without taking into consideration the year |
|
| 105 | + $sql .= " ORDER BY daya ASC"; // We want to have date of the month sorted by the day without taking into consideration the year |
|
| 106 | 106 | $sql .= $this->db->plimit($max, 0); |
| 107 | 107 | |
| 108 | 108 | dol_syslog(get_class($this)."::loadBox", LOG_DEBUG); |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | } |
| 161 | 161 | } else { |
| 162 | 162 | dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO user not found for '".$usertotest."'", LOG_NOTICE); |
| 163 | - sleep(1); // Anti brut force protection. Must be same delay when password is not valid |
|
| 163 | + sleep(1); // Anti brut force protection. Must be same delay when password is not valid |
|
| 164 | 164 | |
| 165 | 165 | // Load translation files required by the page |
| 166 | 166 | $langs->loadLangs(array('main', 'errors')); |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | } |
| 175 | 175 | } else { |
| 176 | 176 | dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO Too many attempts", LOG_NOTICE); |
| 177 | - sleep(1); // Anti brut force protection. Must be same delay when password is not valid |
|
| 177 | + sleep(1); // Anti brut force protection. Must be same delay when password is not valid |
|
| 178 | 178 | // Load translation files required by the page |
| 179 | 179 | $langs->loadLangs(array('main', 'errors')); |
| 180 | 180 | $_SESSION["dol_loginmesg"] = $langs->transnoentitiesnoconv("ErrorTooManyAttempts"); |
@@ -75,12 +75,12 @@ |
||
| 75 | 75 | //global $dolibarr_main_url_root; |
| 76 | 76 | //$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root)); |
| 77 | 77 | //$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file |
| 78 | - $urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current |
|
| 78 | + $urlwithroot = DOL_MAIN_URL_ROOT; // This is to use same domain name than current |
|
| 79 | 79 | |
| 80 | 80 | //$shortscope = 'userinfo_email,userinfo_profile'; |
| 81 | - $shortscope = 'openid,email,profile'; // For openid connect |
|
| 81 | + $shortscope = 'openid,email,profile'; // For openid connect |
|
| 82 | 82 | |
| 83 | - $oauthstateanticsrf = bin2hex(random_bytes(128/8)); |
|
| 83 | + $oauthstateanticsrf = bin2hex(random_bytes(128 / 8)); |
|
| 84 | 84 | $_SESSION['oauthstateanticsrf'] = $shortscope.'-'.$oauthstateanticsrf; |
| 85 | 85 | |
| 86 | 86 | $url = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?shortscope='.urlencode($shortscope).'&state='.urlencode('forlogin-'.$shortscope.'-'.$oauthstateanticsrf).'&username='.urlencode($usertotest); |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | |
| 118 | 118 | // Object card |
| 119 | 119 | // ------------------------------------------------------------ |
| 120 | - $linkback = '<a href="' . dol_buildpath('/asset/asset_list.php', 1) . '?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>'; |
|
| 120 | + $linkback = '<a href="'.dol_buildpath('/asset/asset_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>'; |
|
| 121 | 121 | |
| 122 | 122 | $morehtmlref = '<div class="refidno">'; |
| 123 | 123 | $morehtmlref .= '</div>'; |
@@ -130,10 +130,10 @@ discard block |
||
| 130 | 130 | print '<table class="border centpercent tableforfield">'; |
| 131 | 131 | |
| 132 | 132 | // Number of files |
| 133 | - print '<tr><td class="titlefield">' . $langs->trans("NbOfAttachedFiles") . '</td><td colspan="3">' . count($filearray) . '</td></tr>'; |
|
| 133 | + print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>'; |
|
| 134 | 134 | |
| 135 | 135 | // Total size |
| 136 | - print '<tr><td>' . $langs->trans("TotalSizeOfAttachedFiles") . '</td><td colspan="3">' . $totalsize . ' ' . $langs->trans("bytes") . '</td></tr>'; |
|
| 136 | + print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>'; |
|
| 137 | 137 | |
| 138 | 138 | print '</table>'; |
| 139 | 139 | |
@@ -146,12 +146,12 @@ discard block |
||
| 146 | 146 | // $permissiontoadd = 1; |
| 147 | 147 | $permtoedit = $user->hasRight('asset', 'write'); |
| 148 | 148 | // $permtoedit = 1; |
| 149 | - $param = '&id=' . $object->id; |
|
| 149 | + $param = '&id='.$object->id; |
|
| 150 | 150 | |
| 151 | 151 | //$relativepathwithnofile='asset/' . dol_sanitizeFileName($object->id).'/'; |
| 152 | - $relativepathwithnofile = dol_sanitizeFileName($object->ref) . '/'; |
|
| 152 | + $relativepathwithnofile = dol_sanitizeFileName($object->ref).'/'; |
|
| 153 | 153 | |
| 154 | - include DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php'; |
|
| 154 | + include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php'; |
|
| 155 | 155 | } else { |
| 156 | 156 | accessforbidden('', 0, 1); |
| 157 | 157 | } |
@@ -216,7 +216,7 @@ |
||
| 216 | 216 | if (!$disable_delete) { |
| 217 | 217 | print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), '', 1); |
| 218 | 218 | } else { |
| 219 | - print dolGetButtonAction($langs->trans("CantRemovePaymentWithOneInvoicePaid"), $langs->trans('Delete'), '', $_SERVER["PHP_SELF"].'?id='.$object->id.'#', '', 1, [ 'attr' => ['classOverride' => 'butActionRefused']]); |
|
| 219 | + print dolGetButtonAction($langs->trans("CantRemovePaymentWithOneInvoicePaid"), $langs->trans('Delete'), '', $_SERVER["PHP_SELF"].'?id='.$object->id.'#', '', 1, ['attr' => ['classOverride' => 'butActionRefused']]); |
|
| 220 | 220 | } |
| 221 | 221 | } |
| 222 | 222 | } |