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

Optimised Company() Setup() Config() and changed method_directory into URL

Browse Source
This commit is contained in:
Deon George
2013-02-12 22:14:59 +11:00
parent 97d894d472
commit 288d974cfa
63 changed files with 422 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/ssl/classes/Controller/Admin/Ssl.php
View File

@@ -24,7 +24,7 @@ class Controller_Admin_SSL extends Controller_TemplateDefault_Admin {
ORM::factory('SSL_CA')->find_all(),
25,
array(
'id'=>array('label'=>'ID','url'=>'admin/ssl/view/'),
'id'=>array('label'=>'ID','url'=>URL::link('admin','ssl/view/')),
'sign_cert'=>array('label'=>'Cert'),
'issuer()'=>array('label'=>'Issuer'),
'valid_to(TRUE)'=>array('label'=>'Expires'),
@@ -32,7 +32,7 @@ class Controller_Admin_SSL extends Controller_TemplateDefault_Admin {
array(
'page'=>TRUE,
'type'=>'select',
'form'=>'admin/ssl/view',
'form'=>URL::link('admin','ssl/view'),
)),
));
}
@@ -94,14 +94,14 @@ class Controller_Admin_SSL extends Controller_TemplateDefault_Admin {
ORM::factory('SSL_CA',$id)->list_issued(),
25,
array(
'id'=>array('label'=>'ID','url'=>'admin/service/view/'),
'id'=>array('label'=>'ID','url'=>URL::link('admin','service/view/')),
'plugin()->dn()'=>array('label'=>'Cert'),
'plugin()->valid_to(TRUE)'=>array('label'=>'Expires'),
),
array(
'page'=>TRUE,
'type'=>'select',
'form'=>'admin/service/view',
'form'=>URL::link('admin','service/view'),
)),
));

2
modules/ssl/classes/Controller/User/Ssl.php
View File

@@ -30,7 +30,7 @@ class Controller_User_SSL extends Controller_TemplateDefault_User {
'body'=>_('Your requested password is too short.'),
));
HTTP::redirect('user/service/view/'.$so->id);
HTTP::redirect(URL::link('user','service/view/'.$so->id));
}
if (! $so->loaded() OR ! Auth::instance()->authorised($so->account_id,$so->affiliate_id)) {

2
modules/ssl/classes/Model/Service/Plugin/Ssl.php
View File

@@ -112,7 +112,7 @@ class Model_Service_Plugin_Ssl extends Model_Service_Plugin {
return '';
// @todo Do some password validation
$output = Form::open('user/ssl/download');
$output = Form::open(URL::link('user','ssl/download'));
$output .= Form::hidden('sid',$this->service->id);
$output .= _('Choose a password').': '.Form::password('passwd','').'<br/><br/>';
$output .= Form::submit('download','Download',array('class'=>'form_button'));