summaryrefslogtreecommitdiff
path: root/includes/general.php
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 /includes/general.php
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 'includes/general.php')
-rw-r--r--includes/general.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/includes/general.php b/includes/general.php
index 26a369e..596cc49 100644
--- a/includes/general.php
+++ b/includes/general.php
@@ -219,7 +219,7 @@
//echo "Points due to name matches: $points<br/>";
$shellpwd = escapeshellarg($pwd);
- $do = `grep -F -- $shellpwd /usr/share/dict/american-english`;
+ $do = shell_exec("grep -F -- $shellpwd /usr/share/dict/american-english");
if($do)
$points--;
@@ -527,7 +527,8 @@
$fp = fopen($tmpfname, "w");
fputs($fp, $message);
fclose($fp);
- $do = `/usr/bin/gpg --homedir /home/gpg --clearsign "$tmpfname"|/usr/sbin/sendmail "$to"`;
+ $to_esc = escapeshellarg($to);
+ $do = shell_exec("/usr/bin/gpg --homedir /home/gpg --clearsign \"$tmpfname\"|/usr/sbin/sendmail ".$to_esc);
@unlink($tmpfname);
}
@@ -538,9 +539,9 @@
{
list($username,$domain)=explode('@',$email,2);
$dom = escapeshellarg($domain);
- $line = trim(`dig +short MX $dom 2>&1`);
+ $line = trim(shell_exec("dig +short MX $dom 2>&1"));
#echo $email."-$dom-$line-\n";
-#echo `dig +short mx heise.de 2>&1`."-<br>\n";
+#echo shell_exec("dig +short mx heise.de 2>&1")."-<br>\n";
$list = explode("\n", $line);
foreach($list as $row) {