| %s |
| ',_('Domains are available with the following suffixes')); $output .= Table::display( - $t->where('status','=','1')->find_all(), + $t->list_active(), 25, - array( + array( 'display("name")'=>array('label'=>'TLD Suffix'), ), - array( + array( )); $output .= ' |
'.$pco->description().'
'; diff --git a/modules/product/classes/model/product.php b/modules/product/classes/model/product.php index 4e9a6e59..19959f4f 100644 --- a/modules/product/classes/model/product.php +++ b/modules/product/classes/model/product.php @@ -26,9 +26,6 @@ class Model_Product extends ORMOSB { ); protected $_display_filters = array( - 'active'=>array( - array('StaticList_YesNo::display',array(':value')), - ), 'price_base'=>array( array('Tax::add',array(':value')), array('Currency::display',array(':value')), @@ -36,6 +33,9 @@ class Model_Product extends ORMOSB { 'price_type'=>array( array('StaticList_PriceType::display',array(':value')), ), + 'status'=>array( + array('StaticList_YesNo::display',array(':value')), + ), 'taxable'=>array( array('StaticList_YesNo::display',array(':value')), ), @@ -173,6 +173,20 @@ class Model_Product extends ORMOSB { return array('price_base','price_setup'); } + /** + * List the number of services using this product + */ + public function count_services() { + return $this->service->list_count(TRUE); + } + + /** + * List the number of invoices using this product + */ + public function count_invoices() { + return $this->invoice->list_count(TRUE); + } + /** * Return the price for the particle group and price option for the period */ @@ -182,20 +196,6 @@ class Model_Product extends ORMOSB { return isset($x[$grp][$option]) ? $x[$grp][$option] : NULL; } - /** - * List the number of services using this product - */ - public function services_count() { - return $this->service->where('active','=',1)->find_all()->count(); - } - - /** - * List the number of invoices using this product - */ - public function invoices_count() { - return $this->invoice->where('status','=',1)->find_all()->count(); - } - /** * Return the products for a given category * @todo This shouldnt be here. @@ -203,10 +203,7 @@ class Model_Product extends ORMOSB { public function list_category($cat,$active=TRUE) { $results = array(); - if ($active) - $cats = $this->where('active','=',TRUE); - else - $cats = $this; + $cats = $active ? $this->_where_active() : $this; foreach ($cats->find_all() as $po) { if ($c = unserialize($po->avail_category) AND in_array($cat,$c)) diff --git a/modules/product/classes/model/product/category.php b/modules/product/classes/model/product/category.php index 27ba2f5c..72b2c77b 100644 --- a/modules/product/classes/model/product/category.php +++ b/modules/product/classes/model/product/category.php @@ -30,10 +30,6 @@ class Model_Product_Category extends ORMOSB { return ($a=$this->product_category_translate->where('language_id','=',$ao->language_id)->find()->description) ? $a : _('No Description'); } - public function list_active() { - return $this->where('status','=',1); - } - public function list_bylistgroup($cat) { $result = array(); diff --git a/modules/product/views/product/admin/update.php b/modules/product/views/product/admin/update.php index 02dcae60..be0900d9 100644 --- a/modules/product/views/product/admin/update.php +++ b/modules/product/views/product/admin/update.php @@ -7,7 +7,7 @@| Service Active | -active); ?> | +status); ?> |
| Queue | diff --git a/modules/service/views/service/user/view.php b/modules/service/views/service/user/view.php index 07fd1d80..69497d05 100644 --- a/modules/service/views/service/user/view.php +++ b/modules/service/views/service/user/view.php @@ -10,7 +10,7 @@||
| Service Active | -display('active'); ?> | +display('status'); ?> |
| Billing Period | diff --git a/modules/ssl/classes/controller/user/ssl.php b/modules/ssl/classes/controller/user/ssl.php index 5e0baa18..4748af9d 100644 --- a/modules/ssl/classes/controller/user/ssl.php +++ b/modules/ssl/classes/controller/user/ssl.php @@ -25,7 +25,7 @@ class Controller_User_SSL extends Controller_TemplateDefault_User { $passwd = $_POST['passwd']; if (strlen($passwd) < Kohana::config('ssl.minpass_length')) { SystemMessage::add(array( - 'title'=>_('Validation failed'), + 'title'=>_('Validation failed'), 'type'=>'error', 'body'=>_('Your requested password is too short.'), )); diff --git a/modules/ssl/classes/model/service/plugin/ssl.php b/modules/ssl/classes/model/service/plugin/ssl.php index d29e67f1..ddfb31e8 100644 --- a/modules/ssl/classes/model/service/plugin/ssl.php +++ b/modules/ssl/classes/model/service/plugin/ssl.php @@ -121,7 +121,7 @@ class Model_Service_Plugin_SSL extends Model_Service_Plugin { } public function download_button() { - if (! $this->service->active OR ! preg_match('/client/',$this->service->product->plugin()->extensions) OR $this->valid_to() < time()) + if (! $this->service->status OR ! preg_match('/client/',$this->service->product->plugin()->extensions) OR $this->valid_to() < time()) return ''; // @todo Do some password validation diff --git a/modules/task/classes/model/task.php b/modules/task/classes/model/task.php index f542bbcd..bc6ccdd9 100644 --- a/modules/task/classes/model/task.php +++ b/modules/task/classes/model/task.php @@ -81,14 +81,10 @@ class Model_Task extends ORMOSB { /** LIST FUNCTIONS **/ - private function _list_active() { - return $this->where('status','=',1)->find_all(); - } - public function list_active() { $return = array(); - foreach ($this->_list_active() as $to) { + foreach ($this->_where_active()->find_all() as $to) { $ct = sprintf('%s %s %s %s %s',$to->int_min,$to->int_hour,$to->int_month_day,$to->int_month,$to->int_week_day); $c = new Cron($ct,$to->command);