diff --git a/Changelog b/Changelog index 01303870e..aaa541e57 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2017-05-22 DariusIII + * Chg: Small change in classes * Chg: Update search page 2017-15-19 DariusIII * Chg: Replace $this->colorcli with ColorCLI:: in Groups class diff --git a/nntmux/ReleaseSearch.php b/nntmux/ReleaseSearch.php index 2b37ecd47..4874f94e0 100755 --- a/nntmux/ReleaseSearch.php +++ b/nntmux/ReleaseSearch.php @@ -126,7 +126,7 @@ class ReleaseSearch * * @return string */ - private function likeSQL(): string + private function likeSQL() { $return = ''; foreach ($this->searchOptions as $columnName => $searchString) { @@ -154,7 +154,7 @@ class ReleaseSearch * * @return string */ - private function sphinxSQL(): string + private function sphinxSQL() { $searchQuery = $fullReturn = ''; diff --git a/nntmux/Releases.php b/nntmux/Releases.php index e7bb08e85..a88e72cc1 100755 --- a/nntmux/Releases.php +++ b/nntmux/Releases.php @@ -799,34 +799,14 @@ class Releases * @param int $limit * @param string|array $orderBy * @param int $maxAge - * @param integer[] $excludedCats + * @param integer|array $excludedCats * @param string $type * @param array $cat * * @param int $minSize * @return array */ - public function search( - $searchName, - $usenetName, - $posterName, - $fileName, - $groupName, - $sizeFrom, - $sizeTo, - $hasNfo, - $hasComments, - $daysNew, - $daysOld, - $offset = 0, - $limit = 1000, - $orderBy = '', - $maxAge = -1, - $excludedCats = [], - $type = 'basic', - $cat = [-1], - $minSize = 0 - ) { + public function search($searchName, $usenetName, $posterName, $fileName, $groupName, $sizeFrom, $sizeTo, $hasNfo, $hasComments, $daysNew, $daysOld, $offset = 0, $limit = 1000, $orderBy = '', $maxAge = -1, $excludedCats = [], $type = 'basic', $cat = [-1], $minSize = 0) { $sizeRange = [ 1 => 1, 2 => 2.5, diff --git a/www/pages/search.php b/www/pages/search.php index 4597cbc86..0bbdd9cd5 100644 --- a/www/pages/search.php +++ b/www/pages/search.php @@ -54,8 +54,8 @@ if ((isset($_REQUEST['id']) || isset($_REQUEST['subject'])) && !isset($_REQUEST[ } foreach ($releases->getBrowseOrdering() as $orderType) { $page->smarty->assign( - "orderby$orderType", - WWW_TOP . '/search/' . htmlentities($searchString) . '?t=' . implode(',', $categoryID) . "&ob=$orderType" + 'orderby' . $orderType, + WWW_TOP . '/search/' . htmlentities($searchString) . '?t=' . implode(',', $categoryID) . '&ob='. $orderType ); }