Add 'mod/openid_client/' from commit '11ea6ae4734a0e722c6ecaaee90e9ab772e8d2cc'

git-subtree-dir: mod/openid_client
git-subtree-mainline: a9ac4c861335e60373c1e99b61372e6e0d6ac9f4
git-subtree-split: 11ea6ae4734a0e722c6ecaaee90e9ab772e8d2cc

diff --cc mod/openid_client/actions/openid_client/login.php
index 0000000000000000000000000000000000000000,2a6896a611986faf82d037da74a24626a0f707ff..2a6896a611986faf82d037da74a24626a0f707ff
mode 000000,100644..100644
--- /dev/null
--- 2/actions/openid_client/login.php
+++ b/mod/openid_client/actions/openid_client/login.php

diff --cc mod/openid_client/actions/openid_client/register.php
index 0000000000000000000000000000000000000000,f0ad2a5fdebd8d1a79b7171701aa879fcda459fa..f0ad2a5fdebd8d1a79b7171701aa879fcda459fa
mode 000000,100644..100644
--- /dev/null
--- 2/actions/openid_client/register.php
+++ b/mod/openid_client/actions/openid_client/register.php

diff --cc mod/openid_client/classes/ElggOpenIDConsumer.php
index 0000000000000000000000000000000000000000,09820134368a648cf0592f8c7d199e2f64700858..09820134368a648cf0592f8c7d199e2f64700858
mode 000000,100644..100644
--- /dev/null
--- 2/classes/ElggOpenIDConsumer.php
+++ b/mod/openid_client/classes/ElggOpenIDConsumer.php

diff --cc mod/openid_client/graphics/openid_icon.png
index 0000000000000000000000000000000000000000,97d4714c58db45000aee4ade1d5b1193a59161cf..97d4714c58db45000aee4ade1d5b1193a59161cf
mode 000000,100644..100644
Binary files differ

diff --cc mod/openid_client/languages/en.php
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..4af3bf06a981ed02e5a395e3f799e3f4414606f7
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/mod/openid_client/languages/en.php
@@@ -1,0 -1,0 +1,28 @@@
++<?php\r
++/**\r
++ * OpenID client English language file\r
++ */\r
++\r
++$english = array(\r
++\r
++      'openid_client' => 'OpenID',\r
++      'openid_client:login:header' => 'Log in with',\r
++      'openid_client:login' => 'Login in with OpenID',\r
++      'openid_client:others' => 'Others...',\r
++      'openid_client:url' => 'OpenID URL',\r
++\r
++      'openid_client:create' => 'Create an account',\r
++      'openid_client:create:instructs' => 'Your account has been approved. We just need you to confirm or set the below information.',\r
++\r
++      'openid_client:success:register' => 'Your account has been created.',\r
++      'openid_client:error:bad_register' => 'Unable to create an account. Please contact a site administrator.',\r
++      'openid_client:error:bad_response' => 'Bad response from the OpenID server',\r
++      'openid_client:error:no_html' => 'An error occurred trying to contact %s',\r
++      'openid_client:warning:username_not_available' => 'The username %s is not available. Please pick another.',\r
++      'openid_client:warning:username_valid' => 'The username %s is not valid as this site. Please pick another.',\r
++      'openid_client:warning:email_not_available' => 'The email address %s is not available. Please pick another.',\r
++\r
++      'river:friend:user:openid' => "%s is now a friend with %s",\r
++);\r
++\r
++add_translation('en', $english);\r

diff --cc mod/openid_client/lib/helpers.php
index 0000000000000000000000000000000000000000,3fc101c4206752aed1d473ca0ee2e3988537b1b8..3fc101c4206752aed1d473ca0ee2e3988537b1b8
mode 000000,100644..100644
--- /dev/null
--- 2/lib/helpers.php
+++ b/mod/openid_client/lib/helpers.php

diff --cc mod/openid_client/manifest.xml
index 0000000000000000000000000000000000000000,eba4674c751b7150cf8e0894b89c4d0f5d585f85..eba4674c751b7150cf8e0894b89c4d0f5d585f85
mode 000000,100644..100644
--- /dev/null
--- 2/manifest.xml
+++ b/mod/openid_client/manifest.xml

diff --cc mod/openid_client/return.php
index 0000000000000000000000000000000000000000,3aa728ea642e932bb948be651a9b5eb87ab46703..3aa728ea642e932bb948be651a9b5eb87ab46703
mode 000000,100644..100644
--- /dev/null
--- 2/return.php
+++ b/mod/openid_client/return.php

diff --cc mod/openid_client/start.php
index 0000000000000000000000000000000000000000,9da701b6bad10f3853b2c84d79e3ad61e46f8226..9da701b6bad10f3853b2c84d79e3ad61e46f8226
mode 000000,100644..100644
--- /dev/null
--- 2/start.php
+++ b/mod/openid_client/start.php

diff --cc mod/openid_client/upgrade.php
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..37248d4846e9b9734e8f9b75e31cefb7c80250f3
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/mod/openid_client/upgrade.php
@@@ -1,0 -1,0 +1,12 @@@
++<?php
++require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
++
++admin_gatekeeper();
++set_time_limit(0);
++
++echo "upgrade microthemes";
++$previous_access = elgg_set_ignore_access(true);
++openid_client_run_upgrades();
++elgg_set_ignore_access($previous_access);
++
++echo "DONE";

diff --cc mod/openid_client/upgrades/2012100501.php
index 0000000000000000000000000000000000000000,789a73e0ad5926187d2bc884be6edf1938634e28..789a73e0ad5926187d2bc884be6edf1938634e28
mode 000000,100644..100644
--- /dev/null
--- 2/upgrades/2012100501.php
+++ b/mod/openid_client/upgrades/2012100501.php

diff --cc mod/openid_client/views/default/core/account/login_box.php
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..51b13398b966d8a764c9acf2372400975089b65b
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/mod/openid_client/views/default/core/account/login_box.php
@@@ -1,0 -1,0 +1,24 @@@
++<?php
++/**
++ * Elgg login box
++ *
++ * @package Elgg
++ * @subpackage Core
++ *
++ * @uses $vars['module'] The module name. Default: aside
++ * @override views/default/core/account/login_box.php
++ */
++
++$module = elgg_extract('module', $vars, 'aside');
++
++$login_url = elgg_get_site_url();
++if (elgg_get_config('https_login')) {
++      $login_url = str_replace("http:", "https:", $login_url);
++}
++
++$title = elgg_echo('login');
++$body = elgg_view_form('login', array('action' => "{$login_url}action/login"));
++$body .= elgg_view_form('openid_client/login', array('class' => 'elgg-form-login hidden'), array());
++$body .= elgg_view('openid_client/icon');
++
++echo elgg_view_module($module, $title, $body);

diff --cc mod/openid_client/views/default/core/account/login_dropdown.php
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..c3add29243dd12c0e3c3d43477469eed7fa1e4aa
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/mod/openid_client/views/default/core/account/login_dropdown.php
@@@ -1,0 -1,0 +1,31 @@@
++<?php
++/**
++ * Elgg drop-down login form
++ * 
++ * @override views/default/core/account/login_dropdown.php
++ */
++
++if (elgg_is_logged_in()) {
++      return true;
++}
++
++$login_url = elgg_get_site_url();
++if (elgg_get_config('https_login')) {
++      $login_url = str_replace("http:", "https:", elgg_get_site_url());
++}
++
++$body = elgg_view_form('login', array('action' => "{$login_url}action/login"), array('returntoreferer' => TRUE));
++$body .= elgg_view_form('openid_client/login', array('class' => 'elgg-form-login hidden'), array());
++$body .= elgg_view('openid_client/icon');
++?>
++<div id="login-dropdown">
++      <?php 
++              echo elgg_view('output/url', array(
++                      'href' => 'login#login-dropdown-box',
++                      'rel' => 'popup',
++                      'class' => 'elgg-button elgg-button-dropdown',
++                      'text' => elgg_echo('login'),
++              )); 
++              echo elgg_view_module('dropdown', '', $body, array('id' => 'login-dropdown-box')); 
++      ?>
++</div>

diff --cc mod/openid_client/views/default/forms/openid_client/login.php
index 0000000000000000000000000000000000000000,1f440dc491e172d3f5574d9502287f3672eefdb4..1f440dc491e172d3f5574d9502287f3672eefdb4
mode 000000,100644..100644
--- /dev/null
--- 2/views/default/forms/openid_client/login.php
+++ b/mod/openid_client/views/default/forms/openid_client/login.php

diff --cc mod/openid_client/views/default/forms/openid_client/register.php
index 0000000000000000000000000000000000000000,6044f0f0bfc94294e841dfb3c079487a8d793704..6044f0f0bfc94294e841dfb3c079487a8d793704
mode 000000,100644..100644
--- /dev/null
--- 2/views/default/forms/openid_client/register.php
+++ b/mod/openid_client/views/default/forms/openid_client/register.php

diff --cc mod/openid_client/views/default/openid_client/css.php
index 0000000000000000000000000000000000000000,d01fc6b5ac1a9a3defe737866bac63700773b698..d01fc6b5ac1a9a3defe737866bac63700773b698
mode 000000,100644..100644
--- /dev/null
--- 2/views/default/openid_client/css.php
+++ b/mod/openid_client/views/default/openid_client/css.php

diff --cc mod/openid_client/views/default/openid_client/icon.php
index 0000000000000000000000000000000000000000,3a9a9d9812f66a5f80ad46295c24cb86a8f12da5..3a9a9d9812f66a5f80ad46295c24cb86a8f12da5
mode 000000,100644..100644
--- /dev/null
--- 2/views/default/openid_client/icon.php
+++ b/mod/openid_client/views/default/openid_client/icon.php

diff --cc mod/openid_client/views/default/openid_client/js.php
index 0000000000000000000000000000000000000000,171215593e405fd217cf3a89f9a2e0809ba3503c..171215593e405fd217cf3a89f9a2e0809ba3503c
mode 000000,100644..100644
--- /dev/null
--- 2/views/default/openid_client/js.php
+++ b/mod/openid_client/views/default/openid_client/js.php

diff --cc mod/openid_client/views/default/openid_client/register.php
index 0000000000000000000000000000000000000000,be448ef5431f3dac2ebf4a8a86740076076fb423..be448ef5431f3dac2ebf4a8a86740076076fb423
mode 000000,100644..100644
--- /dev/null
--- 2/views/default/openid_client/register.php
+++ b/mod/openid_client/views/default/openid_client/register.php