@@ -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 | } |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | |
27 | 27 | $sapi_type = php_sapi_name(); |
28 | 28 | $script_file = basename(__FILE__); |
29 | -$path=__DIR__.'/'; |
|
29 | +$path = __DIR__.'/'; |
|
30 | 30 | |
31 | 31 | // Test si mode batch |
32 | 32 | if (substr($sapi_type, 0, 3) == 'cgi') { |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | } |
36 | 36 | |
37 | 37 | // Recupere root dolibarr |
38 | -$path=preg_replace('/purge-data.php/i', '', $_SERVER["PHP_SELF"]); |
|
38 | +$path = preg_replace('/purge-data.php/i', '', $_SERVER["PHP_SELF"]); |
|
39 | 39 | require $path."../../htdocs/master.inc.php"; |
40 | 40 | include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; |
41 | 41 | include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; |
@@ -47,11 +47,11 @@ discard block |
||
47 | 47 | $langs->loadLangs(array("main", "errors")); |
48 | 48 | |
49 | 49 | // Global variables |
50 | -$version=DOL_VERSION; |
|
51 | -$error=0; |
|
50 | +$version = DOL_VERSION; |
|
51 | +$error = 0; |
|
52 | 52 | |
53 | 53 | // List of sql to execute |
54 | -$sqls=array( |
|
54 | +$sqls = array( |
|
55 | 55 | 'user'=>array( |
56 | 56 | "DELETE FROM ".MAIN_DB_PREFIX."user_rights WHERE fk_user IN (SELECT rowid FROM ".MAIN_DB_PREFIX."user WHERE admin = 0 and login != 'admin') AND fk_user IN (select rowid FROM ".MAIN_DB_PREFIX."user where datec < '__DATE__')", |
57 | 57 | "DELETE FROM ".MAIN_DB_PREFIX."user WHERE admin = 0 and login != 'admin' AND datec < '__DATE__'", |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | $option = $argv[2]; |
183 | 183 | $date = $argv[3]; |
184 | 184 | |
185 | -if (empty($mode) || ! in_array($mode, array('test','confirm'))) { |
|
185 | +if (empty($mode) || !in_array($mode, array('test', 'confirm'))) { |
|
186 | 186 | print "Usage: $script_file (test|confirm) (all|option) (all|YYYY-MM-DD) [dbtype dbhost dbuser dbpassword dbname dbport]\n"; |
187 | 187 | print "\n"; |
188 | 188 | print "option can be ".implode(',', array_keys($sqls))."\n"; |
@@ -195,9 +195,9 @@ discard block |
||
195 | 195 | exit(-1); |
196 | 196 | } |
197 | 197 | if ($option != 'all') { |
198 | - $listofoptions=explode(',', $option); |
|
198 | + $listofoptions = explode(',', $option); |
|
199 | 199 | foreach ($listofoptions as $cursoroption) { |
200 | - if (! in_array($cursoroption, array_keys($sqls))) { |
|
200 | + if (!in_array($cursoroption, array_keys($sqls))) { |
|
201 | 201 | print "Usage: $script_file (test|confirm) (all|option) (all|YYYY-MM-DD) [dbtype dbhost dbuser dbpassword dbname dbport]\n"; |
202 | 202 | print "\n"; |
203 | 203 | print "option '".$cursoroption."' must be in list ".implode(',', array_keys($sqls))."\n"; |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | } |
207 | 207 | } |
208 | 208 | |
209 | -if (empty($date) || (! preg_match('/\d\d\d\d\-\d\d\-\d\d$/', $date) && $date != 'all')) { |
|
209 | +if (empty($date) || (!preg_match('/\d\d\d\d\-\d\d\-\d\d$/', $date) && $date != 'all')) { |
|
210 | 210 | print "Usage: $script_file (test|confirm) (all|option) (all|YYYY-MM-DD) [dbtype dbhost dbuser dbpassword dbname dbport]\n"; |
211 | 211 | print "\n"; |
212 | 212 | print "date can be 'all' or 'YYYY-MM-DD' to delete record before YYYY-MM-DD\n"; |
@@ -221,13 +221,13 @@ discard block |
||
221 | 221 | if (!empty($argv[4])) { |
222 | 222 | $db->close(); |
223 | 223 | unset($db); |
224 | - $db=getDoliDBInstance($argv[4], $argv[5], $argv[6], $argv[7], $argv[8], $argv[9]); |
|
225 | - $user=new User($db); |
|
224 | + $db = getDoliDBInstance($argv[4], $argv[5], $argv[6], $argv[7], $argv[8], $argv[9]); |
|
225 | + $user = new User($db); |
|
226 | 226 | } |
227 | 227 | |
228 | 228 | //var_dump($user->db->database_name); |
229 | -$ret=$user->fetch('', 'admin'); |
|
230 | -if (! $ret > 0) { |
|
229 | +$ret = $user->fetch('', 'admin'); |
|
230 | +if (!$ret > 0) { |
|
231 | 231 | print 'An admin user with login "admin" must exists to use this script.'."\n"; |
232 | 232 | exit; |
233 | 233 | } |
@@ -242,7 +242,7 @@ discard block |
||
242 | 242 | print "User = ".$db->database_user."\n"; |
243 | 243 | print "\n"; |
244 | 244 | |
245 | -if (! $confirmed) { |
|
245 | +if (!$confirmed) { |
|
246 | 246 | print "Hit Enter to continue or CTRL+C to stop...\n"; |
247 | 247 | $input = trim(fgets(STDIN)); |
248 | 248 | } |
@@ -259,10 +259,10 @@ discard block |
||
259 | 259 | { |
260 | 260 | global $db, $sqls; |
261 | 261 | |
262 | - $error=0; |
|
262 | + $error = 0; |
|
263 | 263 | foreach ($sqls[$family] as $sql) { |
264 | 264 | if (preg_match('/^@/', $sql)) { |
265 | - $newfamily=preg_replace('/@/', '', $sql); |
|
265 | + $newfamily = preg_replace('/@/', '', $sql); |
|
266 | 266 | processfamily($newfamily, $date); |
267 | 267 | continue; |
268 | 268 | } |
@@ -271,8 +271,8 @@ discard block |
||
271 | 271 | |
272 | 272 | print "Run sql: ".$sql."\n"; |
273 | 273 | |
274 | - $resql=$db->query($sql); |
|
275 | - if (! $resql) { |
|
274 | + $resql = $db->query($sql); |
|
275 | + if (!$resql) { |
|
276 | 276 | if ($db->errno() != 'DB_ERROR_NOSUCHTABLE') { |
277 | 277 | $error++; |
278 | 278 | } |
@@ -295,9 +295,9 @@ discard block |
||
295 | 295 | |
296 | 296 | $db->begin(); |
297 | 297 | |
298 | -$listofoptions=explode(',', $option); |
|
298 | +$listofoptions = explode(',', $option); |
|
299 | 299 | foreach ($listofoptions as $cursoroption) { |
300 | - $oldfamily=''; |
|
300 | + $oldfamily = ''; |
|
301 | 301 | foreach ($sqls as $family => $familysql) { |
302 | 302 | if ($cursoroption && $cursoroption != 'all' && $cursoroption != $family) { |
303 | 303 | continue; |
@@ -308,7 +308,7 @@ discard block |
||
308 | 308 | } |
309 | 309 | $oldfamily = $family; |
310 | 310 | |
311 | - $result=processfamily($family, $date); |
|
311 | + $result = processfamily($family, $date); |
|
312 | 312 | if ($result < 0) { |
313 | 313 | $error++; |
314 | 314 | break; |
@@ -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 |