summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2014-11-23 15:02:56 +0100
committerBenny Baumann <BenBE@geshi.org>2014-11-23 15:02:56 +0100
commit0bae20ba9f726c964eaee62a3b41c2da65bb8f0b (patch)
treef8d6b2f1f08845c98fea516d4005394fae9f3397 /www
parent7d6bbbd7c52dab0393d2abe64839f00c69390c75 (diff)
parentc2cc1c5e3f8f4b7ec9b786cffbb6f8ec68fcefc9 (diff)
downloadcacert-devel-0bae20ba9f726c964eaee62a3b41c2da65bb8f0b.tar.gz
cacert-devel-0bae20ba9f726c964eaee62a3b41c2da65bb8f0b.tar.xz
cacert-devel-0bae20ba9f726c964eaee62a3b41c2da65bb8f0b.zip
Merge branch 'bug-1273' into release
Diffstat (limited to 'www')
-rw-r--r--www/api/ccsr.php4
-rw-r--r--www/gpg.php6
2 files changed, 5 insertions, 5 deletions
diff --git a/www/api/ccsr.php b/www/api/ccsr.php
index b223168..3bfe55a 100644
--- a/www/api/ccsr.php
+++ b/www/api/ccsr.php
@@ -75,7 +75,7 @@ require_once '../../includes/lib/check_weak_key.php';
fclose($fp);
$incsr_esc = escapeshellarg($incsr);
$checkedcsr_esc = escapeshellarg($checkedcsr);
- $do = `/usr/bin/openssl req -in $incsr_esc -out $checkedcsr_esc`;
+ $do = shell_exec("/usr/bin/openssl req -in $incsr_esc -out $checkedcsr_esc");
@unlink($incsr);
if(filesize($checkedcsr) <= 0)
die("404,Invalid or missing CSR");
@@ -97,7 +97,7 @@ require_once '../../includes/lib/check_weak_key.php';
foreach($emails as $emailid => $email)
mysql_query("insert into `emaillink` set `emailcertsid`='$certid', `emailid`='".intval($emailid)."'");
- $do = `../../scripts/runclient`;
+ $do = shell_exec("../../scripts/runclient");
sleep(10); // THIS IS BROKEN AND SHOULD BE FIXED
$query = "select * from `emailcerts` where `id`='$certid' and `crt_name` != ''";
$res = mysql_query($query);
diff --git a/www/gpg.php b/www/gpg.php
index 80d8f21..cb72475 100644
--- a/www/gpg.php
+++ b/www/gpg.php
@@ -112,7 +112,7 @@ function verifyEmail($email)
clean_gpgcsr($CSR),
$gpg);
- `rm -r $tmpdir`;
+ shell_exec("rm -r $tmpdir");
}
if ($err)
@@ -340,7 +340,7 @@ function verifyEmail($email)
$cmd_keyid = escapeshellarg($keyid);
- $gpg = trim(`gpg --homedir $cwd --with-colons --fixed-list-mode --list-keys $cmd_keyid 2>&1`);
+ $gpg = trim(shell_exec("gpg --homedir $cwd --with-colons --fixed-list-mode --list-keys $cmd_keyid 2>&1"));
$lines = "";
$gpgarr = explode("\n", $gpg);
foreach($gpgarr as $line)
@@ -525,7 +525,7 @@ function verifyEmail($email)
$csrname=generatecertpath("csr","gpg",$insert_id);
$cmd_keyid = escapeshellarg($keyid);
- $do=`gpg --homedir $cwd --batch --export-options export-minimal --export $cmd_keyid >$csrname`;
+ $do=shell_exec("gpg --homedir $cwd --batch --export-options export-minimal --export $cmd_keyid >$csrname");
mysql_query("update `gpg` set `csr`='$csrname' where `id`='$insert_id'");
waitForResult('gpg', $insert_id);