[phpws-comm-commits] modules/openid/class OpenID_Admin.php, 1.5, 1.6 OpenID_Runtime.php, 1.1.1.1, 1.2

[Greg M. <bli...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/openid/class
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11129/class

Modified Files:
	OpenID_Admin.php OpenID_Runtime.php 
Log Message:
Now support 2.0 delegation. Only delegate on homepage

Index: OpenID_Admin.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/OpenID_Admin.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** OpenID_Admin.php	10 Feb 2008 16:42:14 -0000	1.5
--- OpenID_Admin.php	10 Feb 2008 21:28:36 -0000	1.6
***************
*** 71,74 ****
--- 71,78 ----
          $form->setClass('delegate_openid', (FORCE_MOD_TEMPLATES ? 'openid openid_mod' : 'openid'));
  
+         $form->addCheck('delegate_ver_2');
+         $form->setMatch('delegate_ver_2', PHPWS_Settings::get('openid', 'delegate_ver_2'));
+         $form->setLabel('delegate_ver_2', dgettext('openid', 'Provider supports OpenID 2.0'));
+ 
          $errors = OpenID_Detect::run();
          if (empty($errors))
***************
*** 115,118 ****
--- 119,123 ----
          PHPWS_Settings::set('openid', 'delegate_server', $delegate_server);
          PHPWS_Settings::set('openid', 'delegate_openid', $delegate_openid);
+         PHPWS_Settings::set('openid', 'delegate_ver_2',  (int)isset($_POST['delegate_ver_2']));
          PHPWS_Settings::set('openid', 'allow_openid',    (int)isset($_POST['allow_openid']));
  

Index: OpenID_Runtime.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/OpenID_Runtime.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** OpenID_Runtime.php	4 Feb 2008 04:54:31 -0000	1.1.1.1
--- OpenID_Runtime.php	10 Feb 2008 21:28:36 -0000	1.2
***************
*** 27,31 ****
      function delegate()
      {
!         if (PHPWS_Settings::get('openid', 'delegate'))
          {
              $server = PHPWS_Settings::get('openid', 'delegate_server');
--- 27,32 ----
      function delegate()
      {
!         $key = Key::getCurrent();
!         if (!empty($key) && $key->isHomeKey() && PHPWS_Settings::get('openid', 'delegate'))
          {
              $server = PHPWS_Settings::get('openid', 'delegate_server');
***************
*** 34,37 ****
--- 35,44 ----
              Layout::addLink('<link rel="openid.server" href="' . $server . '" />');
              Layout::addLink('<link rel="openid.delegate" href="' . $openid . '" />');
+ 
+             if (PHPWS_Settings::get('openid', 'delegate_ver_2'))
+             {
+                 Layout::addLink('<link rel="openid2.provider" href="' . $server . '" />');
+                 Layout::addLink('<link rel="openid2.local_id" href="' . $openid . '" />');
+             }
          }
      }