@@ -4,7 +4,7 @@ |
||
| 4 | 4 | * Simple autoloader, so we don't need Composer just for this. |
| 5 | 5 | */ |
| 6 | 6 | |
| 7 | -spl_autoload_register(function ($class) { |
|
| 7 | +spl_autoload_register(function($class) { |
|
| 8 | 8 | if (preg_match('/^DebugBar/', $class)) { |
| 9 | 9 | $file = DOL_DOCUMENT_ROOT.'/includes/maximebf/debugbar/src/'.str_replace('\\', DIRECTORY_SEPARATOR, $class).'.php'; |
| 10 | 10 | //var_dump($class.' - '.file_exists($file).' - '.$file); |
@@ -18,7 +18,7 @@ |
||
| 18 | 18 | |
| 19 | 19 | // Create the autoloader for Luracast |
| 20 | 20 | require_once DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/AutoLoader.php'; |
| 21 | -call_user_func(function () { |
|
| 21 | +call_user_func(function() { |
|
| 22 | 22 | $loader = Luracast\Restler\AutoLoader::instance(); |
| 23 | 23 | spl_autoload_register($loader); |
| 24 | 24 | return $loader; |
@@ -152,15 +152,15 @@ |
||
| 152 | 152 | |
| 153 | 153 | // Create a line of payments |
| 154 | 154 | $payment = new PaymentLoan($db); |
| 155 | - $payment->chid = $chid; |
|
| 155 | + $payment->chid = $chid; |
|
| 156 | 156 | $payment->datep = $datepaid; |
| 157 | 157 | $payment->label = $loan->label; |
| 158 | - $payment->amount_capital = $pay_amount_capital; |
|
| 159 | - $payment->amount_insurance = $pay_amount_insurance; |
|
| 160 | - $payment->amount_interest = $pay_amount_interest; |
|
| 158 | + $payment->amount_capital = $pay_amount_capital; |
|
| 159 | + $payment->amount_insurance = $pay_amount_insurance; |
|
| 160 | + $payment->amount_interest = $pay_amount_interest; |
|
| 161 | 161 | $payment->fk_bank = GETPOST('accountid', 'int'); |
| 162 | 162 | $payment->paymenttype = GETPOST('paymenttype', 'int'); |
| 163 | - $payment->num_payment = GETPOST('num_payment'); |
|
| 163 | + $payment->num_payment = GETPOST('num_payment'); |
|
| 164 | 164 | $payment->note_private = GETPOST('note_private', 'restricthtml'); |
| 165 | 165 | $payment->note_public = GETPOST('note_public', 'restricthtml'); |
| 166 | 166 | |
@@ -166,11 +166,11 @@ |
||
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | // Clean parameters |
| 169 | - $this->url = clean_url($this->url, 1); |
|
| 169 | + $this->url = clean_url($this->url, 1); |
|
| 170 | 170 | if (empty($this->label)) { |
| 171 | 171 | $this->label = basename($this->url); |
| 172 | 172 | } |
| 173 | - $this->label = trim($this->label); |
|
| 173 | + $this->label = trim($this->label); |
|
| 174 | 174 | |
| 175 | 175 | |
| 176 | 176 | $this->db->begin(); |
@@ -205,12 +205,12 @@ |
||
| 205 | 205 | |
| 206 | 206 | $numFinal = get_next_value($db, $mask, 'product', $field, $where, '', $now); |
| 207 | 207 | //Begin barcode with key: for barcode with key (EAN13...) calculate and substitute the last character (* or ?) used in the mask by the key |
| 208 | - if ((substr($numFinal, -1)=='*') or (substr($numFinal, -1)=='?')) { // if last mask character is * or ? a joker, probably we have to calculate a key as last character (EAN13...) |
|
| 208 | + if ((substr($numFinal, -1) == '*') or (substr($numFinal, -1) == '?')) { // if last mask character is * or ? a joker, probably we have to calculate a key as last character (EAN13...) |
|
| 209 | 209 | $literaltype = ''; |
| 210 | - $literaltype = $this->literalBarcodeType($db, $type);//get literal_Barcode_Type |
|
| 210 | + $literaltype = $this->literalBarcodeType($db, $type); //get literal_Barcode_Type |
|
| 211 | 211 | switch ($literaltype) { |
| 212 | 212 | case 'EAN13': //EAN13 rowid = 2 |
| 213 | - if (strlen($numFinal)==13) {// be sure that the mask length is correct for EAN13 |
|
| 213 | + if (strlen($numFinal) == 13) {// be sure that the mask length is correct for EAN13 |
|
| 214 | 214 | $ean = substr($numFinal, 0, 12); //take first 12 digits |
| 215 | 215 | $eansum = barcode_gen_ean_sum($ean); |
| 216 | 216 | $ean .= $eansum; //substitute the las character by the key |
@@ -241,12 +241,12 @@ |
||
| 241 | 241 | } |
| 242 | 242 | |
| 243 | 243 | /** |
| 244 | - * Delete a language for this member type |
|
| 245 | - * |
|
| 246 | - * @param string $langtodelete Language code to delete |
|
| 247 | - * @param User $user Object user making delete |
|
| 248 | - * @return int <0 if KO, >0 if OK |
|
| 249 | - */ |
|
| 244 | + * Delete a language for this member type |
|
| 245 | + * |
|
| 246 | + * @param string $langtodelete Language code to delete |
|
| 247 | + * @param User $user Object user making delete |
|
| 248 | + * @return int <0 if KO, >0 if OK |
|
| 249 | + */ |
|
| 250 | 250 | public function delMultiLangs($langtodelete, $user) |
| 251 | 251 | { |
| 252 | 252 | $sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent_type_lang"; |
@@ -517,7 +517,7 @@ discard block |
||
| 517 | 517 | $this->amount = $obj->amount; |
| 518 | 518 | $this->caneditamount = $obj->caneditamount; |
| 519 | 519 | $this->mail_valid = $obj->mail_valid; |
| 520 | - $this->note = $obj->note_public; // deprecated |
|
| 520 | + $this->note = $obj->note_public; // deprecated |
|
| 521 | 521 | $this->note_public = $obj->note_public; |
| 522 | 522 | $this->vote = $obj->vote; |
| 523 | 523 | |
@@ -716,7 +716,7 @@ discard block |
||
| 716 | 716 | } elseif ($this->duration_value > 0) { |
| 717 | 717 | $dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year")); |
| 718 | 718 | } |
| 719 | - $datas['duration'] .= " " . (!empty($this->duration_unit) && isset($dur[$this->duration_unit]) ? $langs->trans($dur[$this->duration_unit]) : ''); |
|
| 719 | + $datas['duration'] .= " ".(!empty($this->duration_unit) && isset($dur[$this->duration_unit]) ? $langs->trans($dur[$this->duration_unit]) : ''); |
|
| 720 | 720 | } |
| 721 | 721 | |
| 722 | 722 | return $datas; |
@@ -767,7 +767,7 @@ discard block |
||
| 767 | 767 | } |
| 768 | 768 | } |
| 769 | 769 | $linkstart = '<a href="'.$url.'"'; |
| 770 | - $linkstart .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"'); |
|
| 770 | + $linkstart .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"'); |
|
| 771 | 771 | $linkstart .= $dataparams.' class="'.$classfortooltip.'">'; |
| 772 | 772 | |
| 773 | 773 | $linkend = '</a>'; |
@@ -841,13 +841,13 @@ discard block |
||
| 841 | 841 | global $conf; |
| 842 | 842 | $dn = ''; |
| 843 | 843 | if ($mode == 0) { |
| 844 | - $dn = getDolGlobalString('LDAP_KEY_MEMBERS_TYPES') . "=".$info[getDolGlobalString('LDAP_KEY_MEMBERS_TYPES')]."," . getDolGlobalString('LDAP_MEMBER_TYPE_DN'); |
|
| 844 | + $dn = getDolGlobalString('LDAP_KEY_MEMBERS_TYPES')."=".$info[getDolGlobalString('LDAP_KEY_MEMBERS_TYPES')].",".getDolGlobalString('LDAP_MEMBER_TYPE_DN'); |
|
| 845 | 845 | } |
| 846 | 846 | if ($mode == 1) { |
| 847 | 847 | $dn = $conf->global->LDAP_MEMBER_TYPE_DN; |
| 848 | 848 | } |
| 849 | 849 | if ($mode == 2) { |
| 850 | - $dn = getDolGlobalString('LDAP_KEY_MEMBERS_TYPES') . "=".$info[getDolGlobalString('LDAP_KEY_MEMBERS_TYPES')]; |
|
| 850 | + $dn = getDolGlobalString('LDAP_KEY_MEMBERS_TYPES')."=".$info[getDolGlobalString('LDAP_KEY_MEMBERS_TYPES')]; |
|
| 851 | 851 | } |
| 852 | 852 | return $dn; |
| 853 | 853 | } |
@@ -263,7 +263,7 @@ |
||
| 263 | 263 | echo '<div>'; |
| 264 | 264 | echo '<table class="noborder centpercent">'; |
| 265 | 265 | echo '<thead>'; |
| 266 | -echo '<tr class="liste_titre"><th>' . $langs->trans('Parameter') . '</th><th>' . $langs->trans('Value') . '</th></tr>'; |
|
| 266 | +echo '<tr class="liste_titre"><th>'.$langs->trans('Parameter').'</th><th>'.$langs->trans('Value').'</th></tr>'; |
|
| 267 | 267 | echo '</thead>'; |
| 268 | 268 | echo '<tbody>'; |
| 269 | 269 | |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | * \brief Module to show box of members |
| 25 | 25 | */ |
| 26 | 26 | |
| 27 | -include_once DOL_DOCUMENT_ROOT . '/core/boxes/modules_boxes.php'; |
|
| 27 | +include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; |
|
| 28 | 28 | |
| 29 | 29 | |
| 30 | 30 | /** |
@@ -83,8 +83,8 @@ discard block |
||
| 83 | 83 | |
| 84 | 84 | $this->max = $max; |
| 85 | 85 | |
| 86 | - include_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php'; |
|
| 87 | - require_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent_type.class.php'; |
|
| 86 | + include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; |
|
| 87 | + require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php'; |
|
| 88 | 88 | $memberstatic = new Adherent($this->db); |
| 89 | 89 | $statictype = new AdherentType($this->db); |
| 90 | 90 | |
@@ -100,8 +100,8 @@ discard block |
||
| 100 | 100 | $numb = 0; |
| 101 | 101 | |
| 102 | 102 | $sql = "SELECT c.subscription, c.dateadh as dateh"; |
| 103 | - $sql .= " FROM " . MAIN_DB_PREFIX . "adherent as d, " . MAIN_DB_PREFIX . "subscription as c"; |
|
| 104 | - $sql .= " WHERE d.entity IN (" . getEntity('adherent') . ")"; |
|
| 103 | + $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."subscription as c"; |
|
| 104 | + $sql .= " WHERE d.entity IN (".getEntity('adherent').")"; |
|
| 105 | 105 | $sql .= " AND d.rowid = c.fk_adherent"; |
| 106 | 106 | |
| 107 | 107 | |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | $this->info_box_contents[0][0] = array( |
| 217 | 217 | 'td' => '', |
| 218 | 218 | 'maxlength' => 500, |
| 219 | - 'text' => ($this->db->error() . ' sql=' . $sql), |
|
| 219 | + 'text' => ($this->db->error().' sql='.$sql), |
|
| 220 | 220 | ); |
| 221 | 221 | } |
| 222 | 222 | } else { |
@@ -100,7 +100,7 @@ |
||
| 100 | 100 | while ($line < $num) { |
| 101 | 101 | $objp = $this->db->fetch_object($result); |
| 102 | 102 | $date = $this->db->jdate($objp->date_movement); |
| 103 | - $journal = $objp->code_journal; |
|
| 103 | + $journal = $objp->code_journal; |
|
| 104 | 104 | $label = $objp->label_operation; |
| 105 | 105 | $amount = $objp->amount; |
| 106 | 106 | |