Merge branch 'release' into bug-782
authorMichael Tänzer <neo@nhng.de>
Sat, 15 Jun 2013 11:40:57 +0000 (13:40 +0200)
committerMichael Tänzer <neo@nhng.de>
Sat, 15 Jun 2013 11:40:57 +0000 (13:40 +0200)
Conflicts:
includes/account.php
pages/account/12.php

Signed-off-by: Michael Tänzer <neo@nhng.de>
1  2 
includes/account.php
pages/account/10.php
pages/account/12.php

                                                `created`=FROM_UNIXTIME(UNIX_TIMESTAMP()),
                                                `subject`='".mysql_real_escape_string($csrsubject)."',
                                                `codesign`='".$_SESSION['_config']['codesign']."',
 -                                              `rootcert`='".$_SESSION['_config']['rootcert']."'";
+                                               `disablelogin`='".($_SESSION['_config']['disablelogin']?1:0)."',
 +                                              `rootcert`='".$_SESSION['_config']['rootcert']."',
 +                                              `description`='".$_SESSION['_config']['description']."'";
                        mysql_query($query);
                        $emailid = mysql_insert_id();
                        if(is_array($addys))
Simple merge
                        UNIX_TIMESTAMP(`domaincerts`.`expire`) - UNIX_TIMESTAMP() as `timeleft`,
                        UNIX_TIMESTAMP(`domaincerts`.`expire`) as `expired`,
                        `domaincerts`.`expire` as `expires`, `revoked` as `revoke`,
 -                      UNIX_TIMESTAMP(`revoked`) as `revoked`, `CN`, `domaincerts`.`serial`, `domaincerts`.`id` as `id`
 +                      UNIX_TIMESTAMP(`revoked`) as `revoked`, `CN`, `domaincerts`.`serial`, `domaincerts`.`id` as `id`,
 +                      `domaincerts`.`description`
                        from `domaincerts`,`domains`
-                       where `memid`='".intval($_SESSION['profile']['id'])."' and `deleted`=0 and `domaincerts`.`domid`=`domains`.`id` ";
+                       where `memid`='".intval($_SESSION['profile']['id'])."' and `domaincerts`.`domid`=`domains`.`id` ";
        if($viewall != 1)
        {
                $query .= "AND `revoked`=0 AND `renewed`=0 ";
    </tr>
  <? } ?>
    <tr>
 -    <td class="DataTD" colspan="6"><input type="submit" name="renew" value="<?=_("Renew")?>">&#160;&#160;&#160;&#160;
 +    <td class="DataTD" colspan="8">
 +      <?=_('* Comment is NOT included in the certificate as it is intended for your personal reference only. To change the comment tick the checkbox and hit "Change Settings".')?>
 +    </td>
 +  </tr>
 +  <tr>
 +    <td class="DataTD" colspan="6"><input type="submit" name="renew" value="<?=_("Renew")?>"/>&#160;&#160;&#160;&#160;
            <input type="submit" name="revoke" value="<?=_("Revoke/Delete")?>"></td>
 +      <td class="DataTD" colspan="2"><input type="submit" name="change" value="<?=_("Change settings")?>"/> </td>
    </tr>
  <? } ?>
+   <tr>
+     <td class="DataTD" colspan="6"><?=_("From here you can delete pending requests, or revoke valid certificates.")?></td>
+   </tr>
  </table>
 -<input type="hidden" name="oldid" value="<?=$id?>">
 -<input type="hidden" name="csrf" value="<?=make_csrf('srvcerchange')?>" />
 +<input type="hidden" name="oldid" value="<?=$id?>"/>
 +<input type="hidden" name="csrf" value="<?=make_csrf('srvcerchange')?>"/>
  </form>
- <p><?=_("From here you can delete pending requests, or revoke valid certificates.")?></p>