diff --git a/modules/host/classes/model/service/plugin/host.php b/modules/host/classes/model/service/plugin/host.php index 8e1c7330..cc076f4e 100644 --- a/modules/host/classes/model/service/plugin/host.php +++ b/modules/host/classes/model/service/plugin/host.php @@ -69,7 +69,7 @@ class Model_Service_Plugin_Host extends Model_Service_Plugin { if ($this->service->queue == 'PROVISION') 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) : ''; } } ?> diff --git a/modules/product/classes/controller/admin/product.php b/modules/product/classes/controller/admin/product.php index e3d8786c..118acd9c 100644 --- a/modules/product/classes/controller/admin/product.php +++ b/modules/product/classes/controller/admin/product.php @@ -79,10 +79,10 @@ class Controller_Admin_Product extends Controller_TemplateDefault_Admin { if ($_POST) { 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())); - 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())); } diff --git a/modules/ssl/classes/model/service/plugin/ssl.php b/modules/ssl/classes/model/service/plugin/ssl.php index 46c45a14..d29e67f1 100644 --- a/modules/ssl/classes/model/service/plugin/ssl.php +++ b/modules/ssl/classes/model/service/plugin/ssl.php @@ -166,8 +166,18 @@ class Model_Service_Plugin_SSL extends Model_Service_Plugin { $this->save(); 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())); + } } } ?>