Merge branch 'development'

nilsteampassnet · May 21, 2018 · 0738b2b · 0738b2b
2 parents dd35c7f + ee3a16a
commit 0738b2b
Show file tree

Hide file tree

Showing 28 changed files with 184 additions and 174 deletions.
diff --git a/api/functions.php b/api/functions.php
diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,7 @@
 2.1.27
+15/
+ #2266 Google 2FA mail for temporary code is blank
+
 14/
  Fix for missing install/upgrade instructions
 

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'].".14";
+$SETTINGS_EXT['version_full'] = $SETTINGS_EXT['version'].".15";
 $SETTINGS_EXT['tool_name'] = "TeamPass";
 $SETTINGS_EXT['one_day_seconds'] = 86400;
 $SETTINGS_EXT['one_week_seconds'] = 604800;

diff --git a/includes/language/arabic.php b/includes/language/arabic.php
@@ -15,6 +15,7 @@
 global $LANG;
 $LANG = array(
     'log_in' => 'Log In',
+    '2fa_authentication_selector' => 'Select a 2 factor authenticator method',
     'create_item_based_upon_template' => 'Use of template for Item',
     'create_item_based_upon_template_tip' => 'When enabled, this feature permits the author to select a template made of Custom Fields. Notice that this feature requires Custom Fields to be enabled too.',
     'main_template' => 'Use as template',

diff --git a/includes/language/bulgarian.php b/includes/language/bulgarian.php
@@ -15,6 +15,7 @@
 global $LANG;
 $LANG = array(
     'log_in' => 'Log In',
+    '2fa_authentication_selector' => 'Select a 2 factor authenticator method',
     'create_item_based_upon_template' => 'Use of template for Item',
     'create_item_based_upon_template_tip' => 'When enabled, this feature permits the author to select a template made of Custom Fields. Notice that this feature requires Custom Fields to be enabled too.',
     'main_template' => 'Use as template',

diff --git a/includes/language/catalan.php b/includes/language/catalan.php
@@ -15,6 +15,7 @@
 global $LANG;
 $LANG = array(
     'log_in' => 'Log In',
+    '2fa_authentication_selector' => 'Select a 2 factor authenticator method',
     'create_item_based_upon_template' => 'Use of template for Item',
     'create_item_based_upon_template_tip' => 'When enabled, this feature permits the author to select a template made of Custom Fields. Notice that this feature requires Custom Fields to be enabled too.',
     'main_template' => 'Use as template',

diff --git a/includes/language/chinese.php b/includes/language/chinese.php
@@ -15,6 +15,7 @@
 global $LANG;
 $LANG = array(
     'log_in' => 'Log In',
+    '2fa_authentication_selector' => 'Select a 2 factor authenticator method',
     'create_item_based_upon_template' => 'Use of template for Item',
     'create_item_based_upon_template_tip' => 'When enabled, this feature permits the author to select a template made of Custom Fields. Notice that this feature requires Custom Fields to be enabled too.',
     'main_template' => 'Use as template',

diff --git a/includes/language/czech.php b/includes/language/czech.php
@@ -15,6 +15,7 @@
 global $LANG;
 $LANG = array(
     'log_in' => 'Log In',
+    '2fa_authentication_selector' => 'Select a 2 factor authenticator method',
     'create_item_based_upon_template' => 'Use of template for Item',
     'create_item_based_upon_template_tip' => 'When enabled, this feature permits the author to select a template made of Custom Fields. Notice that this feature requires Custom Fields to be enabled too.',
     'main_template' => 'Use as template',

diff --git a/includes/language/dutch.php b/includes/language/dutch.php
@@ -15,6 +15,7 @@
 global $LANG;
 $LANG = array(
     'log_in' => 'Log In',
+    '2fa_authentication_selector' => 'Select a 2 factor authenticator method',
     'create_item_based_upon_template' => 'Use of template for Item',
     'create_item_based_upon_template_tip' => 'When enabled, this feature permits the author to select a template made of Custom Fields. Notice that this feature requires Custom Fields to be enabled too.',
     'main_template' => 'Use as template',

diff --git a/includes/language/estonian.php b/includes/language/estonian.php
@@ -15,6 +15,7 @@
 global $LANG;
 $LANG = array(
     'log_in' => 'Log In',
+    '2fa_authentication_selector' => 'Select a 2 factor authenticator method',
     'create_item_based_upon_template' => 'Use of template for Item',
     'create_item_based_upon_template_tip' => 'When enabled, this feature permits the author to select a template made of Custom Fields. Notice that this feature requires Custom Fields to be enabled too.',
     'main_template' => 'Use as template',

diff --git a/includes/language/french.php b/includes/language/french.php
@@ -15,6 +15,7 @@
 global $LANG;
 $LANG = array(
     'log_in' => 'Connexion',
+    '2fa_authentication_selector' => 'Sélectionner une méthode d\'authentification double',
     'create_item_based_upon_template' => 'Activer le Modèle par Objet',
     'create_item_based_upon_template_tip' => 'Quand activée, cette fonction permet à l\'auteur de choisir un modèle réalisé à partir des Champs Spéciaux. A noter que cela ne fonctionnera que si l\'option Champs Spéciaux est activée.',
     'main_template' => 'Utiliser comme Modèle',

diff --git a/includes/language/german.php b/includes/language/german.php
@@ -15,6 +15,7 @@
 global $LANG;
 $LANG = array(
     'log_in' => 'Log In',
+    '2fa_authentication_selector' => 'Select a 2 factor authenticator method',
     'create_item_based_upon_template' => 'Use of template for Item',
     'create_item_based_upon_template_tip' => 'When enabled, this feature permits the author to select a template made of Custom Fields. Notice that this feature requires Custom Fields to be enabled too.',
     'main_template' => 'Use as template',

diff --git a/includes/language/greek.php b/includes/language/greek.php
@@ -15,6 +15,7 @@
 global $LANG;
 $LANG = array(
     'log_in' => 'Log In',
+    '2fa_authentication_selector' => 'Select a 2 factor authenticator method',
     'create_item_based_upon_template' => 'Use of template for Item',
     'create_item_based_upon_template_tip' => 'When enabled, this feature permits the author to select a template made of Custom Fields. Notice that this feature requires Custom Fields to be enabled too.',
     'main_template' => 'Use as template',

diff --git a/includes/language/hungarian.php b/includes/language/hungarian.php
@@ -15,6 +15,7 @@
 global $LANG;
 $LANG = array(
     'log_in' => 'Log In',
+    '2fa_authentication_selector' => 'Select a 2 factor authenticator method',
     'create_item_based_upon_template' => 'Use of template for Item',
     'create_item_based_upon_template_tip' => 'When enabled, this feature permits the author to select a template made of Custom Fields. Notice that this feature requires Custom Fields to be enabled too.',
     'main_template' => 'Use as template',

diff --git a/includes/language/italian.php b/includes/language/italian.php
@@ -15,6 +15,7 @@
 global $LANG;
 $LANG = array(
     'log_in' => 'Log In',
+    '2fa_authentication_selector' => 'Select a 2 factor authenticator method',
     'create_item_based_upon_template' => 'Use of template for Item',
     'create_item_based_upon_template_tip' => 'When enabled, this feature permits the author to select a template made of Custom Fields. Notice that this feature requires Custom Fields to be enabled too.',
     'main_template' => 'Use as template',

diff --git a/includes/language/japanese.php b/includes/language/japanese.php
@@ -15,6 +15,7 @@
 global $LANG;
 $LANG = array(
     'log_in' => 'Log In',
+    '2fa_authentication_selector' => 'Select a 2 factor authenticator method',
     'create_item_based_upon_template' => 'Use of template for Item',
     'create_item_based_upon_template_tip' => 'When enabled, this feature permits the author to select a template made of Custom Fields. Notice that this feature requires Custom Fields to be enabled too.',
     'main_template' => 'Use as template',

diff --git a/includes/language/norwegian.php b/includes/language/norwegian.php
@@ -15,6 +15,7 @@
 global $LANG;
 $LANG = array(
     'log_in' => 'Log In',
+    '2fa_authentication_selector' => 'Select a 2 factor authenticator method',
     'create_item_based_upon_template' => 'Use of template for Item',
     'create_item_based_upon_template_tip' => 'When enabled, this feature permits the author to select a template made of Custom Fields. Notice that this feature requires Custom Fields to be enabled too.',
     'main_template' => 'Use as template',

diff --git a/includes/language/polish.php b/includes/language/polish.php
@@ -15,6 +15,7 @@
 global $LANG;
 $LANG = array(
     'log_in' => 'Log In',
+    '2fa_authentication_selector' => 'Select a 2 factor authenticator method',
     'create_item_based_upon_template' => 'Use of template for Item',
     'create_item_based_upon_template_tip' => 'When enabled, this feature permits the author to select a template made of Custom Fields. Notice that this feature requires Custom Fields to be enabled too.',
     'main_template' => 'Use as template',

diff --git a/includes/language/portuguese.php b/includes/language/portuguese.php
@@ -15,6 +15,7 @@
 global $LANG;
 $LANG = array(
     'log_in' => 'Log In',
+    '2fa_authentication_selector' => 'Select a 2 factor authenticator method',
     'create_item_based_upon_template' => 'Use of template for Item',
     'create_item_based_upon_template_tip' => 'When enabled, this feature permits the author to select a template made of Custom Fields. Notice that this feature requires Custom Fields to be enabled too.',
     'main_template' => 'Use as template',

diff --git a/includes/language/portuguese_br.php b/includes/language/portuguese_br.php
@@ -15,6 +15,7 @@
 global $LANG;
 $LANG = array(
     'log_in' => 'Log In',
+    '2fa_authentication_selector' => 'Select a 2 factor authenticator method',
     'create_item_based_upon_template' => 'Use of template for Item',
     'create_item_based_upon_template_tip' => 'When enabled, this feature permits the author to select a template made of Custom Fields. Notice that this feature requires Custom Fields to be enabled too.',
     'main_template' => 'Use as template',

diff --git a/includes/language/romanian.php b/includes/language/romanian.php
@@ -15,6 +15,7 @@
 global $LANG;
 $LANG = array(
     'log_in' => 'Log In',
+    '2fa_authentication_selector' => 'Select a 2 factor authenticator method',
     'create_item_based_upon_template' => 'Use of template for Item',
     'create_item_based_upon_template_tip' => 'When enabled, this feature permits the author to select a template made of Custom Fields. Notice that this feature requires Custom Fields to be enabled too.',
     'main_template' => 'Use as template',

diff --git a/includes/language/russian.php b/includes/language/russian.php
@@ -15,6 +15,7 @@
 global $LANG;
 $LANG = array(
     'log_in' => 'Log In',
+    '2fa_authentication_selector' => 'Select a 2 factor authenticator method',
     'create_item_based_upon_template' => 'Use of template for Item',
     'create_item_based_upon_template_tip' => 'When enabled, this feature permits the author to select a template made of Custom Fields. Notice that this feature requires Custom Fields to be enabled too.',
     'main_template' => 'Use as template',

diff --git a/includes/language/spanish.php b/includes/language/spanish.php
@@ -15,6 +15,7 @@
 global $LANG;
 $LANG = array(
     'log_in' => 'Log In',
+    '2fa_authentication_selector' => 'Select a 2 factor authenticator method',
     'create_item_based_upon_template' => 'Use of template for Item',
     'create_item_based_upon_template_tip' => 'When enabled, this feature permits the author to select a template made of Custom Fields. Notice that this feature requires Custom Fields to be enabled too.',
     'main_template' => 'Use as template',

diff --git a/includes/language/swedish.php b/includes/language/swedish.php
@@ -15,6 +15,7 @@
 global $LANG;
 $LANG = array(
     'log_in' => 'Log In',
+    '2fa_authentication_selector' => 'Select a 2 factor authenticator method',
     'create_item_based_upon_template' => 'Use of template for Item',
     'create_item_based_upon_template_tip' => 'When enabled, this feature permits the author to select a template made of Custom Fields. Notice that this feature requires Custom Fields to be enabled too.',
     'main_template' => 'Use as template',

diff --git a/includes/language/turkish.php b/includes/language/turkish.php
@@ -15,6 +15,7 @@
 global $LANG;
 $LANG = array(
     'log_in' => 'Log In',
+    '2fa_authentication_selector' => 'Select a 2 factor authenticator method',
     'create_item_based_upon_template' => 'Use of template for Item',
     'create_item_based_upon_template_tip' => 'When enabled, this feature permits the author to select a template made of Custom Fields. Notice that this feature requires Custom Fields to be enabled too.',
     'main_template' => 'Use as template',

diff --git a/includes/language/ukrainian.php b/includes/language/ukrainian.php
@@ -15,6 +15,7 @@
 global $LANG;
 $LANG = array(
     'log_in' => 'Log In',
+    '2fa_authentication_selector' => 'Select a 2 factor authenticator method',
     'create_item_based_upon_template' => 'Use of template for Item',
     'create_item_based_upon_template_tip' => 'When enabled, this feature permits the author to select a template made of Custom Fields. Notice that this feature requires Custom Fields to be enabled too.',
     'main_template' => 'Use as template',

diff --git a/includes/language/vietnamese.php b/includes/language/vietnamese.php
@@ -15,6 +15,7 @@
 global $LANG;
 $LANG = array(
     'log_in' => 'Log In',
+    '2fa_authentication_selector' => 'Select a 2 factor authenticator method',
     'create_item_based_upon_template' => 'Use of template for Item',
     'create_item_based_upon_template_tip' => 'When enabled, this feature permits the author to select a template made of Custom Fields. Notice that this feature requires Custom Fields to be enabled too.',
     'main_template' => 'Use as template',

diff --git a/sources/items.queries.php b/sources/items.queries.php
@@ -306,6 +306,7 @@
                 if (isset($SETTINGS['item_creation_templates']) === true
                     && $SETTINGS['item_creation_templates'] === '1'
                     && isset($post_template_id) === true
+                    && empty($post_template_id) === false
                 ) {
                     DB::queryFirstRow(
                         "SELECT *