@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | $checkread_key = GETPOST('MAILING_EMAIL_UNSUBSCRIBE_KEY', 'alpha'); |
54 | 54 | $contactbulkdefault = GETPOST('MAILING_CONTACT_DEFAULT_BULK_STATUS', 'int'); |
55 | 55 | if (GETPOST('MAILING_DELAY', 'alpha') != '') { |
56 | - $mailingdelay = price2num(GETPOST('MAILING_DELAY', 'alpha'), 3); // Not less than 1 millisecond. |
|
56 | + $mailingdelay = price2num(GETPOST('MAILING_DELAY', 'alpha'), 3); // Not less than 1 millisecond. |
|
57 | 57 | } else { |
58 | 58 | $mailingdelay = ''; |
59 | 59 | } |
@@ -181,9 +181,9 @@ discard block |
||
181 | 181 | |
182 | 182 | // default blacklist from mailing |
183 | 183 | print '<tr class="oddeven">'; |
184 | -print '<td>' . $langs->trans("DefaultBlacklistMailingStatus", $langs->transnoentitiesnoconv("No_Email")) . '</td>'; |
|
184 | +print '<td>'.$langs->trans("DefaultBlacklistMailingStatus", $langs->transnoentitiesnoconv("No_Email")).'</td>'; |
|
185 | 185 | print '<td>'; |
186 | -$blacklist_setting=array(0=>$langs->trans('No'), 1=>$langs->trans('Yes'), 2=>$langs->trans('DefaultStatusEmptyMandatory')); |
|
186 | +$blacklist_setting = array(0=>$langs->trans('No'), 1=>$langs->trans('Yes'), 2=>$langs->trans('DefaultStatusEmptyMandatory')); |
|
187 | 187 | print $form->selectarray("MAILING_CONTACT_DEFAULT_BULK_STATUS", $blacklist_setting, $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS); |
188 | 188 | print '</td>'; |
189 | 189 | print '<td class="hideonsmartphone"></td>'; |
@@ -489,7 +489,7 @@ discard block |
||
489 | 489 | print '<tr class="oddeven"><td><label for="logo">'.$form->textwithpicto($langs->trans("Logo"), $tooltiplogo).'</label></td><td>'; |
490 | 490 | print '<div class="centpercent nobordernopadding valignmiddle "><div class="inline-block marginrightonly">'; |
491 | 491 | if ($maxmin > 0) { |
492 | - print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
492 | + print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
493 | 493 | } |
494 | 494 | print '<input type="file" class="flat minwidth100 maxwidthinputfileonsmartphone" name="logo" id="logo" accept="image/*">'; |
495 | 495 | print '</div>'; |
@@ -531,7 +531,7 @@ discard block |
||
531 | 531 | $maxfilesizearray = getMaxFileSizeArray(); |
532 | 532 | $maxmin = $maxfilesizearray['maxmin']; |
533 | 533 | if ($maxmin > 0) { |
534 | - print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
534 | + print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
535 | 535 | } |
536 | 536 | print '<input type="file" class="flat minwidth100 maxwidthinputfileonsmartphone" name="logo_squarred" id="logo_squarred" accept="image/*">'; |
537 | 537 | print '</div>'; |
@@ -38,7 +38,7 @@ |
||
38 | 38 | <!-- BEGIN PHP TEMPLATE admin_extrafields_view.tpl.php --> |
39 | 39 | <?php |
40 | 40 | |
41 | -$title = '<span class="opacitymedium">'.$langs->trans("DefineHereComplementaryAttributes", empty($textobject) ? '': $textobject).'</span><br>'."\n"; |
|
41 | +$title = '<span class="opacitymedium">'.$langs->trans("DefineHereComplementaryAttributes", empty($textobject) ? '' : $textobject).'</span><br>'."\n"; |
|
42 | 42 | //if ($action != 'create' && $action != 'edit') { |
43 | 43 | $newcardbutton = dolGetButtonTitle($langs->trans('NewAttribute'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?action=create', '', (($action != 'create' && $action != 'edit') ? 1 : 1)); |
44 | 44 | /*} else { |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | if ($val['type'] == 'text' || $val['type'] == 'html') { |
156 | 156 | $rightpart .= ' tdtop'; |
157 | 157 | } |
158 | - $rightpart.= '">'; |
|
158 | + $rightpart .= '">'; |
|
159 | 159 | $labeltoshow = ''; |
160 | 160 | if (!empty($val['help'])) { |
161 | 161 | $labeltoshow .= $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help'])); |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | $out = $object->showOutputField($val, $key, $value, '', '', '', 0); |
196 | 196 | $rightpart .= showValueWithClipboardCPButton($out, 0, $out); |
197 | 197 | } else { |
198 | - $rightpart.= $object->showOutputField($val, $key, $value, '', '', '', 0); |
|
198 | + $rightpart .= $object->showOutputField($val, $key, $value, '', '', '', 0); |
|
199 | 199 | } |
200 | 200 | } |
201 | 201 | if (preg_match('/^(text|html)/', $val['type'])) { |
@@ -258,7 +258,9 @@ |
||
258 | 258 | if (empty($senderissupplier)) { |
259 | 259 | $statustoshow = 1; |
260 | 260 | $statuswarehouse = 'warehouseopen,warehouseinternal'; |
261 | - if (!empty($conf->global->ENTREPOT_WAREHOUSEINTERNAL_NOT_SELL)) $statuswarehouse = 'warehouseopen'; |
|
261 | + if (!empty($conf->global->ENTREPOT_WAREHOUSEINTERNAL_NOT_SELL)) { |
|
262 | + $statuswarehouse = 'warehouseopen'; |
|
263 | + } |
|
262 | 264 | if (!empty($conf->global->ENTREPOT_EXTRA_STATUS)) { |
263 | 265 | // hide products in closed warehouse, but show products for internal transfer |
264 | 266 | $form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, $statuswarehouse, GETPOST('combinations', 'array')); |
@@ -383,7 +383,7 @@ |
||
383 | 383 | $object->actionmsg = $message; // Long text |
384 | 384 | $object->actionmsg2 = $actionmsg2; // Short text ($langs->transnoentities('MailSentBy')...); |
385 | 385 | if (!empty($conf->global->MAIN_MAIL_REPLACE_EVENT_TITLE_BY_EMAIL_SUBJECT)) { |
386 | - $object->actionmsg2 = $subject; // Short text |
|
386 | + $object->actionmsg2 = $subject; // Short text |
|
387 | 387 | } |
388 | 388 | |
389 | 389 | $object->trackid = $trackid; |
@@ -150,9 +150,9 @@ |
||
150 | 150 | $productstatic->accountancy_code_buy_export = $objp->accountancy_code_buy_export; |
151 | 151 | $productstatic->date_modification = $datem; |
152 | 152 | |
153 | - $usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('product', 'product_advance', 'read_prices'):$user->hasRight('product', 'read'); |
|
153 | + $usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('product', 'product_advance', 'read_prices') : $user->hasRight('product', 'read'); |
|
154 | 154 | if ($productstatic->isService()) { |
155 | - $usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('service', 'service_advance', 'read_prices'):$user->hasRight('service', 'read'); |
|
155 | + $usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('service', 'service_advance', 'read_prices') : $user->hasRight('service', 'read'); |
|
156 | 156 | } |
157 | 157 | |
158 | 158 | $this->info_box_contents[$line][] = array( |
@@ -83,8 +83,8 @@ discard block |
||
83 | 83 | $badgeStatus7 = '#baa32b'; |
84 | 84 | $badgeStatus8 = '#993013'; |
85 | 85 | $badgeStatus9 = '#e7f0f0'; |
86 | - if (file_exists(DOL_DOCUMENT_ROOT . '/theme/' . $conf->theme . '/theme_vars.inc.php')) { |
|
87 | - include DOL_DOCUMENT_ROOT . '/theme/' . $conf->theme . '/theme_vars.inc.php'; |
|
86 | + if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php')) { |
|
87 | + include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php'; |
|
88 | 88 | } |
89 | 89 | $this->max = $max; |
90 | 90 | |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | $colorseriesstat = array(); |
102 | 102 | if ($user->hasRight('ticket', 'read')) { |
103 | 103 | $sql = "SELECT cts.rowid, cts.label, cts.code"; |
104 | - $sql .= " FROM " . MAIN_DB_PREFIX . "c_ticket_severity as cts"; |
|
104 | + $sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_severity as cts"; |
|
105 | 105 | $sql .= " WHERE cts.active = 1"; |
106 | 106 | $sql .= $this->db->order('cts.rowid', 'ASC'); |
107 | 107 | $resql = $this->db->query($sql); |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | $dataseries = array(); |
139 | 139 | $data = array(); |
140 | 140 | $sql = "SELECT t.severity_code, COUNT(t.severity_code) as nb"; |
141 | - $sql .= " FROM " . MAIN_DB_PREFIX . "ticket as t"; |
|
141 | + $sql .= " FROM ".MAIN_DB_PREFIX."ticket as t"; |
|
142 | 142 | $sql .= " WHERE t.fk_statut <> 8"; |
143 | 143 | $sql .= " GROUP BY t.severity_code"; |
144 | 144 | $resql = $this->db->query($sql); |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | } |
153 | 153 | foreach ($listofoppcode as $rowid => $code) { |
154 | 154 | $dataseries[] = array( |
155 | - 'label' => $langs->getLabelFromKey($this->db, 'TicketSeverityShort' . $code, 'c_ticket_severity', 'code', 'label', $code), |
|
155 | + 'label' => $langs->getLabelFromKey($this->db, 'TicketSeverityShort'.$code, 'c_ticket_severity', 'code', 'label', $code), |
|
156 | 156 | 'data' => (empty($data[$code]) ? 0 : $data[$code]) |
157 | 157 | ); |
158 | 158 | } |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | $stringtoprint .= $px1->show($totalnb ? 0 : 1); |
191 | 191 | } |
192 | 192 | $stringtoprint .= '</div>'; |
193 | - $this->info_box_contents[][]=array( |
|
193 | + $this->info_box_contents[][] = array( |
|
194 | 194 | 'td' => 'class="center"', |
195 | 195 | 'text' => $stringtoprint |
196 | 196 | ); |
@@ -122,9 +122,9 @@ |
||
122 | 122 | |
123 | 123 | $response = getURLContent($tmpobject->url, 'POST', $jsonstr, 1, array(), array('http', 'https'), 0, -1); |
124 | 124 | if (empty($response['curl_error_no']) && $response['http_code'] >= 200 && $response['http_code'] < 300) { |
125 | - $nbPosts ++; |
|
125 | + $nbPosts++; |
|
126 | 126 | } else { |
127 | - $errors ++; |
|
127 | + $errors++; |
|
128 | 128 | dol_syslog("Failed to get url with httpcode=".(!empty($response['http_code']) ? $response['http_code'] : "")." curl_error_no=".(!empty($response['curl_error_no']) ? $response['curl_error_no'] : ""), LOG_DEBUG); |
129 | 129 | } |
130 | 130 | } |