Changed from Request::instance() to Request::current()

classes/captcha.php → classes/Captcha.php

@@ -158,7 +158,7 @@ public function __construct($group = NULL)
 	public function update_response_session()
 	{
 		// Store the correct Captcha response in a session
-		Session::instance()->set('captcha_response', sha1(utf8::strtoupper($this->response)));
+		Session::instance()->set('captcha_response', sha1(UTF8::strtoupper($this->response)));
 	}
 
 	/**
@@ -178,7 +178,7 @@ public static function valid($response)
 			return TRUE;
 
 		// Challenge result
-		$result = (bool) (sha1(utf8::strtoupper($response)) === Session::instance()->get('captcha_response'));
+		$result = (bool) (sha1(UTF8::strtoupper($response)) === Session::instance()->get('captcha_response'));
 
 		// Increment response counter
 		if ($counted !== TRUE)
@@ -434,10 +434,10 @@ public function image_render($html)
 			return '<img src="'.url::site('captcha/'.Captcha::$config['group']).'" width="'.Captcha::$config['width'].'" height="'.Captcha::$config['height'].'" alt="Captcha" class="captcha" />';
 
 		// Send the correct HTTP header
-        Request::instance()->headers['Content-Type'] = 'image/'.$this->image_type;
-        Request::instance()->headers['Cache-Control'] = 'no-store, no-cache, must-revalidate, post-check=0, pre-check=0';
-        Request::instance()->headers['Pragma'] = 'no-cache';
-        Request::instance()->headers['Connection'] = 'close';
+		Request::current()->headers('Content-Type', 'image/'.$this->image_type)
+		    ->headers('Cache-Control', 'no-store, no-cache, must-revalidate, post-check=0, pre-check=0')
+		    ->headers('Pragma', 'no-cache')
+		    ->headers('Connection', 'close');
 
 		// Pick the correct output function
 		$function = 'image'.$this->image_type;

classes/captcha/alpha.php → classes/captcha/Alpha.php

@@ -92,4 +92,4 @@ public function render($html = TRUE)
 		return $this->image_render($html);
 	}
 
-} // End Captcha Alpha Driver Class
+} // End Captcha Alpha Driver Class

classes/captcha/math.php → classes/captcha/Math.php

@@ -61,4 +61,4 @@ public function render($html = TRUE)
 		return $this->math_exercise;
 	}
 
-} // End Captcha Math Driver Class
+} // End Captcha Math Driver Class

classes/captcha/riddle.php → classes/captcha/Riddle.php

@@ -47,4 +47,4 @@ public function render($html = TRUE)
 		return $this->riddle;
 	}
 
-} // End Captcha Riddle Driver Class
+} // End Captcha Riddle Driver Class

init.php

@@ -3,6 +3,6 @@
 // Catch-all route for Captcha classes to run
 Route::set('captcha', 'captcha(/<group>)')
 	->defaults(array(
-		'controller' => 'captcha',
+		'controller' => 'Captcha',
 		'action' => 'index',
 		'group' => NULL));