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

Status updates, SSL updates

Browse Source
This commit is contained in:
Deon George
2013-11-08 22:02:32 +11:00
parent 28ea1ac613
commit 2d9d7f383c
31 changed files with 688 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/ssl/views/product/plugin/ssl/feature_summary.php
View File

@@ -3,9 +3,6 @@
<div class="dl-horizontal">
<dt>Validatity Days</dt>
<dd><?php echo $po->display('days'); ?></dd>
<dt>Type</dt>
<dd><?php echo $po->display('extensions'); ?></dd>

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

@@ -3,14 +3,26 @@
<div class="dl-horizontal">
<dt>Subject</dt>
<dt>DN</dt>
<dd><?php echo $o->dn(); ?></dd>
<dt>Issuer</dt>
<dd><?php echo $o->issuerdn(); ?></dd>
<dt>Serial Number</dt>
<dd><?php echo $o->serial(); ?></dd>
<dt>CA</dt>
<dd><?php echo $o->SSL_CA->loaded() ? $o->SSL_CA->subject() : $o->issuer(); ?></dd>
<dt>Subject Key Id</dt>
<dd><?php echo $o->ski(); ?></dd>
<dt>Issuer</dt>
<dd>
<?php if ($o->validCA() AND $o->authorised($o->ca)) : ?>
<?php echo HTML::anchor(URL::link('reseller','ssl/edit/').$o->ca->id,$o->issuer()); ?>
<?php else : ?>
<?php echo $o->issuer(); ?>
<?php endif ?>
</dd>
<dt>Issuer Serial</dt>
<dd><?php printf('%s (%s)',$o->aki_keyid(), $o->aki_serial()); ?></dd>
<dt>Valid From</dt>
<dd><?php echo $o->valid_from(TRUE); ?></dd>
@@ -18,15 +30,12 @@
<dt>Valid To</dt>
<dd><?php echo $o->valid_to(TRUE); ?></dd>
<dt>Serial Number</dt>
<dd><?php echo $o->serial(); ?></dd>
<dt>Hash</dt>
<dd><?php echo $o->hash(); ?></dd>
<dt>Version</dt>
<dd><?php echo $o->version(); ?></dd>
<dt>Hash</dt>
<dd><?php echo $o->hash(); ?></dd>
<dt>Algorithm</dt>
<dd><?php echo $o->algorithm(); ?></dd>
@@ -37,5 +46,12 @@
<legend>Certificate</legend>
<pre><?php echo $o->cert; ?></pre>
<?php echo $o->download_button(); ?>
<?php
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()) :
echo Form::open(URL::link('reseller','ssl/renew/'.$o->service->id));
echo Form::button('submit','Renew',array('class'=>'btn btn-primary'));
endif
?>
</fieldset>

55
modules/ssl/views/ssl/admin/add_view.php
View File

@@ -1,55 +0,0 @@
<!-- $o = ORM::factory('SSL_CA'); -->
<table border="0">
<tr>
<td>DN</td>
<td class="data"><?php echo $o->dn(); ?></td>
</tr>
<tr>
<td>Subject</td>
<td class="data"><?php printf('%s (%s)',$o->subject(),$o->serial()); ?></td>
</tr>
<tr>
<td>Subject Key ID</td>
<td class="data"><?php echo $o->ski(); ?></td>
</tr>
<tr>
<td>Issuer</td>
<td class="data"><?php printf('%s (%s)',$o->issuer(),$o->aki_serial()); ?></td>
</tr>
<tr>
<td>Issuer Key ID</td>
<td class="data"><?php echo $o->aki_keyid(); ?></td>
</tr>
<tr>
<td>CA</td>
<td class="data"><?php echo StaticList_YesNo::get($o->isCA()); ?></td>
</tr>
<tr>
<td>Valid From</td>
<td class="data"><?php echo $o->valid_from(TRUE); ?></td>
</tr>
<tr>
<td>Valid To</td>
<td class="data"><?php echo $o->valid_to(TRUE); ?></td>
</tr>
<tr>
<td>Hash</td>
<td class="data"><?php echo $o->hash(); ?></td>
</tr>
<tr>
<td>Version</td>
<td class="data"><?php echo $o->version(); ?></td>
</tr>
<tr>
<td>Key Algorithm</td>
<td class="data"><?php echo $o->algorithm(); ?></td>
</tr>
<tr>
<td style="width: 40%;">Private Key</td>
<td style="width: 60%;"><?php echo FORM::textarea('sign_pk',$o->sign_pk,array('cols'=>64,'rows'=>13)); ?></td>
</tr>
<tr>
<td>Certificate</td>
<td><?php echo FORM::textarea('sign_cert',$o->sign_cert,array('cols'=>64,'rows'=>13)); ?></td>
</tr>
<table>

58
modules/ssl/views/ssl/reseller/add_edit.php Normal file
View File

@@ -0,0 +1,58 @@
<div class="row">
<div class="span9">
<div class="dl-horizontal">
<dt>Subject</dt>
<dd><?php echo $o->subject(); ?></dd>
<dt>DN</dt>
<dd><?php echo $o->dn(); ?></dd>
<dt>Serial</dt>
<dd><?php echo $o->serial(); ?></dd>
<dt>Subject Key Id</dt>
<dd><?php echo $o->ski(); ?></dd>
<?php if (! $o->isRoot()) : ?>
<dt>Issuer</dt>
<dd>
<?php if ($o->validParent()) : ?>
<?php echo HTML::anchor(URL::link('reseller','ssl/edit/').$o->parent_ssl_ca_id,$o->issuer()); ?>
<?php else : ?>
<?php echo $o->issuer(); ?>
<?php endif ?>
</dd>
<dt>Issuer Serial</dt>
<dd><?php printf('%s (%s)',$o->aki_keyid(), $o->aki_serial()); ?></dd>
<dt>Issuer Valid</dt>
<dd><?php echo $o->validParent(TRUE); ?></dd>
<?php endif ?>
<dt>Valid From</dt>
<dd><?php echo $o->valid_from(TRUE); ?></dd>
<dt>Valid To</dt>
<dd><?php echo $o->valid_to(TRUE); ?></dd>
<dt>Hash</dt>
<dd><?php echo $o->hash(); ?></dd>
<dt>Version</dt>
<dd><?php echo $o->version(); ?></dd>
<dt>Key Algorithm<dt>
<dd><?php echo $o->algorithm(); ?></dd>
</div> <!-- /dl-horizontal -->
<br/>
<?php echo Form::textarea('sign_pk',$o->sign_pk,array('class'=>'span6','label'=>'Private Key','placeholder'=>'Private Key','nowysihtml'=>TRUE,'style'=>'font-family: monospace;','rows'=>Form::textarea_rows($o->sign_pk))); ?>
<?php echo Form::textarea('sign_cert',$o->sign_cert,array('class'=>'span6','label'=>'Public Certificate','placeholder'=>'Public Certificate','nowysihtml'=>TRUE,'style'=>'font-family: monospace;','rows'=>Form::textarea_rows($o->sign_cert))); ?>
<?php echo Form::button('submit','Submit',array('class'=>'btn btn-primary')); ?>
</div> <!-- /span -->
</div> <!-- /row -->