From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 12 Mar 2014 10:47:21 +0000 (+0100)
Subject: Use command -v to check for sendmail
X-Git-Tag: v7.0.0alpha2~635^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=efbca04ab42112e617b81153c68ae51f29241663;p=nextcloud-server.git

Use command -v to check for sendmail

Fix #7559
---

diff --git a/settings/admin.php b/settings/admin.php
index 47028a701db..80b038d2ef6 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -21,7 +21,7 @@ $entries=OC_Log_Owncloud::getEntries(3);
 $entriesremain = count(OC_Log_Owncloud::getEntries(4)) > 3;
 
 // Should we display sendmail as an option?
-if (ini_get('sendmail_path') || file_exists('/usr/sbin/sendmail') || file_exists('/var/qmail/bin/sendmail')) {
+if (findBinaryPath('sendmailsendmail')) {
 	$tmpl->assign('sendmail_is_available', true);
 }
 
@@ -66,3 +66,17 @@ foreach($forms as $form) {
 	$tmpl->append('forms', $form);
 }
 $tmpl->printPage();
+
+/**
+ * Try to find a programm
+ *
+ * @param string $program
+ * @return null|string
+ */
+function findBinaryPath($program) {
+	exec('command -v ' . escapeshellarg($program) . ' 2> /dev/null', $output, $returnCode);
+	if ($returnCode === 0 && count($output) > 0) {
+		return escapeshellcmd($output[0]);
+	}
+	return null;
+}