From: Sem <sembrestels@riseup.net>
Date: Sat, 9 Nov 2013 15:25:34 +0000 (+0100)
Subject: Add 'mod/openid_client/' from commit '11ea6ae4734a0e722c6ecaaee90e9ab772e8d2cc'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=2161e2335c9c650b8e44a56f6c9b0bd37546ae1f;p=lorea%2Felgg.git

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

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

2161e2335c9c650b8e44a56f6c9b0bd37546ae1f
diff --cc mod/openid_client/actions/openid_client/login.php
index 000000000,2a6896a61..2a6896a61
mode 000000,100644..100644
--- a/mod/openid_client/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 000000000,f0ad2a5fd..f0ad2a5fd
mode 000000,100644..100644
--- a/mod/openid_client/actions/openid_client/register.php
+++ b/mod/openid_client/actions/openid_client/register.php
diff --cc mod/openid_client/classes/ElggOpenIDConsumer.php
index 000000000,098201343..098201343
mode 000000,100644..100644
--- a/mod/openid_client/classes/ElggOpenIDConsumer.php
+++ b/mod/openid_client/classes/ElggOpenIDConsumer.php
diff --cc mod/openid_client/graphics/openid_icon.png
index 000000000,97d4714c5..97d4714c5
mode 000000,100644..100644
Binary files differ
diff --cc mod/openid_client/languages/en.php
index 000000000,000000000..4af3bf06a
new file mode 100644
--- /dev/null
+++ b/mod/openid_client/languages/en.php
@@@ -1,0 -1,0 +1,28 @@@
++<?php
++/**
++ * OpenID client English language file
++ */
++
++$english = array(
++
++	'openid_client' => 'OpenID',
++	'openid_client:login:header' => 'Log in with',
++	'openid_client:login' => 'Login in with OpenID',
++	'openid_client:others' => 'Others...',
++	'openid_client:url' => 'OpenID URL',
++
++	'openid_client:create' => 'Create an account',
++	'openid_client:create:instructs' => 'Your account has been approved. We just need you to confirm or set the below information.',
++
++	'openid_client:success:register' => 'Your account has been created.',
++	'openid_client:error:bad_register' => 'Unable to create an account. Please contact a site administrator.',
++	'openid_client:error:bad_response' => 'Bad response from the OpenID server',
++	'openid_client:error:no_html' => 'An error occurred trying to contact %s',
++	'openid_client:warning:username_not_available' => 'The username %s is not available. Please pick another.',
++	'openid_client:warning:username_valid' => 'The username %s is not valid as this site. Please pick another.',
++	'openid_client:warning:email_not_available' => 'The email address %s is not available. Please pick another.',
++
++	'river:friend:user:openid' => "%s is now a friend with %s",
++);
++
++add_translation('en', $english);
diff --cc mod/openid_client/lib/helpers.php
index 000000000,3fc101c42..3fc101c42
mode 000000,100644..100644
--- a/mod/openid_client/lib/helpers.php
+++ b/mod/openid_client/lib/helpers.php
diff --cc mod/openid_client/manifest.xml
index 000000000,eba4674c7..eba4674c7
mode 000000,100644..100644
--- a/mod/openid_client/manifest.xml
+++ b/mod/openid_client/manifest.xml
diff --cc mod/openid_client/return.php
index 000000000,3aa728ea6..3aa728ea6
mode 000000,100644..100644
--- a/mod/openid_client/return.php
+++ b/mod/openid_client/return.php
diff --cc mod/openid_client/start.php
index 000000000,9da701b6b..9da701b6b
mode 000000,100644..100644
--- a/mod/openid_client/start.php
+++ b/mod/openid_client/start.php
diff --cc mod/openid_client/upgrade.php
index 000000000,000000000..37248d484
new file mode 100644
--- /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 000000000,789a73e0a..789a73e0a
mode 000000,100644..100644
--- a/mod/openid_client/upgrades/2012100501.php
+++ b/mod/openid_client/upgrades/2012100501.php
diff --cc mod/openid_client/views/default/core/account/login_box.php
index 000000000,000000000..51b13398b
new file mode 100644
--- /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 000000000,000000000..c3add2924
new file mode 100644
--- /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 000000000,1f440dc49..1f440dc49
mode 000000,100644..100644
--- a/mod/openid_client/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 000000000,6044f0f0b..6044f0f0b
mode 000000,100644..100644
--- a/mod/openid_client/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 000000000,d01fc6b5a..d01fc6b5a
mode 000000,100644..100644
--- a/mod/openid_client/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 000000000,3a9a9d981..3a9a9d981
mode 000000,100644..100644
--- a/mod/openid_client/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 000000000,171215593..171215593
mode 000000,100644..100644
--- a/mod/openid_client/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 000000000,be448ef54..be448ef54
mode 000000,100644..100644
--- a/mod/openid_client/views/default/openid_client/register.php
+++ b/mod/openid_client/views/default/openid_client/register.php