diff --git a/serendipity_event_openid/ChangeLog b/serendipity_event_openid/ChangeLog
index 0a80419f..9f2a9f16 100644
--- a/serendipity_event_openid/ChangeLog
+++ b/serendipity_event_openid/ChangeLog
@@ -1,3 +1,8 @@
+Version 0.8 (brockhaus)
+---------------------------------
+* Added AOL shortcut
+* Added description about the shortcuts to the configuration screen.
+
Version 0.7 (brockhaus)
---------------------------------
* Was not able to change users OpenID url, if logged in with another external login (like BrowserID)
diff --git a/serendipity_event_openid/UTF-8/lang_de.inc.php b/serendipity_event_openid/UTF-8/lang_de.inc.php
index 7c64509b..c497fb96 100644
--- a/serendipity_event_openid/UTF-8/lang_de.inc.php
+++ b/serendipity_event_openid/UTF-8/lang_de.inc.php
@@ -12,7 +12,9 @@
'
OpenID benutzen, um in Dein Blog einzuloggen
' .
'
Das Plugin benötigt keinerlei Konfiguration, um ein OpenID Login zu implementieren (OpenID konfiguriert sich selbstständig)
' .
'
Aber Benutzer, die OpenID als Login verwenden wollen, müssen einmal angeben, welche OpenID URL sie identifizieren soll. ' .
-'Wenn Du also OpenID als Login Option benutzen möchtest, gehe zu Deiner Profilseite in Serendipity und konfiguriere Deine OpenID URL (im unteren Bereich der Seite).
'
+'Wenn Du also OpenID als Login Option benutzen möchtest, gehe zu Deiner Profilseite in Serendipity und konfiguriere Deine OpenID URL (im unteren Bereich der Seite).' .
+'
Hier findest Du auch Knöpfe für Google, Yahoo und Aol Accounts. Diese Services sind ebenfalls OpenID Provider und die Knöpfe helfen Dir beim Setup der Verbindung. ' .
+'Es kann jedoch immer nur eine OpenID Verbindung pro Benutzer aktiviert werden.
';
@@ -229,6 +231,7 @@ class serendipity_common_openid {
}
$form .= ' ';
$form .= ' ';
+ $form .= ' ';
$form .= '';
return $form;
diff --git a/serendipity_event_openid/img/aol.png b/serendipity_event_openid/img/aol.png
new file mode 100644
index 00000000..fcb5c7b9
Binary files /dev/null and b/serendipity_event_openid/img/aol.png differ
diff --git a/serendipity_event_openid/img/aol_small.png b/serendipity_event_openid/img/aol_small.png
new file mode 100644
index 00000000..14166428
Binary files /dev/null and b/serendipity_event_openid/img/aol_small.png differ
diff --git a/serendipity_event_openid/lang_de.inc.php b/serendipity_event_openid/lang_de.inc.php
index 27ce2c32..9f3eda27 100644
--- a/serendipity_event_openid/lang_de.inc.php
+++ b/serendipity_event_openid/lang_de.inc.php
@@ -12,7 +12,9 @@
'
OpenID benutzen, um in Dein Blog einzuloggen
' .
'
Das Plugin benötigt keinerlei Konfiguration, um ein OpenID Login zu implementieren (OpenID konfiguriert sich selbstständig)
' .
'
Aber Benutzer, die OpenID als Login verwenden wollen, müssen einmal angeben, welche OpenID URL sie identifizieren soll. ' .
-'Wenn Du also OpenID als Login Option benutzen möchtest, gehe zu Deiner Profilseite in Serendipity und konfiguriere Deine OpenID URL (im unteren Bereich der Seite).
'
+'Wenn Du also OpenID als Login Option benutzen möchtest, gehe zu Deiner Profilseite in Serendipity und konfiguriere Deine OpenID URL (im unteren Bereich der Seite).' .
+'
Hier findest Du auch Knöpfe für Google, Yahoo und Aol Accounts. Diese Services sind ebenfalls OpenID Provider und die Knöpfe helfen Dir beim Setup der Verbindung. ' .
+'Es kann jedoch immer nur eine OpenID Verbindung pro Benutzer aktiviert werden.
This plugin does not need any configuration to enable login into your blog using OpenID (OpenID is self configuring)
' .
'
But users, who want to use OpenID for login have to configure the OpenID URL they want to be identified with. ' .
-'So if you want to use OpenID as a login option, go to your Serendipity profile page and configure your OpenID URL (at the bottom of the page).
'
+'So if you want to use OpenID as a login option, go to your Serendipity profile page and configure your OpenID URL (at the bottom of the page).' .
+'
There are buttons for Google, Yahoo and Aol accounts, too. These services are also OpenID providers and the buttons will assist you while setting up. ' .
+'But there can only be one OpenID connection for an account configured at a time.
'
);
@define('PLUGIN_OPENID_DELEGATION_DESCRIPTION',
@@ -41,3 +43,5 @@
@define('PLUGIN_OPENID_SET_GOOGLE_OID', 'Set your Google account as OpenID');
@define('PLUGIN_OPENID_LOGIN_WITH_YAHOO', 'Login with your Yahoo account');
@define('PLUGIN_OPENID_SET_YAHOO_OID', 'Set your Yahoo account as OpenID');
+@define('PLUGIN_OPENID_LOGIN_WITH_AOL', 'Login with your Aol account');
+@define('PLUGIN_OPENID_SET_AOL_OID', 'Set your Aol account as OpenID');
diff --git a/serendipity_event_openid/openind.endpoints.txt b/serendipity_event_openid/openind.endpoints.txt
new file mode 100644
index 00000000..2076e18b
--- /dev/null
+++ b/serendipity_event_openid/openind.endpoints.txt
@@ -0,0 +1,8 @@
+Known OpenID endpoints
+
+ Google : https://www.google.com/accounts/o8/id
+ Google profile : http://www.google.com/profiles/~YOURUSERNAME
+ Yahoo : https://me.yahoo.com
+ AOL : https://www.aol.com
+ Wordpress : http://YOURBLOG.wordpress.com
+ LiveJournal : http://www.livejournal.com/openid/server.bml
diff --git a/serendipity_event_openid/serendipity_event_openid.php b/serendipity_event_openid/serendipity_event_openid.php
index 6ff6706f..6715a943 100644
--- a/serendipity_event_openid/serendipity_event_openid.php
+++ b/serendipity_event_openid/serendipity_event_openid.php
@@ -13,7 +13,7 @@ class serendipity_event_openid extends serendipity_event
$propbag->add('description', PLUGIN_OPENID_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Grischa Brockhaus, Rob Richards');
- $propbag->add('version', '0.7');
+ $propbag->add('version', '0.8');
$propbag->add('requirements', array(
'serendipity' => '1.2',
'smarty' => '2.6.7',
@@ -110,6 +110,14 @@ class serendipity_event_openid extends serendipity_event
header('Content-Type: image/png');
echo file_get_contents(dirname(__FILE__). '/img/yahoo_small.png');
}
+ elseif ($eventData=="oid_aol.png") {
+ header('Content-Type: image/png');
+ echo file_get_contents(dirname(__FILE__). '/img/aol.png');
+ }
+ elseif ($eventData=="oids_aol.png") {
+ header('Content-Type: image/png');
+ echo file_get_contents(dirname(__FILE__). '/img/aol_small.png');
+ }
break;
case 'frontend_header':
$server = $this->get_config('server');
@@ -149,7 +157,10 @@ class serendipity_event_openid extends serendipity_event
$openidurl = "https://www.google.com/accounts/o8/id";
}
elseif (isset($_POST['openIDLoginYahoo_x']) || isset($_POST['openIDLoginYahoo_y'])) { // If the Google Button was pressed
- $openidurl = "https://yahoo.com";
+ $openidurl = "https://me.yahoo.com";
+ }
+ elseif (isset($_POST['openIDLoginAol_x']) || isset($_POST['openIDLoginAol_y'])) { // If the Google Button was pressed
+ $openidurl = "https://www.aol.com";
}
if ($_SESSION['serendipityAuthedUser'] == true) {
@@ -194,6 +205,7 @@ class serendipity_event_openid extends serendipity_event
$imgopenid = $serendipity['baseURL'] . 'index.php?/plugin/openid.png';
$imggoogle = $serendipity['baseURL'] . 'index.php?/plugin/oids_google.png';
$imgyahoo = $serendipity['baseURL'] . 'index.php?/plugin/oids_yahoo.png';
+ $imgaol = $serendipity['baseURL'] . 'index.php?/plugin/oids_aol.png';
echo '