diff --git a/newznab/controllers/Parsing.php b/newznab/controllers/Parsing.php index 2076b5019..d238e7d09 100644 --- a/newznab/controllers/Parsing.php +++ b/newznab/controllers/Parsing.php @@ -33,7 +33,7 @@ class Parsing $this->parsprocessed = 0; $this->releasefilesprocessed = 0; $this->cleanup = ['nuke' => [], 'misc' => []]; - $this->pdo = new newznab\db\Settings(); + $this->pdo = new Settings(); } /** @@ -1439,43 +1439,43 @@ class Parsing while (preg_match('/^(\:|\"|\-| |\_)+/', $r['searchname'])) { $r['searchname'] = substr($r['searchname'], 1); } - $this->updateName($this->pdo, $r['id'], $oldname, $r['searchname']); + $this->updateName($r['id'], $oldname, $r['searchname']); } if (preg_match('/^000\-/', $r['searchname'])) { while (preg_match('/^000\-/', $r['searchname'])) { $r['searchname'] = substr($r['searchname'], 4); } - $this->updateName($this->pdo, $r['id'], $oldname, $r['searchname']); + $this->updateName($r['id'], $oldname, $r['searchname']); } if (preg_match('/(\:|\"|\-| |\/)$/', $r['searchname'])) { while (preg_match('/(\:|\"|\-| |\/)$/', $r['searchname'])) { $r['searchname'] = substr($r['searchname'], 0, -1); } - $this->updateName($this->pdo, $r['id'], $oldname, $r['searchname']); + $this->updateName($r['id'], $oldname, $r['searchname']); } if (preg_match('/\"/', $r['searchname'])) { while (preg_match('/\"/', $r['searchname'])) { $r['searchname'] = str_replace('"', '', $r['searchname']); } - $this->updateName($this->pdo, $r['id'], $oldname, $r['searchname']); + $this->updateName($r['id'], $oldname, $r['searchname']); } if (preg_match('/\-\d{1}$/', $r['searchname'])) { while (preg_match('/\-\d{1}$/', $r['searchname'])) { $r['searchname'] = preg_replace('/\-\d{1}$/', '', $r['searchname']); } - $this->updateName($this->pdo, $r['id'], $oldname, $r['searchname']); + $this->updateName($r['id'], $oldname, $r['searchname']); } if (preg_match('/\!+.*?mom.*?\!+/i', $r['searchname'])) { while (preg_match('/\!+.*?mom.*?\!+/i', $r['searchname'])) { $r['searchname'] = preg_replace('/\!+.*?mom.*?\!+/i', '', $r['searchname']); } - $this->updateName($this->pdo, $r['id'], $oldname, $r['searchname']); + $this->updateName($r['id'], $oldname, $r['searchname']); } if (preg_match('/(\\/)/i', $r['searchname'])) { while (preg_match('/(\\/)/i', $r['searchname'])) { $r['searchname'] = preg_replace('/(\\/)/i', '', $r['searchname']); } - $this->updateName($this->pdo, $r['id'], $oldname, $r['searchname']); + $this->updateName($r['id'], $oldname, $r['searchname']); } } } @@ -1483,12 +1483,11 @@ class Parsing /** * update a release name * - * @param Settings $pdo * @param $id * @param $oldname * @param $newname */ - private function updateName(Settings $pdo, $id, $oldname, $newname) + private function updateName($id, $oldname, $newname) { if ($this->verbose) echo sprintf("OLD : %s\nNEW : %s\n\n", $oldname, $newname); diff --git a/www/templates/nntmux/views/frontend/apinfo.tpl b/www/templates/nntmux/views/frontend/apinfo.tpl index 1d93713d9..3e1ff34e7 100644 --- a/www/templates/nntmux/views/frontend/apinfo.tpl +++ b/www/templates/nntmux/views/frontend/apinfo.tpl @@ -1,10 +1,24 @@ -{$rsshead} - + + + + + {$site->title|escape} + {$site->title|escape} Nzb Feed + {$serverroot} + en-gb + {$site->email} ({$site->title|escape}) + {$site->meta_keywords} + + {$serverroot}templates/nntmux/images/logo.png + {$site->title|escape} + {$serverroot} + Visit {$site->title|escape} - {$site->strapline|escape} + {$release.searchname|escape:"htmlall"} {$serverroot}details/{$release.guid} {$serverroot}nfo/{$release.guid} - {$release.postdate|phpdate_format:"DATE_RSS"} + {$release.postdate|phpdate_format:"DATE_RSS"} {$nfoutf|escape:"htmlall"}