From 922e90890865eaf77c70240040b5a592c979071a Mon Sep 17 00:00:00 2001 From: Grischa Brockhaus Date: Mon, 26 Mar 2012 03:08:31 +0200 Subject: [PATCH] plugin_openid: * Added AOL shortcut * Added description about the shortcuts to the configuration screen. --- serendipity_event_openid/ChangeLog | 5 +++++ serendipity_event_openid/UTF-8/lang_de.inc.php | 6 +++++- serendipity_event_openid/common.inc.php | 3 +++ serendipity_event_openid/img/aol.png | Bin 0 -> 1754 bytes serendipity_event_openid/img/aol_small.png | Bin 0 -> 2632 bytes serendipity_event_openid/lang_de.inc.php | 6 +++++- serendipity_event_openid/lang_en.inc.php | 6 +++++- serendipity_event_openid/openind.endpoints.txt | 8 ++++++++ .../serendipity_event_openid.php | 17 +++++++++++++++-- 9 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 serendipity_event_openid/img/aol.png create mode 100644 serendipity_event_openid/img/aol_small.png create mode 100644 serendipity_event_openid/openind.endpoints.txt 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.

' ); @define('PLUGIN_OPENID_DELEGATION_DESCRIPTION', @@ -41,3 +43,5 @@ @define('PLUGIN_OPENID_SET_GOOGLE_OID', 'Deinen Google Account als OpenID setzen'); @define('PLUGIN_OPENID_LOGIN_WITH_YAHOO', 'Mit Deinem Yahoo Account einloggen'); @define('PLUGIN_OPENID_SET_YAHOO_OID', 'Deinen Yahoo Account als OpenID setzen'); +@define('PLUGIN_OPENID_LOGIN_WITH_AOL', 'Mit Deinem Aol Account einloggen'); +@define('PLUGIN_OPENID_SET_AOL_OID', 'Deinen Aol Account als OpenID setzen'); diff --git a/serendipity_event_openid/common.inc.php b/serendipity_event_openid/common.inc.php index 5c559355..273bd56a 100644 --- a/serendipity_event_openid/common.inc.php +++ b/serendipity_event_openid/common.inc.php @@ -207,6 +207,8 @@ class serendipity_common_openid { $imgopenid = $serendipity['baseURL'] . 'index.php?/plugin/openid.png'; $imggoogle = $serendipity['baseURL'] . 'index.php?/plugin/oid_google.png'; $imgyahoo = $serendipity['baseURL'] . 'index.php?/plugin/oid_yahoo.png'; + $imgaol = $serendipity['baseURL'] . 'index.php?/plugin/oid_aol.png'; + $form = ''; if (! empty($instructions)) { $form = $instructions . '

'; @@ -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 0000000000000000000000000000000000000000..fcb5c7b9c5109d7ea19ddeb32fa2580405221f8d GIT binary patch literal 1754 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 agAY-R#*HK&QU4*rU;(}%)C%wDwEqBHlT;P} literal 0 HcmV?d00001 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.

' ); @define('PLUGIN_OPENID_DELEGATION_DESCRIPTION', @@ -41,3 +43,5 @@ @define('PLUGIN_OPENID_SET_GOOGLE_OID', 'Deinen Google Account als OpenID setzen'); @define('PLUGIN_OPENID_LOGIN_WITH_YAHOO', 'Mit Deinem Yahoo Account einloggen'); @define('PLUGIN_OPENID_SET_YAHOO_OID', 'Deinen Yahoo Account als OpenID setzen'); +@define('PLUGIN_OPENID_LOGIN_WITH_AOL', 'Mit Deinem Aol Account einloggen'); +@define('PLUGIN_OPENID_SET_AOL_OID', 'Deinen Aol Account als OpenID setzen'); diff --git a/serendipity_event_openid/lang_en.inc.php b/serendipity_event_openid/lang_en.inc.php index 617100e8..9162725e 100644 --- a/serendipity_event_openid/lang_en.inc.php +++ b/serendipity_event_openid/lang_en.inc.php @@ -12,7 +12,9 @@ '

Using OpenID to log into your blog

' . '

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 '
'; echo '' . htmlspecialchars(PLUGIN_EVENT_OPENID_SELECT) . '

'; @@ -213,6 +225,7 @@ class serendipity_event_openid extends serendipity_event echo ''; echo ' '; echo ' '; + echo ' '; echo ''; echo '

';