diff --git a/app/models/MultigroupPosters.php b/app/models/MultigroupPosters.php index fa179aa24..f486b6eb2 100644 --- a/app/models/MultigroupPosters.php +++ b/app/models/MultigroupPosters.php @@ -22,22 +22,18 @@ use Illuminate\Database\Eloquent\Model; class MultigroupPosters extends Model { + protected $table = 'multigroup_posters'; + + protected $keyType = 'string'; + protected $primaryKey = 'poster'; public $dateFormat = false; public $timestamps = false; - public $incrementing = false; - protected $table = 'multigroup_posters'; - public $validates = [ - 'poster' => [ - 'notEmpty', - 'message' => 'Empty poster value is not permitted.' - ] - ]; public static function commaSeparatedList() { diff --git a/app/models/ReleaseRegexes.php b/app/models/ReleaseRegexes.php index afe317d88..0f201f16a 100644 --- a/app/models/ReleaseRegexes.php +++ b/app/models/ReleaseRegexes.php @@ -29,7 +29,9 @@ class ReleaseRegexes extends Model public $dateFormat = false; + protected $fillable = ['releases_id', 'collection_regex_id', 'naming_regex_id']; + protected $primaryKey = [ - ['releases_id', 'collection_regex_id', 'naming_regex_id'], + ['releases_id', 'collection_regex_id', 'naming_regex_id'] ]; } diff --git a/nntmux/Binaries.php b/nntmux/Binaries.php index 2a3001cf8..166b66e04 100755 --- a/nntmux/Binaries.php +++ b/nntmux/Binaries.php @@ -238,6 +238,8 @@ class Binaries * Constructor. * * @param array $options Class instances / echo to CLI? + * + * @throws \Exception */ public function __construct(array $options = []) { @@ -270,16 +272,16 @@ class Binaries } } - $this->messageBuffer = Settings::value('..maxmssgs') != '' ? - Settings::value('..maxmssgs') : 20000; - $this->_compressedHeaders = Settings::value('..compressedheaders') == 1 ? true : false; - $this->_partRepair = Settings::value('..partrepair') == 1 ? true : false; - $this->_newGroupScanByDays = Settings::value('..newgroupscanmethod') == 1 ? true : false; - $this->_newGroupMessagesToScan = Settings::value('..newgroupmsgstoscan') != '' ? Settings::value('..newgroupmsgstoscan') : 50000; - $this->_newGroupDaysToScan = Settings::value('..newgroupdaystoscan') != '' ? (int)Settings::value('..newgroupdaystoscan') : 3; - $this->_partRepairLimit = Settings::value('..maxpartrepair') != '' ? (int)Settings::value('..maxpartrepair') : 15000; - $this->_partRepairMaxTries = (Settings::value('..partrepairmaxtries') != '' ? (int)Settings::value('..partrepairmaxtries') : 3); - $this->_showDroppedYEncParts = Settings::value('..showdroppedyencparts') == 1 ? true : false; + $this->messageBuffer = Settings::value('..maxmssgs') !== '' ? + (int)Settings::value('..maxmssgs') : 20000; + $this->_compressedHeaders = Settings::value('..compressedheaders') === 1 ? true : false; + $this->_partRepair = Settings::value('..partrepair') === 1 ? true : false; + $this->_newGroupScanByDays = Settings::value('..newgroupscanmethod') === 1 ? true : false; + $this->_newGroupMessagesToScan = Settings::value('..newgroupmsgstoscan') !== '' ? (int)Settings::value('..newgroupmsgstoscan') : 50000; + $this->_newGroupDaysToScan = Settings::value('..newgroupdaystoscan') !== '' ? (int)Settings::value('..newgroupdaystoscan') : 3; + $this->_partRepairLimit = Settings::value('..maxpartrepair') !== '' ? (int)Settings::value('..maxpartrepair') : 15000; + $this->_partRepairMaxTries = (Settings::value('..partrepairmaxtries') !== '' ? (int)Settings::value('..partrepairmaxtries') : 3); + $this->_showDroppedYEncParts = Settings::value('..showdroppedyencparts') === 1 ? true : false; $this->blackList = $this->whiteList = []; } diff --git a/nntmux/processing/ProcessReleases.php b/nntmux/processing/ProcessReleases.php index 4c3167d08..861f85c44 100755 --- a/nntmux/processing/ProcessReleases.php +++ b/nntmux/processing/ProcessReleases.php @@ -663,14 +663,13 @@ class ProcessReleases ); // Add the id of regex that matched the collection and release name to release_regexes table - $releasesRegexes = ReleaseRegexes::create( + ReleaseRegexes::query()->insert( [ 'releases_id' => $releaseID, 'collection_regex_id' => $collection['collection_regexes_id'], - 'naming_regex_id' => isset($cleanedName['id']) ? $cleanedName['id'] : 0, + 'naming_regex_id' => $cleanedName['id'] ?? 0, ] ); - $releasesRegexes->save(); if (preg_match_all('#(\S+):\S+#', $collection['xref'], $matches)) { foreach ($matches[1] as $grp) { @@ -695,26 +694,20 @@ class ProcessReleases ); } - $relGroupsChk = ReleasesGroups::find('first', + $relGroupsChk = ReleasesGroups::query()->where( [ - 'conditions' => - [ - 'releases_id' => $releaseID, - 'groups_id' => $xrefGrpID, - ], - 'fields' => ['releases_id'], - 'limit' => 1, + ['releases_id', '=', $releaseID], + ['groups_id', '=', $xrefGrpID] ] - ); + )->first(); if ($relGroupsChk === null) { - $relGroups = ReleasesGroups::create( + ReleasesGroups::query()->insert( [ 'releases_id' => $releaseID, 'groups_id' => $xrefGrpID, ] ); - $relGroups->save(); } } } diff --git a/nntmux/processing/ProcessReleasesMultiGroup.php b/nntmux/processing/ProcessReleasesMultiGroup.php index 26e681438..554aee2fb 100644 --- a/nntmux/processing/ProcessReleasesMultiGroup.php +++ b/nntmux/processing/ProcessReleasesMultiGroup.php @@ -37,7 +37,7 @@ class ProcessReleasesMultiGroup extends ProcessReleases */ public static function isMultiGroup($fromName): bool { - $poster = MultigroupPosters::find('first', ['conditions' => ['poster' => $fromName]]); + $poster = MultigroupPosters::query()->where('poster', '=', $fromName)->first(); return (empty($poster) ? false : true); } diff --git a/www/admin/poster-delete.php b/www/admin/poster-delete.php index b1be0c4ff..5f2101a8c 100644 --- a/www/admin/poster-delete.php +++ b/www/admin/poster-delete.php @@ -8,11 +8,12 @@ $page = new AdminPage(); if (isset($_GET['id'])) { - MultigroupPosters::remove(['id' => $_GET['id']]); + MultigroupPosters::query()->where('id', '=', $_GET['id'])->delete(); } -if (isset($_GET['from'])) +if (isset($_GET['from'])) { $referrer = $_GET['from']; -else +} else { $referrer = $_SERVER['HTTP_REFERER']; -header("Location: " . $referrer); +} +header('Location: ' . $referrer); diff --git a/www/admin/posters-edit.php b/www/admin/posters-edit.php index 6c69be8d2..c4bebd6e5 100644 --- a/www/admin/posters-edit.php +++ b/www/admin/posters-edit.php @@ -15,14 +15,13 @@ switch ($action) { case 'submit': if ($_POST['id'] === '') { // Add a new mg poster. - $poster = MultigroupPosters::create([ + $poster = MultigroupPosters::query()->insert([ 'poster' => $_POST['poster'], ]); } else { // Update an existing mg poster. - $poster = MultigroupPosters::find($_POST['id']); + $poster = MultigroupPosters::query()->update(['poster' => $_POST['poster']]); } - $poster->save(); header('Location:' . WWW_TOP . '/posters-list.php'); break; diff --git a/www/admin/posters-list.php b/www/admin/posters-list.php index 0bf115d2a..db8a022fd 100644 --- a/www/admin/posters-list.php +++ b/www/admin/posters-list.php @@ -7,7 +7,7 @@ use nntmux\db\DB; $page = new AdminPage(); $pdo = new DB(); -$posters = MultigroupPosters::find('all', ['order' => ['poster' => 'ASC']]); +$posters = MultigroupPosters::all('poster')->sortBy('poster'); $poster = (isset($_REQUEST['poster']) && !empty($_REQUEST['poster']) ? $_REQUEST['poster'] : '');