From 5687b812aecc62bfc4ccf25c4bd3448b1fe0dae7 Mon Sep 17 00:00:00 2001 From: Darko Date: Fri, 27 Feb 2015 09:33:29 +0100 Subject: [PATCH] Remove unneeded PHP version checks. Change description on threaded scripts usage from python to php ones. --- bin/update_releases.php | 2 +- lib/ProcessAdditional.php | 2 +- lib/copy_this/www/lib/Net_NNTP/NNTP/Protocol/Client.php | 4 ---- lib/copy_this/www/lib/groups.php | 2 +- lib/copy_this/www/templates/nntmux/views/admin/site-edit.tpl | 2 +- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/bin/update_releases.php b/bin/update_releases.php index 584706865..4799eae81 100644 --- a/bin/update_releases.php +++ b/bin/update_releases.php @@ -21,7 +21,7 @@ if (isset($argv[2]) && $argv[2] === 'true') { } } if ($site->tablepergroup === 1) { - exit($pdo->log->error("You are using 'tablepergroup', you must use releases_threaded.py")); + exit($pdo->log->error("You are using 'tablepergroup', you must use .../misc/update_scripts/nix_scripts/multiprocessing/releases.php")); } $groupName = isset($argv[3]) ? $argv[3] : ''; diff --git a/lib/ProcessAdditional.php b/lib/ProcessAdditional.php index 71f3a8e76..558d6de56 100644 --- a/lib/ProcessAdditional.php +++ b/lib/ProcessAdditional.php @@ -350,7 +350,7 @@ Class ProcessAdditional ); } - $this->_showCLIReleaseID = (version_compare(PHP_VERSION, '5.5.0', '>=') ? (PHP_BINARY . ' ' . __DIR__ . DS . 'ProcessAdditional.php ReleaseID: ') : false); + $this->_showCLIReleaseID = (PHP_BINARY . ' ' . __DIR__ . DS . 'ProcessAdditional.php ReleaseID: '); // Maximum amount of releases to fetch per run. $this->_queryLimit = diff --git a/lib/copy_this/www/lib/Net_NNTP/NNTP/Protocol/Client.php b/lib/copy_this/www/lib/Net_NNTP/NNTP/Protocol/Client.php index 407e81ad0..9f360dd70 100644 --- a/lib/copy_this/www/lib/Net_NNTP/NNTP/Protocol/Client.php +++ b/lib/copy_this/www/lib/Net_NNTP/NNTP/Protocol/Client.php @@ -67,10 +67,6 @@ * @see */ -// Warn about PHP bugs -if (version_compare(PHP_VERSION, '5.2.11') === 0) { - trigger_error('PHP bug #16657 breaks feof() on socket streams! Connection consistency might be compromised!', E_USER_WARNING); -} require_once 'PEAR.php'; require_once 'Responsecode.php'; diff --git a/lib/copy_this/www/lib/groups.php b/lib/copy_this/www/lib/groups.php index 6790f9bd8..c9b065306 100644 --- a/lib/copy_this/www/lib/groups.php +++ b/lib/copy_this/www/lib/groups.php @@ -471,7 +471,7 @@ class Groups if ($tpgSetting === true) { if ($groupID == '') { - exit('Error: You must use releases_threaded.py since you have enabled TPG!'); + exit('Error: You must use .../misc/update_scripts/nix_scripts/multiprocessing/releases.php since you have enabled TPG!'); } if ($this->createNewTPGTables($groupID) === false && NN_ECHOCLI) { diff --git a/lib/copy_this/www/templates/nntmux/views/admin/site-edit.tpl b/lib/copy_this/www/templates/nntmux/views/admin/site-edit.tpl index 9e6dc79ed..ddd8d81fd 100644 --- a/lib/copy_this/www/templates/nntmux/views/admin/site-edit.tpl +++ b/lib/copy_this/www/templates/nntmux/views/admin/site-edit.tpl @@ -1043,7 +1043,7 @@ {html_radios id="tablepergroup" name='tablepergroup' values=$yesno_ids output=$yesno_names selected=$fsite->tablepergroup separator='
'}
This uses separate tables for binaries and parts for each group.
This requires you to run convert_to_tpg.php or reset_truncate.php.
This requires that you also run - releases_threaded.py. + .../misc/update/nix/multiprocessing/releases.php (tmux does this automatically).
Run: show variables like '%open%files%'; results should be higher than 10k, twice that if you are using TokuDB.;
You may need to increase table_open_cache, open_files_limit and max_allowed_packet in