diff --git a/Blacklight/TmuxRun.php b/Blacklight/TmuxRun.php index 3da7a999b..36ebceb3d 100755 --- a/Blacklight/TmuxRun.php +++ b/Blacklight/TmuxRun.php @@ -134,7 +134,6 @@ class TmuxRun extends Tmux $log = $this->writelog($runVar['panes']['one'][3]); shell_exec( "tmux respawnp -t{$runVar['constants']['tmux_session']}:1.3 ' \ - {$runVar['commands']['_php']} {$runVar['paths']['misc']}update/decrypt_hashes.php 1000 $log; \ {$runVar['commands']['_php']} {$runVar['paths']['misc']}update/match_prefiles.php 1000 show $log; \ date +\"{$this->_dateFormat}\"; {$runVar['commands']['_sleep']} {$runVar['settings']['dehash_timer']}' 2>&1 1> /dev/null" ); @@ -153,7 +152,6 @@ class TmuxRun extends Tmux shell_exec( "tmux respawnp -t{$runVar['constants']['tmux_session']}:1.3 ' \ {$runVar['commands']['_php']} {$runVar['paths']['misc']}update/tmux/bin/postprocess_pre.php {$runVar['constants']['pre_lim']} $log; \ - {$runVar['commands']['_php']} {$runVar['paths']['misc']}update/decrypt_hashes.php 1000 $log; \ {$runVar['commands']['_php']} {$runVar['paths']['misc']}update/match_prefiles.php 1000 show $log; \ date +\"{$this->_dateFormat}\"; {$runVar['commands']['_sleep']} {$runVar['settings']['dehash_timer']}' 2>&1 1> /dev/null" ); diff --git a/Changelog b/Changelog index cbfa01b90..128d512bd 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-06-18 DariusIII + * Chg: Remove decrypt_hashes.php * Chg: Update minimum MySQL version to 5.7 and MariaDB version to 10.2 * Fix: Prevent insertion of blank searchnames for releases * Chg: Update nunomaduro/collision to version 2.0.3 diff --git a/app/Http/Controllers/Admin/TmuxController.php b/app/Http/Controllers/Admin/TmuxController.php index 2ee5e1fb1..5167e923d 100644 --- a/app/Http/Controllers/Admin/TmuxController.php +++ b/app/Http/Controllers/Admin/TmuxController.php @@ -43,8 +43,8 @@ class TmuxController extends BasePageController $this->smarty->assign('backfill_group', ['Newest', 'Oldest', 'Alphabetical', 'Alphabetical - Reverse', 'Most Posts', 'Fewest Posts']); $this->smarty->assign('backfill_days', ['Days per Group', 'Safe Backfill day']); $this->smarty->assign('backfill_days_ids', [1, 2]); - $this->smarty->assign('dehash_ids', [0, 1, 2, 3]); - $this->smarty->assign('dehash_names', ['Disabled', 'Decrypt Hashes', 'Predb', 'All']); + $this->smarty->assign('dehash_ids', [0, 1]); + $this->smarty->assign('dehash_names', ['Disabled', 'Enabled']); $this->smarty->assign('import_ids', [0, 1, 2]); $this->smarty->assign('import_names', ['Disabled', 'Import - Do Not Use Filenames', 'Import - Use Filenames']); $this->smarty->assign('releases_ids', [0, 1]); diff --git a/misc/update/decrypt_hashes.php b/misc/update/decrypt_hashes.php deleted file mode 100755 index f5d46f9e1..000000000 --- a/misc/update/decrypt_hashes.php +++ /dev/null @@ -1,75 +0,0 @@ -log->error( - "\nThis script tries to match hashes of the releases.name or releases.searchname to predb hashes.\n" - ."To display the changes, use 'show' as the second argument.\n\n" - ."php decrypt_hashes.php 1000 ...: to limit to 1000 sorted by newest postdate.\n" - ."php decrypt_hashes.php full ...: to run on full database.\n" - ."php decrypt_hashes.php all ...: to run on all hashed releases(including previously renamed).\n" - )); -} - -ColorCLI::doEcho(ColorCLI::header("Decrypt Hashes (${argv[1]}) Started at ".date('g:i:s')), true); -ColorCLI::doEcho(ColorCLI::primary('Matching predb hashes to hash(releases.name or releases.searchname)'), true); - -getPreName($argv); - -function getPreName($argv) -{ - global $pdo; - $timestart = time(); - $consoletools = new ConsoleTools(); - $namefixer = new NameFixer(['Settings' => $pdo, 'ConsoleTools' => $consoletools]); - - $res = false; - if (isset($argv[1]) && $argv[1] === 'all') { - $res = $pdo->queryDirect('SELECT id AS releases_id, name, searchname, groups_id, categories_id, dehashstatus FROM releases WHERE predb_id = 0 AND ishashed = 1'); - } elseif (isset($argv[1]) && $argv[1] === 'full') { - $res = $pdo->queryDirect('SELECT id AS releases_id, name, searchname, groups_id, categories_id, dehashstatus FROM releases WHERE categories_id = 7020 AND ishashed = 1 AND dehashstatus BETWEEN -6 AND 0'); - } elseif (isset($argv[1]) && is_numeric($argv[1])) { - $res = $pdo->queryDirect('SELECT id AS releases_id, name, searchname, groups_id, categories_id, dehashstatus FROM releases WHERE categories_id = 7020 AND ishashed = 1 AND dehashstatus BETWEEN -6 AND 0 ORDER BY postdate DESC LIMIT '.$argv[1]); - } - - $counter = $counted = $total = 0; - if ($res !== false) { - $total = $res->rowCount(); - } - $show = (! isset($argv[2]) || $argv[2] !== 'show') ? 0 : 1; - if ($total > 0) { - echo $pdo->log->header("\n".number_format($total).' releases to process.'); - sleep(2); - - foreach ($res as $row) { - $success = 0; - if (preg_match('/[a-fA-F0-9]{32,40}/i', $row['name'], $matches)) { - $success = $namefixer->matchPredbHash($matches[0], $row, 1, 1, true, $show); - } elseif (preg_match('/[a-fA-F0-9]{32,40}/i', $row['searchname'], $matches)) { - $success = $namefixer->matchPredbHash($matches[0], $row, 1, 1, true, $show); - } - - if ($success === 0) { - $pdo->queryDirect(sprintf('UPDATE releases SET dehashstatus = dehashstatus - 1 WHERE id = %d', $row['releaseid'])); - } else { - $counted++; - } - if ($show === 0) { - $consoletools->overWritePrimary('Renamed Releases: ['.number_format($counted).'] '.$consoletools->percentString(++$counter, $total)); - } - } - } - if ($total > 0) { - echo $pdo->log->header("\nRenamed ".$counted.' releases in '.$consoletools->convertTime(time() - $timestart).'.'); - } else { - echo $pdo->log->info("\nNothing to do."); - } -}