handler fixes

Changes.md

@@ -1,3 +1,7 @@
+2011/01/17
+		- fixed .co handler (bug #3159317)
+		- fixed .ca handler (bug #3141475)
+
 2010/12/06
 		- fixed .ca handler
 

src/whois.ca.php

@@ -43,11 +43,12 @@ class ca_handler
 						'owner'	=> 'Registrant:',
 						'admin'	=> 'Administrative contact:',
 						'tech'	=> 'Technical contact:',
+						'domain.sponsor' => 'Registrar:',
 						'domain.nserver' => 'Name servers:',
 						'domain.status'	=> 'Domain status:',
-						'domain.created' => 'Approval date:',
-						'domain.expires' => 'Renewal date:',
-						'domain.changed' => 'Name servers last changed:'
+						'domain.created' => 'Creation date:',
+						'domain.expires' => 'Expiry date:',
+						'domain.changed' => 'Updated date:'
 						);
 
 		$extra = array(
@@ -59,6 +60,12 @@ class ca_handler
 
 		$r['regrinfo'] = easy_parser($data_str['rawdata'],$items,'ymd',$extra);
 
+		if (!empty($r['regrinfo']['domain']['sponsor']))
+			{
+			list($v,$reg) = explode(':',$r['regrinfo']['domain']['sponsor'][0]);
+			$r['regrinfo']['domain']['sponsor'] = trim($reg);
+			}
+
 		$r['regyinfo'] = array(
                   'registrar' => 'CIRA',
                   'referrer' => 'http://www.cira.ca/'

src/whois.co.php

@@ -34,7 +34,7 @@ class co_handler
 	{
 	function parse($data_str, $query)
 		{
-		$r['regrinfo'] = generic_parser_b($data_str['rawdata']);
+		$r['regrinfo'] = generic_parser_b($data_str['rawdata'], false, '-md--y');
 		$r['regyinfo']['referrer'] = 'http://www.cointernet.com.co/';
 		$r['regyinfo']['registrar'] = '.CO Internet, S.A.S.';
 		return ($r);