deon/khosb
Archived
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Fixes for upstream

Browse Source
This commit is contained in:
Deon George 2012-07-01 10:18:21 +10:00
parent eb4722f92d
commit 5f5d8a906a
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/host/classes/model/service/plugin/host.php
View File

@ -69,7 +69,7 @@ class Model_Service_Plugin_Host extends Model_Service_Plugin {
if ($this->service->queue == 'PROVISION') if ($this->service->queue == 'PROVISION')
return _('To Be Provisioned'); return _('To Be Provisioned');
return ($this->username_value() AND $this->password_value()) ? $this->host_server->plugin()->manage_button($this,$t) : ''; return ($this->username_value() AND $this->password_value() AND $a=$this->host_server->plugin()) ? $a->manage_button($this,$t) : '';
} }
} }
?> ?>

4
modules/product/classes/controller/admin/product.php
View File

@ -79,10 +79,10 @@ class Controller_Admin_Product extends Controller_TemplateDefault_Admin {
if ($_POST) { if ($_POST) {
if (isset($_POST['product_translate']['id']) AND ($pto=ORM::factory('product_translate',$_POST['product_translate']['id'])) AND $pto->loaded()) if (isset($_POST['product_translate']['id']) AND ($pto=ORM::factory('product_translate',$_POST['product_translate']['id'])) AND $pto->loaded())
if (! $pto->values($_POST['product_translate'])->update()->saved()) if (! $pto->values($_POST['product_translate'])->save())
throw new Kohana_Exception('Failed to save updates to product_translate data for record :record',array(':record'=>$po->id())); throw new Kohana_Exception('Failed to save updates to product_translate data for record :record',array(':record'=>$po->id()));
if (! $po->values($_POST)->update()->saved()) if (! $po->values($_POST)->save())
throw new Kohana_Exception('Failed to save updates to product data for record :record',array(':record'=>$so->id())); throw new Kohana_Exception('Failed to save updates to product data for record :record',array(':record'=>$so->id()));
} }

12
modules/ssl/classes/model/service/plugin/ssl.php
View File

@ -166,8 +166,18 @@ class Model_Service_Plugin_SSL extends Model_Service_Plugin {
$this->save(); $this->save();
return TRUE; return TRUE;
} else } else {
print_r(array(
'csr'=>$this->csr,
'ca'=>$this->ssl_ca->sign_cert,
'capk'=>$this->ssl_ca->sign_pk,
'days'=>$this->service->product->plugin()->days,
'ssl'=>$ssl_conf,
'x509e'=>$this->service->product->plugin()->extensions
));
throw new Kohana_Exception('Error Creating SSL Certificate :error',array(':error'=>openssl_error_string())); throw new Kohana_Exception('Error Creating SSL Certificate :error',array(':error'=>openssl_error_string()));
} }
}
} }
?> ?>