clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12034 from annando/no-include 

Legacy "include" fragments have been removed
This commit is contained in:
Tobias Diekershoff 2022-10-20 09:57:38 +02:00 committed by GitHub
parent 660912351c 4930737cc4
commit ce64148c8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doxyfile
View File

@ -1,4 +1,4 @@
INPUT = README.md index.php update.php bin/ mod/ include/ view/ src/ VERSION INPUT = README.md index.php update.php bin/ mod/ view/ src/ VERSION
RECURSIVE = YES RECURSIVE = YES
PROJECT_NAME = "Friendica" PROJECT_NAME = "Friendica"
PROJECT_LOGO = images/friendica-64.png PROJECT_LOGO = images/friendica-64.png

1
src/Console/Extract.php
View File

@ -77,7 +77,6 @@ HELP;
$files = array_merge( $files = array_merge(
['index.php'], ['index.php'],
glob('mod/*'), glob('mod/*'),
glob('include/*'),
glob('addon/*/*'), glob('addon/*/*'),
$this->globRecursive('src') $this->globRecursive('src')
); );

7
src/Console/Typo.php
View File

@ -105,13 +105,6 @@ HELP;
$files = glob('mod/*.php'); $files = glob('mod/*.php');
$this->checkFiles($php_path, $files); $this->checkFiles($php_path, $files);
if ($this->getOption('v')) {
$this->out('Directory: include');
}
$files = glob('include/*.php');
$this->checkFiles($php_path, $files);
if ($this->getOption('v')) { if ($this->getOption('v')) {
$this->out('Directory: addon'); $this->out('Directory: addon');
} }

17
src/Core/Worker.php
View File

@ -315,17 +315,7 @@ class Worker
return false; return false;
} }
$valid = false; return (strpos($file, 'addon/') === 0);
if (strpos($file, 'include/') === 0) {
$valid = true;
}
if (strpos($file, 'addon/') === 0) {
$valid = true;
}
// Simply return flag
return $valid;
} }
/** /**
@ -406,11 +396,6 @@ class Worker
return true; return true;
} }
// The script could be provided as full path or only with the function name
if ($include == basename($include)) {
$include = 'include/' . $include . '.php';
}
if (!self::validateInclude($include)) { if (!self::validateInclude($include)) {
Logger::warning('Include file is not valid', ['file' => $argv[0]]); Logger::warning('Include file is not valid', ['file' => $argv[0]]);
$stamp = (float)microtime(true); $stamp = (float)microtime(true);

2
src/Navigation/Notifications/Repository/Notify.php
View File

@ -585,7 +585,7 @@ class Notify extends BaseRepository
DBA::insert('notify-threads', $fields); DBA::insert('notify-threads', $fields);
$emailBuilder->setHeader('Message-ID', $message_id); $emailBuilder->setHeader('Message-ID', $message_id);
$log_msg = "include/enotify: No previous notification found for this parent:\n" . $log_msg = "No previous notification found for this parent:\n" .
" parent: ${params['parent']}\n" . " uid : ${params['uid']}\n"; " parent: ${params['parent']}\n" . " uid : ${params['uid']}\n";
$this->logger->info($log_msg); $this->logger->info($log_msg);
} else { } else {