@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | } elseif (null !== filter_input(INPUT_POST, 'change_pw_origine', FILTER_SANITIZE_STRING) |
209 | 209 | && ((filter_input(INPUT_POST, 'change_pw_origine', FILTER_SANITIZE_STRING) === "admin_change" |
210 | 210 | || filter_input(INPUT_POST, 'change_pw_origine', FILTER_SANITIZE_STRING) === "user_change" |
211 | - ) && ($_SESSION['user_admin'] === "1"|| $_SESSION['user_manager'] === "1" |
|
211 | + ) && ($_SESSION['user_admin'] === "1" || $_SESSION['user_manager'] === "1" |
|
212 | 212 | || $_SESSION['user_can_manage_all_users'] === "1") |
213 | 213 | ) |
214 | 214 | ) { |
@@ -1249,10 +1249,10 @@ discard block |
||
1249 | 1249 | |
1250 | 1250 | // Identify url to anonymize it |
1251 | 1251 | if (strpos($line, 'cpassman_url') > 0 && empty($url_found) === true) { |
1252 | - $url_found = substr($line, 19, strlen($line) - 22);//echo $url_found." ; "; |
|
1252 | + $url_found = substr($line, 19, strlen($line) - 22); //echo $url_found." ; "; |
|
1253 | 1253 | $tmp = parse_url($url_found); |
1254 | - $anonym_url = $tmp['scheme'] . '://<anonym_url>' . $tmp['path']; |
|
1255 | - $line = "'cpassman_url' => '" . $anonym_url . "\n"; |
|
1254 | + $anonym_url = $tmp['scheme'].'://<anonym_url>'.$tmp['path']; |
|
1255 | + $line = "'cpassman_url' => '".$anonym_url."\n"; |
|
1256 | 1256 | } |
1257 | 1257 | |
1258 | 1258 | // Anonymize all urls |
@@ -1319,7 +1319,7 @@ discard block |
||
1319 | 1319 | |
1320 | 1320 | **Teampass configuration file:** |
1321 | 1321 | ``` |
1322 | -" . $list_of_options . " |
|
1322 | +" . $list_of_options." |
|
1323 | 1323 | ``` |
1324 | 1324 | |
1325 | 1325 | **Updated from an older Teampass or fresh install:** |
@@ -1334,12 +1334,12 @@ discard block |
||
1334 | 1334 | |
1335 | 1335 | #### Web server error log |
1336 | 1336 | ``` |
1337 | -" . $err['message']." - ".$err['file']." (".$err['line'] .") |
|
1337 | +" . $err['message']." - ".$err['file']." (".$err['line'].") |
|
1338 | 1338 | ``` |
1339 | 1339 | |
1340 | 1340 | #### Teampass 10 last system errors |
1341 | 1341 | ``` |
1342 | -" . $teampass_errors ." |
|
1342 | +" . $teampass_errors." |
|
1343 | 1343 | ``` |
1344 | 1344 | |
1345 | 1345 | #### Log from the web-browser developer console (CTRL + SHIFT + i) |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | logEvents('user_mngt', 'at_user_pwd_changed', $_SESSION['user_id'], $_SESSION['login'], $_SESSION['user_id']); |
201 | 201 | echo '[ { "error" : "none" } ]'; |
202 | 202 | } else { |
203 | - echo '[ { "error" : "pwd_hash_not_correct" } ]'; |
|
203 | + echo '[ { "error" : "pwd_hash_not_correct" } ]'; |
|
204 | 204 | } |
205 | 205 | break; |
206 | 206 | |
@@ -1403,7 +1403,7 @@ discard block |
||
1403 | 1403 | |
1404 | 1404 | // Update session |
1405 | 1405 | if ($field === 'user_api_key') { |
1406 | - $_SESSION['user_settings']['api-key'] = $new_value; |
|
1406 | + $_SESSION['user_settings']['api-key'] = $new_value; |
|
1407 | 1407 | } |
1408 | 1408 | break; |
1409 | 1409 | } |
@@ -341,8 +341,8 @@ |
||
341 | 341 | if ($getItemInList === true) { |
342 | 342 | $sOutputConst .= $sOutputItem; |
343 | 343 | } else { |
344 | - $iFilteredTotal --; |
|
345 | - $iTotal --; |
|
344 | + $iFilteredTotal--; |
|
345 | + $iTotal--; |
|
346 | 346 | } |
347 | 347 | } |
348 | 348 | if (!empty($sOutputConst)) { |
@@ -18,15 +18,15 @@ discard block |
||
18 | 18 | |
19 | 19 | // Load config if $SETTINGS not defined |
20 | 20 | if (!isset($SETTINGS['cpassman_dir']) || empty($SETTINGS['cpassman_dir'])) { |
21 | - if (file_exists('../includes/config/tp.config.php')) { |
|
22 | - require_once '../includes/config/tp.config.php'; |
|
23 | - } elseif (file_exists('./includes/config/tp.config.php')) { |
|
24 | - require_once './includes/config/tp.config.php'; |
|
25 | - } elseif (file_exists('../../includes/config/tp.config.php')) { |
|
26 | - require_once '../../includes/config/tp.config.php'; |
|
27 | - } else { |
|
28 | - throw new Exception("Error file '/includes/config/tp.config.php' not exists", 1); |
|
29 | - } |
|
21 | + if (file_exists('../includes/config/tp.config.php')) { |
|
22 | + require_once '../includes/config/tp.config.php'; |
|
23 | + } elseif (file_exists('./includes/config/tp.config.php')) { |
|
24 | + require_once './includes/config/tp.config.php'; |
|
25 | + } elseif (file_exists('../../includes/config/tp.config.php')) { |
|
26 | + require_once '../../includes/config/tp.config.php'; |
|
27 | + } else { |
|
28 | + throw new Exception("Error file '/includes/config/tp.config.php' not exists", 1); |
|
29 | + } |
|
30 | 30 | } |
31 | 31 | |
32 | 32 | // load phpCrypt |
@@ -1430,7 +1430,7 @@ discard block |
||
1430 | 1430 | // Can we use PHP7 random_int function? |
1431 | 1431 | if (version_compare(phpversion(), '7.0', '>=')) { |
1432 | 1432 | require_once $SETTINGS['cpassman_dir'].'/includes/libraries/PasswordGenerator/RandomGenerator/Php7RandomGenerator.php'; |
1433 | - $generator->setRandomGenerator(new PasswordGenerator\RandomGenerator\Php7RandomGenerator()); |
|
1433 | + $generator->setRandomGenerator(new PasswordGenerator\RandomGenerator\Php7RandomGenerator()); |
|
1434 | 1434 | } |
1435 | 1435 | |
1436 | 1436 | // init |
@@ -785,7 +785,7 @@ discard block |
||
785 | 785 | } |
786 | 786 | // Get IDs of personal folders |
787 | 787 | if (isset($SETTINGS['enable_pf_feature']) === true && $SETTINGS['enable_pf_feature'] === '1' |
788 | - && isset($_SESSION['personal_folder']) === true && $_SESSION['personal_folder'] === '1' |
|
788 | + && isset($_SESSION['personal_folder']) === true && $_SESSION['personal_folder'] === '1' |
|
789 | 789 | ) { |
790 | 790 | $persoFld = DB::queryfirstrow( |
791 | 791 | "SELECT id |
@@ -1997,7 +1997,7 @@ discard block |
||
1997 | 1997 | $antiXss = new protect\AntiXSS\AntiXSS(); |
1998 | 1998 | |
1999 | 1999 | // Protect against bad inputs |
2000 | - if (is_array($source_file) ||is_array($target_file)) { |
|
2000 | + if (is_array($source_file) || is_array($target_file)) { |
|
2001 | 2001 | return 'error_cannot_be_array'; |
2002 | 2002 | } |
2003 | 2003 | |
@@ -2154,7 +2154,7 @@ discard block |
||
2154 | 2154 | $newArr = array(); |
2155 | 2155 | |
2156 | 2156 | foreach ($arr as $key => $value) { |
2157 | - $newArr[ $key ] = (is_array($value) ? array_map_r($func, $value) : ( is_array($func) ? call_user_func_array($func, $value) : $func( $value ))); |
|
2157 | + $newArr[$key] = (is_array($value) ? array_map_r($func, $value) : (is_array($func) ? call_user_func_array($func, $value) : $func($value))); |
|
2158 | 2158 | } |
2159 | 2159 | |
2160 | 2160 | return $newArr; |
@@ -2289,16 +2289,16 @@ discard block |
||
2289 | 2289 | $mailname = str_replace($domain, '', $email); |
2290 | 2290 | $name_l = strlen($mailname); |
2291 | 2291 | $domain_l = strlen($domain); |
2292 | - for($i = 0; $i <= $name_l/$prop-1; $i++) { |
|
2292 | + for ($i = 0; $i <= $name_l / $prop - 1; $i++) { |
|
2293 | 2293 | $start .= 'x'; |
2294 | 2294 | } |
2295 | 2295 | |
2296 | - for($i = 0; $i <= $domain_l/$prop-1; $i++) { |
|
2296 | + for ($i = 0; $i <= $domain_l / $prop - 1; $i++) { |
|
2297 | 2297 | $end .= 'x'; |
2298 | 2298 | } |
2299 | 2299 | |
2300 | - return substr_replace($mailname, $start, 2, $name_l/$prop ) |
|
2301 | - .substr_replace($domain, $end, 2, $domain_l/$prop); |
|
2300 | + return substr_replace($mailname, $start, 2, $name_l / $prop) |
|
2301 | + .substr_replace($domain, $end, 2, $domain_l / $prop); |
|
2302 | 2302 | } |
2303 | 2303 | |
2304 | 2304 | /** |
@@ -2377,9 +2377,9 @@ discard block |
||
2377 | 2377 | |
2378 | 2378 | if ($entries['count'] > 0) { |
2379 | 2379 | // Now check if group fits |
2380 | - for ($i=0; $i<$entries['count']; $i++) { |
|
2381 | - $parsr=ldap_explode_dn($entries[$i]['dn'], 0); |
|
2382 | - if (str_replace(array('CN=','cn='), '', $parsr[0]) === $SETTINGS['ldap_usergroup']) { |
|
2380 | + for ($i = 0; $i < $entries['count']; $i++) { |
|
2381 | + $parsr = ldap_explode_dn($entries[$i]['dn'], 0); |
|
2382 | + if (str_replace(array('CN=', 'cn='), '', $parsr[0]) === $SETTINGS['ldap_usergroup']) { |
|
2383 | 2383 | $GroupRestrictionEnabled = true; |
2384 | 2384 | break; |
2385 | 2385 | } |
@@ -700,20 +700,20 @@ |
||
700 | 700 | && $SETTINGS['maintenance_mode'] === '1') |
701 | 701 | ) { |
702 | 702 | if (strpos($_SERVER['PHP_AUTH_USER'], '@') !== false) { |
703 | - $username = explode("@", $_SERVER['PHP_AUTH_USER'])[0]; |
|
704 | - } elseif (strpos($_SERVER['PHP_AUTH_USER'], '\\') !== false) { |
|
705 | - $username = explode("\\", $_SERVER['PHP_AUTH_USER'])[1]; |
|
706 | - } else { |
|
707 | - $username = $_SERVER['PHP_AUTH_USER']; |
|
708 | - } |
|
709 | - echo ' |
|
703 | + $username = explode("@", $_SERVER['PHP_AUTH_USER'])[0]; |
|
704 | + } elseif (strpos($_SERVER['PHP_AUTH_USER'], '\\') !== false) { |
|
705 | + $username = explode("\\", $_SERVER['PHP_AUTH_USER'])[1]; |
|
706 | + } else { |
|
707 | + $username = $_SERVER['PHP_AUTH_USER']; |
|
708 | + } |
|
709 | + echo ' |
|
710 | 710 | <div style="margin-bottom:3px;"> |
711 | 711 | <label for="login" class="form_label">', isset($SETTINGS['custom_login_text']) && !empty($SETTINGS['custom_login_text']) ? (string) $SETTINGS['custom_login_text'] : $LANG['index_login'], '</label> |
712 | 712 | <input type="text" size="10" id="login" name="login" class="input_text text ui-widget-content ui-corner-all" value="' , $username , '" readonly /> |
713 | 713 | <span id="login_check_wait" style="display:none; float:right;"><i class="fa fa-cog fa-spin fa-1x"></i></span> |
714 | 714 | </div>'; |
715 | - } else { |
|
716 | - echo ' |
|
715 | + } else { |
|
716 | + echo ' |
|
717 | 717 | <div style="margin-bottom:3px;"> |
718 | 718 | <label for="login" class="form_label">', isset($SETTINGS['custom_login_text']) && !empty($SETTINGS['custom_login_text']) ? (string) $SETTINGS['custom_login_text'] : $LANG['index_login'], '</label> |
719 | 719 | <input type="text" size="10" id="login" name="login" class="input_text text ui-widget-content ui-corner-all" value="', empty($post_login) === false ? $post_login : '', '" /> |
@@ -91,35 +91,35 @@ discard block |
||
91 | 91 | require_once $SETTINGS['cpassman_dir'].'/sources/core.php'; |
92 | 92 | |
93 | 93 | // Prepare POST variables |
94 | -$post_language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_STRING); |
|
95 | -$post_sig_response = filter_input(INPUT_POST, 'sig_response', FILTER_SANITIZE_STRING); |
|
96 | -$post_duo_login = filter_input(INPUT_POST, 'duo_login', FILTER_SANITIZE_STRING); |
|
97 | -$post_duo_pwd = filter_input(INPUT_POST, 'duo_pwd', FILTER_SANITIZE_STRING); |
|
98 | -$post_duo_data = filter_input(INPUT_POST, 'duo_data', FILTER_SANITIZE_STRING); |
|
99 | -$post_login = filter_input(INPUT_POST, 'login', FILTER_SANITIZE_STRING); |
|
100 | -$post_pw = filter_input(INPUT_POST, 'pw', FILTER_SANITIZE_STRING); |
|
94 | +$post_language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_STRING); |
|
95 | +$post_sig_response = filter_input(INPUT_POST, 'sig_response', FILTER_SANITIZE_STRING); |
|
96 | +$post_duo_login = filter_input(INPUT_POST, 'duo_login', FILTER_SANITIZE_STRING); |
|
97 | +$post_duo_pwd = filter_input(INPUT_POST, 'duo_pwd', FILTER_SANITIZE_STRING); |
|
98 | +$post_duo_data = filter_input(INPUT_POST, 'duo_data', FILTER_SANITIZE_STRING); |
|
99 | +$post_login = filter_input(INPUT_POST, 'login', FILTER_SANITIZE_STRING); |
|
100 | +$post_pw = filter_input(INPUT_POST, 'pw', FILTER_SANITIZE_STRING); |
|
101 | 101 | |
102 | 102 | // Prepare superGlobal variables |
103 | -$session_user_language = $superGlobal->get("user_language", "SESSION"); |
|
104 | -$session_user_id = $superGlobal->get("user_id", "SESSION"); |
|
105 | -$session_user_flag = $superGlobal->get("user_language_flag", "SESSION"); |
|
106 | -$session_user_admin = $superGlobal->get("user_admin", "SESSION"); |
|
103 | +$session_user_language = $superGlobal->get("user_language", "SESSION"); |
|
104 | +$session_user_id = $superGlobal->get("user_id", "SESSION"); |
|
105 | +$session_user_flag = $superGlobal->get("user_language_flag", "SESSION"); |
|
106 | +$session_user_admin = $superGlobal->get("user_admin", "SESSION"); |
|
107 | 107 | $session_user_human_resources = $superGlobal->get("user_can_manage_all_users", "SESSION"); |
108 | -$session_user_avatar_thumb = $superGlobal->get("user_avatar_thumb", "SESSION"); |
|
109 | -$session_name = $superGlobal->get("name", "SESSION"); |
|
110 | -$session_lastname = $superGlobal->get("lastname", "SESSION"); |
|
111 | -$session_user_manager = $superGlobal->get("user_manager", "SESSION"); |
|
112 | -$session_user_read_only = $superGlobal->get("user_read_only", "SESSION"); |
|
113 | -$session_is_admin = $superGlobal->get("is_admin", "SESSION"); |
|
114 | -$session_login = $superGlobal->get("login", "SESSION"); |
|
115 | -$session_validite_pw = $superGlobal->get("validite_pw", "SESSION"); |
|
116 | -$session_nb_folders = $superGlobal->get("nb_folders", "SESSION"); |
|
117 | -$session_nb_roles = $superGlobal->get("nb_roles", "SESSION"); |
|
118 | -$session_autoriser = $superGlobal->get("autoriser", "SESSION"); |
|
119 | -$session_hide_maintenance = $superGlobal->get("hide_maintenance", "SESSION"); |
|
120 | -$session_initial_url = $superGlobal->get("initial_url", "SESSION"); |
|
121 | -$server_request_uri = $superGlobal->get("REQUEST_URI", "SERVER"); |
|
122 | -$session_nb_users_online = $superGlobal->get("nb_users_online", "SESSION"); |
|
108 | +$session_user_avatar_thumb = $superGlobal->get("user_avatar_thumb", "SESSION"); |
|
109 | +$session_name = $superGlobal->get("name", "SESSION"); |
|
110 | +$session_lastname = $superGlobal->get("lastname", "SESSION"); |
|
111 | +$session_user_manager = $superGlobal->get("user_manager", "SESSION"); |
|
112 | +$session_user_read_only = $superGlobal->get("user_read_only", "SESSION"); |
|
113 | +$session_is_admin = $superGlobal->get("is_admin", "SESSION"); |
|
114 | +$session_login = $superGlobal->get("login", "SESSION"); |
|
115 | +$session_validite_pw = $superGlobal->get("validite_pw", "SESSION"); |
|
116 | +$session_nb_folders = $superGlobal->get("nb_folders", "SESSION"); |
|
117 | +$session_nb_roles = $superGlobal->get("nb_roles", "SESSION"); |
|
118 | +$session_autoriser = $superGlobal->get("autoriser", "SESSION"); |
|
119 | +$session_hide_maintenance = $superGlobal->get("hide_maintenance", "SESSION"); |
|
120 | +$session_initial_url = $superGlobal->get("initial_url", "SESSION"); |
|
121 | +$server_request_uri = $superGlobal->get("REQUEST_URI", "SERVER"); |
|
122 | +$session_nb_users_online = $superGlobal->get("nb_users_online", "SESSION"); |
|
123 | 123 | |
124 | 124 | /* DEFINE WHAT LANGUAGE TO USE */ |
125 | 125 | if (isset($_GET['language']) === true) { |
@@ -239,10 +239,7 @@ discard block |
||
239 | 239 | <div style="float:right; margin:-10px 5px 0 0; color:#FFF;">' |
240 | 240 | .$LANG['index_welcome'].' <b>'.$session_name.' '.$session_lastname |
241 | 241 | .' ['.$session_login.']</b> - ' |
242 | - , $session_user_admin === '1' ? $LANG['god'] : |
|
243 | - ($session_user_manager === '1' ? $LANG['gestionnaire'] : |
|
244 | - ($session_user_read_only === '1' ? $LANG['read_only_account'] : |
|
245 | - ($session_user_human_resources === '1' ? $LANG['human_resources'] :$LANG['user']) |
|
242 | + , $session_user_admin === '1' ? $LANG['god'] : ($session_user_manager === '1' ? $LANG['gestionnaire'] : ($session_user_read_only === '1' ? $LANG['read_only_account'] : ($session_user_human_resources === '1' ? $LANG['human_resources'] : $LANG['user']) |
|
246 | 243 | ) |
247 | 244 | ), ' '.strtolower($LANG['index_login']).'</div>'; |
248 | 245 | |
@@ -709,7 +706,7 @@ discard block |
||
709 | 706 | echo ' |
710 | 707 | <div style="margin-bottom:3px;"> |
711 | 708 | <label for="login" class="form_label">', isset($SETTINGS['custom_login_text']) && !empty($SETTINGS['custom_login_text']) ? (string) $SETTINGS['custom_login_text'] : $LANG['index_login'], '</label> |
712 | - <input type="text" size="10" id="login" name="login" class="input_text text ui-widget-content ui-corner-all" value="' , $username , '" readonly /> |
|
709 | + <input type="text" size="10" id="login" name="login" class="input_text text ui-widget-content ui-corner-all" value="' , $username, '" readonly /> |
|
713 | 710 | <span id="login_check_wait" style="display:none; float:right;"><i class="fa fa-cog fa-spin fa-1x"></i></span> |
714 | 711 | </div>'; |
715 | 712 | } else { |
@@ -733,7 +730,7 @@ discard block |
||
733 | 730 | </div>'; |
734 | 731 | } |
735 | 732 | |
736 | - if (!(isset($SETTINGS['enable_http_request_login']) === true && $SETTINGS['enable_http_request_login'] === '1' && isset($_SERVER['PHP_AUTH_USER']) === true && !(isset($SETTINGS['maintenance_mode']) === true && $SETTINGS['maintenance_mode'] === '1')) ) { |
|
733 | + if (!(isset($SETTINGS['enable_http_request_login']) === true && $SETTINGS['enable_http_request_login'] === '1' && isset($_SERVER['PHP_AUTH_USER']) === true && !(isset($SETTINGS['maintenance_mode']) === true && $SETTINGS['maintenance_mode'] === '1'))) { |
|
737 | 734 | echo ' |
738 | 735 | <div id="connect_pw" style="margin-bottom:3px;"> |
739 | 736 | <label for="pw" class="form_label" id="user_pwd">'.$LANG['index_password'].'</label> |
@@ -788,7 +785,7 @@ discard block |
||
788 | 785 | <script> |
789 | 786 | var seconds = 1; |
790 | 787 | function updateLogonButton(timeToGo){ |
791 | - document.getElementById("but_identify_user").value = "' . $LANG['duration_login_attempt'] . ' " + timeToGo; |
|
788 | + document.getElementById("but_identify_user").value = "' . $LANG['duration_login_attempt'].' " + timeToGo; |
|
792 | 789 | } |
793 | 790 | $( window ).on( "load", function() { |
794 | 791 | updateLogonButton(seconds); |
@@ -845,7 +842,7 @@ discard block |
||
845 | 842 | <a href="https://www.reddit.com/r/TeamPass/" target="_blank" style="color:#F0F0F0;" class="tip" title="'.addslashes($LANG['admin_help']).'"><i class="fa fa-reddit-alien"></i></a> |
846 | 843 | |
847 | 844 | ', ($session_user_id !== null && empty($session_user_id) === false) ? ' |
848 | - <a href="#" style="color:#F0F0F0;" class="tip" title="'.addslashes($LANG['bugs_page']).'" onclick="generateBugReport()"><i class="fa fa-bug"></i></a>' : '' ,' |
|
845 | + <a href="#" style="color:#F0F0F0;" class="tip" title="'.addslashes($LANG['bugs_page']).'" onclick="generateBugReport()"><i class="fa fa-bug"></i></a>' : '', ' |
|
849 | 846 | </div> |
850 | 847 | <div style="float:left;width:32%;text-align:center;"> |
851 | 848 | ', ($session_user_id !== null && empty($session_user_id) === false) ? '<i class="fa fa-users"></i> '.$session_nb_users_online.' '.$LANG['users_online'].' | <i class="fa fa-hourglass-end"></i> '.$LANG['index_expiration_in'].' <div style="display:inline;" id="countdown"></div>' : '', ' |
@@ -633,7 +633,7 @@ discard block |
||
633 | 633 | $json[$inc]['nlevel'] = mb_convert_encoding($folder->nlevel, mb_detect_encoding($folder->nlevel), 'UTF-8'); |
634 | 634 | $json[$inc]['personal'] = mb_convert_encoding($folder->personal_folder, mb_detect_encoding($folder->personal_folder), 'UTF-8'); |
635 | 635 | |
636 | - $inc ++; |
|
636 | + $inc++; |
|
637 | 637 | } |
638 | 638 | } |
639 | 639 | } |
@@ -2099,7 +2099,7 @@ discard block |
||
2099 | 2099 | $tree = new Tree\NestedTree\NestedTree(prefix_table("nested_tree"), 'id', 'parent_id', 'title'); |
2100 | 2100 | $tree->rebuild(); |
2101 | 2101 | |
2102 | - echo json_encode(array('new_id' => $newID , 'err' => '')); |
|
2102 | + echo json_encode(array('new_id' => $newID, 'err' => '')); |
|
2103 | 2103 | } elseif ($GLOBALS['request'][1] === "edit") { |
2104 | 2104 | // Is this folder a personal one? |
2105 | 2105 | $fldData = DB::queryFirstRow( |
@@ -2166,7 +2166,7 @@ discard block |
||
2166 | 2166 | $item_definition['item_id'] |
2167 | 2167 | ); |
2168 | 2168 | |
2169 | - echo json_encode(array('new_id' => '' , 'err' => '')); |
|
2169 | + echo json_encode(array('new_id' => '', 'err' => '')); |
|
2170 | 2170 | } |
2171 | 2171 | } else { |
2172 | 2172 | rest_error('AUTH_NOT_GRANTED'); |
@@ -1635,7 +1635,7 @@ |
||
1635 | 1635 | rest_error('AUTH_NO_URL'); |
1636 | 1636 | } |
1637 | 1637 | } else { |
1638 | - rest_error('AUTH_NO_IDENTIFIER'); |
|
1638 | + rest_error('AUTH_NO_IDENTIFIER'); |
|
1639 | 1639 | } |
1640 | 1640 | } else { |
1641 | 1641 | rest_error('AUTH_NO_IDENTIFIER'); |
@@ -978,9 +978,9 @@ discard block |
||
978 | 978 | |
979 | 979 | // Get all allowed folders |
980 | 980 | $array_all_visible_folders = array_merge( |
981 | - $_SESSION['groupes_visibles'], |
|
982 | - $_SESSION['read_only_folders'], |
|
983 | - $_SESSION['personal_visible_groups'] |
|
981 | + $_SESSION['groupes_visibles'], |
|
982 | + $_SESSION['read_only_folders'], |
|
983 | + $_SESSION['personal_visible_groups'] |
|
984 | 984 | ); |
985 | 985 | |
986 | 986 | // get list of all folders |
@@ -993,7 +993,7 @@ discard block |
||
993 | 993 | // Can user access this subfolder? |
994 | 994 | |
995 | 995 | if (in_array($node->id, $array_all_visible_folders) === false) { |
996 | - continue; |
|
996 | + continue; |
|
997 | 997 | } |
998 | 998 | |
999 | 999 | // get info about current node |
@@ -2085,7 +2085,7 @@ discard block |
||
2085 | 2085 | $debug_ldap .= "LDAP connection : ".($ldapconn ? "Connected" : "Failed")."<br/>"; |
2086 | 2086 | |
2087 | 2087 | if ($ldapconn) { |
2088 | - $debug_ldap .= "DN : ".$dataReceived[0]['ldap_bind_dn']." -- ".$dataReceived[0]['ldap_bind_passwd']."<br/>"; |
|
2088 | + $debug_ldap .= "DN : ".$dataReceived[0]['ldap_bind_dn']." -- ".$dataReceived[0]['ldap_bind_passwd']."<br/>"; |
|
2089 | 2089 | ldap_set_option($ldapconn, LDAP_OPT_PROTOCOL_VERSION, 3); |
2090 | 2090 | ldap_set_option($ldapconn, LDAP_OPT_REFERRALS, 0); |
2091 | 2091 | $ldapbind = ldap_bind($ldapconn, $dataReceived[0]['ldap_bind_dn'], $dataReceived[0]['ldap_bind_passwd']); |
@@ -2112,7 +2112,7 @@ discard block |
||
2112 | 2112 | ); |
2113 | 2113 | |
2114 | 2114 | $debug_ldap .= 'Search filter (group): '.$filter_group."<br/>". |
2115 | - 'Results : '.str_replace("\n","<br>", print_r(ldap_get_entries($ldapconn, $result_group), true))."<br/>"; |
|
2115 | + 'Results : '.str_replace("\n","<br>", print_r(ldap_get_entries($ldapconn, $result_group), true))."<br/>"; |
|
2116 | 2116 | |
2117 | 2117 | if ($result_group) { |
2118 | 2118 | $entries = ldap_get_entries($ldapconn, $result_group); |
@@ -2120,11 +2120,11 @@ discard block |
||
2120 | 2120 | if ($entries['count'] > 0) { |
2121 | 2121 | // Now check if group fits |
2122 | 2122 | for ($i=0; $i<$entries['count']; $i++) { |
2123 | - $parsr=ldap_explode_dn($entries[$i]['dn'], 0); |
|
2124 | - if (str_replace(array('CN=','cn='), '', $parsr[0]) === $SETTINGS['ldap_usergroup']) { |
|
2123 | + $parsr=ldap_explode_dn($entries[$i]['dn'], 0); |
|
2124 | + if (str_replace(array('CN=','cn='), '', $parsr[0]) === $SETTINGS['ldap_usergroup']) { |
|
2125 | 2125 | $GroupRestrictionEnabled = true; |
2126 | 2126 | break; |
2127 | - } |
|
2127 | + } |
|
2128 | 2128 | } |
2129 | 2129 | |
2130 | 2130 | } |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | array( |
108 | 108 | 'http' => array( |
109 | 109 | 'ignore_errors' => true, |
110 | - 'proxy' => $SETTINGS['proxy_ip'] . ':' . $SETTINGS['proxy_port'] |
|
110 | + 'proxy' => $SETTINGS['proxy_ip'].':'.$SETTINGS['proxy_port'] |
|
111 | 111 | ) |
112 | 112 | ) |
113 | 113 | ); |
@@ -665,7 +665,7 @@ discard block |
||
665 | 665 | |
666 | 666 | |
667 | 667 | // generate new saltkey |
668 | - $old_sk_filename = SECUREPATH."/teampass-seckey.txt".'.'.date("Y_m_d", mktime(0, 0, 0, (int)date('m'), (int)date('d'), (int)date('y'))).'.'.time(); |
|
668 | + $old_sk_filename = SECUREPATH."/teampass-seckey.txt".'.'.date("Y_m_d", mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))).'.'.time(); |
|
669 | 669 | copy( |
670 | 670 | SECUREPATH."/teampass-seckey.txt", |
671 | 671 | $old_sk_filename |
@@ -769,7 +769,7 @@ discard block |
||
769 | 769 | $objects = explode(",", $post_object); |
770 | 770 | |
771 | 771 | // Allowed values for $_POST['object'] : "items,logs,files,categories" |
772 | - if (in_array($objects[0], array("items","logs","files","categories")) === false) { |
|
772 | + if (in_array($objects[0], array("items", "logs", "files", "categories")) === false) { |
|
773 | 773 | echo '[{"nextAction":"" , "error":"Input `'.$objects[0].'` is not allowed" , "nbOfItems":""}]'; |
774 | 774 | break; |
775 | 775 | } |
@@ -1259,7 +1259,7 @@ discard block |
||
1259 | 1259 | foreach ($rows as $record) { |
1260 | 1260 | if (is_file($SETTINGS['path_to_upload_folder'].'/'.$record['file'])) { |
1261 | 1261 | $addFile = 0; |
1262 | - if ($post_option== "decrypt" && $record['status'] === 'encrypted') { |
|
1262 | + if ($post_option == "decrypt" && $record['status'] === 'encrypted') { |
|
1263 | 1263 | $addFile = 1; |
1264 | 1264 | } elseif ($post_option == "encrypt" && $record['status'] === 'clear') { |
1265 | 1265 | $addFile = 1; |
@@ -1551,7 +1551,7 @@ discard block |
||
1551 | 1551 | $tmp_skfile, |
1552 | 1552 | $tmp_skfile.'.'.date( |
1553 | 1553 | "Y_m_d", |
1554 | - mktime(0, 0, 0, (int)date('m'), (int)date('d'), (int)date('y')) |
|
1554 | + mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y')) |
|
1555 | 1555 | ) |
1556 | 1556 | )) { |
1557 | 1557 | echo '[{"result" : "" , "error" : "Could NOT perform a copy of file: '.$tmp_skfile.'"}]'; |
@@ -2067,16 +2067,16 @@ discard block |
||
2067 | 2067 | ); |
2068 | 2068 | |
2069 | 2069 | $debug_ldap .= 'Search filter (group): '.$filter_group."<br/>". |
2070 | - 'Results : '.str_replace("\n","<br>", print_r(ldap_get_entries($ldapconn, $result_group), true))."<br/>"; |
|
2070 | + 'Results : '.str_replace("\n", "<br>", print_r(ldap_get_entries($ldapconn, $result_group), true))."<br/>"; |
|
2071 | 2071 | |
2072 | 2072 | if ($result_group) { |
2073 | 2073 | $entries = ldap_get_entries($ldapconn, $result_group); |
2074 | 2074 | |
2075 | 2075 | if ($entries['count'] > 0) { |
2076 | 2076 | // Now check if group fits |
2077 | - for ($i=0; $i<$entries['count']; $i++) { |
|
2078 | - $parsr=ldap_explode_dn($entries[$i]['dn'], 0); |
|
2079 | - if (str_replace(array('CN=','cn='), '', $parsr[0]) === $SETTINGS['ldap_usergroup']) { |
|
2077 | + for ($i = 0; $i < $entries['count']; $i++) { |
|
2078 | + $parsr = ldap_explode_dn($entries[$i]['dn'], 0); |
|
2079 | + if (str_replace(array('CN=', 'cn='), '', $parsr[0]) === $SETTINGS['ldap_usergroup']) { |
|
2080 | 2080 | $GroupRestrictionEnabled = true; |
2081 | 2081 | break; |
2082 | 2082 | } |
@@ -2089,7 +2089,7 @@ discard block |
||
2089 | 2089 | } |
2090 | 2090 | |
2091 | 2091 | $debug_ldap .= 'Search filter : '.$filter."<br/>". |
2092 | - 'Results : '.str_replace("\n","<br>", print_r(ldap_get_entries($ldapconn, $result), true))."<br/>"; |
|
2092 | + 'Results : '.str_replace("\n", "<br>", print_r(ldap_get_entries($ldapconn, $result), true))."<br/>"; |
|
2093 | 2093 | |
2094 | 2094 | if (ldap_count_entries($ldapconn, $result)) { |
2095 | 2095 | // try auth |
@@ -495,9 +495,9 @@ |
||
495 | 495 | |
496 | 496 | if ($entries['count'] > 0) { |
497 | 497 | // Now check if group fits |
498 | - for ($i=0; $i<$entries['count']; $i++) { |
|
499 | - $parsr=ldap_explode_dn($entries[$i]['dn'], 0); |
|
500 | - if (str_replace(array('CN=','cn='), '', $parsr[0]) === $SETTINGS['ldap_usergroup']) { |
|
498 | + for ($i = 0; $i < $entries['count']; $i++) { |
|
499 | + $parsr = ldap_explode_dn($entries[$i]['dn'], 0); |
|
500 | + if (str_replace(array('CN=', 'cn='), '', $parsr[0]) === $SETTINGS['ldap_usergroup']) { |
|
501 | 501 | $GroupRestrictionEnabled = true; |
502 | 502 | break; |
503 | 503 | } |
@@ -503,11 +503,11 @@ |
||
503 | 503 | if ($entries['count'] > 0) { |
504 | 504 | // Now check if group fits |
505 | 505 | for ($i=0; $i<$entries['count']; $i++) { |
506 | - $parsr=ldap_explode_dn($entries[$i]['dn'], 0); |
|
507 | - if (str_replace(array('CN=','cn='), '', $parsr[0]) === $SETTINGS['ldap_usergroup']) { |
|
506 | + $parsr=ldap_explode_dn($entries[$i]['dn'], 0); |
|
507 | + if (str_replace(array('CN=','cn='), '', $parsr[0]) === $SETTINGS['ldap_usergroup']) { |
|
508 | 508 | $GroupRestrictionEnabled = true; |
509 | 509 | break; |
510 | - } |
|
510 | + } |
|
511 | 511 | } |
512 | 512 | |
513 | 513 | } |
@@ -50,23 +50,23 @@ |
||
50 | 50 | Handle CASES |
51 | 51 | */ |
52 | 52 | switch (filter_input(INPUT_POST, 'type', FILTER_SANITIZE_STRING)) { |
53 | -case "checkSessionExists": |
|
54 | - // Case permit to check if SESSION is still valid |
|
55 | - session_start(); |
|
56 | - if (isset($_SESSION['CPM']) === true) { |
|
57 | - echo "1"; |
|
58 | - } else { |
|
59 | - // In case that no session is available |
|
60 | - // Force the page to be reloaded and attach the CSRFP info |
|
61 | - |
|
62 | - // Load CSRFP |
|
63 | - $csrfp_array = include '../includes/libraries/csrfp/libs/csrfp.config.php'; |
|
64 | - |
|
65 | - // Send back CSRFP info |
|
66 | - echo $csrfp_array['CSRFP_TOKEN'].";".filter_input(INPUT_POST, $csrfp_array['CSRFP_TOKEN'], FILTER_SANITIZE_STRING); |
|
67 | - } |
|
53 | + case "checkSessionExists": |
|
54 | + // Case permit to check if SESSION is still valid |
|
55 | + session_start(); |
|
56 | + if (isset($_SESSION['CPM']) === true) { |
|
57 | + echo "1"; |
|
58 | + } else { |
|
59 | + // In case that no session is available |
|
60 | + // Force the page to be reloaded and attach the CSRFP info |
|
61 | + |
|
62 | + // Load CSRFP |
|
63 | + $csrfp_array = include '../includes/libraries/csrfp/libs/csrfp.config.php'; |
|
64 | + |
|
65 | + // Send back CSRFP info |
|
66 | + echo $csrfp_array['CSRFP_TOKEN'].";".filter_input(INPUT_POST, $csrfp_array['CSRFP_TOKEN'], FILTER_SANITIZE_STRING); |
|
67 | + } |
|
68 | 68 | |
69 | - break; |
|
69 | + break; |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | /** |