From dfcf67f21d5d33095ee09f62ac5dfd639dfd747f Mon Sep 17 00:00:00 2001
From: DariusIII <dkrisan@gmail.com>
Date: Tue, 24 Jan 2017 13:31:48 +0100
Subject: [PATCH] Fix wrong check for yydecoderpath

---
 Changelog                                    | 2 ++
 app/config/bootstrap/yenc.php                | 4 ++--
 app/extensions/util/yenc/adapter/Ydecode.php | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Changelog b/Changelog
index 32dce7088..076f988e0 100755
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,5 @@
+2017-01-24 DariusIII
+	* Fix: Fix wrong check for yydecoderpath
 2017-01-18 DariusIII
 	* Chg: Prevent undefined index output on nzb-import page
 	* Chg: Add back construct to RequestIDLocal
diff --git a/app/config/bootstrap/yenc.php b/app/config/bootstrap/yenc.php
index 937da7c90..028485587 100644
--- a/app/config/bootstrap/yenc.php
+++ b/app/config/bootstrap/yenc.php
@@ -41,8 +41,8 @@ if (defined('NN_INSTALLER') && NN_INSTALLER !== false) {
 		case extension_loaded('simple_php_yenc_decode'):
 			$adapter = 'SimplePhpYencDecode';
 			break;
-		case !empty(Settings::value('..yydecoderpath', true)) &&
-			(strpos(Settings::value('..yydecoderpath', true), 'simple_php_yenc_decode') === false):
+		case !empty(Settings::value('apps..yydecoderpath', true)) &&
+			(strpos(Settings::value('apps..yydecoderpath', true), 'simple_php_yenc_decode') === false):
 			$adapter = 'Ydecode';
 			break;
 		default:
diff --git a/app/extensions/util/yenc/adapter/Ydecode.php b/app/extensions/util/yenc/adapter/Ydecode.php
index b49fc611c..906bf6942 100644
--- a/app/extensions/util/yenc/adapter/Ydecode.php
+++ b/app/extensions/util/yenc/adapter/Ydecode.php
@@ -43,13 +43,13 @@ class Ydecode extends \lithium\core\Object
 	public static function decode(&$text, $ignore = false)
 	{
 		if (!preg_match('/^(=yBegin.*=yEnd[^$]*)$/ims', $text, $input)) {
-			throw new \Exception('Text does not look like yEnc.');
+			throw new \UnexpectedValueException('Text does not look like yEnc.');
 		}
 		$data = shell_exec(
 			"echo '{$input[1]}' | '" . self::$pathBin . "' -o - " . ($ignore ? "-b " : " ") . self::$silent
 		);
 		if ($data === null) {
-			throw new \Exception('Error getting data from yydecode.');
+			throw new \LengthException('Error getting data from yydecode.');
 		}
 
 		return $data;
@@ -79,7 +79,7 @@ class Ydecode extends \lithium\core\Object
 	{
 		parent::_init();
 
-		$path = Settings::value('..yydecoderpath', true);
+		$path = Settings::value('apps..yydecoderpath', true);
 		if (!empty($path) && strpos($path, 'simple_php_yenc_decode') === false) {
 			if (file_exists($path) && is_executable($path)) {
 				self::$silent = (Utility::isWin() ? '' : ' > /dev/null 2>&1');