Add OpenID providers selection.

Merge openid_manage and fb_connect into linked-accounts.

15 files changed, 699 insertions, 637 deletions

diff --git a/css/v2/cswindow.css b/css/v2/cswindow.css
index 21643f4..ff00b10 100644
--- a/css/v2/cswindow.css
+++ b/css/v2/cswindow.css
@@ -5,44 +5,34 @@ a:active { color: yellow; }
 body {
   background-color: black;
   color: white;
-  text-align: center;
+  text-align: left;
+  border: 2px solid red;
+  border-radius: 8px;
+  padding: 1em;
+  -moz-border-radius: 8px;
+  -webkit-border-radius: 8px;
+}
+h2 {
+  font-size: 100%;
 }
 ul, p {
   margin-top: 1em;
   margin-bottom: 1em;
 }
 
-.smaller {
-  font-size: smaller;
-}
+.hidden { display: none; }
+.left { text-align: left; }
+.smaller { font-size: smaller; }
 .warning {
   color: red;
   font-weight: bold;
 }
 
-#box {
-  position: relative;
-  width: 80%;
-  max-width: 600px;
-  top: 50px;
-  border: 2px solid red;
-  margin-left: auto;
-  margin-right: auto;
-  padding: 1em;
-  border-radius: 8px;
-  -moz-border-radius: 8px;
-  -webkit-border-radius: 8px;
-}
-#box a {
-  color: #eae3d7;
-  font-size: smaller;
-}
-#box table {
-  margin-left: auto;
-  margin-right: auto;
+#accounts {
+  font-size: 85%;
 }
 
-#add_openid {
+.openid {
   background: url(images/openid.png) no-repeat;
   background-color: #fff;
   background-position: 0 50%;
@@ -50,3 +40,26 @@ ul, p {
   padding-left: 18px;
 }
 .img-16-delete {background: transparent url(images/master-icons.png?v=0) no-repeat -64px 0px;}
+
+#providers {
+  height: 40px;
+}
+#providers a {
+  float: left;
+  width: 32px;
+  height: 32px;
+  margin-right: 4px;
+  border: 1px solid black;
+}
+#providers a:hover {
+  border: 1px dashed #fffcc9;
+}
+#providers a.selected {
+  border: 4px solid #fffcc9;
+  -moz-border-radius: 10px;
+  -webkit-border-radius: 10px;
+}
+#auth-facebook { background: transparent url(images/master-auth.png?v=0) no-repeat 0px 0px; }
+#auth-google { background: transparent url(images/master-auth.png?v=0) no-repeat -32px 0px; }
+#auth-openid { background: transparent url(images/master-auth.png?v=0) no-repeat -64px 0px; }
+#auth-yahoo { background: transparent url(images/master-auth.png?v=0) no-repeat -96px 0px; }
diff --git a/css/v2/login.css b/css/v2/login.css
index 54d7d51..1804f41 100644
--- a/css/v2/login.css
+++ b/css/v2/login.css
@@ -8,13 +8,9 @@ ul, p {
   margin-bottom: 1em;
 }
 
-.hidden {
-  display: none;
-}
-
-.smaller {
-  font-size: 90%;
-}
+.hidden { display: none; }
+.left { text-align: left; }
+.smaller { font-size: 90%; }
 
 .link {
   color: #eae3d7;
@@ -68,7 +64,7 @@ ul, p {
   margin-right: auto;
 }
 
-input.openid_identifier {
+#openid_identifier {
   background: url(images/openid.png) no-repeat;
   background-color: #fff;
   background-position: 0 50%;
@@ -162,3 +158,34 @@ input.openid_identifier {
   color: white;
   text-decoration: none;
 }
+
+#trExtAuth p {
+  margin: 0.5em 0 0.5em 0;
+}
+#trOpenID {
+  margin: 0.5em 0 0.5em 0;
+}
+
+#providers {
+  height: 40px;
+  padding-left: 8px;
+}
+#providers a {
+  float: left;
+  width: 32px;
+  height: 32px;
+  margin-right: 4px;
+  border: 1px solid black;
+}
+#providers a:hover {
+  border: 1px dashed #fffcc9;
+}
+#providers a.selected {
+  border: 4px solid #fffcc9;
+  -moz-border-radius: 10px;
+  -webkit-border-radius: 10px;
+}
+#auth-facebook { background: transparent url(images/master-auth.png?v=0) no-repeat 0px 0px; }
+#auth-google { background: transparent url(images/master-auth.png?v=0) no-repeat -32px 0px; }
+#auth-openid { background: transparent url(images/master-auth.png?v=0) no-repeat -64px 0px; }
+#auth-yahoo { background: transparent url(images/master-auth.png?v=0) no-repeat -96px 0px; }
diff --git a/frontend/fb_connect.php b/frontend/fb_connect.php
deleted file mode 100644
index ee91c23..0000000
--- a/frontend/fb_connect.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-
-/*
-   Cheetah News fb_connect.php
-   Copyright (C) 2010 Wojciech Polak.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 3 of the License, or (at your
-   option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License along
-   with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-require_once 'lib/include.php';
-require_once 'lib/d-sigs.php';
-require_once 'lib/facebook.php';
-
-start_session (null, true);
-$session->auth ('iflogged');
-$message = '';
-$auth = true;
-
-getvars ('link');
-
-if ($session->status['afterlogged'] != 'yes' ||
-    $session->email == 'guest')
-{
-  $message = _('You are using a guest account. You must register in order to do this.');
-  $auth = false;
-}
-else if ($link == '1')
-{
-  try {
-    $fb = new Facebook (array ('appId'  => $CONF['fb.app_id'],
-                               'secret' => $CONF['fb.secret_key'],
-                               'cookie' => true));
-    $fb_session = $fb->getSession ();
-    if ($fb_session) {
-      $fb_uid = $fb->getUser ();
-      if ($fb_uid) {
-        $db = new Database ();
-        $db->query ("UPDATE user SET fbUID=".$fb_uid." WHERE id='".
-                    $session->id."'");
-      }
-    }
-  }
-  catch (FacebookApiException $e) {
-    error_log ($e);