@@ -45,7 +45,9 @@ |
||
45 | 45 | |
46 | 46 | // Security check |
47 | 47 | $socid = 0; |
48 | -if ($user->socid) $socid = $user->socid; |
|
48 | +if ($user->socid) { |
|
49 | + $socid = $user->socid; |
|
50 | +} |
|
49 | 51 | $result = restrictedArea($user, 'don', $id, ''); |
50 | 52 | |
51 | 53 | $object = new Don($db); |
@@ -21,13 +21,27 @@ discard block |
||
21 | 21 | * \brief File that include javascript functions used for dispatching qty/stock/lot |
22 | 22 | */ |
23 | 23 | |
24 | -if (!defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1'); |
|
25 | -if (!defined('NOCSRFCHECK')) define('NOCSRFCHECK', 1); |
|
26 | -if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); |
|
27 | -if (!defined('NOLOGIN')) define('NOLOGIN', 1); |
|
28 | -if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', 1); |
|
29 | -if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1); |
|
30 | -if (!defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1'); |
|
24 | +if (!defined('NOREQUIRESOC')) { |
|
25 | + define('NOREQUIRESOC', '1'); |
|
26 | +} |
|
27 | +if (!defined('NOCSRFCHECK')) { |
|
28 | + define('NOCSRFCHECK', 1); |
|
29 | +} |
|
30 | +if (!defined('NOTOKENRENEWAL')) { |
|
31 | + define('NOTOKENRENEWAL', 1); |
|
32 | +} |
|
33 | +if (!defined('NOLOGIN')) { |
|
34 | + define('NOLOGIN', 1); |
|
35 | +} |
|
36 | +if (!defined('NOREQUIREMENU')) { |
|
37 | + define('NOREQUIREMENU', 1); |
|
38 | +} |
|
39 | +if (!defined('NOREQUIREHTML')) { |
|
40 | + define('NOREQUIREHTML', 1); |
|
41 | +} |
|
42 | +if (!defined('NOREQUIREAJAX')) { |
|
43 | + define('NOREQUIREAJAX', '1'); |
|
44 | +} |
|
31 | 45 | |
32 | 46 | session_cache_limiter('public'); |
33 | 47 | |
@@ -36,8 +50,11 @@ discard block |
||
36 | 50 | // Define javascript type |
37 | 51 | top_httphead('text/javascript; charset=UTF-8'); |
38 | 52 | // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access. |
39 | -if (empty($dolibarr_nocache)) header('Cache-Control: max-age=10800, public, must-revalidate'); |
|
40 | -else header('Cache-Control: no-cache'); |
|
53 | +if (empty($dolibarr_nocache)) { |
|
54 | + header('Cache-Control: max-age=10800, public, must-revalidate'); |
|
55 | +} else { |
|
56 | + header('Cache-Control: no-cache'); |
|
57 | +} |
|
41 | 58 | |
42 | 59 | ?> |
43 | 60 | /** |
@@ -40,7 +40,9 @@ discard block |
||
40 | 40 | // Now we load forced value from install.forced.php file. |
41 | 41 | $useforcedwizard = false; |
42 | 42 | $forcedfile = "./install.forced.php"; |
43 | -if ($conffile == "/etc/dolibarr/conf.php") $forcedfile = "/etc/dolibarr/install.forced.php"; |
|
43 | +if ($conffile == "/etc/dolibarr/conf.php") { |
|
44 | + $forcedfile = "/etc/dolibarr/install.forced.php"; |
|
45 | +} |
|
44 | 46 | if (@file_exists($forcedfile)) { |
45 | 47 | $useforcedwizard = true; |
46 | 48 | include_once $forcedfile; |
@@ -112,7 +114,9 @@ discard block |
||
112 | 114 | } |
113 | 115 | |
114 | 116 | $ret = 0; |
115 | -if ($error && isset($argv[1])) $ret = 1; |
|
117 | +if ($error && isset($argv[1])) { |
|
118 | + $ret = 1; |
|
119 | +} |
|
116 | 120 | dolibarr_install_syslog("Exit ".$ret); |
117 | 121 | |
118 | 122 | dolibarr_install_syslog("- step4: end"); |
@@ -122,4 +126,6 @@ discard block |
||
122 | 126 | $db->close(); |
123 | 127 | |
124 | 128 | // Return code if ran from command line |
125 | -if ($ret) exit($ret); |
|
129 | +if ($ret) { |
|
130 | + exit($ret); |
|
131 | +} |
@@ -1,4 +1,7 @@ |
||
1 | -<?php if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> |
|
1 | +<?php if (!defined('ISLOADEDBYSTEELSHEET')) { |
|
2 | + die('Must be call by steelsheet'); |
|
3 | +} |
|
4 | +?> |
|
2 | 5 | /* <style type="text/css" > */ |
3 | 6 | |
4 | 7 | .mainmenu::before{ |
@@ -1,5 +1,7 @@ |
||
1 | 1 | <?php |
2 | -if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); |
|
2 | +if (!defined('ISLOADEDBYSTEELSHEET')) { |
|
3 | + die('Must be call by steelsheet'); |
|
4 | +} |
|
3 | 5 | |
4 | 6 | include dol_buildpath($path.'/theme/eldy/progress.inc.php', 0); // actually md use same style as eldy theme |
5 | 7 |
@@ -1,5 +1,8 @@ |
||
1 | 1 | <?php |
2 | -if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> |
|
2 | +if (!defined('ISLOADEDBYSTEELSHEET')) { |
|
3 | + die('Must be call by steelsheet'); |
|
4 | +} |
|
5 | +?> |
|
3 | 6 | /* <style type="text/css" > dont remove this line it's an ide hack */ |
4 | 7 | /* |
5 | 8 | * Dropdown of user popup |
@@ -1,11 +1,24 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -if (!defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1'); |
|
4 | -if (!defined('NOCSRFCHECK')) define('NOCSRFCHECK', 1); |
|
5 | -if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); |
|
6 | -if (!defined('NOLOGIN')) define('NOLOGIN', 1); // File must be accessed by logon page so without login |
|
7 | -if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1); |
|
8 | -if (!defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1'); |
|
3 | +if (!defined('NOREQUIRESOC')) { |
|
4 | + define('NOREQUIRESOC', '1'); |
|
5 | +} |
|
6 | +if (!defined('NOCSRFCHECK')) { |
|
7 | + define('NOCSRFCHECK', 1); |
|
8 | +} |
|
9 | +if (!defined('NOTOKENRENEWAL')) { |
|
10 | + define('NOTOKENRENEWAL', 1); |
|
11 | +} |
|
12 | +if (!defined('NOLOGIN')) { |
|
13 | + define('NOLOGIN', 1); |
|
14 | +} |
|
15 | +// File must be accessed by logon page so without login |
|
16 | +if (!defined('NOREQUIREHTML')) { |
|
17 | + define('NOREQUIREHTML', 1); |
|
18 | +} |
|
19 | +if (!defined('NOREQUIREAJAX')) { |
|
20 | + define('NOREQUIREAJAX', '1'); |
|
21 | +} |
|
9 | 22 | |
10 | 23 | session_cache_limiter('public'); |
11 | 24 |
@@ -1,5 +1,8 @@ |
||
1 | 1 | <?php |
2 | -if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> |
|
2 | +if (!defined('ISLOADEDBYSTEELSHEET')) { |
|
3 | + die('Must be call by steelsheet'); |
|
4 | +} |
|
5 | +?> |
|
3 | 6 | /* <style type="text/css" > */ |
4 | 7 | /* |
5 | 8 | progress style is based on boostrap and admin lte framework |
@@ -38,7 +38,9 @@ |
||
38 | 38 | |
39 | 39 | // Security check |
40 | 40 | $socid = GETPOST('socid', 'int'); |
41 | -if ($user->socid) $socid = $user->socid; |
|
41 | +if ($user->socid) { |
|
42 | + $socid = $user->socid; |
|
43 | +} |
|
42 | 44 | $result = restrictedArea($user, 'loan', $id, '', ''); |
43 | 45 | |
44 | 46 |