diff options
| author | Benny Baumann <BenBE@geshi.org> | 2014-10-21 22:46:02 +0200 |
|---|---|---|
| committer | Benny Baumann <BenBE@geshi.org> | 2014-10-21 22:46:02 +0200 |
| commit | 350a2f0df6d80e2667a7698ffd1fc613229fab54 (patch) | |
| tree | dc19097f925bd5f2b095dc4773f66a864554bee7 /scripts | |
| parent | 00c3bbd5944d976ddb17a3bb024fdebb142b3141 (diff) | |
| parent | c2cc1c5e3f8f4b7ec9b786cffbb6f8ec68fcefc9 (diff) | |
| download | cacert-devel-350a2f0df6d80e2667a7698ffd1fc613229fab54.tar.gz cacert-devel-350a2f0df6d80e2667a7698ffd1fc613229fab54.tar.xz cacert-devel-350a2f0df6d80e2667a7698ffd1fc613229fab54.zip | |
Merge branch 'bug-1273' into testserver-stable
Conflicts:
scripts/cron/warning.php
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/cron/warning.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/cron/warning.php b/scripts/cron/warning.php index 3022ffb..813f402 100755 --- a/scripts/cron/warning.php +++ b/scripts/cron/warning.php @@ -1,5 +1,5 @@ #!/usr/bin/php -q -<? /* +<?php /* LibreSSL - CAcert web application Copyright (C) 2004-2008 CAcert Inc. @@ -19,6 +19,7 @@ require_once(dirname(__FILE__).'/../../includes/mysql.php'); require_once(dirname(__FILE__).'/../../includes/lib/l10n.php'); + require_once(dirname(__FILE__).'/../../includes/lib/general.php'); $days = array("1" => "3", "15" => "2", "30" => "1", "45" => "0"); @@ -41,7 +42,7 @@ $row['crt_name'] = str_replace("../", "www/", $row['crt_name']); $row['crt_name'] = "/home/cacert/".$row['crt_name']; $crt_name = escapeshellarg($row['crt_name']); - $subject = `openssl x509 -in $crt_name -text -noout|grep Subject:`; + $subject = runCommand("openssl x509 -in $crt_name -text -noout|grep Subject:"); $bits = explode("/", $subject); foreach($bits as $val) { |