2.1.27

New - User must provide a reason to access a restricted item Fix for #2109, #2035 Changed licensing to GNU GPL-3.0
nilsteampassnet · Feb 25, 2018 · 883c57a · 883c57a
1 parent eb13097
commit 883c57a
Show file tree

Hide file tree

Showing 125 changed files with 711 additions and 881 deletions.
diff --git a/admin.php b/admin.php
@@ -4,7 +4,7 @@
  * @author        Nils Laumaillé
  * @version       2.1.27
  * @copyright     (c) 2009-2017 Nils Laumaillé
- * @licensing     GNU AFFERO GPL 3.0
+ * @licensing     GNU GPL-3.0
  * @link          http://www.teampass.net
  *
  * This library is distributed in the hope that it will be useful,

diff --git a/admin.settings.load.php b/admin.settings.load.php
@@ -4,7 +4,7 @@
  * @author        Nils Laumaillé
  * @version       2.1.27
  * @copyright     (c) 2009-2017 Nils Laumaillé
- * @licensing     GNU AFFERO GPL 3.0
+ * @licensing     GNU GPL-3.0
  * @link          http://www.teampass.net
  *
  * This library is distributed in the hope that it will be useful,

diff --git a/admin.settings.php b/admin.settings.php
@@ -5,7 +5,7 @@
  * @author        Nils Laumaillé
  * @version       2.1.27
  * @copyright     (c) 2009-2017 Nils Laumaillé
- * @licensing     GNU AFFERO GPL 3.0
+ * @licensing     GNU GPL-3.0
  * @link          http://www.teampass.net
  *
  * This library is distributed in the hope that it will be useful,
@@ -1076,7 +1076,7 @@
 echo '
                     <tr style="display:', (isset($ldap_type)) ? '' : 'none', '" class="tr-windows tr-ldap tr-posix tr-posix-search">
                         <td><label for="ldap_suffix">'.$LANG['settings_ldap_domain'].'</label></td>
-                        <td><input type="text" size="50" id="ldap_suffix" name="ldap_suffix" class="text ui-widget-content" title="@dc=example,dc=com" value="', isset($SETTINGS['ldap_suffix']) ? $SETTINGS['ldap_suffix'] : '', '" onchange="updateSetting($(this).attr(\'id\'));" /></td>
+                        <td><input type="text" size="50" id="ldap_suffix" name="ldap_suffix" class="text ui-widget-content" title="dc=example,dc=com" value="', isset($SETTINGS['ldap_suffix']) ? $SETTINGS['ldap_suffix'] : '', '" onchange="updateSetting($(this).attr(\'id\'));" /></td>
                     </tr>';
 
 // Domain DN
@@ -1111,7 +1111,7 @@
                 echo '
                 <tr style="display:', (isset($ldap_type) && $ldap_type === 'posix-search') ? '' : 'none', '" class="tr-posix-search tr-ldap">
                     <td><label for="ldap_usergroup">'.$LANG['settings_ldap_usergroup'].'&nbsp;<i class="fa fa-question-circle tip" title="'.htmlentities(strip_tags($LANG['settings_ldap_usergroup_tip']), ENT_QUOTES).'"></i></label></td>
-                    <td><input type="text" size="50" id="ldap_usergroup" name="ldap_usergroup" class="text ui-widget-content" title="uid" value="',
+                    <td><input type="text" size="50" id="ldap_usergroup" name="ldap_usergroup" class="text ui-widget-content" title="usergroupname" value="',
                         isset($SETTINGS['ldap_usergroup']) ? $SETTINGS['ldap_usergroup'] : '', '" class="text ui-widget-content" onchange="updateSetting($(this).attr(\'id\'));" /></td>
                 </tr>';
                 // LDAP BIND DN for search

diff --git a/admin.settings_api.php b/admin.settings_api.php
@@ -5,7 +5,7 @@
  * @author        Nils Laumaillé
  * @version       2.1.27
  * @copyright     (c) 2009-2017 Nils Laumaillé
- * @licensing     GNU AFFERO GPL 3.0
+ * @licensing     GNU GPL-3.0
  * @link          http://www.teampass.net
  *
  * This library is distributed in the hope that it will be useful,

diff --git a/admin.settings_categories.php b/admin.settings_categories.php
@@ -5,7 +5,7 @@
  * @author        Nils Laumaillé
  * @version       2.1.27
  * @copyright     (c) 2009-2017 Nils Laumaillé
- * @licensing     GNU AFFERO GPL 3.0
+ * @licensing     GNU GPL-3.0
  * @link          http://www.teampass.net
  *
  * This library is distributed in the hope that it will be useful,

diff --git a/admin.settings_duo.php b/admin.settings_duo.php
@@ -5,7 +5,7 @@
  * @author        Nils Laumaillé
  * @version       2.1.27
  * @copyright     (c) 2009-2017 Nils Laumaillé
- * @licensing     GNU AFFERO GPL 3.0
+ * @licensing     GNU GPL-3.0
  * @link          http://www.teampass.net
  *
  * This library is distributed in the hope that it will be useful,

diff --git a/api/functions.php b/api/functions.php
@@ -5,7 +5,7 @@
  * @author        Nils Laumaillé
  * @version       2.0
  * @copyright     (c) 2009-2017 Nils Laumaillé
- * @licensing     GNU AFFERO GPL 3.0
+ * @licensing     GNU GPL-3.0
  * @link          http://www.teampass.net
  *
  * This library is distributed in the hope that it will be useful,

diff --git a/api/index.php b/api/index.php
@@ -5,7 +5,7 @@
  * @author        Nils Laumaillé
  * @version       2.0
  * @copyright     (c) 2009-2017 Nils Laumaillé
- * @licensing     GNU AFFERO GPL 3.0
+ * @licensing     GNU GPL-3.0
  * @link		  http://www.teampass.net
  *
  * This library is distributed in the hope that it will be useful,

diff --git a/backups/script.backup.php b/backups/script.backup.php
@@ -4,7 +4,7 @@
  * @author        Nils Laumaillé
  * @version       2.1.27
  * @copyright     (c) 2009-2017 Nils Laumaillé
- * @licensing     GNU AFFERO GPL 3.0
+ * @licensing     GNU GPL-3.0
  * @link          http://www.teampass.net
  *
  * This library is distributed in the hope that it will be useful,

diff --git a/backups/script.ssh.php b/backups/script.ssh.php
@@ -4,7 +4,7 @@
  * @author        Nils Laumaillé
  * @version       2.1.27
  * @copyright     (c) 2009-2017 Nils Laumaillé
- * @licensing     GNU AFFERO GPL 3.0
+ * @licensing     GNU GPL-3.0
  * @link          http://www.teampass.net
  *
  * This library is distributed in the hope that it will be useful,

diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,7 @@
 2.1.27
 11/
+ Changed licensing to GNU GPL-3.0
+ New - User must provide a reason to access a restricted item
  Improved security of password generator with php7
  Improved cannot edit user without email
  Improved read-only user limitation to copy folder and import action
@@ -15,6 +17,7 @@
  #2116 Insufficient password strength when creating Offline Mode
  #2115 Fix script backup issue with encryption key
  #2111 Add support for login through http header
+ #2109 restrict login to Group Ldap don't work
  #2102 Changed field renewal_period size
  #2095 Can't upload files on items - Plupload update
  #2094 PHP 7.2: Call to undefined function mcrypt_encrypt()
@@ -37,6 +40,7 @@
  #2064 LDAP and DUO users with administrator role taken to items page then logged out
  #2063 Setting "Hide forgot password link on Home page" not correctly displayed
  #2059 Fix for Custom LDAP port and adLDAP
+ #2035 After first time login as user Personal Folder is not correctly shown (100000)
  #2015 Double click to edit not working for items created by a different user
 
 10/

diff --git a/duo.load.php b/duo.load.php
@@ -5,7 +5,7 @@
  * @author        Nils Laumaillé
  * @version       2.1.27
  * @copyright     (c) 2009-2017 Nils Laumaillé
- * @licensing     GNU AFFERO GPL 3.0
+ * @licensing     GNU GPL-3.0
  * @link          http://www.teampass.net
  *
  * This library is distributed in the hope that it will be useful,

diff --git a/error.php b/error.php
@@ -4,7 +4,7 @@
  * @author        Nils Laumaillé
  * @version       2.1.27
  * @copyright     (c) 2009-2017 Nils Laumaillé
- * @licensing     GNU AFFERO GPL 3.0
+ * @licensing     GNU GPL-3.0
  * @link          http://www.teampass.net
  *
  * This library is distributed in the hope that it will be useful,

diff --git a/favorites.php b/favorites.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * @file        favorites.php
- * @author      Nils Laumaillé
- * @version     2.1.27
- * @copyright   (c) 2009-2017 Nils Laumaillé
- * @licensing   GNU AFFERO GPL 3.0
+ * @file          favorites.php
+ * @author        Nils Laumaillé
+ * @version       2.1.27
+ * @copyright     (c) 2009-2017 Nils Laumaillé
+ * @licensing     GNU GPL-3.0
  * @link          http://www.teampass.net
  *
  * This library is distributed in the hope that it will be useful,

diff --git a/find.load.php b/find.load.php
@@ -4,7 +4,7 @@
  * @author        Nils Laumaillé
  * @version       2.1.27
  * @copyright     (c) 2009-2017 Nils Laumaillé
- * @licensing     GNU AFFERO GPL 3.0
+ * @licensing     GNU GPL-3.0
  * @link          http://www.teampass.net
  *
  * This library is distributed in the hope that it will be useful,

diff --git a/find.php b/find.php
@@ -5,7 +5,7 @@
  * @author        Nils Laumaillé
  * @version       2.1.27
  * @copyright     (c) 2009-2017 Nils Laumaillé
- * @licensing     GNU AFFERO GPL 3.0
+ * @licensing     GNU GPL-3.0
  * @link
  */
 

diff --git a/folders.load.php b/folders.load.php
@@ -4,7 +4,7 @@
  * @author        Nils Laumaillé
  * @version       2.1.27
  * @copyright     (c) 2009-2017 Nils Laumaillé
- * @licensing     GNU AFFERO GPL 3.0
+ * @licensing     GNU GPL-3.0
  * @link          http://www.teampass.net
  *
  * This library is distributed in the hope that it will be useful,

diff --git a/folders.php b/folders.php
@@ -5,7 +5,7 @@
  * @author        Nils Laumaillé
  * @version       2.1.27
  * @copyright     (c) 2009-2017 Nils Laumaillé
- * @licensing     GNU AFFERO GPL 3.0
+ * @licensing     GNU GPL-3.0
  * @link          http://www.teampass.net
  *
  * This library is distributed in the hope that it will be useful,

diff --git a/includes/config/include.php b/includes/config/include.php
@@ -5,7 +5,7 @@
  * @author        Nils Laumaillé
  * @version       2.1.27
  * @copyright     (c) 2009-2017 Nils Laumaillé
- * @licensing     GNU AFFERO GPL 3.0
+ * @licensing     GNU GPL-3.0
  * @link
  */
 // DONT'T CHANGE BELOW THIS LINE

diff --git a/includes/js/functions.js b/includes/js/functions.js
@@ -3,7 +3,7 @@
  * @author        Nils Laumaillé
  * @version       2.1.27
  * @copyright     (c) 2009-2017 Nils Laumaillé
- * @licensing     GNU AFFERO GPL 3.0
+ * @licensing     GNU GPL-3.0
  * @link          http://www.teampass.net
  *
  * This library is distributed in the hope that it will be useful,

diff --git a/includes/language/arabic.php b/includes/language/arabic.php
@@ -1,11 +1,11 @@
-<?php 
+<?php
 /**
  *
  * @file          arabic.php
  * @author        Nils Laumaillé
  * @version       2.1.27
  * @copyright     2009 - 2018 Nils Laumaillé
- * @licensing     GNU AFFERO GPL 3.0
+ * @licensing     GNU GPL-3.0
  * @link          http://www.teampass.net
  *
  * This library is distributed in the hope that it will be useful,
@@ -14,6 +14,10 @@
  */
 global $LANG;
 $LANG = array (
+    'request_access_to_item' => 'Request access for this item',
+    'request_access_to_item_info' => 'Provide the reason why you want to access this item',
+    'send_request' => 'Send request',
+    'error_no_reason_of_access' => 'Please provide a reason for accessing this item.',
     'human_resources' => 'Human Resources',
     'user_ga_code' => 'Email Google Authentication to user',
     'send_ga_code' => 'Set and email Google Authentication code',
@@ -1081,4 +1085,4 @@
     'create_github_bug_report' => 'Create new bug report',
     'deselect_all' => 'Deselect all',
     '' => ''
-);
+);
diff --git a/includes/language/bulgarian.php b/includes/language/bulgarian.php
@@ -1,11 +1,11 @@
-<?php 
+<?php
 /**
  *
  * @file          bulgarian.php
  * @author        Nils Laumaillé
  * @version       2.1.27
  * @copyright     2009 - 2018 Nils Laumaillé
- * @licensing     GNU AFFERO GPL 3.0
+ * @licensing     GNU GPL-3.0
  * @link          http://www.teampass.net
  *
  * This library is distributed in the hope that it will be useful,
@@ -14,6 +14,10 @@
  */
 global $LANG;
 $LANG = array (
+    'request_access_to_item' => 'Request access for this item',
+    'request_access_to_item_info' => 'Provide the reason why you want to access this item',
+    'send_request' => 'Send request',
+    'error_no_reason_of_access' => 'Please provide a reason for accessing this item.',
     'human_resources' => 'Human Resources',
     'user_ga_code' => 'Изптати Google Authenticator на потребителя по имейл',
     'send_ga_code' => 'Google Authenticator за потребител',
@@ -1081,4 +1085,4 @@
     'create_github_bug_report' => 'Create new bug report',
     'deselect_all' => 'Deselect all',
     '' => ''
-);
+);
diff --git a/includes/language/catalan.php b/includes/language/catalan.php
@@ -1,11 +1,11 @@
-<?php 
+<?php
 /**
  *
  * @file          catalan.php
  * @author        Nils Laumaillé
  * @version       2.1.27
  * @copyright     2009 - 2018 Nils Laumaillé
- * @licensing     GNU AFFERO GPL 3.0
+ * @licensing     GNU GPL-3.0
  * @link          http://www.teampass.net
  *
  * This library is distributed in the hope that it will be useful,
@@ -14,6 +14,10 @@
  */
 global $LANG;
 $LANG = array (
+    'request_access_to_item' => 'Request access for this item',
+    'request_access_to_item_info' => 'Provide the reason why you want to access this item',
+    'send_request' => 'Send request',
+    'error_no_reason_of_access' => 'Please provide a reason for accessing this item.',
     'human_resources' => 'Human Resources',
     'user_ga_code' => 'Envia Google Authenticator per email a l\'usuari',
     'send_ga_code' => 'Estableix i envia per correu el codi de Google Authenticator',
@@ -1081,4 +1085,4 @@
     'create_github_bug_report' => 'Create new bug report',
     'deselect_all' => 'Deselect all',
     '' => ''
-);
+);
diff --git a/includes/language/chinese.php b/includes/language/chinese.php
@@ -1,11 +1,11 @@
-<?php 
+<?php
 /**
  *
  * @file          chinese_simplified.php
  * @author        Nils Laumaillé
  * @version       2.1.27
  * @copyright     2009 - 2018 Nils Laumaillé
- * @licensing     GNU AFFERO GPL 3.0
+ * @licensing     GNU GPL-3.0
  * @link          http://www.teampass.net
  *
  * This library is distributed in the hope that it will be useful,
@@ -14,6 +14,10 @@
  */
 global $LANG;
 $LANG = array (
+    'request_access_to_item' => 'Request access for this item',
+    'request_access_to_item_info' => 'Provide the reason why you want to access this item',
+    'send_request' => 'Send request',
+    'error_no_reason_of_access' => 'Please provide a reason for accessing this item.',
     'human_resources' => 'Human Resources',
     'user_ga_code' => '发送 Google 身份验证器至用户，通过电子邮件',
     'send_ga_code' => 'Google 身份验证器，为用户',
@@ -1081,4 +1085,4 @@
     'create_github_bug_report' => 'Create new bug report',
     'deselect_all' => 'Deselect all',
     '' => ''
-);
+);
diff --git a/includes/language/czech.php b/includes/language/czech.php
@@ -1,11 +1,11 @@
-<?php 
+<?php
 /**
  *
  * @file          czech.php
  * @author        Nils Laumaillé
  * @version       2.1.27
  * @copyright     2009 - 2018 Nils Laumaillé
- * @licensing     GNU AFFERO GPL 3.0
+ * @licensing     GNU GPL-3.0
  * @link          http://www.teampass.net
  *
  * This library is distributed in the hope that it will be useful,
@@ -14,6 +14,10 @@
  */
 global $LANG;
 $LANG = array (
+    'request_access_to_item' => 'Request access for this item',
+    'request_access_to_item_info' => 'Provide the reason why you want to access this item',
+    'send_request' => 'Send request',
+    'error_no_reason_of_access' => 'Please provide a reason for accessing this item.',
     'human_resources' => 'Human Resources',
     'user_ga_code' => 'Zaslat uživateli Google Authenticator emailem',
     'send_ga_code' => 'Google Authenticator pro uživatele',
@@ -1081,4 +1085,4 @@
     'create_github_bug_report' => 'Create new bug report',
     'deselect_all' => 'Deselect all',
     '' => ''
-);
+);