← Back to branch summary

~ubuntu-branches/ubuntu/lucid/ebox-openvpn/lucid

« back to all changes in this revision

Viewing changes to src/EBox/CGI/ClientBundle.pm

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2008-02-27 13:31:29 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20080227133129-6mpzfq43hghuxtaz
Tags: 0.11.99-0ubuntu1
New upstream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/EBox/CGI/ClientBundle.pm
38
38
    my ($self) = @_;
39
39
    # we use unsafeParam because download is free text and we don't use the value; only we check if the param is present
40
40
    if ($self->unsafeParam('download')) {
41
 
        [qw(download os clientCertificate ip\d+)];
 
41
        [qw(installer download os clientCertificate ip\d+)];
42
42
    }
43
43
    else {
44
44
        return [];
113
113
    } 
114
114
  }
115
115
 
116
 
  EBox::debug("addrs @addrs");
117
116
  return \@addrs;
118
117
}
119
118
 
128
127
        my $name              = $self->param('name');
129
128
        my $os                = $self->param('os');
130
129
        my $clientCertificate = $self->param('clientCertificate');
 
130
        my $installer         = $self->param('installer');
 
131
 
131
132
        my $addresses         = $self->_addressesFromParams();
132
133
 
 
134
 
133
135
        my $bundle;
134
136
        try {
135
 
          $bundle = $openvpn->server($name)->clientBundle($os, $clientCertificate, $addresses);
 
137
          $bundle = $openvpn->server($name)->clientBundle(
 
138
                                           os => $os, 
 
139
                                           clientCertificate => $clientCertificate, 
 
140
                                           addresses => $addresses,
 
141
                                          installer => $installer,
 
142
                                         );
136
143
        
137
144
          $self->{bundle} = $bundle;
138
145
        }