From ee90115ffb5305fc997481f27e09d8f5af0fc13b Mon Sep 17 00:00:00 2001
From: nilsteampassnet <nils@teampass.net>
Date: Mon, 11 Jan 2016 16:35:58 +0100
Subject: [PATCH] 2.1.25

Fixes for #1149, #1152
---
 includes/language/english.php |  1 +
 load.php                      |  7 +++--
 sources/admin.queries.php     | 50 +++++++++++++++++++----------------
 3 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/includes/language/english.php b/includes/language/english.php
index b06918b8c..a8b649cc8 100644
--- a/includes/language/english.php
+++ b/includes/language/english.php
@@ -14,6 +14,7 @@
  */
 global $LANG;
 $LANG = array (
+	'error_bad_credentials' => 'Login credentials do not correspond!',
     'user_ga_code' => 'Send GoogleAuthenticator to user by email',
     'send_ga_code' => 'Google Authenticator for user',
     'error_no_email' => 'This user has no email set!',
diff --git a/load.php b/load.php
index 95efdb60e..dfa67c3c7 100644
--- a/load.php
+++ b/load.php
@@ -238,8 +238,7 @@ function(data) {
                     $("#connection_error").html("' . $LANG['psk_required'] . '");
                     $("#connection_error, #connect_psk_confirm").show();
                 } else if (data[0].value == "user_not_exists") {
-                    $("#connection_error").html("'.$LANG['user_not_exists'].'").show();
-                    console.log("'.$LANG['user_not_exists'].'");
+                    $("#connection_error").html("'.$LANG['error_bad_credentials'].'").show();
                 } else if (!isNaN(parseFloat(data[0].value)) && isFinite(data[0].value)) {
                     $("#connection_error").html(data + "'.$LANG['login_attempts_on'].(@$_SESSION['settings']['nb_bad_authentication'] + 1).'").show();
                 } else if (data[0].value == "error") {
@@ -248,11 +247,11 @@ function(data) {
                 } else if (data[0].value == "false_onetimepw") {
                     $("#connection_error").html("'.$LANG['bad_onetime_password'].'").show();
                 } else if (data[0].error == "bad_credentials") {
-                    $("#connection_error").html("'.$LANG['index_bas_pw'].'").show();
+                    $("#connection_error").html("'.$LANG['error_bad_credentials'].'").show();
                 } else if (data[0].error == "ga_code_wrong") {
                     $("#connection_error").html("'.$LANG['ga_bad_code'].'").show();
                 } else {
-                    $("#connection_error").html("'.$LANG['index_bas_pw'].'").show();
+                    $("#connection_error").html("'.$LANG['error_bad_credentials'].'").show();
                 }
                 $("#ajax_loader_connexion").hide();
             },
diff --git a/sources/admin.queries.php b/sources/admin.queries.php
index c729790c8..a865e6145 100644
--- a/sources/admin.queries.php
+++ b/sources/admin.queries.php
@@ -1141,29 +1141,33 @@
         $_SESSION['settings']['2factors_authentication'] = htmlspecialchars_decode($dataReceived['2factors_authentication']);
 
         // ga_website_name
-        DB::query("SELECT * FROM ".prefix_table("misc")." WHERE type = %s AND intitule = %s", "admin", "ga_website_name");
-        $counter = DB::count();
-        if ($counter == 0) {
-            DB::insert(
-                prefix_table("misc"),
-                array(
-                    'type' => "admin",
-                    "intitule" => "ga_website_name",
-                    'valeur' => htmlspecialchars_decode($dataReceived['ga_website_name'])
-                )
-            );
-        } else {
-            DB::update(
-                prefix_table("misc"),
-                array(
-                    'valeur' => htmlspecialchars_decode($dataReceived['ga_website_name'])
-                ),
-                "type = %s AND intitule = %s",
-                "admin",
-                "ga_website_name"
-            );
-        }
-        $_SESSION['settings']['ga_website_name'] = htmlspecialchars_decode($dataReceived['ga_website_name']);
+		if (!is_null($dataReceived['ga_website_name'])) {
+			DB::query("SELECT * FROM ".prefix_table("misc")." WHERE type = %s AND intitule = %s", "admin", "ga_website_name");
+			$counter = DB::count();
+			if ($counter == 0) {
+				DB::insert(
+					prefix_table("misc"),
+					array(
+						'type' => "admin",
+						"intitule" => "ga_website_name",
+						'valeur' => htmlspecialchars_decode($dataReceived['ga_website_name'])
+					)
+				);
+			} else {
+				DB::update(
+					prefix_table("misc"),
+					array(
+						'valeur' => htmlspecialchars_decode($dataReceived['ga_website_name'])
+					),
+					"type = %s AND intitule = %s",
+					"admin",
+					"ga_website_name"
+				);
+			}
+			$_SESSION['settings']['ga_website_name'] = htmlspecialchars_decode($dataReceived['ga_website_name']);
+		} else {
+			$_SESSION['settings']['ga_website_name'] = "";
+		}
 
         // send data
         echo '[{"result" : "'.addslashes($LANG['done']).'" , "error" : ""}]';