mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-04-26 09:17:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Test if set_time_limit exists (#5675)

Browse Source 
* Fix @set_time_limit as @-operator after PHP8 no longer suppresses disabled functions

* preserve @ decorator

* Fix whitespace

---------

Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
This commit is contained in:
VYSE V.E.O
2023-09-28 03:40:05 +08:00
committed by GitHub
parent 89a3d36c3e
commit b82c41f6b9
4 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Controllers/entryController.php
View File

@@ -169,7 +169,9 @@ class FreshRSS_entry_Controller extends FreshRSS_ActionController {
Minz_Request::forward($url_redirect, true);
}
@set_time_limit(300);
if (function_exists('set_time_limit')) {
@set_time_limit(300);
}
$databaseDAO = FreshRSS_Factory::createDatabaseDAO();
$databaseDAO->optimize();
@@ -188,7 +190,9 @@ class FreshRSS_entry_Controller extends FreshRSS_ActionController {
* @todo should be in feedController
*/
public function purgeAction(): void {
@set_time_limit(300);
if (function_exists('set_time_limit')) {
@set_time_limit(300);
}
$feedDAO = FreshRSS_Factory::createFeedDao();
$feeds = $feedDAO->listFeeds();

12
app/Controllers/feedController.php
View File

@@ -36,7 +36,9 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController {
public static function addFeed(string $url, string $title = '', int $cat_id = 0, string $new_cat_name = '',
string $http_auth = '', array $attributes = [], int $kind = FreshRSS_Feed::KIND_RSS): FreshRSS_Feed {
FreshRSS_UserDAO::touch();
@set_time_limit(300);
if (function_exists('set_time_limit')) {
@set_time_limit(300);
}
$catDAO = FreshRSS_Factory::createCategoryDao();
@@ -329,7 +331,9 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController {
*/
public static function actualizeFeed(int $feed_id, string $feed_url, bool $force, ?SimplePie $simplePiePush = null,
bool $noCommit = false, int $maxFeeds = 10): array {
@set_time_limit(300);
if (function_exists('set_time_limit')) {
@set_time_limit(300);
}
$feedDAO = FreshRSS_Factory::createFeedDao();
$entryDAO = FreshRSS_Factory::createEntryDao();
@@ -875,7 +879,9 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController {
* @throws FreshRSS_BadUrl_Exception
*/
public function reloadAction(): void {
@set_time_limit(300);
if (function_exists('set_time_limit')) {
@set_time_limit(300);
}
//Get Feed ID.
$feed_id = Minz_Request::paramInt('id');

4
app/Controllers/importExportController.php
View File

@@ -182,7 +182,9 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController {
Minz_Request::bad(_t('feedback.import_export.file_cannot_be_uploaded'), [ 'c' => 'importExport', 'a' => 'index' ]);
}
@set_time_limit(300);
if (function_exists('set_time_limit')) {
@set_time_limit(300);
}
$error = false;
try {

4
app/Services/ImportService.php
View File

@@ -34,7 +34,9 @@ class FreshRSS_Import_Service {
* @param bool $dry_run true to not create categories and feeds in database.
*/
public function importOpml(string $opml_file, ?FreshRSS_Category $forced_category = null, bool $dry_run = false): void {
@set_time_limit(300);
if (function_exists('set_time_limit')) {
@set_time_limit(300);
}
$this->lastStatus = true;
$opml_array = [];
try {