@@ -81,12 +81,12 @@ |
||
| 81 | 81 | $response = array(); |
| 82 | 82 | while ($i < $num) { |
| 83 | 83 | $obj = $db->fetch_object($resql); |
| 84 | - $response[] = array('title'=>$obj->question,'ref'=>$obj->ref,'answer'=>dol_escape_htmltag(preg_replace('/\\r|\\r\\n|\\n/', "", $obj->answer)),'url'=>$obj->url); |
|
| 84 | + $response[] = array('title'=>$obj->question, 'ref'=>$obj->ref, 'answer'=>dol_escape_htmltag(preg_replace('/\\r|\\r\\n|\\n/', "", $obj->answer)), 'url'=>$obj->url); |
|
| 85 | 85 | $i++; |
| 86 | 86 | } |
| 87 | 87 | } else { |
| 88 | 88 | dol_print_error($db); |
| 89 | 89 | } |
| 90 | - $response =json_encode($response); |
|
| 90 | + $response = json_encode($response); |
|
| 91 | 91 | echo $response; |
| 92 | 92 | } |
@@ -214,16 +214,16 @@ |
||
| 214 | 214 | print '<table class="border tableforfield centpercent">'; |
| 215 | 215 | |
| 216 | 216 | print "<tr>"; |
| 217 | - print '<td class="titlefield">' . $langs->trans("DateStartPeriod") . '</td><td>'; |
|
| 217 | + print '<td class="titlefield">'.$langs->trans("DateStartPeriod").'</td><td>'; |
|
| 218 | 218 | print dol_print_date($object->datesp, 'day'); |
| 219 | 219 | print '</td></tr>'; |
| 220 | 220 | |
| 221 | 221 | print "<tr>"; |
| 222 | - print '<td>' . $langs->trans("DateEndPeriod") . '</td><td>'; |
|
| 222 | + print '<td>'.$langs->trans("DateEndPeriod").'</td><td>'; |
|
| 223 | 223 | print dol_print_date($object->dateep, 'day'); |
| 224 | 224 | print '</td></tr>'; |
| 225 | 225 | |
| 226 | - print '<tr><td>' . $langs->trans("Amount") . '</td><td><span class="amount">' . price($object->amount, 0, $langs, 1, -1, -1, $conf->currency) . '</span></td></tr>'; |
|
| 226 | + print '<tr><td>'.$langs->trans("Amount").'</td><td><span class="amount">'.price($object->amount, 0, $langs, 1, -1, -1, $conf->currency).'</span></td></tr>'; |
|
| 227 | 227 | |
| 228 | 228 | print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td>'.count($filearray).'</td></tr>'; |
| 229 | 229 | |
@@ -152,7 +152,7 @@ |
||
| 152 | 152 | while ($i < $num) { |
| 153 | 153 | $objp = $db->fetch_object($resql); |
| 154 | 154 | $listofoppstatus[$objp->rowid] = $objp->percent; |
| 155 | - $listofopplabel[$objp->rowid] = $objp->label; // default label if translation from "OppStatus".code not found. |
|
| 155 | + $listofopplabel[$objp->rowid] = $objp->label; // default label if translation from "OppStatus".code not found. |
|
| 156 | 156 | $listofoppcode[$objp->rowid] = $objp->code; |
| 157 | 157 | switch ($objp->code) { |
| 158 | 158 | case 'PROSP': |
@@ -91,8 +91,8 @@ |
||
| 91 | 91 | $label_default = getDolGlobalString('TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT'); |
| 92 | 92 | $qty_default = 1; |
| 93 | 93 | |
| 94 | - print '<input type="text" id="label" name="label" class="takepospay" value="' . $label_default . '" style="width:40%;" placeholder="' . $langs->trans('Label') . '">'; |
|
| 95 | - print '<input type="text" id="qty" name="qty" class="takepospay" value="' . $qty_default . '" style="width:10%;" placeholder="' . $langs->trans('Qty') . '">'; |
|
| 94 | + print '<input type="text" id="label" name="label" class="takepospay" value="'.$label_default.'" style="width:40%;" placeholder="'.$langs->trans('Label').'">'; |
|
| 95 | + print '<input type="text" id="qty" name="qty" class="takepospay" value="'.$qty_default.'" style="width:10%;" placeholder="'.$langs->trans('Qty').'">'; |
|
| 96 | 96 | } |
| 97 | 97 | ?> |
| 98 | 98 | <input type="button" class="button takepospay clearboth" value="OK" onclick="Save();"> |
@@ -273,7 +273,7 @@ |
||
| 273 | 273 | print '<tr class="oddeven"><td>'; |
| 274 | 274 | print $langs->trans('PrintWithoutDetailsLabelDefault'); |
| 275 | 275 | print '<td colspan="2">'; |
| 276 | - print '<input type="text" name="TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT" value="' . getDolGlobalString('TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT') . '" />'; |
|
| 276 | + print '<input type="text" name="TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT" value="'.getDolGlobalString('TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT').'" />'; |
|
| 277 | 277 | print "</td></tr>\n"; |
| 278 | 278 | } |
| 279 | 279 | |
@@ -74,7 +74,7 @@ |
||
| 74 | 74 | |
| 75 | 75 | // update of object |
| 76 | 76 | if ($forcelangprod == $current_lang) { |
| 77 | - $object->label = GETPOST("libelle", 'alphanohtml'); |
|
| 77 | + $object->label = GETPOST("libelle", 'alphanohtml'); |
|
| 78 | 78 | $object->description = dol_htmlcleanlastbr(GETPOST("desc", 'restricthtml')); |
| 79 | 79 | //$object->other = dol_htmlcleanlastbr(GETPOST("other", 'restricthtml')); |
| 80 | 80 | } else { |
@@ -682,7 +682,7 @@ |
||
| 682 | 682 | { |
| 683 | 683 | $base = new DateTime("$year-03-21", new DateTimeZone("UTC")); |
| 684 | 684 | $days = easter_days($year); // Return number of days between 21 march and easter day. |
| 685 | - $tmp = $base->add(new DateInterval("P{$days}D")); |
|
| 685 | + $tmp = $base->add(new DateInterval("p{$days}d")); |
|
| 686 | 686 | return $tmp->getTimestamp(); |
| 687 | 687 | } |
| 688 | 688 | |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | |
| 184 | 184 | $newtimeyear = (int) dol_print_date($newtime, '%Y'); |
| 185 | 185 | $newtimemonth = (int) dol_print_date($newtime, '%m'); |
| 186 | - $newtimetotalmonths = (($newtimeyear * 12) + $newtimemonth); |
|
| 186 | + $newtimetotalmonths = (($newtimeyear * 12) + $newtimemonth); |
|
| 187 | 187 | |
| 188 | 188 | if ($monthsexpected < $newtimetotalmonths) { |
| 189 | 189 | $newtimehours = (int) dol_print_date($newtime, '%H'); |
@@ -796,7 +796,7 @@ discard block |
||
| 796 | 796 | $sql = "SELECT id, code, entity, fk_country, dayrule, year, month, day, active"; |
| 797 | 797 | $sql .= " FROM ".MAIN_DB_PREFIX."c_hrm_public_holiday"; |
| 798 | 798 | $sql .= " WHERE active = 1 and fk_country IN (0".($country_id > 0 ? ", ".$country_id : 0).")"; |
| 799 | - $sql .= " AND entity IN (0," .getEntity('holiday') .")"; |
|
| 799 | + $sql .= " AND entity IN (0,".getEntity('holiday').")"; |
|
| 800 | 800 | |
| 801 | 801 | $resql = $db->query($sql); |
| 802 | 802 | if ($resql) { |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | case 'sellist': |
| 49 | 49 | $tmp = ''; |
| 50 | 50 | $tmpparam = jsonOrUnserialize($obj->param); // $tmp may be array 'options' => array 'c_currencies:code_iso:code_iso' => null |
| 51 | - if (is_array($tmpparam) && array_key_exists('options', $tmpparam) && $tmpparam['options'] && is_array($tmpparam['options'])) { |
|
| 51 | + if (is_array($tmpparam) && array_key_exists('options', $tmpparam) && $tmpparam['options'] && is_array($tmpparam['options'])) { |
|
| 52 | 52 | $tmpkeys = array_keys($tmpparam['options']); |
| 53 | 53 | $tmp = array_shift($tmpkeys); |
| 54 | 54 | } |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | */ |
| 139 | 139 | |
| 140 | 140 | // If we have a hash public (hashp), we guess the original_file. |
| 141 | -$ecmfile=''; |
|
| 141 | +$ecmfile = ''; |
|
| 142 | 142 | if (!empty($hashp)) { |
| 143 | 143 | include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php'; |
| 144 | 144 | $ecmfile = new EcmFiles($db); |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | } |
| 197 | 197 | |
| 198 | 198 | // Security: Delete string ../ or ..\ into $original_file |
| 199 | -$original_file = preg_replace('/\.\.+/', '..', $original_file); // Replace '... or more' with '..' |
|
| 199 | +$original_file = preg_replace('/\.\.+/', '..', $original_file); // Replace '... or more' with '..' |
|
| 200 | 200 | $original_file = str_replace('../', '/', $original_file); |
| 201 | 201 | $original_file = str_replace('..\\', '/', $original_file); |
| 202 | 202 | |