Completed
Branch develop (8d279a)
by
unknown
17:41
created
dev/initdata/generate-thirdparty.php 2 patches
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@
 block discarded – undo
105 105
 
106 106
 print "Generates ".GEN_NUMBER_SOCIETE." companies\n";
107 107
 for ($s = 0; $s < GEN_NUMBER_SOCIETE; $s++) {
108
-	print "Company $s\n";
108
+	print "company $s\n";
109 109
 	$soc = new Societe($db);
110 110
 	$soc->name = "Company num ".time()."$s";
111 111
 	$soc->town = $listoftown[mt_rand(0, count($listoftown)-1)];
Please login to merge, or discard this patch.
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 
27 27
 $sapi_type = php_sapi_name();
28 28
 $script_file = basename(__FILE__);
29
-$path=dirname(__FILE__).'/';
29
+$path = dirname(__FILE__).'/';
30 30
 
31 31
 // Test si mode batch
32 32
 $sapi_type = php_sapi_name();
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 
38 38
 // Recupere root dolibarr
39 39
 //$path=preg_replace('/generate-societe.php/i','',$_SERVER["PHP_SELF"]);
40
-require __DIR__. '/../../htdocs/master.inc.php';
40
+require __DIR__.'/../../htdocs/master.inc.php';
41 41
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
42 42
 include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
43 43
 include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
45 45
 include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
46 46
 include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
47 47
 
48
-$listoftown = array("Auray","Baden","Vannes","Pirouville","Haguenau","Souffelweiersheim","Illkirch-Graffenstaden","Lauterbourg","Picauville","Sainte-Mère Eglise","Le Bono");
49
-$listoflastname = array("Joe","Marc","Steve","Laurent","Nico","Isabelle","Dorothee","Saby","Brigitte","Karine","Jose-Anne","Celine","Virginie");
48
+$listoftown = array("Auray", "Baden", "Vannes", "Pirouville", "Haguenau", "Souffelweiersheim", "Illkirch-Graffenstaden", "Lauterbourg", "Picauville", "Sainte-Mère Eglise", "Le Bono");
49
+$listoflastname = array("Joe", "Marc", "Steve", "Laurent", "Nico", "Isabelle", "Dorothee", "Saby", "Brigitte", "Karine", "Jose-Anne", "Celine", "Virginie");
50 50
 
51 51
 
52 52
 /*
@@ -56,8 +56,8 @@  discard block
 block discarded – undo
56 56
 define('GEN_NUMBER_SOCIETE', $argv[1] ?? 10);
57 57
 
58 58
 
59
-$ret=$user->fetch('', 'admin');
60
-if (! $ret > 0) {
59
+$ret = $user->fetch('', 'admin');
60
+if (!$ret > 0) {
61 61
 	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
62 62
 	exit;
63 63
 }
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 
66 66
 
67 67
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product"; $productsid = array();
68
-$resql=$db->query($sql);
68
+$resql = $db->query($sql);
69 69
 if ($resql) {
70 70
 	$num = $db->num_rows($resql);
71 71
 	$i = 0;
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 }
78 78
 
79 79
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe"; $societesid = array();
80
-$resql=$db->query($sql);
80
+$resql = $db->query($sql);
81 81
 if ($resql) {
82 82
 	$num = $db->num_rows($resql);
83 83
 	$i = 0;
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 }
92 92
 
93 93
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande"; $commandesid = array();
94
-$resql=$db->query($sql);
94
+$resql = $db->query($sql);
95 95
 if ($resql) {
96 96
 	$num = $db->num_rows($resql);
97 97
 	$i = 0;
@@ -111,18 +111,18 @@  discard block
 block discarded – undo
111 111
 	print "Company $s\n";
112 112
 	$soc = new Societe($db);
113 113
 	$soc->name = "Company num ".time()."$s";
114
-	$soc->town = $listoftown[mt_rand(0, count($listoftown)-1)];
115
-	$soc->client = mt_rand(1, 2);		// Une societe sur 2 est prospect, l'autre client
116
-	$soc->fournisseur = mt_rand(0, 1);	// Une societe sur 2 est fournisseur
117
-	$soc->code_client='CU'.time()."$s";
118
-	$soc->code_fournisseur='SU'.time()."$s";
119
-	$soc->tva_assuj=1;
120
-	$soc->country_id=1;
121
-	$soc->country_code='FR';
114
+	$soc->town = $listoftown[mt_rand(0, count($listoftown) - 1)];
115
+	$soc->client = mt_rand(1, 2); // Une societe sur 2 est prospect, l'autre client
116
+	$soc->fournisseur = mt_rand(0, 1); // Une societe sur 2 est fournisseur
117
+	$soc->code_client = 'CU'.time()."$s";
118
+	$soc->code_fournisseur = 'SU'.time()."$s";
119
+	$soc->tva_assuj = 1;
120
+	$soc->country_id = 1;
121
+	$soc->country_code = 'FR';
122 122
 	// Un client sur 3 a une remise de 5%
123
-	$user_remise=mt_rand(1, 3);
124
-	if ($user_remise==3) {
125
-		$soc->remise_percent=5;
123
+	$user_remise = mt_rand(1, 3);
124
+	if ($user_remise == 3) {
125
+		$soc->remise_percent = 5;
126 126
 	}
127 127
 	print "> client=".$soc->client.", fournisseur=".$soc->fournisseur.", remise=".$soc->remise_percent."\n";
128 128
 	$soc->note_private = 'Company created by the script generate-societe.php';
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
 			$contact = new Contact($db);
136 136
 			$contact->socid = $soc->id;
137 137
 			$contact->lastname = "Lastname".$c;
138
-			$contact->firstname = $listoflastname[mt_rand(0, count($listoflastname)-1)];
138
+			$contact->firstname = $listoflastname[mt_rand(0, count($listoflastname) - 1)];
139 139
 			if ($contact->create($user)) {
140 140
 			}
141 141
 		}
Please login to merge, or discard this patch.
dev/initdata/purge-data.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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;
Please login to merge, or discard this patch.
dev/initdata/generate-product.php 2 patches
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -106,7 +106,7 @@
 block discarded – undo
106 106
 	$produit->tva_tx = "20.0";
107 107
 	$ret=$produit->create($user);
108 108
 	if ($ret < 0) {
109
-		print "Error $ret - ".$produit->error."\n";
109
+		print "error $ret - ".$produit->error."\n";
110 110
 	} else {
111 111
 		print " OK with ref ".$produit->ref."\n";
112 112
 	}
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 
27 27
 $sapi_type = php_sapi_name();
28 28
 $script_file = basename(__FILE__);
29
-$path=dirname(__FILE__).'/';
29
+$path = dirname(__FILE__).'/';
30 30
 
31 31
 // Test si mode batch
32 32
 $sapi_type = php_sapi_name();
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 
38 38
 // Recupere root dolibarr
39 39
 //$path=preg_replace('/generate-produit.php/i','',$_SERVER["PHP_SELF"]);
40
-require __DIR__. '/../../htdocs/master.inc.php';
40
+require __DIR__.'/../../htdocs/master.inc.php';
41 41
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
42 42
 include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
43 43
 include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
53 53
 define('GEN_NUMBER_PRODUIT', $argv[1] ?? 100);
54 54
 
55 55
 
56
-$ret=$user->fetch('', 'admin');
57
-if (! $ret > 0) {
56
+$ret = $user->fetch('', 'admin');
57
+if (!$ret > 0) {
58 58
 	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
59 59
 	exit;
60 60
 }
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 
63 63
 
64 64
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product"; $productsid = array();
65
-$resql=$db->query($sql);
65
+$resql = $db->query($sql);
66 66
 if ($resql) {
67 67
 	$num = $db->num_rows($resql);
68 68
 	$i = 0;
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 }
75 75
 
76 76
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe"; $societesid = array();
77
-$resql=$db->query($sql);
77
+$resql = $db->query($sql);
78 78
 if ($resql) {
79 79
 	$num = $db->num_rows($resql);
80 80
 	$i = 0;
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 }
89 89
 
90 90
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande"; $commandesid = array();
91
-$resql=$db->query($sql);
91
+$resql = $db->query($sql);
92 92
 if ($resql) {
93 93
 	$num = $db->num_rows($resql);
94 94
 	$i = 0;
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 	$produit->description = 'Description '.time().$s;
114 114
 	$produit->price = mt_rand(1, 999.99);
115 115
 	$produit->tva_tx = "20.0";
116
-	$ret=$produit->create($user);
116
+	$ret = $produit->create($user);
117 117
 	if ($ret < 0) {
118 118
 		print "Error $ret - ".$produit->error."\n";
119 119
 	} else {
Please login to merge, or discard this patch.
htdocs/contact/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@
 block discarded – undo
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
 /*
Please login to merge, or discard this patch.
htdocs/contact/perso.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -197,7 +197,7 @@
 block discarded – undo
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>';
Please login to merge, or discard this patch.
htdocs/product/traduction.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -134,15 +134,15 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 	}
Please login to merge, or discard this patch.
htdocs/product/dynamic_price/class/price_parser.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -155,7 +155,7 @@
 block discarded – undo
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
 		}
Please login to merge, or discard this patch.
htdocs/product/stats/facture_fournisseur.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -246,7 +246,7 @@
 block discarded – undo
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;
Please login to merge, or discard this patch.
doctemplates/websites/website_template-noimg/containers/manifest.json.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
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();
Please login to merge, or discard this patch.