Skip to content

Commit d8fae85

Browse files
nathan30nathan30
authored
Merge pull request #1519 from edissyum/dev
3.4.1
2 parents 6c44bee + bf7fe1c commit d8fae85

303 files changed

Lines changed: 3332 additions & 2421 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎bin/ldap/connection_ldap.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# This file is part of Open-Capture.
2+
# Copyright Edissyum Consulting since 2020 under licence GPLv3
23

34
# Open-Capture is free software: you can redistribute it and/or modify
45
# it under the terms of the GNU General Public License as published by
@@ -10,8 +11,7 @@
1011
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1112
# GNU General Public License for more details.
1213

13-
# You should have received a copy of the GNU General Public License
14-
# along with Open-Capture. If not, see <https://www.gnu.org/licenses/gpl-3.0.html>.
14+
# See LICENCE file at the root folder for more details.
1515

1616
# @dev : Essaid MEGHELLET <essaid.meghellet@edissyum.com>
1717

‎bin/ldap/synchronization_ldap_script.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/usr/bin/env python3
22

33
# This file is part of Open-Capture.
4+
# Copyright Edissyum Consulting since 2020 under licence GPLv3
45
# Open-Capture is free software: you can redistribute it and/or modify
56
# it under the terms of the GNU General Public License as published by
67
# the Free Software Foundation, either version 3 of the License, or
@@ -11,8 +12,7 @@
1112
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1213
# GNU General Public License for more details.
1314

14-
# You should have received a copy of the GNU General Public License
15-
# along with Open-Capture. If not, see <https://www.gnu.org/licenses/gpl-3.0.html>.
15+
# See LICENCE file at the root folder for more details.
1616

1717
# @dev: Essaid MEGHELLET <essaid.meghellet@edissyum.com>
1818

@@ -128,10 +128,9 @@ def get_ldap_users(connection, class_user, object_class, users_dn):
128128
sys.exit(0)
129129
if not users_dn:
130130
status = connection.search(search_base=base_dn, search_filter=f'({class_user}={object_class})',
131-
search_scope='SUBTREE',
132-
attributes=['*'])
131+
search_scope='SUBTREE', attributes=['*'])
133132
else:
134-
status = connection.search(search_base=base_dn, search_filter=users_dn,
133+
status = connection.search(search_base=users_dn, search_filter=f'({class_user}={object_class})',
135134
search_scope='SUBTREE', attributes=['*'])
136135

137136
if connection and status:
@@ -140,8 +139,8 @@ def get_ldap_users(connection, class_user, object_class, users_dn):
140139
else:
141140
print_log("No user is found on the ldap server ")
142141
return {'status_search': False, 'ldap_users': ""}
143-
except LDAPException:
144-
print_log('Search doesn t work')
142+
except LDAPException as _e:
143+
print_log('Search doesn t work' + str(_e))
145144
return False
146145

147146

‎bin/ldap/synchronization_ldap_script.sh.default‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@
22

33
cd /var/www/html/opencapture/ || exit 1
44
python3 bin/ldap/synchronization_ldap_script.py "/var/www/html/opencapture/custom/§§CUSTOM_ID§§/bin/ldap/config/config.ini"
5-

‎bin/scripts/MailCollect/clean.sh.default‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/bash
22
# This file is part of Open-Capture.
3+
# Copyright Edissyum Consulting since 2020 under licence GPLv3
34

45
# Open-Capture is free software: you can redistribute it and/or modify
56
# it under the terms of the GNU General Public License as published by

‎bin/scripts/OCSplitter_worker.sh.default‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/bash
22
# This file is part of Open-Capture.
3+
# Copyright Edissyum Consulting since 2020 under licence GPLv3
34

45
# Open-Capture is free software: you can redistribute it and/or modify
56
# it under the terms of the GNU General Public License as published by
@@ -11,8 +12,7 @@
1112
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1213
# GNU General Public License for more details.
1314

14-
# You should have received a copy of the GNU General Public License
15-
# along with Open-Capture. If not, see <https://www.gnu.org/licenses/gpl-3.0.html>.
15+
# See LICENCE file at the root folder for more details.
1616

1717
# @dev : Nathan Cheval <nathan.cheval@outlook.fr>
1818
# @dev : Oussama Brich <oussama.brich@edissyum.com>

‎bin/scripts/OCVerifier_worker.sh.default‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/bash
22
# This file is part of Open-Capture.
3+
# Copyright Edissyum Consulting since 2020 under licence GPLv3
34

45
# Open-Capture is free software: you can redistribute it and/or modify
56
# it under the terms of the GNU General Public License as published by
@@ -11,8 +12,7 @@
1112
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1213
# GNU General Public License for more details.
1314

14-
# You should have received a copy of the GNU General Public License
15-
# along with Open-Capture. If not, see <https://www.gnu.org/licenses/gpl-3.0.html>.
15+
# See LICENCE file at the root folder for more details.
1616

1717
# @dev : Nathan Cheval <nathan.cheval@outlook.fr>
1818

‎bin/scripts/launch_MAIL.sh.default‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/bash
22
# This file is part of Open-Capture.
3+
# Copyright Edissyum Consulting since 2020 under licence GPLv3
34

45
# Open-Capture is free software: you can redistribute it and/or modify
56
# it under the terms of the GNU General Public License as published by
@@ -11,8 +12,7 @@
1112
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1213
# GNU General Public License for more details.
1314

14-
# You should have received a copy of the GNU General Public License
15-
# along with Open-Capture. If not, see <https://www.gnu.org/licenses/gpl-3.0.html>.
15+
# See LICENCE file at the root folder for more details.
1616

1717
# @dev : Nathan Cheval <nathan.cheval@outlook.fr>
1818

‎bin/scripts/load_users.sh.default‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/bash
22
# This file is part of Open-Capture.
3+
# Copyright Edissyum Consulting since 2020 under licence GPLv3
34

45
# Open-Capture is free software: you can redistribute it and/or modify
56
# it under the terms of the GNU General Public License as published by
@@ -11,8 +12,7 @@
1112
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1213
# GNU General Public License for more details.
1314

14-
# You should have received a copy of the GNU General Public License
15-
# along with Open-Capture. If not, see <https://www.gnu.org/licenses/gpl-3.0.html>.
15+
# See LICENCE file at the root folder for more details.
1616

1717
# @dev : Oussama Brich <oussama.brich@edissyum.com>
1818

‎bin/scripts/purge_splitter.sh.default‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/bash
22
# This file is part of Open-Capture.
3+
# Copyright Edissyum Consulting since 2020 under licence GPLv3
34

45
# Open-Capture is free software: you can redistribute it and/or modify
56
# it under the terms of the GNU General Public License as published by
@@ -11,8 +12,7 @@
1112
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1213
# GNU General Public License for more details.
1314

14-
# You should have received a copy of the GNU General Public License
15-
# along with Open-Capture. If not, see <https://www.gnu.org/licenses/gpl-3.0.html>.
15+
# See LICENCE file at the root folder for more details.
1616

1717
# @dev : Oussama Brich <oussama.brich@edissyum.com>
1818

‎bin/scripts/purge_verifier.sh.default‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/bash
22
# This file is part of Open-Capture.
3+
# Copyright Edissyum Consulting since 2020 under licence GPLv3
34

45
# Open-Capture is free software: you can redistribute it and/or modify
56
# it under the terms of the GNU General Public License as published by
@@ -11,8 +12,7 @@
1112
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1213
# GNU General Public License for more details.
1314

14-
# You should have received a copy of the GNU General Public License
15-
# along with Open-Capture. If not, see <https://www.gnu.org/licenses/gpl-3.0.html>.
15+
# See LICENCE file at the root folder for more details.
1616

1717
# @dev : Nathan CHEVAL <nathan.cheval@outlook.fr>
1818
# @dev : Oussama Brich <oussama.brich@edissyum.com>

0 commit comments

Comments
 (0)