Add 'mod/openid_server/' from commit 'b6c722ac63d250972fea066b30e58026d00ab3e2'

git-subtree-dir: mod/openid_server
git-subtree-mainline: 2161e2335c9c650b8e44a56f6c9b0bd37546ae1f
git-subtree-split: b6c722ac63d250972fea066b30e58026d00ab3e2

diff --cc mod/openid_server/Crypt/RSA.php
index 0000000000000000000000000000000000000000,16dfa54d480bab46041aa197e3c6cca972d5899c..16dfa54d480bab46041aa197e3c6cca972d5899c
mode 000000,100644..100644
--- /dev/null
--- 2/Crypt/RSA.php
+++ b/mod/openid_server/Crypt/RSA.php

diff --cc mod/openid_server/Crypt/RSA/ErrorHandler.php
index 0000000000000000000000000000000000000000,8f39741e02bc097f28062f2cd9c42bc95004b5b6..8f39741e02bc097f28062f2cd9c42bc95004b5b6
mode 000000,100644..100644
--- /dev/null
--- 2/Crypt/RSA/ErrorHandler.php
+++ b/mod/openid_server/Crypt/RSA/ErrorHandler.php

diff --cc mod/openid_server/Crypt/RSA/Key.php
index 0000000000000000000000000000000000000000,72a71e2d086c49d49bb46653428fab238761b831..72a71e2d086c49d49bb46653428fab238761b831
mode 000000,100644..100644
--- /dev/null
--- 2/Crypt/RSA/Key.php
+++ b/mod/openid_server/Crypt/RSA/Key.php

diff --cc mod/openid_server/Crypt/RSA/KeyPair.php
index 0000000000000000000000000000000000000000,ecc0b7dc7eb7cb04afc726532613cc25ac31f5e6..ecc0b7dc7eb7cb04afc726532613cc25ac31f5e6
mode 000000,100644..100644
--- /dev/null
--- 2/Crypt/RSA/KeyPair.php
+++ b/mod/openid_server/Crypt/RSA/KeyPair.php

diff --cc mod/openid_server/Crypt/RSA/Math/BCMath.php
index 0000000000000000000000000000000000000000,646ff67103725951f7af520ecb324df115f8fcf9..646ff67103725951f7af520ecb324df115f8fcf9
mode 000000,100644..100644
--- /dev/null
--- 2/Crypt/RSA/Math/BCMath.php
+++ b/mod/openid_server/Crypt/RSA/Math/BCMath.php

diff --cc mod/openid_server/Crypt/RSA/Math/BigInt.php
index 0000000000000000000000000000000000000000,b7ac24cb66e10d154f5e5c038b4c9b8379082099..b7ac24cb66e10d154f5e5c038b4c9b8379082099
mode 000000,100644..100644
--- /dev/null
--- 2/Crypt/RSA/Math/BigInt.php
+++ b/mod/openid_server/Crypt/RSA/Math/BigInt.php

diff --cc mod/openid_server/Crypt/RSA/Math/GMP.php
index 0000000000000000000000000000000000000000,54e4c34fcef8d661dfe5337242cea63a74b81f01..54e4c34fcef8d661dfe5337242cea63a74b81f01
mode 000000,100644..100644
--- /dev/null
--- 2/Crypt/RSA/Math/GMP.php
+++ b/mod/openid_server/Crypt/RSA/Math/GMP.php

diff --cc mod/openid_server/Crypt/RSA/MathLoader.php
index 0000000000000000000000000000000000000000,de6c94642f0fb6db822dd8d81a72b374e97208c7..de6c94642f0fb6db822dd8d81a72b374e97208c7
mode 000000,100644..100644
--- /dev/null
--- 2/Crypt/RSA/MathLoader.php
+++ b/mod/openid_server/Crypt/RSA/MathLoader.php

diff --cc mod/openid_server/actions/admin.php
index 0000000000000000000000000000000000000000,bdf3b8261413500262980e605edac0b24a59f9bd..bdf3b8261413500262980e605edac0b24a59f9bd
mode 000000,100755..100755
--- /dev/null
--- 2/actions/admin.php
+++ b/mod/openid_server/actions/admin.php

diff --cc mod/openid_server/actions/autologin.php
index 0000000000000000000000000000000000000000,4a200fcfb6acf43865b367f6c76990af820ed556..4a200fcfb6acf43865b367f6c76990af820ed556
mode 000000,100755..100755
--- /dev/null
--- 2/actions/autologin.php
+++ b/mod/openid_server/actions/autologin.php

diff --cc mod/openid_server/actions/autologout.php
index 0000000000000000000000000000000000000000,36a7191c2806384e5508234a95f3eba44e625466..36a7191c2806384e5508234a95f3eba44e625466
mode 000000,100755..100755
--- /dev/null
--- 2/actions/autologout.php
+++ b/mod/openid_server/actions/autologout.php

diff --cc mod/openid_server/actions/trust.php
index 0000000000000000000000000000000000000000,3f882125def8547252a76b3e051dbb54ac42bf52..3f882125def8547252a76b3e051dbb54ac42bf52
mode 000000,100755..100755
--- /dev/null
--- 2/actions/trust.php
+++ b/mod/openid_server/actions/trust.php

diff --cc mod/openid_server/languages/ca.php
index 0000000000000000000000000000000000000000,0b0e6765948d91fcb94769fa689969980ddcb98e..0b0e6765948d91fcb94769fa689969980ddcb98e
mode 000000,100644..100644
--- /dev/null
--- 2/languages/ca.php
+++ b/mod/openid_server/languages/ca.php

diff --cc mod/openid_server/languages/en.php
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..9942408616503f7a2d7585f72df5f614e42a95f7
new file mode 100755 (executable)
--- /dev/null
--- /dev/null
+++ b/mod/openid_server/languages/en.php
@@@ -1,0 -1,0 +1,47 @@@
++<?php\r
++\r
++      $english = array(       \r
++              'item:user:openid'                              => "OpenID users",\r
++              'openid_server:trust_title'                     => "Trust",     \r
++              'openid_server:trust_question'                  => "Do you wish to confirm your OpenID (<code>%s</code>) with <code>%s</code>?",\r
++              'openid_server:remember_trust'                  => "Remember this decision",\r
++              'openid_server:confirm_trust'                   => "Yes",\r
++              'openid_server:reject_trust'                    => "No",\r
++              'openid_server:not_logged_in'                   => "You must be logged-in to approve this request. Please login now.",\r
++              'openid_server:loggedin_as_wrong_user'          => "You must be logged-in as %s to approve this request."\r
++                  ." You are currently logged-in as %s instead.",\r
++              'openid_server:trust_root'                      => "Trust root",\r
++              'openid_server:trust_site'                      => "Trust site",\r
++              'openid_server:autologin_url'                   => "Auto-login URL:",\r
++              'openid_server:autologout_url'                  => "Auto-logout URL:",\r
++              'openid_server:iframe_width'                    => "Iframe width (in pixels)",\r
++              'openid_server:iframe_height'                   => "Iframe height (in pixels)",\r
++              'openid_server:change_button'                   => "Change",\r
++              'openid_server:add_button'                      => "Add",\r
++              'openid_server:admin_explanation'               => "You can use this page to set default trust roots for your OpenID server."\r
++                  ." These are OpenID client applications that are automatically trusted by people using OpenIDs provided by your server and are"\r
++                  ." useful only if you are using OpenID to integrate a federation of trusted applications. (You need do nothing here if you have no"\r
++                  ." trusted applications.) You can also set autologin and autologout URLs for some or all of your trusted applications if you"\r
++                  ." want your users to be automatically logged in or logged out of these applications when they login and logout of your"\r
++                  ." OpenID server. Normally the autologin and autologout takes place in invisible iframes. If you are debugging this and want"\r
++                  ." the iframes to be visible, you can set the width and height below.",\r
++              'openid_server:trust_root_updated'              => "Trust root updated",\r
++              'openid_server:trust_root_added'                => "Trust root added",\r
++              'openid_server:trust_root_deleted'              => "Trust root deleted",\r
++              'openid_server:edit_trust_root_title'           => "Edit trust record",\r
++              'openid_server:manage_trust_root_title'         => "Manage default trust roots",\r
++              'openid_server:trust_root_title'                => "Default trust roots",\r
++              'openid_server:edit_option'                     => "Edit",\r
++              'openid_server:delete_option'                   => "Delete",\r
++              'openid_server:add_trust_root_title'            => "Add default trust root",\r
++              'openid_server:autologin_title'                 => "Logging in",\r
++              'openid_server:autologin_body'                  => "Logging in ... please wait",\r
++              'openid_server:autologout_title'                => "Logging out",\r
++              'openid_server:autologout_body'                 => "Logging out ... please wait",\r
++              'item:object:openid_server::trusted_root'       => "Openid trusted sites",\r
++          \r
++      );\r
++                                      \r
++      add_translation("en",$english);\r
++\r
++?>\r

diff --cc mod/openid_server/languages/es.php
index 0000000000000000000000000000000000000000,eada7cd72ebb8c7384773c4fc244cb04a0016bf0..eada7cd72ebb8c7384773c4fc244cb04a0016bf0
mode 000000,100755..100755
--- /dev/null
--- 2/languages/es.php
+++ b/mod/openid_server/languages/es.php

diff --cc mod/openid_server/languages/gl.php
index 0000000000000000000000000000000000000000,1fa29af1ed8fac4035d6f377ced42248c68b4a7c..1fa29af1ed8fac4035d6f377ced42248c68b4a7c
mode 000000,100644..100644
--- /dev/null
--- 2/languages/gl.php
+++ b/mod/openid_server/languages/gl.php

diff --cc mod/openid_server/languages/pt.php
index 0000000000000000000000000000000000000000,eda8533023e27a9834f27bff209849c1ad681b64..eda8533023e27a9834f27bff209849c1ad681b64
mode 000000,100644..100644
--- /dev/null
--- 2/languages/pt.php
+++ b/mod/openid_server/languages/pt.php

diff --cc mod/openid_server/lib/actions.php
index 0000000000000000000000000000000000000000,f5f05d952feecb1e0b849117b6f4e6e0befdf697..f5f05d952feecb1e0b849117b6f4e6e0befdf697
mode 000000,100755..100755
--- /dev/null
--- 2/lib/actions.php
+++ b/mod/openid_server/lib/actions.php

diff --cc mod/openid_server/lib/common.php
index 0000000000000000000000000000000000000000,3e3e6b0349336a0690770bf09cf3129f660d5e32..3e3e6b0349336a0690770bf09cf3129f660d5e32
mode 000000,100755..100755
--- /dev/null
--- 2/lib/common.php
+++ b/mod/openid_server/lib/common.php

diff --cc mod/openid_server/lib/session.php
index 0000000000000000000000000000000000000000,ccd1e8f4cf40ea1f6c21e46735dafce9503a9438..ccd1e8f4cf40ea1f6c21e46735dafce9503a9438
mode 000000,100755..100755
--- /dev/null
--- 2/lib/session.php
+++ b/mod/openid_server/lib/session.php

diff --cc mod/openid_server/manifest.xml
index 0000000000000000000000000000000000000000,87218e62c95cb73ca09df2c152f839fa301ed63e..87218e62c95cb73ca09df2c152f839fa301ed63e
mode 000000,100755..100755
--- /dev/null
--- 2/manifest.xml
+++ b/mod/openid_server/manifest.xml

diff --cc mod/openid_server/openid_server_include.php
index 0000000000000000000000000000000000000000,6fbd319c4daa60b189337488dfa4ec07e5fbfa82..6fbd319c4daa60b189337488dfa4ec07e5fbfa82
mode 000000,100755..100755
--- /dev/null
--- 2/openid_server_include.php
+++ b/mod/openid_server/openid_server_include.php

diff --cc mod/openid_server/server.php
index 0000000000000000000000000000000000000000,7ebe70dd4d6883dec7263635c26788c28af7d9fd..7ebe70dd4d6883dec7263635c26788c28af7d9fd
mode 000000,100755..100755
--- /dev/null
--- 2/server.php
+++ b/mod/openid_server/server.php

diff --cc mod/openid_server/start.php
index 0000000000000000000000000000000000000000,7129f1497a2476d2677493e17b28a3bd2a63d2a4..7129f1497a2476d2677493e17b28a3bd2a63d2a4
mode 000000,100755..100755
--- /dev/null
--- 2/start.php
+++ b/mod/openid_server/start.php

diff --cc mod/openid_server/views/default/forms/openid_server/trust.php
index 0000000000000000000000000000000000000000,b9e4c3333f4d6e0d7dd63e4f1116b43d95cdcb79..b9e4c3333f4d6e0d7dd63e4f1116b43d95cdcb79
mode 000000,100755..100755
--- /dev/null
--- 2/views/default/forms/openid_server/trust.php
+++ b/mod/openid_server/views/default/forms/openid_server/trust.php

diff --cc mod/openid_server/views/default/openid_server/forms/admin.php
index 0000000000000000000000000000000000000000,e19a97e8eee16b3d43dbcff12fe90363a653152d..e19a97e8eee16b3d43dbcff12fe90363a653152d
mode 000000,100755..100755
--- /dev/null
--- 2/views/default/openid_server/forms/admin.php
+++ b/mod/openid_server/views/default/openid_server/forms/admin.php

diff --cc mod/openid_server/views/default/openid_server/forms/autologin.php
index 0000000000000000000000000000000000000000,6880e15435e37f513904b8f470acbfec55c4743f..6880e15435e37f513904b8f470acbfec55c4743f
mode 000000,100755..100755
--- /dev/null
--- 2/views/default/openid_server/forms/autologin.php
+++ b/mod/openid_server/views/default/openid_server/forms/autologin.php

diff --cc mod/openid_server/views/default/openid_server/forms/autologout.php
index 0000000000000000000000000000000000000000,86b5c9682bc0a05a37f2205e029c9d53486de64e..86b5c9682bc0a05a37f2205e029c9d53486de64e
mode 000000,100755..100755
--- /dev/null
--- 2/views/default/openid_server/forms/autologout.php
+++ b/mod/openid_server/views/default/openid_server/forms/autologout.php

diff --cc mod/openid_server/views/default/openid_server/forms/trust.php
index 0000000000000000000000000000000000000000,5a1e05ca1a2b33fe71f1c1997998c79e0794d3d7..5a1e05ca1a2b33fe71f1c1997998c79e0794d3d7
mode 000000,100755..100755
--- /dev/null
--- 2/views/default/openid_server/forms/trust.php
+++ b/mod/openid_server/views/default/openid_server/forms/trust.php

diff --cc mod/openid_server/views/default/openid_server/metatags.php
index 0000000000000000000000000000000000000000,eddc174d4c69cfbf6c8a9c32da671120719b58a2..eddc174d4c69cfbf6c8a9c32da671120719b58a2
mode 000000,100755..100755
--- /dev/null
--- 2/views/default/openid_server/metatags.php
+++ b/mod/openid_server/views/default/openid_server/metatags.php

diff --cc mod/openid_server/views/xrds/openid_server/profile.php
index 0000000000000000000000000000000000000000,9b34a6b7b489068cb44b946ad47feceba5b54836..9b34a6b7b489068cb44b946ad47feceba5b54836
mode 000000,100644..100644
--- /dev/null
--- 2/views/xrds/openid_server/profile.php
+++ b/mod/openid_server/views/xrds/openid_server/profile.php

diff --cc mod/openid_server/views/xrds/openid_server/service.php
index 0000000000000000000000000000000000000000,269df5c2e80b3520321e28976e44e65c57da106f..269df5c2e80b3520321e28976e44e65c57da106f
mode 000000,100644..100644
--- /dev/null
--- 2/views/xrds/openid_server/service.php
+++ b/mod/openid_server/views/xrds/openid_server/service.php