@@ -94,7 +94,7 @@ |
||
| 94 | 94 | } |
| 95 | 95 | $result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', 0); // If we create a contact with no company (shared contacts), no check on write permission |
| 96 | 96 | |
| 97 | -$permissiontoadd = $user->hasRight('societe', 'contact', 'creer'); // Used by the include of actions_dellink.inc.php |
|
| 97 | +$permissiontoadd = $user->hasRight('societe', 'contact', 'creer'); // Used by the include of actions_dellink.inc.php |
|
| 98 | 98 | |
| 99 | 99 | |
| 100 | 100 | /* |
@@ -197,7 +197,7 @@ |
||
| 197 | 197 | $maxfilesizearray = getMaxFileSizeArray(); |
| 198 | 198 | $maxmin = $maxfilesizearray['maxmin']; |
| 199 | 199 | if ($maxmin > 0) { |
| 200 | - print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 200 | + print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 201 | 201 | } |
| 202 | 202 | print '<input type="file" class="flat" name="photo" id="photoinput">'; |
| 203 | 203 | print '</td></tr>'; |
@@ -134,15 +134,15 @@ discard block |
||
| 134 | 134 | |
| 135 | 135 | foreach ($object->multilangs as $key => $value) { // enregistrement des nouvelles valeurs dans l'objet |
| 136 | 136 | if ($key == $current_lang) { |
| 137 | - $object->label = GETPOST("libelle-" . $key); |
|
| 138 | - $object->description = dol_htmlcleanlastbr(GETPOST("desc-" . $key, 'restricthtml')); |
|
| 139 | - $object->other = dol_htmlcleanlastbr(GETPOST("other-" . $key, 'restricthtml')); |
|
| 137 | + $object->label = GETPOST("libelle-".$key); |
|
| 138 | + $object->description = dol_htmlcleanlastbr(GETPOST("desc-".$key, 'restricthtml')); |
|
| 139 | + $object->other = dol_htmlcleanlastbr(GETPOST("other-".$key, 'restricthtml')); |
|
| 140 | 140 | |
| 141 | 141 | $object->update($object->id, $user); |
| 142 | 142 | } else { |
| 143 | - $object->multilangs[$key]["label"] = GETPOST("libelle-" . $key); |
|
| 144 | - $object->multilangs[$key]["description"] = dol_htmlcleanlastbr(GETPOST("desc-" . $key, 'restricthtml')); |
|
| 145 | - $object->multilangs[$key]["other"] = dol_htmlcleanlastbr(GETPOST("other-" . $key, 'restricthtml')); |
|
| 143 | + $object->multilangs[$key]["label"] = GETPOST("libelle-".$key); |
|
| 144 | + $object->multilangs[$key]["description"] = dol_htmlcleanlastbr(GETPOST("desc-".$key, 'restricthtml')); |
|
| 145 | + $object->multilangs[$key]["other"] = dol_htmlcleanlastbr(GETPOST("other-".$key, 'restricthtml')); |
|
| 146 | 146 | } |
| 147 | 147 | } |
| 148 | 148 | |
@@ -235,9 +235,9 @@ discard block |
||
| 235 | 235 | if (empty($reshook)) { |
| 236 | 236 | if ($action == '') { |
| 237 | 237 | if ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer')) { |
| 238 | - print '<a class="butAction" href="' . DOL_URL_ROOT . '/product/traduction.php?action=add&token='.newToken().'&id=' . $object->id . '">' . $langs->trans("Add") . '</a>'; |
|
| 238 | + print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/traduction.php?action=add&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Add").'</a>'; |
|
| 239 | 239 | if ($cnt_trans > 0) { |
| 240 | - print '<a class="butAction" href="' . DOL_URL_ROOT . '/product/traduction.php?action=edit&token='.newToken().'&id=' . $object->id . '">' . $langs->trans("Modify") . '</a>'; |
|
| 240 | + print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/traduction.php?action=edit&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Modify").'</a>'; |
|
| 241 | 241 | } |
| 242 | 242 | } |
| 243 | 243 | } |
@@ -155,7 +155,7 @@ |
||
| 155 | 155 | )); |
| 156 | 156 | |
| 157 | 157 | // Retrieve all extrafields if not already not know (should not happen) |
| 158 | - if (! is_object($extrafields)) { |
|
| 158 | + if (!is_object($extrafields)) { |
|
| 159 | 159 | $extrafields = new ExtraFields($this->db); |
| 160 | 160 | $extrafields->fetch_name_optionals_label($product->table_element); |
| 161 | 161 | } |
@@ -246,7 +246,7 @@ |
||
| 246 | 246 | $supplierinvoicestatic->id = $objp->facid; |
| 247 | 247 | $supplierinvoicestatic->ref = $objp->ref; |
| 248 | 248 | $supplierinvoicestatic->ref_supplier = $objp->ref_supplier; |
| 249 | - $supplierinvoicestatic->libelle = $objp->label; // deprecated |
|
| 249 | + $supplierinvoicestatic->libelle = $objp->label; // deprecated |
|
| 250 | 250 | $supplierinvoicestatic->label = $objp->label; |
| 251 | 251 | $supplierinvoicestatic->total_ht = $objp->total_ht; |
| 252 | 252 | $supplierinvoicestatic->total_ttc = $objp->total_ttc; |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php // BEGIN PHP |
| 2 | -$websitekey=basename(__DIR__); |
|
| 3 | -if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded |
|
| 2 | +$websitekey = basename(__DIR__); |
|
| 3 | +if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded |
|
| 4 | 4 | require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php'; |
| 5 | 5 | require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php'; |
| 6 | 6 | ob_start(); |
@@ -56,16 +56,16 @@ |
||
| 56 | 56 | // Editing global variables not related to a specific theme |
| 57 | 57 | $constantes = array( |
| 58 | 58 | 'MEMBER_REMINDER_EMAIL'=>array('type'=>'yesno', 'label'=>$langs->trans('MEMBER_REMINDER_EMAIL', $langs->transnoentities("Module2300Name"))), |
| 59 | - 'ADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION' =>array('type'=>'emailtemplate:member','label'=>''), |
|
| 60 | - 'ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER' =>array('type'=>'emailtemplate:member','label'=>''), |
|
| 61 | - 'ADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION' =>array('type'=>'emailtemplate:member','label'=>''), |
|
| 62 | - 'ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION' =>array('type'=>'emailtemplate:member','label'=>''), |
|
| 63 | - 'ADHERENT_EMAIL_TEMPLATE_CANCELATION' =>array('type'=>'emailtemplate:member','label'=>''), |
|
| 64 | - 'ADHERENT_EMAIL_TEMPLATE_EXCLUSION' =>array('type'=>'emailtemplate:member','label'=>''), |
|
| 65 | - 'ADHERENT_MAIL_FROM' =>array('type'=>'string','label'=>''), |
|
| 66 | - 'ADHERENT_CC_MAIL_FROM' =>array('type'=>'string','label'=>''), |
|
| 67 | - 'ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT' =>array('type'=>'string','label'=>''), |
|
| 68 | - 'ADHERENT_AUTOREGISTER_NOTIF_MAIL' =>array('type'=>'html', 'tooltip'=>$helptext,'label'=>'') |
|
| 59 | + 'ADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION' =>array('type'=>'emailtemplate:member', 'label'=>''), |
|
| 60 | + 'ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER' =>array('type'=>'emailtemplate:member', 'label'=>''), |
|
| 61 | + 'ADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION' =>array('type'=>'emailtemplate:member', 'label'=>''), |
|
| 62 | + 'ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION' =>array('type'=>'emailtemplate:member', 'label'=>''), |
|
| 63 | + 'ADHERENT_EMAIL_TEMPLATE_CANCELATION' =>array('type'=>'emailtemplate:member', 'label'=>''), |
|
| 64 | + 'ADHERENT_EMAIL_TEMPLATE_EXCLUSION' =>array('type'=>'emailtemplate:member', 'label'=>''), |
|
| 65 | + 'ADHERENT_MAIL_FROM' =>array('type'=>'string', 'label'=>''), |
|
| 66 | + 'ADHERENT_CC_MAIL_FROM' =>array('type'=>'string', 'label'=>''), |
|
| 67 | + 'ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT' =>array('type'=>'string', 'label'=>''), |
|
| 68 | + 'ADHERENT_AUTOREGISTER_NOTIF_MAIL' =>array('type'=>'html', 'tooltip'=>$helptext, 'label'=>'') |
|
| 69 | 69 | ); |
| 70 | 70 | |
| 71 | 71 | |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | $maxfilesizearray = getMaxFileSizeArray(); |
| 163 | 163 | $maxmin = $maxfilesizearray['maxmin']; |
| 164 | 164 | if ($maxmin > 0) { |
| 165 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 165 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 166 | 166 | } |
| 167 | 167 | $texte .= ' <input type="file" name="uploadfile">'; |
| 168 | 168 | $texte .= '<input type="hidden" value="TICKET_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -253,7 +253,7 @@ discard block |
||
| 253 | 253 | $newfiletmp = preg_replace('/template_/i', '', $newfiletmp); |
| 254 | 254 | $newfiletmp = preg_replace('/modele_/i', '', $newfiletmp); |
| 255 | 255 | |
| 256 | - $newfiletmp = $objectref . '_' . $newfiletmp; |
|
| 256 | + $newfiletmp = $objectref.'_'.$newfiletmp; |
|
| 257 | 257 | |
| 258 | 258 | // Get extension (ods or odt) |
| 259 | 259 | $newfileformat = substr($newfile, strrpos($newfile, '.') + 1); |
@@ -262,11 +262,11 @@ discard block |
||
| 262 | 262 | if ($format == '1') { |
| 263 | 263 | $format = '%Y%m%d%H%M%S'; |
| 264 | 264 | } |
| 265 | - $filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat; |
|
| 265 | + $filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat; |
|
| 266 | 266 | } else { |
| 267 | - $filename = $newfiletmp . '.' . $newfileformat; |
|
| 267 | + $filename = $newfiletmp.'.'.$newfileformat; |
|
| 268 | 268 | } |
| 269 | - $file = $dir . '/' . $filename; |
|
| 269 | + $file = $dir.'/'.$filename; |
|
| 270 | 270 | //print "newdir=".$dir; |
| 271 | 271 | //print "newfile=".$newfile; |
| 272 | 272 | //print "file=".$file; |
@@ -275,7 +275,7 @@ discard block |
||
| 275 | 275 | dol_mkdir($conf->ticket->dir_temp); |
| 276 | 276 | if (!is_writable($conf->ticket->dir_temp)) { |
| 277 | 277 | $this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->ticket->dir_temp); |
| 278 | - dol_syslog('Error in write_file: ' . $this->error, LOG_ERR); |
|
| 278 | + dol_syslog('Error in write_file: '.$this->error, LOG_ERR); |
|
| 279 | 279 | return -1; |
| 280 | 280 | } |
| 281 | 281 | |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | $address = SwissQrBill\DataGroup\Element\CombinedAddress::create( |
| 121 | 121 | $this->emetteur->name, |
| 122 | 122 | $this->emetteur->address, |
| 123 | - $this->emetteur->zip . " " . $this->emetteur->town, |
|
| 123 | + $this->emetteur->zip." ".$this->emetteur->town, |
|
| 124 | 124 | $this->emetteur->country_code |
| 125 | 125 | ); |
| 126 | 126 | if (!$address->isValid()) { |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | $address = SwissQrBill\DataGroup\Element\CombinedAddress::create( |
| 176 | 176 | $object->thirdparty->name, |
| 177 | 177 | $object->thirdparty->address, |
| 178 | - $object->thirdparty->zip . " " . $object->thirdparty->town, |
|
| 178 | + $object->thirdparty->zip." ".$object->thirdparty->town, |
|
| 179 | 179 | $object->thirdparty->country_code |
| 180 | 180 | ); |
| 181 | 181 | if (!$address->isValid()) { |