@@ -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 |
@@ -29,8 +29,9 @@ discard block |
||
29 | 29 | // Load translation files required by the page |
30 | 30 | $langs->loadLangs(array("install", "other", "admin")); |
31 | 31 | |
32 | -if (!$user->admin) |
|
32 | +if (!$user->admin) { |
|
33 | 33 | accessforbidden(); |
34 | +} |
|
34 | 35 | |
35 | 36 | |
36 | 37 | /* |
@@ -55,8 +56,12 @@ discard block |
||
55 | 56 | print '<tr class="oddeven"><td width="300">'.$langs->trans("Version").'</td><td colspan="2">'.$tmp['browserversion'].'</td></tr>'."\n"; |
56 | 57 | print '<tr class="oddeven"><td width="300">'.$langs->trans("Layout").' (phone/tablet/classic)</td><td colspan="2">'.$tmp['layout'].'</td></tr>'."\n"; |
57 | 58 | print '<tr class="oddeven"><td width="300">'.$langs->trans("IPAddress").'</td><td colspan="2">'.dol_escape_htmltag($_SERVER['REMOTE_ADDR']); |
58 | -if (!empty($_SERVER['HTTP_CLIENT_IP'])) print ' (HTTP_CLIENT_IP='.dol_escape_htmltag($_SERVER['HTTP_CLIENT_IP']).')'; |
|
59 | -if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) print ' (HTTP_X_FORWARDED_FOR='.dol_escape_htmltag($_SERVER['HTTP_X_FORWARDED_FOR']).')'; |
|
59 | +if (!empty($_SERVER['HTTP_CLIENT_IP'])) { |
|
60 | + print ' (HTTP_CLIENT_IP='.dol_escape_htmltag($_SERVER['HTTP_CLIENT_IP']).')'; |
|
61 | +} |
|
62 | +if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) { |
|
63 | + print ' (HTTP_X_FORWARDED_FOR='.dol_escape_htmltag($_SERVER['HTTP_X_FORWARDED_FOR']).')'; |
|
64 | +} |
|
60 | 65 | print '</td></tr>'."\n"; |
61 | 66 | print '<tr class="oddeven"><td width="300">'.$langs->trans("SessionName").'</td><td colspan="2">'.session_name().'</td></tr>'."\n"; |
62 | 67 | print '<tr class="oddeven"><td width="300">'.$langs->trans("SessionId").'</td><td colspan="2">'.session_id().'</td></tr>'."\n"; |
@@ -24,7 +24,9 @@ |
||
24 | 24 | |
25 | 25 | $langs->load("admin"); |
26 | 26 | |
27 | -if (!$user->admin) accessforbidden(); |
|
27 | +if (!$user->admin) { |
|
28 | + accessforbidden(); |
|
29 | +} |
|
28 | 30 | |
29 | 31 | $action = GETPOST('action', 'aZ09'); |
30 | 32 |