From ba6e7667da60bcc4fcb01e5ebacea2d1db359f31 Mon Sep 17 00:00:00 2001
From: Xavier Guimard <xavier.guimard@laposte.net>
Date: Sun, 29 Sep 2013 18:08:21 +0000
Subject: [PATCH] Remove Google form, automatic now

---
 .../example/skins/dark/google.tpl             |  1 -
 .../example/skins/dark/googleform.tpl         |  1 -
 .../example/skins/impact/google.tpl           |  1 -
 .../example/skins/impact/googleform.tpl       | 19 -------------
 .../example/skins/pastel/google.tpl           |  1 -
 .../example/skins/pastel/googleform.tpl       | 27 -------------------
 .../lib/Lemonldap/NG/Portal/Display.pm        |  6 -----
 7 files changed, 56 deletions(-)
 delete mode 120000 lemonldap-ng-portal/example/skins/dark/google.tpl
 delete mode 120000 lemonldap-ng-portal/example/skins/dark/googleform.tpl
 delete mode 100644 lemonldap-ng-portal/example/skins/impact/google.tpl
 delete mode 100644 lemonldap-ng-portal/example/skins/impact/googleform.tpl
 delete mode 100644 lemonldap-ng-portal/example/skins/pastel/google.tpl
 delete mode 100644 lemonldap-ng-portal/example/skins/pastel/googleform.tpl

diff --git a/lemonldap-ng-portal/example/skins/dark/google.tpl b/lemonldap-ng-portal/example/skins/dark/google.tpl
deleted file mode 120000
index b30f04870..000000000
--- a/lemonldap-ng-portal/example/skins/dark/google.tpl
+++ /dev/null
@@ -1 +0,0 @@
-../pastel/google.tpl
\ No newline at end of file
diff --git a/lemonldap-ng-portal/example/skins/dark/googleform.tpl b/lemonldap-ng-portal/example/skins/dark/googleform.tpl
deleted file mode 120000
index 82ed6b02f..000000000
--- a/lemonldap-ng-portal/example/skins/dark/googleform.tpl
+++ /dev/null
@@ -1 +0,0 @@
-../pastel/googleform.tpl
\ No newline at end of file
diff --git a/lemonldap-ng-portal/example/skins/impact/google.tpl b/lemonldap-ng-portal/example/skins/impact/google.tpl
deleted file mode 100644
index 1fc08abae..000000000
--- a/lemonldap-ng-portal/example/skins/impact/google.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<TMPL_INCLUDE NAME="openid.tpl">
diff --git a/lemonldap-ng-portal/example/skins/impact/googleform.tpl b/lemonldap-ng-portal/example/skins/impact/googleform.tpl
deleted file mode 100644
index 45fcacde6..000000000
--- a/lemonldap-ng-portal/example/skins/impact/googleform.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-        <TMPL_IF NAME="CHECK_LOGINS">
-        <p>
-        <label for="checkLogins">
-            <input type="checkbox" id="checkLogins" name="checkLogins" <TMPL_IF NAME="ASK_LOGINS">checked</TMPL_IF>/>
-            <lang en="Check my last logins" fr="Voir mes dernières connexions"/>
-        </label>
-        </p>
-        </TMPL_IF>
-
-        <hr class="solid" />
-        <div class="panel-buttons">
-          <button type="reset" class="negative" tabindex="4">
-            <lang en="Cancel" fr="Annuler" />
-          </button>
-          <button type="submit" class="positive" tabindex="3">
-            <lang en="Connect" fr="Se connecter" />
-          </button>
-        </div>
-
diff --git a/lemonldap-ng-portal/example/skins/pastel/google.tpl b/lemonldap-ng-portal/example/skins/pastel/google.tpl
deleted file mode 100644
index 1fc08abae..000000000
--- a/lemonldap-ng-portal/example/skins/pastel/google.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<TMPL_INCLUDE NAME="openid.tpl">
diff --git a/lemonldap-ng-portal/example/skins/pastel/googleform.tpl b/lemonldap-ng-portal/example/skins/pastel/googleform.tpl
deleted file mode 100644
index ad6cd1017..000000000
--- a/lemonldap-ng-portal/example/skins/pastel/googleform.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-                <h3><lang en="Log in with your Google Account" fr="Connectez-vous avec votre compte Google"/></h3>
-
-                <table>
-
-                <TMPL_IF NAME="CHECK_LOGINS">
-                <tr><td colspan="2"><div class="buttons">
-                <label for="checkLogins">
-                    <input type="checkbox" id="checkLogins" name="checkLogins" <TMPL_IF NAME="ASK_LOGINS">checked</TMPL_IF>/>
-                    <lang en="Check my last logins" fr="Voir mes dernières connexions"/>
-                </label>
-                </div></td></tr>
-                </TMPL_IF>
-
-                <tr><td>
-                <div class="buttons">
-                <button type="reset" class="negative" tabindex="4">
-                        <img src="<TMPL_VAR NAME="SKIN_PATH">/common/cancel.png" alt="" />
-                        <lang en="Cancel" fr="Annuler" />
-                </button>
-                <button type="submit" class="positive" tabindex="3" name="google_go" value="1">
-                        <img src="<TMPL_VAR NAME="SKIN_PATH">/common/accept.png" alt="" />
-                        <lang en="Connect" fr="Se connecter" />
-                </button>
-                </div></td></tr>
-
-                </table>
-
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Display.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Display.pm
index b68293b69..1ade89718 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Display.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Display.pm
@@ -189,8 +189,6 @@ sub display {
         );
     }
 
-    # TODO: Manage Google errors
-
     # 2.5 Authentication has been refused OR this is the first access
     else {
         $skinfile       = 'login.tpl';
@@ -237,7 +235,6 @@ sub display {
                 REQUIRE_OLDPASSWORD =>
                   1,    # Old password is required to check user credentials
                 DISPLAY_FORM          => 0,
-                DISPLAY_GOOGLE_FORM   => 0,
                 DISPLAY_OPENID_FORM   => 0,
                 DISPLAY_YUBIKEY_FORM  => 0,
                 DISPLAY_PASSWORD      => 1,
@@ -263,7 +260,6 @@ sub display {
                 %templateParams,
                 DISPLAY_RESETPASSWORD => 0,
                 DISPLAY_FORM          => 0,
-                DISPLAY_GOOGLE_FORM   => 0,
                 DISPLAY_OPENID_FORM   => 0,
                 DISPLAY_YUBIKEY_FORM  => 0,
                 AUTH_LOOP             => [],
@@ -284,7 +280,6 @@ sub display {
                     CHOICE_PARAM         => $self->{authChoiceParam},
                     CHOICE_VALUE         => $self->{_authChoice},
                     DISPLAY_FORM         => 0,
-                    DISPLAY_GOOGLE_FORM  => 0,
                     DISPLAY_OPENID_FORM  => 0,
                     DISPLAY_YUBIKEY_FORM => 0,
                 );
@@ -300,7 +295,6 @@ sub display {
                 %templateParams = (
                     %templateParams,
                     DISPLAY_FORM => $displayType eq "standardform" ? 1 : 0,
-                    DISPLAY_GOOGLE_FORM => $displayType eq "googleform" ? 1 : 0,
                     DISPLAY_OPENID_FORM => $displayType eq "openidform" ? 1 : 0,
                     DISPLAY_YUBIKEY_FORM => $displayType eq "yubikeyform"
                     ? 1