Merge branch 'development'

nilsteampassnet · May 24, 2018 · 454057e · 454057e
2 parents 0738b2b + d487a0b
commit 454057e
Show file tree

Hide file tree

Showing 94 changed files with 556 additions and 713 deletions.
diff --git a/admin.settings.php b/admin.settings.php
@@ -1603,6 +1603,36 @@
                     </td><td>
                     <input type="text" size="5" id="upload_maxfilesize" name="upload_maxfilesize" value="', isset($SETTINGS['upload_maxfilesize']) ? $SETTINGS['upload_maxfilesize'] : '10', '" class="text ui-widget-content" onchange="updateSetting($(this).attr(\'id\'));" />
                 </td></tr>';
+
+// upload_zero_byte_file
+echo '
+                <tr style="margin-bottom:3px">
+                    <td>
+                        <i class="fa fa-chevron-right mi-grey-1" style="margin-right: .3em;">&nbsp;</i>
+                        <label>' .
+                        $LANG['upload_empty_file'].'
+                        </label>
+                    </td>
+                    <td>
+                        <div class="toggle toggle-modern" id="upload_zero_byte_file" data-toggle-on="', isset($SETTINGS['upload_zero_byte_file']) && $SETTINGS['upload_zero_byte_file'] == 1 ? 'true' : 'false', '"></div><input type="hidden" id="upload_zero_byte_file_input" name="upload_zero_byte_file_input" value="', isset($SETTINGS['upload_zero_byte_file']) && $SETTINGS['upload_zero_byte_file'] == 1 ? '1' : '0', '" />
+                    </td>
+                </tr>';
+
+// upload_all_extensions_file
+echo '
+                <tr style="margin-bottom:3px">
+                    <td>
+                        <i class="fa fa-chevron-right mi-grey-1" style="margin-right: .3em;">&nbsp;</i>
+                        <label>' .
+                        $LANG['upload_any_extension_file'].'
+                        &nbsp;<i class="fa fa-question-circle tip" title="'.htmlentities(strip_tags($LANG['upload_any_extension_file_tip']), ENT_QUOTES).'"></i>
+                        </label>
+                    </td>
+                    <td>
+                        <div class="toggle toggle-modern" id="upload_all_extensions_file" data-toggle-on="', isset($SETTINGS['upload_all_extensions_file']) && $SETTINGS['upload_all_extensions_file'] == 1 ? 'true' : 'false', '"></div><input type="hidden" id="upload_all_extensions_file_input" name="upload_all_extensions_file_input" value="', isset($SETTINGS['upload_all_extensions_file']) && $SETTINGS['upload_all_extensions_file'] == 1 ? '1' : '0', '" />
+                    </td>
+                </tr>';
+
 // Extension for Documents
 echo '
                 <tr><td>
@@ -1643,6 +1673,7 @@
                     </td><td>
                     <input type="text" size="70" id="upload_otherext" name="upload_otherext" value="', isset($SETTINGS['upload_otherext']) ? $SETTINGS['upload_otherext'] : 'sql,xml', '" class="text ui-widget-content" onchange="updateSetting($(this).attr(\'id\'));" />
                 </td></tr>';
+
 echo '<tr><td colspan="3"><hr /></td></tr>';
 // Image resize width / height / quality
 echo '

diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,12 @@
 2.1.27
+16/
+ New - Added folders filter in Manage Roles page
+ New - Added folders alphabet filter in Manage Folders page
+ #2279 Google Authentication no link
+ #2277 Import fails when Login: / Account: has a backslash inside of it
+ #2274 Import from csv-list includes items that are marked as already imported
+ #2263 New upload settings to permit empty files and/or any extensions to be uploaded
+
 15/
  #2266 Google 2FA mail for temporary code is blank
 

diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
     "version": "2.1.27",
     "keywords": ["passwords", "manager", "collaborative", "vault", "security"],
     "homepage": "https://www.teampass.net",
-    "license": "GNU GPL-3.0",
+    "license": "GPL-3.0-only",
     "authors": [
         {"name": "Nils Laumaillé", "email": "[email protected]"}
     ],

diff --git a/folders.load.php b/folders.load.php
@@ -19,6 +19,26 @@
 
 <script type="text/javascript">
 //<![CDATA[
+
+
+$.extend($.expr[":"], {
+    "containsIN": function(elem, i, match, array) {
+        return (elem.textContent || elem.innerText || "").toLowerCase().indexOf((match[3] || "").toLowerCase()) >= 0;
+    }
+});
+
+// prepare Alphabet
+var _alphabetSearch = '';
+$.fn.dataTable.ext.search.push( function ( settings, searchData ) {
+    if ( ! _alphabetSearch ) {
+        return true;
+    }
+    if ( searchData[0].charAt(0) === _alphabetSearch ) {
+        return true;
+    }
+    return false;
+} );
+
 $(function() {
     $("#span_new_rep_roles").hide();
 
@@ -31,7 +51,10 @@
         "processing": true,
         "serverSide": true,
         "ajax": {
-            url: "<?php echo $SETTINGS['cpassman_url']; ?>/sources/datatable/datatable.folders.php"
+            url: "<?php echo $SETTINGS['cpassman_url']; ?>/sources/datatable/datatable.folders.php",
+            data: function(d) {
+                d.letter = _alphabetSearch
+            }
         },
         "language": {
             "url": "<?php echo $SETTINGS['cpassman_url']; ?>/includes/language/datatables.<?php echo $_SESSION['user_language']; ?>.txt"
@@ -49,6 +72,30 @@
             {"width": "5%"}
         ]
     });
+
+    // manage the Alphabet
+    var alphabet = $('<div class="alphabet"/>').append( 'Search: ' );
+    $('<span class="clear active"/>')
+        .data( 'letter', '' )
+        .html( 'None' )
+        .appendTo( alphabet );
+    for ( var i=0 ; i<26 ; i++ ) {
+        var letter = String.fromCharCode( 65 + i );
+
+        $('<span/>')
+            .data( 'letter', letter )
+            .html( letter )
+            .appendTo( alphabet );
+    }
+    alphabet.insertBefore( "#t_folders_alphabet" );
+    alphabet.on( 'click', 'span', function () {
+        alphabet.find( '.active' ).removeClass( 'active' );
+        $(this).addClass( 'active' );
+
+        _alphabetSearch = $(this).data('letter');
+
+        tableFolders.api().ajax.reload();
+    } );
 
 
     $("#div_add_group").dialog({

diff --git a/folders.php b/folders.php
@@ -93,6 +93,7 @@
 //Show the KB in a table view
 echo '
 <div style="margin:10px auto 25px auto;min-height:250px;" id="folders_page">
+<div id="t_folders_alphabet" style="margin-top:25px;"></div>
 <table id="t_folders" class="hover" width="100%">
     <thead><tr>
         <th></th>

diff --git a/includes/config/include.php b/includes/config/include.php
@@ -12,7 +12,7 @@
 global $SETTINGS, $languagesList, $SETTINGS_EXT;
 
 $SETTINGS_EXT['version'] = "2.1.27";
-$SETTINGS_EXT['version_full'] = $SETTINGS_EXT['version'].".15";
+$SETTINGS_EXT['version_full'] = $SETTINGS_EXT['version'].".16";
 $SETTINGS_EXT['tool_name'] = "TeamPass";
 $SETTINGS_EXT['one_day_seconds'] = 86400;
 $SETTINGS_EXT['one_week_seconds'] = 604800;