Skip to content
This repository has been archived by the owner on Apr 1, 2019. It is now read-only.

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

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

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

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2e25a73
Changed from Request::instance() to Request::current()
Jul 23, 2013
0cce133
Updated to headers() calls to use Kohana style
Jul 23, 2013
c233d5f
Fix for dodgy commit
Jul 23, 2013
ce42973
Updates for Kohana 3.3
Jul 23, 2013
4fe2340
Rename captcha.php to Captcha.php
Jul 23, 2013
e9d9b3a
Rename alpha.php to Alpha.php
Jul 23, 2013
cd6ec9c
Rename basic.php to Basic.php
Jul 23, 2013
37ff1e4
Rename black.php to Black.php
Jul 23, 2013
fca43c2
Rename math.php to Math.php
Jul 23, 2013
8348f8b
Rename riddle.php to Riddle.php
Jul 23, 2013
5625ce4
Rename word.php to Word.php
Jul 23, 2013
7bcd87e
Controller call update for Kohana 3.3
Jul 23, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions classes/captcha.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Request::current()->headers['Cache-Control'] = 'no-store, no-cache, must-revalidate, post-check=0, pre-check=0';
Request::current()->headers['Pragma'] = 'no-cache';
Request::current()->headers['Connection'] = 'close';
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe like this?

// Send the correct HTTP header
Request::current()->response()
    ->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;
Expand Down