summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Burton <phil@d3r.com>2019-06-11 15:09:17 +0100
committerPhil Burton <phil@d3r.com>2019-06-11 15:09:17 +0100
commitd8ffff6171b433b4e0a1b0849c060c9e1051734f (patch)
tree41799e4bf7f66eb856d185a6a6b1041a2bc85c8d
parent77d70c27da45ef10bc901a0975a5f24a578665c9 (diff)
Stop piping pastebin stderr to null
-rw-r--r--scripts/run.php2
-rw-r--r--src/Etym.php3
2 files changed, 3 insertions, 2 deletions
diff --git a/scripts/run.php b/scripts/run.php
index b50bcc7..59af4be 100644
--- a/scripts/run.php
+++ b/scripts/run.php
@@ -6,7 +6,7 @@ use App\Etym;
$baseURL = "http://www.etymonline.com/word/";
$htmlNode = "section[class^='word__defination']";
-$pasteCmd = "pastebinit -b http://p.of.je 2>/dev/null";
+$pasteCmd = "../pastebinit -b http://p.of.je";
$etym = new Etym($baseURL, $htmlNode, $pasteCmd);
$result = $etym->getDefinition();
diff --git a/src/Etym.php b/src/Etym.php
index 10e22d7..8be0a99 100644
--- a/src/Etym.php
+++ b/src/Etym.php
@@ -121,8 +121,9 @@ class Etym
if (strlen($truncated) >= $MAX_CHARACTERS) {
// Create that povjee link.
// Capitalise the first char of the input.
- $input = ucfirst($input);
+ $input = ucfirst($input);
$defAndUrl = "\"$input\"" . "\n\n" . $definition . "\n\n" . "[Original at: $url]";
+
$safeDef = escapeshellarg($defAndUrl);
$pasteBinCmd = "echo $safeDef | " . $this->pasteCmd;