@@ -13,7 +13,7 @@ |
||
13 | 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
14 | 14 | */ |
15 | 15 | global $LANG; |
16 | -$LANG = array ( |
|
16 | +$LANG = array( |
|
17 | 17 | 'report_a_bug' => 'Report a Bug', |
18 | 18 | 'user_profile_api_key' => 'Your API key', |
19 | 19 | 'settings_ldap_and_local_authentication' => 'Local and LDAP users', |
@@ -13,7 +13,7 @@ |
||
13 | 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
14 | 14 | */ |
15 | 15 | global $LANG; |
16 | -$LANG = array ( |
|
16 | +$LANG = array( |
|
17 | 17 | 'report_a_bug' => 'Report a Bug', |
18 | 18 | 'user_profile_api_key' => 'Your API key', |
19 | 19 | 'settings_ldap_and_local_authentication' => 'Local and LDAP users', |
@@ -13,7 +13,7 @@ |
||
13 | 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
14 | 14 | */ |
15 | 15 | global $LANG; |
16 | -$LANG = array ( |
|
16 | +$LANG = array( |
|
17 | 17 | 'report_a_bug' => 'Report a Bug', |
18 | 18 | 'user_profile_api_key' => 'Your API key', |
19 | 19 | 'settings_ldap_and_local_authentication' => 'Local and LDAP users', |
@@ -13,7 +13,7 @@ |
||
13 | 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
14 | 14 | */ |
15 | 15 | global $LANG; |
16 | -$LANG = array ( |
|
16 | +$LANG = array( |
|
17 | 17 | 'report_a_bug' => 'Report a Bug', |
18 | 18 | 'user_profile_api_key' => 'Your API key', |
19 | 19 | 'settings_ldap_and_local_authentication' => 'Local and LDAP users', |
@@ -446,10 +446,10 @@ discard block |
||
446 | 446 | if (($SETTINGS['ldap_bind_dn'] === "" && $SETTINGS['ldap_bind_passwd'] === "") || $ldapbind === true) { |
447 | 447 | $filter = "(&(".$SETTINGS['ldap_user_attribute']."=".$username.")(objectClass=".$SETTINGS['ldap_object_class']."))"; |
448 | 448 | $result = ldap_search( |
449 | - $ldapconn, |
|
450 | - $SETTINGS['ldap_search_base'], |
|
451 | - $filter, |
|
452 | - array('dn', 'mail', 'givenname', 'sn') |
|
449 | + $ldapconn, |
|
450 | + $SETTINGS['ldap_search_base'], |
|
451 | + $filter, |
|
452 | + array('dn', 'mail', 'givenname', 'sn') |
|
453 | 453 | ); |
454 | 454 | if ($debugLdap == 1) { |
455 | 455 | fputs( |
@@ -496,11 +496,11 @@ discard block |
||
496 | 496 | if ($entries['count'] > 0) { |
497 | 497 | // Now check if group fits |
498 | 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']) { |
|
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 | + } |
|
504 | 504 | } |
505 | 505 | |
506 | 506 | } |
@@ -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 | } |
@@ -13,7 +13,7 @@ |
||
13 | 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
14 | 14 | */ |
15 | 15 | global $LANG; |
16 | -$LANG = array ( |
|
16 | +$LANG = array( |
|
17 | 17 | 'at_user_updated' => 'User #user_login# was updated', |
18 | 18 | 'report_a_bug' => 'Report a Bug', |
19 | 19 | 'user_profile_api_key' => 'Your API key', |
@@ -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 | /** |
@@ -457,28 +457,28 @@ discard block |
||
457 | 457 | |
458 | 458 | // Prepare error message |
459 | 459 | if (value.pw_status === "encryption_error") { |
460 | - pwd_error = '<span class="fa fa-warning fa-sm mi-red tip" title="<?php echo addslashes($LANG['pw_encryption_error']);?>"></span> '; |
|
460 | + pwd_error = '<span class="fa fa-warning fa-sm mi-red tip" title="<?php echo addslashes($LANG['pw_encryption_error']); ?>"></span> '; |
|
461 | 461 | } |
462 | 462 | |
463 | 463 | // Prepare anyone can modify icon |
464 | 464 | if (value.anyone_can_modify === "1") { |
465 | - icon_all_can_modify = '<span class="fa fa-pencil fa-sm mi-grey-1 pointer tip" title="<?php echo addslashes($LANG['item_menu_collab_enable']);?>" onclick="AfficherDetailsItem(\''+value.item_id+'\',\''+value.sk+'\',\''+value.expired+'\', \''+value.restricted+'\', \''+value.display+'\', \''+value.open_edit+'\', \''+value.reload+'\', \''+value.tree_id+'\')"></span> '; |
|
465 | + icon_all_can_modify = '<span class="fa fa-pencil fa-sm mi-grey-1 pointer tip" title="<?php echo addslashes($LANG['item_menu_collab_enable']); ?>" onclick="AfficherDetailsItem(\''+value.item_id+'\',\''+value.sk+'\',\''+value.expired+'\', \''+value.restricted+'\', \''+value.display+'\', \''+value.open_edit+'\', \''+value.reload+'\', \''+value.tree_id+'\')"></span> '; |
|
466 | 466 | } |
467 | 467 | |
468 | 468 | // Prepare mini icons |
469 | 469 | if (value.copy_to_clipboard_small_icons === "1" && value.display_item === 1) { |
470 | 470 | // Login icon |
471 | 471 | if (value.login !== "") { |
472 | - icon_login = '<span class="fa fa-sm fa-user mi-black mini_login" data-clipboard-text="'+sanitizeString(value.login)+'" title="<?php echo addslashes($LANG['item_menu_copy_login']);?>" id="minilogin_'+value.item_id+'"></span> '; |
|
472 | + icon_login = '<span class="fa fa-sm fa-user mi-black mini_login" data-clipboard-text="'+sanitizeString(value.login)+'" title="<?php echo addslashes($LANG['item_menu_copy_login']); ?>" id="minilogin_'+value.item_id+'"></span> '; |
|
473 | 473 | } |
474 | 474 | // Pwd icon |
475 | 475 | if (value.pw !== "") { |
476 | - icon_pwd = '<span class="fa fa-sm fa-lock mi-black mini_pw" data-clipboard-text="'+sanitizeString(value.pw)+'" title="<?php echo addslashes($LANG['item_menu_copy_pw']);?>" data-clipboard-id="'+value.item_id+'" id="minipwd_'+value.item_id+'"></span> '; |
|
476 | + icon_pwd = '<span class="fa fa-sm fa-lock mi-black mini_pw" data-clipboard-text="'+sanitizeString(value.pw)+'" title="<?php echo addslashes($LANG['item_menu_copy_pw']); ?>" data-clipboard-id="'+value.item_id+'" id="minipwd_'+value.item_id+'"></span> '; |
|
477 | 477 | } |
478 | 478 | |
479 | 479 | // Now check if pwd is empty. If it is then warn user |
480 | 480 | if (value.pw === "") { |
481 | - pwd_error = ' <span class="fa fa-exclamation-circle fa-sm mi-yellow tip" title="<?php echo addslashes($LANG['password_is_empty']);?>"></span> '; |
|
481 | + pwd_error = ' <span class="fa fa-exclamation-circle fa-sm mi-yellow tip" title="<?php echo addslashes($LANG['password_is_empty']); ?>"></span> '; |
|
482 | 482 | } |
483 | 483 | } |
484 | 484 | |
@@ -2409,8 +2409,8 @@ discard block |
||
2409 | 2409 | $("#delete-edit-file_"+file_id) |
2410 | 2410 | .hide() |
2411 | 2411 | .after( |
2412 | - '<span class="delete_me"> <span id="confirm-delete-edit-file_'+file_id+'" class="fa fa-thumbs-up tip" style="cursor:pointer;" onclick="delete_attached_file('+file_id+', 1)" title="<?php echo addslashes($LANG['confirm']);?>"></span>' + |
|
2413 | - ' <span id="cancel-delete-edit-file_'+file_id+'" class="fa fa-thumbs-down tip" style="cursor:pointer;" onclick="cancel_delete_attached_file('+file_id+')" title="<?php echo addslashes($LANG['cancel']);?>"></span> </span>' |
|
2412 | + '<span class="delete_me"> <span id="confirm-delete-edit-file_'+file_id+'" class="fa fa-thumbs-up tip" style="cursor:pointer;" onclick="delete_attached_file('+file_id+', 1)" title="<?php echo addslashes($LANG['confirm']); ?>"></span>' + |
|
2413 | + ' <span id="cancel-delete-edit-file_'+file_id+'" class="fa fa-thumbs-down tip" style="cursor:pointer;" onclick="cancel_delete_attached_file('+file_id+')" title="<?php echo addslashes($LANG['cancel']); ?>"></span> </span>' |
|
2414 | 2414 | ); |
2415 | 2415 | $(".tip").tooltipster({multiple: true}); |
2416 | 2416 | } |
@@ -2631,9 +2631,9 @@ discard block |
||
2631 | 2631 | |
2632 | 2632 | // Shall we show the root folder |
2633 | 2633 | if (data.html_json.can_create_root_folder === 1) { |
2634 | - html_visible = '<option value="0"><?php echo addslashes($LANG['root']);?></option>'; |
|
2635 | - html_full_visible = '<option value="0"><?php echo addslashes($LANG['root']);?></option>'; |
|
2636 | - html_active_visible = '<option value="0"><?php echo addslashes($LANG['root']);?></option>'; |
|
2634 | + html_visible = '<option value="0"><?php echo addslashes($LANG['root']); ?></option>'; |
|
2635 | + html_full_visible = '<option value="0"><?php echo addslashes($LANG['root']); ?></option>'; |
|
2636 | + html_active_visible = '<option value="0"><?php echo addslashes($LANG['root']); ?></option>'; |
|
2637 | 2637 | } |
2638 | 2638 | |
2639 | 2639 | // |
@@ -4674,20 +4674,20 @@ discard block |
||
4674 | 4674 | if (value.copy_to_clipboard_small_icons === '1') { |
4675 | 4675 | // Prepare Login |
4676 | 4676 | if (value.login !== "") { |
4677 | - value.login = '<span class="fa fa-user fa-lg mi-black mini_login tip" data-clipboard-text="'+value.login+'" title="<?php echo addslashes($LANG['item_menu_copy_login']);?>"></span> '; |
|
4677 | + value.login = '<span class="fa fa-user fa-lg mi-black mini_login tip" data-clipboard-text="'+value.login+'" title="<?php echo addslashes($LANG['item_menu_copy_login']); ?>"></span> '; |
|
4678 | 4678 | } |
4679 | 4679 | |
4680 | 4680 | // Prepare PWD |
4681 | 4681 | if (value.pw !== "") { |
4682 | - value.pw = '<span class="fa fa-lock fa-lg mi-black mini_pw tip" data-clipboard-text="'+value.pw+'" title="<?php echo addslashes($LANG['item_menu_copy_pw']);?>"></span> ' |
|
4682 | + value.pw = '<span class="fa fa-lock fa-lg mi-black mini_pw tip" data-clipboard-text="'+value.pw+'" title="<?php echo addslashes($LANG['item_menu_copy_pw']); ?>"></span> ' |
|
4683 | 4683 | } |
4684 | 4684 | |
4685 | 4685 | // Prepare favorite |
4686 | 4686 | if (value.enable_favourites === '1') { |
4687 | 4687 | if (value.is_favorite === '1') { |
4688 | - icon_favorite = '<span class="fa fa-star fa-lg mi-yellow tip" onclick="ActionOnQuickIcon('+value.item_id+',0)" class="tip" title="<?php echo addslashes($LANG['item_menu_del_from_fav']);?>"></span>'; |
|
4688 | + icon_favorite = '<span class="fa fa-star fa-lg mi-yellow tip" onclick="ActionOnQuickIcon('+value.item_id+',0)" class="tip" title="<?php echo addslashes($LANG['item_menu_del_from_fav']); ?>"></span>'; |
|
4689 | 4689 | } else { |
4690 | - icon_favorite = '<span class="fa fa-star-o fa-lg tip" onclick="ActionOnQuickIcon('+value.item_id+',1)" class="tip" title="<?php echo addslashes($LANG['item_menu_add_to_fav']);?>"></span>'; |
|
4690 | + icon_favorite = '<span class="fa fa-star-o fa-lg tip" onclick="ActionOnQuickIcon('+value.item_id+',1)" class="tip" title="<?php echo addslashes($LANG['item_menu_add_to_fav']); ?>"></span>'; |
|
4691 | 4691 | } |
4692 | 4692 | } else { |
4693 | 4693 | icon_favorite = ''; |
@@ -4701,7 +4701,7 @@ discard block |
||
4701 | 4701 | // Append |
4702 | 4702 | $("#full_items_list").append( |
4703 | 4703 | '<li class="item trunc_line" id="'+value.item_id+'"><a id="fileclass'+value.item_id+'" class="file_search">' + |
4704 | - '<span class="fa fa-key mi-yellow tip" onclick="AfficherDetailsItem(\''+value.item_id+'\',\''+value.sk+'\',\''+value.expired+'\', \''+value.restricted+'\', \''+value.display+'\', \''+value.open_edit+'\', \''+value.reload+'\', \''+value.tree_id+'\')" title="<?php echo addslashes($LANG['click_to_edit']);?>"></span> ' + |
|
4704 | + '<span class="fa fa-key mi-yellow tip" onclick="AfficherDetailsItem(\''+value.item_id+'\',\''+value.sk+'\',\''+value.expired+'\', \''+value.restricted+'\', \''+value.display+'\', \''+value.open_edit+'\', \''+value.reload+'\', \''+value.tree_id+'\')" title="<?php echo addslashes($LANG['click_to_edit']); ?>"></span> ' + |
|
4705 | 4705 | '<span class="truncate" onclick="AfficherDetailsItem(\''+value.item_id+'\',\''+value.sk+'\',\''+value.expired+'\', \''+value.restricted+'\', \''+value.display+'\', \'\', \''+value.reload+'\', \''+value.tree_id+'\')"><b>'+value.label + '</b>' + |
4706 | 4706 | ' <span style="font-size:11px;font-style:italic; background-color:#f2e9e5;"> <i class="fa fa-folder-o"></i> '+value.folder+' </span> '+value.desc+'' + |
4707 | 4707 | '</span><span style="float:right;margin:2px 10px 0px 0px;">' + |
@@ -4758,20 +4758,20 @@ discard block |
||
4758 | 4758 | if (value.copy_to_clipboard_small_icons === "1") { |
4759 | 4759 | // Prepare Login |
4760 | 4760 | if (value.login !== "") { |
4761 | - value.login = '<span class="fa fa-user fa-lg mi-black mini_login tip" data-clipboard-text="'+value.login+'" title="<?php echo addslashes($LANG['item_menu_copy_login']);?>"></span> '; |
|
4761 | + value.login = '<span class="fa fa-user fa-lg mi-black mini_login tip" data-clipboard-text="'+value.login+'" title="<?php echo addslashes($LANG['item_menu_copy_login']); ?>"></span> '; |
|
4762 | 4762 | } |
4763 | 4763 | |
4764 | 4764 | // Prepare PWD |
4765 | 4765 | if (value.pw !== "") { |
4766 | - value.pw = '<span class="fa fa-lock fa-lg mi-black mini_pw tip" data-clipboard-text="'+value.pw+'" title="<?php echo addslashes($LANG['item_menu_copy_pw']);?>"></span> ' |
|
4766 | + value.pw = '<span class="fa fa-lock fa-lg mi-black mini_pw tip" data-clipboard-text="'+value.pw+'" title="<?php echo addslashes($LANG['item_menu_copy_pw']); ?>"></span> ' |
|
4767 | 4767 | } |
4768 | 4768 | |
4769 | 4769 | // Prepare favorite |
4770 | 4770 | if (value.enable_favourites === "1") { |
4771 | 4771 | if (value.is_favorite === 1) { |
4772 | - icon_favorite = '<span class="fa fa-star fa-lg mi-yellow tip" onclick="ActionOnQuickIcon('+value.item_id+',0)" class="tip" title="<?php echo addslashes($LANG['item_menu_del_from_fav']);?>"></span>'; |
|
4772 | + icon_favorite = '<span class="fa fa-star fa-lg mi-yellow tip" onclick="ActionOnQuickIcon('+value.item_id+',0)" class="tip" title="<?php echo addslashes($LANG['item_menu_del_from_fav']); ?>"></span>'; |
|
4773 | 4773 | } else { |
4774 | - icon_favorite = '<span class="fa fa-star-o fa-lg tip" onclick="ActionOnQuickIcon('+value.item_id+',1)" class="tip" title="<?php echo addslashes($LANG['item_menu_add_to_fav']);?>"></span>'; |
|
4774 | + icon_favorite = '<span class="fa fa-star-o fa-lg tip" onclick="ActionOnQuickIcon('+value.item_id+',1)" class="tip" title="<?php echo addslashes($LANG['item_menu_add_to_fav']); ?>"></span>'; |
|
4775 | 4775 | } |
4776 | 4776 | } else { |
4777 | 4777 | icon_favorite = ''; |
@@ -4785,7 +4785,7 @@ discard block |
||
4785 | 4785 | // Append |
4786 | 4786 | $("#full_items_list").append( |
4787 | 4787 | '<li class="item trunc_line" id="'+value.item_id+'"><a id="fileclass'+value.item_id+'" class="file_search">' + |
4788 | - '<span class="fa fa-key mi-yellow tip" onclick="AfficherDetailsItem(\''+value.item_id+'\',\''+value.sk+'\',\''+value.expired+'\', \''+value.restricted+'\', \''+value.display+'\', \''+value.open_edit+'\', \''+value.reload+'\', \''+value.tree_id+'\')" title="<?php echo addslashes($LANG['click_to_edit']);?>"></span> ' + |
|
4788 | + '<span class="fa fa-key mi-yellow tip" onclick="AfficherDetailsItem(\''+value.item_id+'\',\''+value.sk+'\',\''+value.expired+'\', \''+value.restricted+'\', \''+value.display+'\', \''+value.open_edit+'\', \''+value.reload+'\', \''+value.tree_id+'\')" title="<?php echo addslashes($LANG['click_to_edit']); ?>"></span> ' + |
|
4789 | 4789 | '<span class="truncate" onclick="AfficherDetailsItem(\''+value.item_id+'\',\''+value.sk+'\',\''+value.expired+'\', \''+value.restricted+'\', \''+value.display+'\', \'\', \''+value.reload+'\', \''+value.tree_id+'\')">'+value.label + |
4790 | 4790 | value.desc + |
4791 | 4791 | ' <span style="font-size:11px;font-style:italic;"><i class="fa fa-folder-o"></i> '+value.folder+'</span>' + |