SSL improvements

This commit is contained in:
Deon George 2011-12-28 15:12:35 +11:00
parent 6f1d0d749c
commit 50fe0583a3

View File

@ -20,7 +20,6 @@ class Model_Service_Plugin_SSL extends Model_Service_Plugin {
); );
protected $_has_one = array( protected $_has_one = array(
'ssl_ca'=>array('far_key'=>'ssl_ca_id','foreign_key'=>'id'), 'ssl_ca'=>array('far_key'=>'ssl_ca_id','foreign_key'=>'id'),
'ssl'=>array('far_key'=>'ssl_id','foreign_key'=>'id'),
); );
protected $_display_filters = array( protected $_display_filters = array(
@ -99,7 +98,7 @@ class Model_Service_Plugin_SSL extends Model_Service_Plugin {
} }
public function download_button() { public function download_button() {
if (! $this->service->active OR ! preg_match('/client/',$this->ssl->extensions) OR $this->valid_to() < time()) if (! $this->service->active OR ! preg_match('/client/',$this->service->product->plugin()->extensions) OR $this->valid_to() < time())
return ''; return '';
// @todo Do some password validation // @todo Do some password validation