@@ -363,7 +363,7 @@ |
||
| 363 | 363 | if ($typefield == 'Text' || $typefield == 'TextAuto') { |
| 364 | 364 | // If $newvalue start with an equal sign we don't want it to be interpreted as a formula, so we add a '. Such transformation should be |
| 365 | 365 | // done by SetCellValueByColumnAndRow but it is not, so we do it ourself. |
| 366 | - $newvalue = (dol_substr($newvalue, 0, 1) === '=' ? '\'' : '') . $newvalue; |
|
| 366 | + $newvalue = (dol_substr($newvalue, 0, 1) === '=' ? '\'' : '').$newvalue; |
|
| 367 | 367 | $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, $newvalue); |
| 368 | 368 | $coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate(); |
| 369 | 369 | $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('@'); |
@@ -259,17 +259,17 @@ |
||
| 259 | 259 | $r = 0; |
| 260 | 260 | // Add here entries to declare new permissions |
| 261 | 261 | /* BEGIN MODULEBUILDER PERMISSIONS */ |
| 262 | - $this->rights[$r][0] = $this->numero . sprintf("%02d", $r + 1); // Permission id (must not be already used) |
|
| 262 | + $this->rights[$r][0] = $this->numero.sprintf("%02d", $r + 1); // Permission id (must not be already used) |
|
| 263 | 263 | $this->rights[$r][1] = 'Read Webhooks'; // Permission label |
| 264 | 264 | $this->rights[$r][4] = 'webhook_target'; |
| 265 | 265 | $this->rights[$r][5] = 'read'; // In php code, permission will be checked by test if ($user->rights->webhook->webhook_target->read) |
| 266 | 266 | $r++; |
| 267 | - $this->rights[$r][0] = $this->numero . sprintf("%02d", $r + 1); // Permission id (must not be already used) |
|
| 267 | + $this->rights[$r][0] = $this->numero.sprintf("%02d", $r + 1); // Permission id (must not be already used) |
|
| 268 | 268 | $this->rights[$r][1] = 'Create/Update Webhooks'; // Permission label |
| 269 | 269 | $this->rights[$r][4] = 'webhook_target'; |
| 270 | 270 | $this->rights[$r][5] = 'write'; // In php code, permission will be checked by test if ($user->rights->webhook->webhook_target->write) |
| 271 | 271 | $r++; |
| 272 | - $this->rights[$r][0] = $this->numero . sprintf("%02d", $r + 1); // Permission id (must not be already used) |
|
| 272 | + $this->rights[$r][0] = $this->numero.sprintf("%02d", $r + 1); // Permission id (must not be already used) |
|
| 273 | 273 | $this->rights[$r][1] = 'Delete Webhooks'; // Permission label |
| 274 | 274 | $this->rights[$r][4] = 'webhook_target'; |
| 275 | 275 | $this->rights[$r][5] = 'delete'; // In php code, permission will be checked by test if ($user->rights->webhook->webhook_target->delete) |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | 'type'=>'info', |
| 117 | 117 | ); |
| 118 | 118 | } else { |
| 119 | - $keyforprovider = ''; // @FIXME |
|
| 119 | + $keyforprovider = ''; // @FIXME |
|
| 120 | 120 | |
| 121 | 121 | $this->google_id = getDolGlobalString('OAUTH_GOOGLE_ID'); |
| 122 | 122 | $this->google_secret = getDolGlobalString('OAUTH_GOOGLE_SECRET'); |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | global $conf; |
| 259 | 259 | $ret = array(); |
| 260 | 260 | |
| 261 | - $keyforprovider = ''; // @FIXME |
|
| 261 | + $keyforprovider = ''; // @FIXME |
|
| 262 | 262 | |
| 263 | 263 | // Token storage |
| 264 | 264 | $storage = new DoliStorage($this->db, $conf, $keyforprovider); |
@@ -400,7 +400,7 @@ discard block |
||
| 400 | 400 | 'contentType' => $contenttype, |
| 401 | 401 | ); |
| 402 | 402 | |
| 403 | - $keyforprovider = ''; // @FIXME |
|
| 403 | + $keyforprovider = ''; // @FIXME |
|
| 404 | 404 | |
| 405 | 405 | // Dolibarr Token storage |
| 406 | 406 | $storage = new DoliStorage($this->db, $conf, $keyforprovider); |
@@ -452,7 +452,7 @@ discard block |
||
| 452 | 452 | $error = 0; |
| 453 | 453 | $html = ''; |
| 454 | 454 | |
| 455 | - $keyforprovider = ''; // @FIXME |
|
| 455 | + $keyforprovider = ''; // @FIXME |
|
| 456 | 456 | |
| 457 | 457 | // Token storage |
| 458 | 458 | $storage = new DoliStorage($this->db, $conf, $keyforprovider); |
@@ -76,8 +76,8 @@ discard block |
||
| 76 | 76 | |
| 77 | 77 | public $multilangs; |
| 78 | 78 | |
| 79 | - public $product_type; // type in line |
|
| 80 | - public $fk_product; // product id in line (when line is linked to a product) |
|
| 79 | + public $product_type; // type in line |
|
| 80 | + public $fk_product; // product id in line (when line is linked to a product) |
|
| 81 | 81 | |
| 82 | 82 | /** |
| 83 | 83 | * Description of the line |
@@ -93,12 +93,12 @@ discard block |
||
| 93 | 93 | */ |
| 94 | 94 | public $description; |
| 95 | 95 | |
| 96 | - public $product; // To store full product object after a fetch_product() on a line |
|
| 97 | - public $product_ref; // ref in product table |
|
| 98 | - public $product_label; // label in product table |
|
| 99 | - public $product_barcode; // barcode in product table |
|
| 100 | - public $product_desc; // desc in product table |
|
| 101 | - public $fk_product_type; // type in product table |
|
| 96 | + public $product; // To store full product object after a fetch_product() on a line |
|
| 97 | + public $product_ref; // ref in product table |
|
| 98 | + public $product_label; // label in product table |
|
| 99 | + public $product_barcode; // barcode in product table |
|
| 100 | + public $product_desc; // desc in product table |
|
| 101 | + public $fk_product_type; // type in product table |
|
| 102 | 102 | |
| 103 | 103 | public $qty; |
| 104 | 104 | public $duree; |
@@ -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; |
@@ -60,7 +60,7 @@ |
||
| 60 | 60 | $showempty = 0; |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | - $return['value'] = $formProject->selectInvoiceAndLine($invoice_id, 0, 'invoiceid', 'invoicelineid', 'maxwidth500', array(), 1); |
|
| 63 | + $return['value'] = $formProject->selectInvoiceAndLine($invoice_id, 0, 'invoiceid', 'invoicelineid', 'maxwidth500', array(), 1); |
|
| 64 | 64 | //$return['num'] = $form->num; |
| 65 | 65 | //$return['error'] = $form->error; |
| 66 | 66 | |
@@ -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 | } |
@@ -40,7 +40,7 @@ |
||
| 40 | 40 | |
| 41 | 41 | |
| 42 | 42 | $id = GETPOST('id', 'aZ09'); |
| 43 | -$objecttype = GETPOST('objecttype', 'aZ09arobase'); // 'module' or 'myobject@mymodule', 'mymodule_myobject' |
|
| 43 | +$objecttype = GETPOST('objecttype', 'aZ09arobase'); // 'module' or 'myobject@mymodule', 'mymodule_myobject' |
|
| 44 | 44 | |
| 45 | 45 | $params = array('fromajaxtooltip' => 1); |
| 46 | 46 | if (GETPOSTISSET('infologin')) { |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | |
| 216 | 216 | $html_id = !empty($object->id) ? $object->element.'_extras_'.$tmpkeyextra.'_'.$object->id : ''; |
| 217 | 217 | |
| 218 | - print '<td id="' . $html_id . '" class="valuefield ' . $object->element . '_extras_' . $tmpkeyextra . ' wordbreakimp"' . (!empty($cols) ? ' colspan="' . $cols . '"' : '') . '>'; |
|
| 218 | + print '<td id="'.$html_id.'" class="valuefield '.$object->element.'_extras_'.$tmpkeyextra.' wordbreakimp"'.(!empty($cols) ? ' colspan="'.$cols.'"' : '').'>'; |
|
| 219 | 219 | |
| 220 | 220 | // Convert date into timestamp format |
| 221 | 221 | if (in_array($extrafields->attributes[$object->table_element]['type'][$tmpkeyextra], array('date'))) { |
@@ -243,7 +243,7 @@ discard block |
||
| 243 | 243 | if ($object->table_element == 'societe') { |
| 244 | 244 | $fieldid = 'socid'; |
| 245 | 245 | } |
| 246 | - print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"] . '?' . $fieldid . '=' . $object->id . '" method="post" name="formextra">'; |
|
| 246 | + print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'?'.$fieldid.'='.$object->id.'" method="post" name="formextra">'; |
|
| 247 | 247 | print '<input type="hidden" name="action" value="update_extras">'; |
| 248 | 248 | print '<input type="hidden" name="attribute" value="'.$tmpkeyextra.'">'; |
| 249 | 249 | print '<input type="hidden" name="token" value="'.newToken().'">'; |