@@ -2166,12 +2166,12 @@ discard block |
||
2166 | 2166 | |
2167 | 2167 | // Check that user can access this folder |
2168 | 2168 | if (( |
2169 | - in_array($post_source_folder_id, $_SESSION['groupes_visibles']) === false || |
|
2169 | + in_array($post_source_folder_id, $_SESSION['groupes_visibles']) === false || |
|
2170 | 2170 | in_array($post_target_folder_id, $_SESSION['groupes_visibles']) === false) && |
2171 | 2171 | ( |
2172 | - $post_target_folder_id === '0' && |
|
2172 | + $post_target_folder_id === '0' && |
|
2173 | 2173 | isset($SETTINGS['can_create_root_folder']) === true && $SETTINGS['can_create_root_folder'] === '1' |
2174 | - ) |
|
2174 | + ) |
|
2175 | 2175 | ) { |
2176 | 2176 | $returnValues = '[{"error" : "'.addslashes($LANG['error_not_allowed_to']).'"}]'; |
2177 | 2177 | echo $returnValues; |
@@ -3168,7 +3168,7 @@ discard block |
||
3168 | 3168 | if ((isset($_SESSION['user_settings']['session_psk']) === false || empty($_SESSION['user_settings']['session_psk']) === true) |
3169 | 3169 | && ($dataSource['personal_folder'] === '1' || $dataDestination['personal_folder'] === '1') |
3170 | 3170 | ) { |
3171 | - echo '[{"error" : "ERR_PSK_REQUIRED"}]'; |
|
3171 | + echo '[{"error" : "ERR_PSK_REQUIRED"}]'; |
|
3172 | 3172 | break; |
3173 | 3173 | } |
3174 | 3174 | |
@@ -4279,19 +4279,19 @@ discard block |
||
4279 | 4279 | $ret = sendEmail( |
4280 | 4280 | $LANG['email_request_access_subject'], |
4281 | 4281 | str_replace( |
4282 | - array( |
|
4283 | - '#tp_item_author#', |
|
4284 | - '#tp_user#', |
|
4285 | - '#tp_item#', |
|
4286 | - '#tp_reason#' |
|
4287 | - ), |
|
4288 | - array( |
|
4289 | - " ".addslashes($dataAuthor['login']), |
|
4290 | - addslashes($_SESSION['login']), |
|
4291 | - addslashes($dataItem['label']), |
|
4292 | - nl2br(addslashes($emailText)) |
|
4293 | - ), |
|
4294 | - $LANG['email_request_access_mail'] |
|
4282 | + array( |
|
4283 | + '#tp_item_author#', |
|
4284 | + '#tp_user#', |
|
4285 | + '#tp_item#', |
|
4286 | + '#tp_reason#' |
|
4287 | + ), |
|
4288 | + array( |
|
4289 | + " ".addslashes($dataAuthor['login']), |
|
4290 | + addslashes($_SESSION['login']), |
|
4291 | + addslashes($dataItem['label']), |
|
4292 | + nl2br(addslashes($emailText)) |
|
4293 | + ), |
|
4294 | + $LANG['email_request_access_mail'] |
|
4295 | 4295 | ), |
4296 | 4296 | $dataAuthor['email'], |
4297 | 4297 | $LANG, |
@@ -4300,11 +4300,11 @@ discard block |
||
4300 | 4300 | |
4301 | 4301 | // Do log |
4302 | 4302 | logItems( |
4303 | - $item_id, |
|
4304 | - $dataItem['label'], |
|
4305 | - $_SESSION['user_id'], |
|
4306 | - 'at_access', |
|
4307 | - $_SESSION['login'] |
|
4303 | + $item_id, |
|
4304 | + $dataItem['label'], |
|
4305 | + $_SESSION['user_id'], |
|
4306 | + 'at_access', |
|
4307 | + $_SESSION['login'] |
|
4308 | 4308 | ); |
4309 | 4309 | |
4310 | 4310 | // Return |
@@ -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', |