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

Some more fixes as a result of changing status to active

Browse Source
This commit is contained in:
Deon George 2016-11-28 22:09:40 +11:00
parent 8bd409d86f
commit 378946ee37
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/invoice/classes/Task/Invoice/Reminddue.php
View File

@ -23,7 +23,7 @@ class Task_Invoice_Reminddue extends Minion_Task {
// Generate a token to view the invoice online // Generate a token to view the invoice online
$token = ORM::factory('Module_Method_Token') $token = ORM::factory('Module_Method_Token')
->method(array('invoice','user_view')) ->method(array('invoice','user:view'))
->account($io->account) ->account($io->account)
->expire(time()+86400*21) ->expire(time()+86400*21)
->uses(3) ->uses(3)

3
modules/ssl/classes/SSL.php
View File

@ -162,6 +162,9 @@ class SSL {
} }
public function get_issuer() { public function get_issuer() {
if ($this->get_isRoot())
return '-';
$k = $this->_details('issuer'); $k = $this->_details('issuer');
return isset($k['CN']) ? $k['CN'] : ''; return isset($k['CN']) ? $k['CN'] : '';

2
modules/ssl/views/service/user/plugin/ssl/view/certificate.php
View File

@ -5,7 +5,7 @@
<?php <?php
echo $o->download_button(); echo $o->download_button();
if ($ao=Auth::instance()->get_user() AND ($ao->isAdmin() OR $ao->isReseller()) AND $o->service->status AND ($o->valid_to()-(Kohana::$config->load('ssl.min_renew_days')*86400) <= time()) AND $o->service->paid_to() > time()) : if ($ao=Auth::instance()->get_user() AND ($ao->isAdmin() OR $ao->isReseller()) AND $o->service->active AND ($o->valid_to()-(Kohana::$config->load('ssl.min_renew_days')*86400) <= time()) AND $o->service->paid_to() > time()) :
echo Form::open(URL::link('reseller','ssl/renew/'.$o->service->id)); echo Form::open(URL::link('reseller','ssl/renew/'.$o->service->id));
echo Form::button('submit','Renew',array('class'=>'btn btn-primary','nocg'=>TRUE)); echo Form::button('submit','Renew',array('class'=>'btn btn-primary','nocg'=>TRUE));
else : ?> else : ?>