diff --git a/Changelog b/Changelog
index c1ab97603..4400c3833 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
2016-11-08 DariusIII
+ * Chg: Couple of fixes and missing settings (Sphinx, sabnzbd)
* Chg: Improve performance of site/edit by updating some queries in Groups/Releases
* Chg: Add serch description to search page in all themes
2016-11-07 DariusIII
diff --git a/app/extensions/util/Versions.php b/app/extensions/util/Versions.php
index a304ac04d..a6db46d84 100644
--- a/app/extensions/util/Versions.php
+++ b/app/extensions/util/Versions.php
@@ -271,6 +271,11 @@ class Versions extends \lithium\core\Object
}
}
+ protected function error($message)
+ {
+ // TODO handle console error message.
+ }
+
protected function initialiseGit()
{
if (!($this->git instanceof \app\extensions\util\Git)) {
diff --git a/build/nntmux.xml b/build/nntmux.xml
index 457814b45..eff1c6bbb 100755
--- a/build/nntmux.xml
+++ b/build/nntmux.xml
@@ -16,8 +16,8 @@
- 278
- 278
+ 279
+ 279
diff --git a/nntmux/ReleaseRemover.php b/nntmux/ReleaseRemover.php
index 33199fef8..93c4cffef 100755
--- a/nntmux/ReleaseRemover.php
+++ b/nntmux/ReleaseRemover.php
@@ -428,7 +428,7 @@ class ReleaseRemover
case ReleaseSearch::SPHINX:
$rs = new ReleaseSearch($this->pdo);
$execFT =
- str_replace('=10000;', '=1000000;',
+ str_replace('=10000;', '=100000;',
$rs->getSearchSQL(
[
'searchname' => '-exes* -exec*',
@@ -482,7 +482,7 @@ class ReleaseRemover
switch (NN_RELEASE_SEARCH_TYPE) {
case ReleaseSearch::SPHINX:
$rs = new ReleaseSearch($this->pdo);
- $instbinFT = str_replace('=10000;', '=10000000;', $rs->getSearchSQL(['filename' => 'install<getSearchSQL(['filename' => 'install<getFullTextJoinString();
break;
default:
@@ -520,7 +520,7 @@ class ReleaseRemover
switch (NN_RELEASE_SEARCH_TYPE) {
case ReleaseSearch::SPHINX:
$rs = new ReleaseSearch($this->pdo);
- $passurlFT = str_replace('=10000;', '=10000000;', $rs->getSearchSQL(['filename' => 'password<getSearchSQL(['filename' => 'password<getFullTextJoinString();
break;
default:
@@ -558,7 +558,7 @@ class ReleaseRemover
switch (NN_RELEASE_SEARCH_TYPE) {
case ReleaseSearch::SPHINX:
$rs = new ReleaseSearch($this->pdo);
- $passFT = str_replace('=10000;', '=10000000;', $rs->getSearchSQL(['searchname' => 'passwor*']));
+ $passFT = str_replace('=10000;', '=100000;', $rs->getSearchSQL(['searchname' => 'passwor*']));
$ftJoin = $rs->getFullTextJoinString();
break;
default:
@@ -677,7 +677,7 @@ class ReleaseRemover
switch (NN_RELEASE_SEARCH_TYPE) {
case ReleaseSearch::SPHINX:
$rs = new ReleaseSearch($this->pdo);
- $sampleFT = str_replace('=10000;', '=10000000;', $rs->getSearchSQL(['name' => 'sample']));
+ $sampleFT = str_replace('=10000;', '=100000;', $rs->getSearchSQL(['name' => 'sample']));
$ftJoin = $rs->getFullTextJoinString();
break;
default:
@@ -732,7 +732,7 @@ class ReleaseRemover
switch (NN_RELEASE_SEARCH_TYPE) {
case ReleaseSearch::SPHINX:
$rs = new ReleaseSearch($this->pdo);
- $scrFT = str_replace('=10000;', '=10000000;', $rs->getSearchSQL(['(name,filename)' => 'scr']));
+ $scrFT = str_replace('=10000;', '=100000;', $rs->getSearchSQL(['(name,filename)' => 'scr']));
$ftJoin = $rs->getFullTextJoinString();
break;
default:
diff --git a/nntmux/SABnzbd.php b/nntmux/SABnzbd.php
index 565b06151..b69263244 100755
--- a/nntmux/SABnzbd.php
+++ b/nntmux/SABnzbd.php
@@ -100,8 +100,8 @@ class SABnzbd
$this->apikey = $_COOKIE['sabnzbd_' . $this->uid . '__apikey'];
$this->priority = (isset($_COOKIE['sabnzbd_' . $this->uid . '__priority'])) ? $_COOKIE['sabnzbd_' . $this->uid . '__priority'] : 0;
$this->apikeytype = (isset($_COOKIE['sabnzbd_' . $this->uid . '__apitype'])) ? $_COOKIE['sabnzbd_' . $this->uid . '__apitype'] : 1;
- } else if (!empty($page->userdata['sabapikey']) && !empty($page->userdata['saburl'])) {
- $this->url = $page->userdata['saburl'];
+ } else if (!empty($page->userdata['sabapikey']) && !empty($page->userdata['apps.sabnzbplus.url'])) {
+ $this->url = $page->userdata['apps.sabnzbplus.url'];
$this->apikey = $page->userdata['sabapikey'];
$this->priority = $page->userdata['sabpriority'];
$this->apikeytype = $page->userdata['sabapikeytype'];
@@ -119,8 +119,8 @@ class SABnzbd
break;
case self::INTEGRATION_TYPE_SITEWIDE:
- if ((Settings::value('apps.sabnzbplus.apikey') != '') && (Settings::value('saburl') != '')) {
- $this->url = Settings::value('saburl');
+ if ((Settings::value('apps.sabnzbplus.apikey') != '') && (Settings::value('apps.sabnzbplus.url') != '')) {
+ $this->url = Settings::value('apps.sabnzbplus.url');
$this->apikey = Settings::value('apps.sabnzbplus.apikey');
$this->priority = Settings::value('apps.sabnzbplus.priority');
$this->apikeytype = Settings::value('apps.sabnzbplus.apikeytype');
diff --git a/resources/db/patches/mysql/+1~settings.sql b/resources/db/patches/mysql/+1~settings.sql
new file mode 100644
index 000000000..e69de29bb
diff --git a/resources/db/patches/mysql/0279~settings.sql b/resources/db/patches/mysql/0279~settings.sql
new file mode 100644
index 000000000..e23399f6c
--- /dev/null
+++ b/resources/db/patches/mysql/0279~settings.sql
@@ -0,0 +1,3 @@
+# Add missing saburl setting
+
+UPDATE settings SET section = 'apps', subsection = 'sabnzbplus', name = 'url' WHERE setting = 'saburl';