Merge branch 'development'

nilsteampassnet · Jun 28, 2016 · 307d009 · 307d009
2 parents 1b72901 + 044bcff
commit 307d009
Show file tree

Hide file tree

Showing 26 changed files with 124 additions and 2,814 deletions.
diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE
diff --git a/backups/script.backup.php b/backups/script.backup.php
@@ -3,7 +3,7 @@
  * @file          script.backup.php
  * @author        Nils Laumaillé
  * @version       2.1.26
- * @copyright     (c) 2009-2014 Nils Laumaillé
+ * @copyright     (c) 2009-2016 Nils Laumaillé
  * @licensing     GNU AFFERO GPL 3.0
  * @link          http://www.teampass.net
  *

diff --git a/backups/script.ssh.php b/backups/script.ssh.php
@@ -3,7 +3,7 @@
  * @file          script.ssh.php
  * @author        Nils Laumaillé
  * @version       2.1.26
- * @copyright     (c) 2009-2014 Nils Laumaillé
+ * @copyright     (c) 2009-2016 Nils Laumaillé
  * @licensing     GNU AFFERO GPL 3.0
  * @link          http://www.teampass.net
  *

diff --git a/changelog.md b/changelog.md
@@ -48,6 +48,7 @@ Last changes
  #1172 Complete number of Items displayed in Tree
  #1158 Can't Change admin Password
  #910  Backslashes in accounts are not copied to clipboard
+ #268  Password recovery "Forgot your password?" don't do anything
  NEW: Server user password change through SSH connection
  NEW: Upgrade database handler improved for better upgrades management
  NEW: New user right added for managing all users (super Manager)

diff --git a/find.php b/find.php
@@ -10,9 +10,9 @@
  */
 
 if (
-    !isset($_SESSION['CPM']) || $_SESSION['CPM'] != 1 || 
-    !isset($_SESSION['user_id']) || empty($_SESSION['user_id']) || 
-    !isset($_SESSION['key']) || empty($_SESSION['key'])) 
+    !isset($_SESSION['CPM']) || $_SESSION['CPM'] != 1 ||
+    !isset($_SESSION['user_id']) || empty($_SESSION['user_id']) ||
+    !isset($_SESSION['key']) || empty($_SESSION['key']))
 {
     die('Hacking attempt...');
 }

diff --git a/folders.load.php b/folders.load.php
@@ -50,8 +50,8 @@
     .on('xhr.dt', function ( e, settings, json, xhr ) {
         //$(".tip").tooltipster();
     } );
-    
-    
+
+
     $("#div_add_group").dialog({
         bgiframe: true,
         modal: true,
@@ -61,7 +61,7 @@
         title: "<?php echo $LANG['add_new_group'];?>",
         open: function(event, ui) {
             $("#new_folder_wait").hide();
-            
+
             //empty dialogbox
             $("#div_add_group input, #div_add_group select").val("");
             $("#add_node_renewal_period").val("0");
@@ -210,7 +210,7 @@ function(data) {
             }
         }
     });
-    
+
     $(".cb_selected_folder").click(function() {
         var elem = $(this).attr("id").split("-");
         if ($(this).prop("checked") == true) {
@@ -221,13 +221,13 @@ function(data) {
             $("#title_"+elem[1]).css({"background-color":"#FFF"});
         }
     });
-    
+
     // manage the click on toggle icons
     $(document).on({
         click: function (event) {
             $("#div_loading").show();
-            var tmp = $(this).attr('tp').split('-');    //[0]>ID ; [1]>action  ; [2]>NewValue  
-                        
+            var tmp = $(this).attr('tp').split('-');    //[0]>ID ; [1]>action  ; [2]>NewValue
+
             // send change to be stored
             $.post(
                 "sources/folders.queries.php",
@@ -242,10 +242,10 @@ function(data) {
                     // refresh table content
                     tableFolders.api().ajax.reload();
                 }
-            );            
+            );
         }
     }, ".fa-toggle-off, .fa-toggle-on");
-    
+
     $( "#click_delete_multiple_folders" ).click(function() {
         var list_i = "";
         $(".cb_selected_folder:checked").each(function() {
@@ -274,7 +274,7 @@ function(data) {
            );
         }
     });
-    
+
     $("#click_refresh_folders_list").click(function() {
         tableFolders.api().ajax.reload();
     });

diff --git a/includes/js/functions.js b/includes/js/functions.js
@@ -267,7 +267,7 @@ function prepareExchangedData(data, type, key)
 }
 
 function jsonErrorHdl(message)
-{	
+{
 	$("#div_dialog_message_text").html(message);
 	$("#div_dialog_message").dialog("open");
 	$("#items_path_var").html('<i class="fa fa-folder-open-o"></i>&nbsp;Error');
@@ -286,10 +286,10 @@ function displayMessage(textToDisplay)
     setTimeout(function(){$("#main_info_box").effect( "fade", "slow");}, 2000);
 }
 
-	
+
 function blink(elem, times, speed, klass)
 {
-	if (times > 0 || times < 0) { 
+	if (times > 0 || times < 0) {
 	  if ($(elem).hasClass(klass))
 		 $(elem).removeClass(klass);
 	  else

diff --git a/includes/libraries/Authentication/Twofactors/twofactors.php b/includes/libraries/Authentication/Twofactors/twofactors.php
@@ -5,7 +5,7 @@
  * @file          twofactors.php
  * @author        Nils Laumaillé
  * @version       2.1.26
- * @copyright     (c) 2009-2015 Nils Laumaillé
+ * @copyright     (c) 2009-2016 Nils Laumaillé
  * @licensing     GNU AFFERO GPL 3.0
  * @link          http://www.teampass.net
  *

diff --git a/index.php b/index.php
@@ -125,14 +125,14 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <title>Teampass</title>
 <script type="text/javascript">
-            if (window.location.href.indexOf("page=") == -1 && (window.location.href.indexOf("otv=") == -1 || window.location.href.indexOf("action=") == -1)) {
-                if (window.location.href.indexOf("session_over=true") == -1) {
-                    location.replace("<?php echo $_SESSION['settings']['cpassman_url'];?>/index.php?page=items");
-                } else {
-                    location.replace("<?php echo $_SESSION['settings']['cpassman_url'];?>/logout.php");
-                }
-            }
-        </script>
+    if (window.location.href.indexOf("page=") == -1 && (window.location.href.indexOf("otv=") == -1 && window.location.href.indexOf("action=") == -1)) {
+        if (window.location.href.indexOf("session_over=true") == -1) {
+            location.replace("<?php echo $_SESSION['settings']['cpassman_url'];?>/index.php?page=items");
+        } else {
+            location.replace("<?php echo $_SESSION['settings']['cpassman_url'];?>/logout.php");
+        }
+    }
+</script>
 <?php
 echo $htmlHeaders;
 ?>
@@ -517,6 +517,9 @@ class="ui-state-highlight ui-corner-all" id="div_maintenance">
                     <br /><br />
                     <img id="ajax_loader_send_mail" style="display:none;" src="includes/images/ajax-loader.gif" alt="" />
                 </div>
+                <div style="margin-top:30px; text-align:center;">
+                    <a href="index.php" class="tip" title="'.$LANG['home'].'"><span class="fa fa-home fa-lg"></span></a>
+                </div>
             </div>';
     } elseif (!empty($_SESSION['user_id']) && isset($_SESSION['user_id'])) {
         // Page doesn't exist