@@ -65,11 +65,11 @@ |
||
65 | 65 | - To convert pfx certificate to pem: openssl pkcs12 -in tcpdf.pfx -out tcpdf.crt -nodes |
66 | 66 | |
67 | 67 | */ |
68 | -$permissions=array('copy'); |
|
69 | -$user_pass='aaa'; |
|
70 | -$owner_pass=null; |
|
71 | -$mode=0; |
|
72 | -$pubkeys=null; |
|
68 | +$permissions = array('copy'); |
|
69 | +$user_pass = 'aaa'; |
|
70 | +$owner_pass = null; |
|
71 | +$mode = 0; |
|
72 | +$pubkeys = null; |
|
73 | 73 | $pdf->SetProtection($permissions, $user_pass, $owner_pass, $mode, $pubkeys); |
74 | 74 | |
75 | 75 | // Example with public-key |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | |
29 | 29 | $sapi_type = php_sapi_name(); |
30 | 30 | $script_file = basename(__FILE__); |
31 | -$path=dirname(__FILE__).'/'; |
|
31 | +$path = dirname(__FILE__).'/'; |
|
32 | 32 | |
33 | 33 | // Test if batch mode |
34 | 34 | if (substr($sapi_type, 0, 3) == 'cgi') { |
@@ -45,17 +45,17 @@ discard block |
||
45 | 45 | $langs->load("main"); |
46 | 46 | |
47 | 47 | // Global variables |
48 | -$version='1.14'; |
|
49 | -$error=0; |
|
48 | +$version = '1.14'; |
|
49 | +$error = 0; |
|
50 | 50 | |
51 | 51 | |
52 | 52 | // -------------------- START OF YOUR CODE HERE -------------------- |
53 | 53 | @set_time_limit(0); |
54 | 54 | print "***** ".$script_file." (".$version.") *****\n"; |
55 | -$dir=DOL_DOCUMENT_ROOT."/langs"; |
|
55 | +$dir = DOL_DOCUMENT_ROOT."/langs"; |
|
56 | 56 | |
57 | 57 | // Check parameters |
58 | -if (! isset($argv[3])) { |
|
58 | +if (!isset($argv[3])) { |
|
59 | 59 | print "Usage: ".$script_file." lang_code_src lang_code_dest|all APIKEY [langfile.lang]\n"; |
60 | 60 | print "Example: ".$script_file." en_US pt_PT 123456\n"; |
61 | 61 | print "Rem: lang_code to use can be found on https://translate.google.com\n"; |
@@ -66,18 +66,18 @@ discard block |
||
66 | 66 | print 'Argument 1='.$argv[1]."\n"; |
67 | 67 | print 'Argument 2='.$argv[2]."\n"; |
68 | 68 | print 'Argument 3='.$argv[3]."\n"; |
69 | -$file=''; |
|
69 | +$file = ''; |
|
70 | 70 | if (isset($argv[4])) { |
71 | - $file=$argv[4]; |
|
71 | + $file = $argv[4]; |
|
72 | 72 | print 'Argument 4='.$argv[4]."\n"; |
73 | 73 | } |
74 | 74 | print 'Files will be generated/updated in directory '.$dir."\n"; |
75 | 75 | |
76 | 76 | if ($argv[2] != 'all') { |
77 | - if (! is_dir($dir.'/'.$argv[2])) { |
|
77 | + if (!is_dir($dir.'/'.$argv[2])) { |
|
78 | 78 | print 'Create directory '.$dir.'/'.$argv[2]."\n"; |
79 | - $result=mkdir($dir.'/'.$argv[2]); |
|
80 | - if (! $result) { |
|
79 | + $result = mkdir($dir.'/'.$argv[2]); |
|
80 | + if (!$result) { |
|
81 | 81 | $db->close(); |
82 | 82 | return -1; |
83 | 83 | } |
@@ -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 | /* |
@@ -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; |
@@ -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 |
@@ -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()) { |
@@ -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('@'); |