Decouple simple registration extension

examples/basic/index.php

@@ -55,6 +55,9 @@
    define('OPENID_URL', $_POST['openid_type']);
   }
 
+  // Include the simple registration extension
+  require('../../sreg.ext.php');
+
   require('../../processor.php');
 
  } else {

processor.php

@@ -25,7 +25,6 @@
  require_once(dirname(__FILE__) . '/logging.inc.php');
  require_once(dirname(__FILE__) . '/discoverer.inc.php');
  require_once(dirname(__FILE__) . '/poster.inc.php');
- require_once(dirname(__FILE__) . '/sreg.inc.php');
  require_once(dirname(__FILE__) . '/urlbuilder.inc.php');
  require_once(dirname(__FILE__) . '/keymanager.inc.php');
 
@@ -333,7 +332,7 @@
    error('noauth', 'Provider didn\'t authenticate response');
   }
 
-  parseSRegResponse();
+  Processor::callHandlers();
   URLBuilder::redirect(); 
  }
 
@@ -368,6 +367,20 @@
   URLBuilder::redirect();
  }
 
+ class Processor {
+
+  public static function callHandlers() {
+   global $_POIDSY;
+
+   if (empty($_POIDSY['handlers'])) { return; }
+
+   foreach ($_POIDSY['handlers'] as $handler) {
+    $handler->parseResponse();
+   }
+  }
+
+ }
+
  // Here we go!
  process();
 ?>

sreg.inc.php → sreg.ext.php

@@ -36,13 +36,35 @@
              . ',' . SREG_DOB . ',' . SREG_GENDER . ',' . SREG_POSTCODE . ','
              . SREG_COUNTRY . ',' . SREG_LANGUAGE . ', ' . SREG_TIMEZONE);
 
- function parseSRegResponse() {
-  foreach (explode(',', SREG_ALL) as $reg) {
-   $reg = str_replace('.', '_', $reg);
-   if (isset($_REQUEST[$reg])) {
-    $_SESSION['openid']['sreg'][substr($reg, 12)] = $_REQUEST[$reg];
+ class SReg {
+
+  public function parseResponse() {
+   foreach (explode(',', SREG_ALL) as $reg) {
+    $reg = str_replace('.', '_', $reg);
+    if (isset($_REQUEST[$reg])) {
+     $_SESSION['openid']['sreg'][substr($reg, 12)] = $_REQUEST[$reg];
+    }
+   }
+  }
+
+  public function decorate(&$args, $ns) {
+   if (defined('OPENID_SREG_REQUEST')) {
+    $args['openid.sreg.required'] = OPENID_SREG_REQUEST;
+   }
+
+   if (defined('OPENID_SREG_OPTIONAL')) {
+    $args['openid.sreg.optional'] = OPENID_SREG_OPTIONAL;
+   }
+
+   if (defined('OPENID_SREG_POLICY')) {
+    $args['openid.sreg.policy_url'] = OPENID_SREG_POLICY;
    }
   }
+
  }
 
+ $sreg = new SReg();
+ $_POIDSY['decorators'][] = $sreg;
+ $_POIDSY['handlers'][] = $sreg;
+
 ?>

urlbuilder.inc.php

@@ -76,7 +76,7 @@
     $args['openid.assoc_handle'] = $handle;
    }
 
-   self::addSRegArgs($args);
+   self::decorateArgs($args);
 
    return self::addArguments($base, $args);
   }
@@ -99,17 +99,15 @@
    return $root; 
   }
 
-  private static function addSRegArgs(&$args) {
-   if (defined('OPENID_SREG_REQUEST')) {
-    $args['openid.sreg.required'] = OPENID_SREG_REQUEST;
-   }
+  private static function decorateArgs(&$args) {
+   global $_POIDSY;
 
-   if (defined('OPENID_SREG_OPTIONAL')) {
-    $args['openid.sreg.optional'] = OPENID_SREG_OPTIONAL;
-   }
+   if (empty($_POIDSY['decorators'])) { return; }
+
+   $id = 1;
 
-   if (defined('OPENID_SREG_POLICY')) {
-    $args['openid.sreg.policy_url'] = OPENID_SREG_POLICY;
+   foreach ($_POIDSY['decorators'] as $decorator) {
+    $decorator->decorate($args, 'ext' . ($id++));
    }
   }