[geeklog-hg] geeklog: Fixed merge mistake with OAuth20 and updated docs for n...

geeklog-cvs at lists.geeklog.net geeklog-cvs at lists.geeklog.net
Sun Aug 25 01:41:09 EDT 2013 

changeset 9265:26d84fe98459
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/26d84fe98459
user: Tom <websitemaster at cogeco.net>
date: Sun Aug 25 01:39:24 2013 -0400
description:
Fixed merge mistake with OAuth20 and updated docs for new OAuth config options.

diffstat:

 public_html/docs/english/config.html  |  66 ++++++++++++++++++++++++++++------
 public_html/docs/japanese/config.html |  56 +++++++++++++++++++++++++++--
 sql/updates/mssql_2.0.0_to_2.0.1.php  |  11 +++++
 3 files changed, 116 insertions(+), 17 deletions(-)

diffs (170 lines):

diff -r 111e135f28a8 -r 26d84fe98459 public_html/docs/english/config.html
--- a/public_html/docs/english/config.html	Sun Aug 25 01:08:58 2013 -0400
+++ b/public_html/docs/english/config.html	Sun Aug 25 01:39:24 2013 -0400
@@ -836,10 +836,9 @@
   <td valign="top"><a name="desc_user_login_method_oauth">oauth</a></td>
   <td valign="top"><code>false</code></td>
   <td valign="top">Whether to allow logins using <a href="http://oauth.net/">OAuth</a>. This will display a special OAuth login below the normal login field.<br>
-    <strong>Note:</strong> Currently only OAuth 1.0 is supported. Current login methods supported: Facebook, Twitter, LinkedIn, Google and Microsoft.<br>Please note that to enable login for a 
-    specific method, you need an authorization class in <tt>system/classes/oauth</tt>. If you only want to allow Facebook but not Twitter users (or vice versa), simply
-    remove the class file for the unwanted service(s) or use the config options below. You must also update the config options below with the correct key and secret string 
-    ($consumer_secret) values. The PHP extension OpenSSL is required to be loaded.<br>
+    <strong>Note:</strong> Currently OAuth 1.0, 1.0a, and 2.0 is supported (depends on what the OAuth provider supports). Current login methods supported: Facebook, Twitter, LinkedIn, Google, Microsoft, and Yahoo.<br>
+    To enable logins for a specific method, you need to enable the method below and you must also update the config options with the correct key and secret string values. 
+    The PHP extension OpenSSL is required to be loaded for OAuth logins to work.<br>
     See our <a href="http://wiki.geeklog.net/index.php/OAuth">Wiki OAuth page</a> for more information.</td></tr>
 <tr>
   <td valign="top"><a name="desc_facebook_login">facebook_login</a></td>
@@ -892,14 +891,57 @@
   <td valign="top">Required to use Twitter OAuth login method. Visit this <a href="https://twitter.com/apps">Twitter Application page</a> 
   to create an application to receive your consumer key and secret.<br>
   See our <a href="http://wiki.geeklog.net/index.php/OAuth">Wiki OAuth page</a> for more information.</td></tr>
-  
-  
-  
-  
-  
-  
-  
-  
+<tr>
+  <td valign="top"><a name="desc_google_login">google_login</a></td>
+  <td valign="top"><code>false</code></td>
+  <td valign="top">Allow (when set to <tt>true</tt>) users who already have
+    an account with Google to log into Geeklog with said account using OAuth. You must set the Google client id and client secret.</td></tr>
+<tr>
+  <td valign="top"><a name="desc_google_consumer_key">google_consumer_key</a></td>
+  <td valign="top"><code>''</code></td>
+  <td valign="top">Required to use Google OAuth login method. Visit the <a href="https://code.google.com/apis/console">Google Developers Console</a> 
+  to create an application to receive your client ID and client secret.<br>
+  See our <a href="http://wiki.geeklog.net/index.php/OAuth">Wiki OAuth page</a> for more information.</td></tr>
+<tr>
+  <td valign="top"><a name="desc_google_consumer_secret">google_consumer_secret</a></td>
+  <td valign="top"><code>''</code></td>
+  <td valign="top">Required to use Google OAuth login method. Visit the <a href="https://code.google.com/apis/console">Google Developers Console</a> 
+  to create an application to receive your client ID and client secret.<br>
+  See our <a href="http://wiki.geeklog.net/index.php/OAuth">Wiki OAuth page</a> for more information.</td></tr>
+<tr>
+  <td valign="top"><a name="desc_microsoft_login">microsoft_login</a></td>
+  <td valign="top"><code>false</code></td>
+  <td valign="top">Allow (when set to <tt>true</tt>) users who already have
+    an account with Microsoft to log into Geeklog with said account using OAuth. You must set the Microsoft client id and client secret.</td></tr>
+<tr>
+  <td valign="top"><a name="desc_microsoft_consumer_key">microsoft_consumer_key</a></td>
+  <td valign="top"><code>''</code></td>
+  <td valign="top">Required to use Microsoft OAuth login method. Visit the <a href="http://go.microsoft.com/fwlink/?LinkId=248605">Microsoft Seller Dashboard</a> 
+  to create an application to receive your client id and client secret.<br>
+  See our <a href="http://wiki.geeklog.net/index.php/OAuth">Wiki OAuth page</a> for more information.</td></tr>
+<tr>
+  <td valign="top"><a name="desc_microsoft_consumer_secret">microsoft_consumer_secret</a></td>
+  <td valign="top"><code>''</code></td>
+  <td valign="top">Required to use Microsoft OAuth login method. Visit the <a href="http://go.microsoft.com/fwlink/?LinkId=248605">Microsoft Seller Dashboard</a> 
+  to create an application to receive your client id and client secret.<br>
+  See our <a href="http://wiki.geeklog.net/index.php/OAuth">Wiki OAuth page</a> for more information.</td></tr>
+<tr>
+  <td valign="top"><a name="desc_yahoo_login">yahoo_login</a></td>
+  <td valign="top"><code>false</code></td>
+  <td valign="top">Allow (when set to <tt>true</tt>) users who already have
+    an account with Yahoo to log into Geeklog with said account using OAuth. You must set the Yahoo consumer key and consumer secret.</td></tr>
+<tr>
+  <td valign="top"><a name="desc_yahoo_consumer_key">yahoo_consumer_key</a></td>
+  <td valign="top"><code>''</code></td>
+  <td valign="top">Required to use Yahoo OAuth login method. Visit this <a href="http://developer.yahoo.com">Yahoo Developer page</a>  
+  to create an application to receive your consumer key and consumer secret.<br>
+  See our <a href="http://wiki.geeklog.net/index.php/OAuth">Wiki OAuth page</a> for more information.</td></tr>
+<tr>
+  <td valign="top"><a name="desc_yahoo_consumer_secret">yahoo_consumer_secret</a></td>
+  <td valign="top"><code>''</code></td>
+  <td valign="top">Required to use Yahoo OAuth login method. Visit this <a href="http://developer.yahoo.com">Yahoo Developer page</a> 
+  to create an application to receive your consumer key and consumer secret.<br>
+  See our <a href="http://wiki.geeklog.net/index.php/OAuth">Wiki OAuth page</a> for more information.</td></tr>
 <tr>
   <td valign="top"><a name="desc_aftersave_user">aftersave_user</a></td>
   <td valign="top"><code>'item'</code></td>
diff -r 111e135f28a8 -r 26d84fe98459 public_html/docs/japanese/config.html
--- a/public_html/docs/japanese/config.html	Sun Aug 25 01:08:58 2013 -0400
+++ b/public_html/docs/japanese/config.html	Sun Aug 25 01:39:24 2013 -0400
@@ -787,11 +787,57 @@
   <td valign="top"><code>''</code></td>
   <td valign="top">Twitter OAuth ログイン利用時にはå
¥åŠ›ã—てください。アプリケーションを作成してconsumer keyと secretを取得するには、この<a href="https://twitter.com/apps">Twitter Application page</a>を参ç
§ã—てください。<br>
   さらに詳しいæƒ
報は、<a href="http://wiki.geeklog.net/index.php/OAuth">Wiki OAuth page</a>を参ç
§ã—てください。</td></tr>
-  
-  
-  
-  
-  
+<tr>
+  <td valign="top"><a name="desc_google_login">google_login</a></td>
+  <td valign="top"><code>false</code></td>
+  <td valign="top">Allow (when set to <tt>true</tt>) users who already have
+    an account with Google to log into Geeklog with said account using OAuth. You must set the Google client id and client secret.</td></tr>
+<tr>
+  <td valign="top"><a name="desc_google_consumer_key">google_consumer_key</a></td>
+  <td valign="top"><code>''</code></td>
+  <td valign="top">Required to use Google OAuth login method. Visit the <a href="https://code.google.com/apis/console">Google Developers Console</a> 
+  to create an application to receive your client ID and client secret.<br>
+  See our <a href="http://wiki.geeklog.net/index.php/OAuth">Wiki OAuth page</a> for more information.</td></tr>
+<tr>
+  <td valign="top"><a name="desc_google_consumer_secret">google_consumer_secret</a></td>
+  <td valign="top"><code>''</code></td>
+  <td valign="top">Required to use Google OAuth login method. Visit the <a href="https://code.google.com/apis/console">Google Developers Console</a> 
+  to create an application to receive your client ID and client secret.<br>
+  See our <a href="http://wiki.geeklog.net/index.php/OAuth">Wiki OAuth page</a> for more information.</td></tr>
+<tr>
+  <td valign="top"><a name="desc_microsoft_login">microsoft_login</a></td>
+  <td valign="top"><code>false</code></td>
+  <td valign="top">Allow (when set to <tt>true</tt>) users who already have
+    an account with Microsoft to log into Geeklog with said account using OAuth. You must set the Microsoft client id and client secret.</td></tr>
+<tr>
+  <td valign="top"><a name="desc_microsoft_consumer_key">microsoft_consumer_key</a></td>
+  <td valign="top"><code>''</code></td>
+  <td valign="top">Required to use Microsoft OAuth login method. Visit the <a href="http://go.microsoft.com/fwlink/?LinkId=248605">Microsoft Seller Dashboard</a> 
+  to create an application to receive your client id and client secret.<br>
+  See our <a href="http://wiki.geeklog.net/index.php/OAuth">Wiki OAuth page</a> for more information.</td></tr>
+<tr>
+  <td valign="top"><a name="desc_microsoft_consumer_secret">microsoft_consumer_secret</a></td>
+  <td valign="top"><code>''</code></td>
+  <td valign="top">Required to use Microsoft OAuth login method. Visit the <a href="http://go.microsoft.com/fwlink/?LinkId=248605">Microsoft Seller Dashboard</a> 
+  to create an application to receive your client id and client secret.<br>
+  See our <a href="http://wiki.geeklog.net/index.php/OAuth">Wiki OAuth page</a> for more information.</td></tr>
+<tr>
+  <td valign="top"><a name="desc_yahoo_login">yahoo_login</a></td>
+  <td valign="top"><code>false</code></td>
+  <td valign="top">Allow (when set to <tt>true</tt>) users who already have
+    an account with Yahoo to log into Geeklog with said account using OAuth. You must set the Yahoo consumer key and consumer secret.</td></tr>
+<tr>
+  <td valign="top"><a name="desc_yahoo_consumer_key">yahoo_consumer_key</a></td>
+  <td valign="top"><code>''</code></td>
+  <td valign="top">Required to use Yahoo OAuth login method. Visit this <a href="http://developer.yahoo.com">Yahoo Developer page</a>  
+  to create an application to receive your consumer key and consumer secret.<br>
+  See our <a href="http://wiki.geeklog.net/index.php/OAuth">Wiki OAuth page</a> for more information.</td></tr>
+<tr>
+  <td valign="top"><a name="desc_yahoo_consumer_secret">yahoo_consumer_secret</a></td>
+  <td valign="top"><code>''</code></td>
+  <td valign="top">Required to use Yahoo OAuth login method. Visit this <a href="http://developer.yahoo.com">Yahoo Developer page</a> 
+  to create an application to receive your consumer key and consumer secret.<br>
+  See our <a href="http://wiki.geeklog.net/index.php/OAuth">Wiki OAuth page</a> for more information.</td></tr>
 <tr>
   <td valign="top"><a name="desc_aftersave_user">ユーザー保存後の画面遷移(aftersave_user)</a></td>
   <td valign="top"><code>作成したé 
目を表示する(item)</code></td>
diff -r 111e135f28a8 -r 26d84fe98459 sql/updates/mssql_2.0.0_to_2.0.1.php
--- a/sql/updates/mssql_2.0.0_to_2.0.1.php	Sun Aug 25 01:08:58 2013 -0400
+++ b/sql/updates/mssql_2.0.0_to_2.0.1.php	Sun Aug 25 01:39:24 2013 -0400
@@ -81,6 +81,17 @@
     $c->add('language_files',array('en'=>'english_utf-8', 'de'=>'german_formal_utf-8'),'*text',6,29,NULL,470,FALSE, $me, 28);
     $c->del('languages', 'Core');
     $c->add('languages',array('en'=>'English', 'de'=>'Deutsch'),'*text',6,29,NULL,480,FALSE, $me, 28);       
+    
+    // New OAuth Services 
+    $c->add('google_login',0,'select',4,16,1,359,TRUE, $me, 16);
+    $c->add('google_consumer_key','','text',4,16,NULL,360,TRUE, $me, 16);
+    $c->add('google_consumer_secret','','text',4,16,NULL,361,TRUE, $me, 16);    
+    $c->add('microsoft_login',0,'select',4,16,1,362,TRUE, $me, 16);
+    $c->add('microsoft_consumer_key','','text',4,16,NULL,363,TRUE, $me, 16);
+    $c->add('microsoft_consumer_secret','','text',4,16,NULL,364,TRUE, $me, 16);
+    $c->add('yahoo_login',0,'select',4,16,1,365,TRUE, $me, 16);
+    $c->add('yahoo_consumer_key','','text',4,16,NULL,366,TRUE, $me, 16);
+    $c->add('yahoo_consumer_secret','','text',4,16,NULL,367,TRUE, $me, 16);       
 
     // Advanced Editor Options
     $c->add('path_editors','','text',0,3,NULL,132,TRUE, $me, 3);

More information about the geeklog-cvs mailing list