From 10edbea99ecea37a88b54708bf35e2e2e57df6aa Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 13 Jun 2020 13:15:53 -0400 Subject: [PATCH 1/8] Update author email address in file headers --- src/classes/Content/Pager.php | 2 +- src/classes/Controllers/Api/MatchSearch.php | 2 +- src/classes/Controllers/Api/Photo.php | 2 +- src/classes/Controllers/Api/Search.php | 2 +- src/classes/Controllers/Api/Submit.php | 2 +- src/classes/Controllers/Api/Surprise.php | 2 +- src/classes/Controllers/Api/SyncPull.php | 2 +- src/classes/Controllers/Console.php | 2 +- src/classes/Controllers/Console/DirectoryAdd.php | 2 +- src/classes/Controllers/Console/DirectoryPoll.php | 2 +- src/classes/Controllers/Console/ExtractStrings.php | 2 +- src/classes/Controllers/Console/Install.php | 2 +- src/classes/Controllers/Console/ProfileAdd.php | 2 +- src/classes/Controllers/Console/ProfileHide.php | 2 +- src/classes/Controllers/Console/ProfilePoll.php | 2 +- src/classes/Controllers/Console/ServerHide.php | 2 +- src/classes/Controllers/Console/ServerPoll.php | 2 +- src/classes/Controllers/Console/UpdateDb.php | 2 +- src/classes/Controllers/Cron.php | 2 +- src/classes/Controllers/Web/Directory.php | 2 +- src/classes/Controllers/Web/Page.php | 2 +- src/classes/Controllers/Web/Search.php | 2 +- src/classes/Controllers/Web/Servers.php | 2 +- src/classes/Controllers/Web/Statistics.php | 2 +- src/classes/Model.php | 2 +- src/classes/Models/Profile.php | 2 +- src/classes/Models/ProfilePollQueue.php | 2 +- src/classes/Models/Server.php | 2 +- src/classes/Pollers/Directory.php | 2 +- src/classes/Pollers/Profile.php | 2 +- src/classes/Pollers/Server.php | 2 +- src/classes/Routes/Console/BaseRoute.php | 2 +- src/classes/Routes/Console/DirectoryAdd.php | 2 +- src/classes/Routes/Console/DirectoryPoll.php | 2 +- src/classes/Routes/Console/ExtractStrings.php | 2 +- src/classes/Routes/Console/Install.php | 2 +- src/classes/Routes/Console/ProfileAdd.php | 2 +- src/classes/Routes/Console/ProfileHide.php | 2 +- src/classes/Routes/Console/ProfilePoll.php | 2 +- src/classes/Routes/Console/ServerHide.php | 2 +- src/classes/Routes/Console/ServerPoll.php | 2 +- src/classes/Routes/Console/UpdateDb.php | 2 +- src/classes/Routes/Http/BaseRoute.php | 2 +- src/classes/Routes/Http/MatchSearch.php | 2 +- src/classes/Routes/Http/Photo.php | 2 +- src/classes/Routes/Http/Search.php | 2 +- src/classes/Routes/Http/Submit.php | 2 +- src/classes/Routes/Http/Surprise.php | 2 +- src/classes/Routes/Http/SyncPull.php | 2 +- src/classes/Routes/Web/BaseRoute.php | 2 +- src/classes/Routes/Web/Directory.php | 2 +- src/classes/Routes/Web/Pages.php | 2 +- src/classes/Routes/Web/Search.php | 2 +- src/classes/Routes/Web/Servers.php | 2 +- src/classes/Routes/Web/Statistics.php | 2 +- src/classes/Utils/L10n.php | 2 +- src/classes/Utils/Network.php | 2 +- src/classes/Utils/Photo.php | 2 +- src/classes/Utils/Scrape.php | 2 +- src/classes/Views/PhpRenderer.php | 2 +- src/classes/Views/Widget/AccountTypeTabs.php | 2 +- src/classes/Views/Widget/PopularCountries.php | 2 +- src/classes/Views/Widget/PopularLanguages.php | 2 +- src/classes/Views/Widget/PopularTags.php | 2 +- 64 files changed, 64 insertions(+), 64 deletions(-) diff --git a/src/classes/Content/Pager.php b/src/classes/Content/Pager.php index b271f7f..cc15a42 100644 --- a/src/classes/Content/Pager.php +++ b/src/classes/Content/Pager.php @@ -5,7 +5,7 @@ namespace Friendica\Directory\Content; /** * The Pager has two very different output, Minimal and Full, see renderMinimal() and renderFull() for more details. * - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Pager { diff --git a/src/classes/Controllers/Api/MatchSearch.php b/src/classes/Controllers/Api/MatchSearch.php index 17e9969..98ce0f5 100644 --- a/src/classes/Controllers/Api/MatchSearch.php +++ b/src/classes/Controllers/Api/MatchSearch.php @@ -7,7 +7,7 @@ use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class MatchSearch { diff --git a/src/classes/Controllers/Api/Photo.php b/src/classes/Controllers/Api/Photo.php index 3eeba12..52ae50f 100644 --- a/src/classes/Controllers/Api/Photo.php +++ b/src/classes/Controllers/Api/Photo.php @@ -6,7 +6,7 @@ use Slim\Http\Request; use Slim\Http\Response; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Photo { diff --git a/src/classes/Controllers/Api/Search.php b/src/classes/Controllers/Api/Search.php index 24c9e6d..455859e 100644 --- a/src/classes/Controllers/Api/Search.php +++ b/src/classes/Controllers/Api/Search.php @@ -7,7 +7,7 @@ use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Search { diff --git a/src/classes/Controllers/Api/Submit.php b/src/classes/Controllers/Api/Submit.php index 243bbf0..bc13529 100644 --- a/src/classes/Controllers/Api/Submit.php +++ b/src/classes/Controllers/Api/Submit.php @@ -6,7 +6,7 @@ use Slim\Http\Request; use Slim\Http\Response; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Submit { diff --git a/src/classes/Controllers/Api/Surprise.php b/src/classes/Controllers/Api/Surprise.php index 8d3ac8d..dbce115 100644 --- a/src/classes/Controllers/Api/Surprise.php +++ b/src/classes/Controllers/Api/Surprise.php @@ -7,7 +7,7 @@ use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Surprise { diff --git a/src/classes/Controllers/Api/SyncPull.php b/src/classes/Controllers/Api/SyncPull.php index b895094..fa46c1c 100644 --- a/src/classes/Controllers/Api/SyncPull.php +++ b/src/classes/Controllers/Api/SyncPull.php @@ -6,7 +6,7 @@ use Slim\Http\Request; use Slim\Http\Response; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class SyncPull { diff --git a/src/classes/Controllers/Console.php b/src/classes/Controllers/Console.php index 3fdc382..65ca4b5 100644 --- a/src/classes/Controllers/Console.php +++ b/src/classes/Controllers/Console.php @@ -7,7 +7,7 @@ use Monolog\Logger; /** * Description of Console * - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Console extends \Asika\SimpleConsole\Console { diff --git a/src/classes/Controllers/Console/DirectoryAdd.php b/src/classes/Controllers/Console/DirectoryAdd.php index 6845397..44ae1f2 100644 --- a/src/classes/Controllers/Console/DirectoryAdd.php +++ b/src/classes/Controllers/Console/DirectoryAdd.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Controllers\Console; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class DirectoryAdd extends \Asika\SimpleConsole\Console { diff --git a/src/classes/Controllers/Console/DirectoryPoll.php b/src/classes/Controllers/Console/DirectoryPoll.php index d1a29f3..15f83a3 100644 --- a/src/classes/Controllers/Console/DirectoryPoll.php +++ b/src/classes/Controllers/Console/DirectoryPoll.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Controllers\Console; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class DirectoryPoll extends \Asika\SimpleConsole\Console { diff --git a/src/classes/Controllers/Console/ExtractStrings.php b/src/classes/Controllers/Console/ExtractStrings.php index bba13b1..5107aa8 100644 --- a/src/classes/Controllers/Console/ExtractStrings.php +++ b/src/classes/Controllers/Console/ExtractStrings.php @@ -6,7 +6,7 @@ use Gettext\Merge; use Gettext\Translations; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class ExtractStrings extends \Asika\SimpleConsole\Console { diff --git a/src/classes/Controllers/Console/Install.php b/src/classes/Controllers/Console/Install.php index ec487e0..4de2e05 100644 --- a/src/classes/Controllers/Console/Install.php +++ b/src/classes/Controllers/Console/Install.php @@ -7,7 +7,7 @@ use Monolog\Logger; use Seld\CliPrompt\CliPrompt; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Install extends \Asika\SimpleConsole\Console { diff --git a/src/classes/Controllers/Console/ProfileAdd.php b/src/classes/Controllers/Console/ProfileAdd.php index 7941ca8..2dc5e78 100644 --- a/src/classes/Controllers/Console/ProfileAdd.php +++ b/src/classes/Controllers/Console/ProfileAdd.php @@ -5,7 +5,7 @@ namespace Friendica\Directory\Controllers\Console; use Friendica\Directory\Models\ProfilePollQueue; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class ProfileAdd extends \Asika\SimpleConsole\Console { diff --git a/src/classes/Controllers/Console/ProfileHide.php b/src/classes/Controllers/Console/ProfileHide.php index 94468b0..67bc622 100644 --- a/src/classes/Controllers/Console/ProfileHide.php +++ b/src/classes/Controllers/Console/ProfileHide.php @@ -5,7 +5,7 @@ namespace Friendica\Directory\Controllers\Console; use Friendica\Directory\Models\Profile; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class ProfileHide extends \Asika\SimpleConsole\Console { diff --git a/src/classes/Controllers/Console/ProfilePoll.php b/src/classes/Controllers/Console/ProfilePoll.php index 634ca0d..6f7d931 100644 --- a/src/classes/Controllers/Console/ProfilePoll.php +++ b/src/classes/Controllers/Console/ProfilePoll.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Controllers\Console; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class ProfilePoll extends \Asika\SimpleConsole\Console { diff --git a/src/classes/Controllers/Console/ServerHide.php b/src/classes/Controllers/Console/ServerHide.php index e43a05b..830c4fb 100644 --- a/src/classes/Controllers/Console/ServerHide.php +++ b/src/classes/Controllers/Console/ServerHide.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Controllers\Console; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class ServerHide extends \Asika\SimpleConsole\Console { diff --git a/src/classes/Controllers/Console/ServerPoll.php b/src/classes/Controllers/Console/ServerPoll.php index 17d79cb..847b993 100644 --- a/src/classes/Controllers/Console/ServerPoll.php +++ b/src/classes/Controllers/Console/ServerPoll.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Controllers\Console; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class ServerPoll extends \Asika\SimpleConsole\Console { diff --git a/src/classes/Controllers/Console/UpdateDb.php b/src/classes/Controllers/Console/UpdateDb.php index 48ccbe2..0f2c32e 100644 --- a/src/classes/Controllers/Console/UpdateDb.php +++ b/src/classes/Controllers/Console/UpdateDb.php @@ -5,7 +5,7 @@ namespace Friendica\Directory\Controllers\Console; use Monolog\Logger; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class UpdateDb extends \Asika\SimpleConsole\Console { diff --git a/src/classes/Controllers/Cron.php b/src/classes/Controllers/Cron.php index 34876bf..5d2a9c6 100644 --- a/src/classes/Controllers/Cron.php +++ b/src/classes/Controllers/Cron.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Controllers; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Cron { diff --git a/src/classes/Controllers/Web/Directory.php b/src/classes/Controllers/Web/Directory.php index d24b5c1..f56ed20 100644 --- a/src/classes/Controllers/Web/Directory.php +++ b/src/classes/Controllers/Web/Directory.php @@ -10,7 +10,7 @@ use Slim\Http\Request; use Slim\Http\Response; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Directory extends BaseController { diff --git a/src/classes/Controllers/Web/Page.php b/src/classes/Controllers/Web/Page.php index 53cc31d..d3de73e 100644 --- a/src/classes/Controllers/Web/Page.php +++ b/src/classes/Controllers/Web/Page.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Controllers\Web; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Page extends BaseController { diff --git a/src/classes/Controllers/Web/Search.php b/src/classes/Controllers/Web/Search.php index 56ce937..39ae0ac 100644 --- a/src/classes/Controllers/Web/Search.php +++ b/src/classes/Controllers/Web/Search.php @@ -5,7 +5,7 @@ namespace Friendica\Directory\Controllers\Web; use \Friendica\Directory\Content\Pager; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Search extends BaseController { diff --git a/src/classes/Controllers/Web/Servers.php b/src/classes/Controllers/Web/Servers.php index 94e64f5..aee8590 100644 --- a/src/classes/Controllers/Web/Servers.php +++ b/src/classes/Controllers/Web/Servers.php @@ -8,7 +8,7 @@ use Slim\Http\Request; use Slim\Http\Response; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Servers extends BaseController { diff --git a/src/classes/Controllers/Web/Statistics.php b/src/classes/Controllers/Web/Statistics.php index e7fd888..673d1a5 100644 --- a/src/classes/Controllers/Web/Statistics.php +++ b/src/classes/Controllers/Web/Statistics.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Controllers\Web; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Statistics extends BaseController { diff --git a/src/classes/Model.php b/src/classes/Model.php index 568ffb2..f68a6c8 100644 --- a/src/classes/Model.php +++ b/src/classes/Model.php @@ -3,7 +3,7 @@ namespace Friendica\Directory; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Model { diff --git a/src/classes/Models/Profile.php b/src/classes/Models/Profile.php index 3f107cf..e8e5324 100644 --- a/src/classes/Models/Profile.php +++ b/src/classes/Models/Profile.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Models; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Profile extends \Friendica\Directory\Model { diff --git a/src/classes/Models/ProfilePollQueue.php b/src/classes/Models/ProfilePollQueue.php index 8776764..6be6c0f 100644 --- a/src/classes/Models/ProfilePollQueue.php +++ b/src/classes/Models/ProfilePollQueue.php @@ -5,7 +5,7 @@ namespace Friendica\Directory\Models; use Friendica\Directory\Utils\Network; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class ProfilePollQueue extends \Friendica\Directory\Model { diff --git a/src/classes/Models/Server.php b/src/classes/Models/Server.php index afe0b1b..72c89e0 100644 --- a/src/classes/Models/Server.php +++ b/src/classes/Models/Server.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Models; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Server extends \Friendica\Directory\Model { diff --git a/src/classes/Pollers/Directory.php b/src/classes/Pollers/Directory.php index 04dff76..93e2c10 100644 --- a/src/classes/Pollers/Directory.php +++ b/src/classes/Pollers/Directory.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Pollers; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Directory { diff --git a/src/classes/Pollers/Profile.php b/src/classes/Pollers/Profile.php index a1723ee..91a5169 100644 --- a/src/classes/Pollers/Profile.php +++ b/src/classes/Pollers/Profile.php @@ -5,7 +5,7 @@ namespace Friendica\Directory\Pollers; use Friendica\Directory\Utils\Network; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Profile { diff --git a/src/classes/Pollers/Server.php b/src/classes/Pollers/Server.php index d5de2fc..16492dd 100644 --- a/src/classes/Pollers/Server.php +++ b/src/classes/Pollers/Server.php @@ -5,7 +5,7 @@ namespace Friendica\Directory\Pollers; use ByJG\Util\WebRequest; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Server { diff --git a/src/classes/Routes/Console/BaseRoute.php b/src/classes/Routes/Console/BaseRoute.php index f3c5c0b..4833ccb 100644 --- a/src/classes/Routes/Console/BaseRoute.php +++ b/src/classes/Routes/Console/BaseRoute.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Routes\Console; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ abstract class BaseRoute { diff --git a/src/classes/Routes/Console/DirectoryAdd.php b/src/classes/Routes/Console/DirectoryAdd.php index 2b2fecf..4ccce03 100644 --- a/src/classes/Routes/Console/DirectoryAdd.php +++ b/src/classes/Routes/Console/DirectoryAdd.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Routes\Console; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class DirectoryAdd extends BaseRoute { diff --git a/src/classes/Routes/Console/DirectoryPoll.php b/src/classes/Routes/Console/DirectoryPoll.php index 66805bc..7552208 100644 --- a/src/classes/Routes/Console/DirectoryPoll.php +++ b/src/classes/Routes/Console/DirectoryPoll.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Routes\Console; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class DirectoryPoll extends BaseRoute { diff --git a/src/classes/Routes/Console/ExtractStrings.php b/src/classes/Routes/Console/ExtractStrings.php index d39bf4e..e1041fc 100644 --- a/src/classes/Routes/Console/ExtractStrings.php +++ b/src/classes/Routes/Console/ExtractStrings.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Routes\Console; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class ExtractStrings extends BaseRoute { diff --git a/src/classes/Routes/Console/Install.php b/src/classes/Routes/Console/Install.php index 72a6472..25be93c 100644 --- a/src/classes/Routes/Console/Install.php +++ b/src/classes/Routes/Console/Install.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Routes\Console; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Install extends BaseRoute { diff --git a/src/classes/Routes/Console/ProfileAdd.php b/src/classes/Routes/Console/ProfileAdd.php index d1ce28d..4801c19 100644 --- a/src/classes/Routes/Console/ProfileAdd.php +++ b/src/classes/Routes/Console/ProfileAdd.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Routes\Console; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class ProfileAdd extends BaseRoute { diff --git a/src/classes/Routes/Console/ProfileHide.php b/src/classes/Routes/Console/ProfileHide.php index 5446b67..b8eafac 100644 --- a/src/classes/Routes/Console/ProfileHide.php +++ b/src/classes/Routes/Console/ProfileHide.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Routes\Console; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class ProfileHide extends BaseRoute { diff --git a/src/classes/Routes/Console/ProfilePoll.php b/src/classes/Routes/Console/ProfilePoll.php index ee96847..ea85f2b 100644 --- a/src/classes/Routes/Console/ProfilePoll.php +++ b/src/classes/Routes/Console/ProfilePoll.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Routes\Console; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class ProfilePoll extends BaseRoute { diff --git a/src/classes/Routes/Console/ServerHide.php b/src/classes/Routes/Console/ServerHide.php index 3a9cdbd..f75bf02 100644 --- a/src/classes/Routes/Console/ServerHide.php +++ b/src/classes/Routes/Console/ServerHide.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Routes\Console; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class ServerHide extends BaseRoute { diff --git a/src/classes/Routes/Console/ServerPoll.php b/src/classes/Routes/Console/ServerPoll.php index 7fdab2e..9cf75e0 100644 --- a/src/classes/Routes/Console/ServerPoll.php +++ b/src/classes/Routes/Console/ServerPoll.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Routes\Console; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class ServerPoll extends BaseRoute { diff --git a/src/classes/Routes/Console/UpdateDb.php b/src/classes/Routes/Console/UpdateDb.php index f157aea..bb7549e 100644 --- a/src/classes/Routes/Console/UpdateDb.php +++ b/src/classes/Routes/Console/UpdateDb.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Routes\Console; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class UpdateDb extends BaseRoute { diff --git a/src/classes/Routes/Http/BaseRoute.php b/src/classes/Routes/Http/BaseRoute.php index af405ac..f6c10cf 100644 --- a/src/classes/Routes/Http/BaseRoute.php +++ b/src/classes/Routes/Http/BaseRoute.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Routes\Http; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ abstract class BaseRoute { diff --git a/src/classes/Routes/Http/MatchSearch.php b/src/classes/Routes/Http/MatchSearch.php index 54f79e2..9e8e384 100644 --- a/src/classes/Routes/Http/MatchSearch.php +++ b/src/classes/Routes/Http/MatchSearch.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Routes\Http; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class MatchSearch extends BaseRoute { diff --git a/src/classes/Routes/Http/Photo.php b/src/classes/Routes/Http/Photo.php index 3f8673e..6afb643 100644 --- a/src/classes/Routes/Http/Photo.php +++ b/src/classes/Routes/Http/Photo.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Routes\Http; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Photo extends BaseRoute { diff --git a/src/classes/Routes/Http/Search.php b/src/classes/Routes/Http/Search.php index 5b3dbc0..2f7fc67 100644 --- a/src/classes/Routes/Http/Search.php +++ b/src/classes/Routes/Http/Search.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Routes\Http; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Search extends BaseRoute { diff --git a/src/classes/Routes/Http/Submit.php b/src/classes/Routes/Http/Submit.php index 92b673e..f12d9c3 100644 --- a/src/classes/Routes/Http/Submit.php +++ b/src/classes/Routes/Http/Submit.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Routes\Http; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Submit extends BaseRoute { diff --git a/src/classes/Routes/Http/Surprise.php b/src/classes/Routes/Http/Surprise.php index d7fc6e4..95e00b2 100644 --- a/src/classes/Routes/Http/Surprise.php +++ b/src/classes/Routes/Http/Surprise.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Routes\Http; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Surprise extends BaseRoute { diff --git a/src/classes/Routes/Http/SyncPull.php b/src/classes/Routes/Http/SyncPull.php index 74cd3d6..7c1539c 100644 --- a/src/classes/Routes/Http/SyncPull.php +++ b/src/classes/Routes/Http/SyncPull.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Routes\Http; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class SyncPull extends BaseRoute { diff --git a/src/classes/Routes/Web/BaseRoute.php b/src/classes/Routes/Web/BaseRoute.php index 633bbef..5053b88 100644 --- a/src/classes/Routes/Web/BaseRoute.php +++ b/src/classes/Routes/Web/BaseRoute.php @@ -5,7 +5,7 @@ namespace Friendica\Directory\Routes\Web; use Friendica\Directory\Controllers\Web\BaseController; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ abstract class BaseRoute { diff --git a/src/classes/Routes/Web/Directory.php b/src/classes/Routes/Web/Directory.php index ce4459c..79c580c 100644 --- a/src/classes/Routes/Web/Directory.php +++ b/src/classes/Routes/Web/Directory.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Routes\Web; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Directory extends BaseRoute { diff --git a/src/classes/Routes/Web/Pages.php b/src/classes/Routes/Web/Pages.php index e90bb03..537d485 100644 --- a/src/classes/Routes/Web/Pages.php +++ b/src/classes/Routes/Web/Pages.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Routes\Web; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Pages extends BaseRoute { diff --git a/src/classes/Routes/Web/Search.php b/src/classes/Routes/Web/Search.php index 655beb7..a9943d4 100644 --- a/src/classes/Routes/Web/Search.php +++ b/src/classes/Routes/Web/Search.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Routes\Web; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Search extends BaseRoute { diff --git a/src/classes/Routes/Web/Servers.php b/src/classes/Routes/Web/Servers.php index 041de84..0f35f8e 100644 --- a/src/classes/Routes/Web/Servers.php +++ b/src/classes/Routes/Web/Servers.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Routes\Web; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Servers extends BaseRoute { diff --git a/src/classes/Routes/Web/Statistics.php b/src/classes/Routes/Web/Statistics.php index a3182b1..197d50b 100644 --- a/src/classes/Routes/Web/Statistics.php +++ b/src/classes/Routes/Web/Statistics.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Routes\Web; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Statistics extends BaseRoute { diff --git a/src/classes/Utils/L10n.php b/src/classes/Utils/L10n.php index 96de65b..849b8f9 100644 --- a/src/classes/Utils/L10n.php +++ b/src/classes/Utils/L10n.php @@ -6,7 +6,7 @@ use Gettext\Languages\Language; use Gettext\Translator; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class L10n { diff --git a/src/classes/Utils/Network.php b/src/classes/Utils/Network.php index 5b6d972..a6170af 100644 --- a/src/classes/Utils/Network.php +++ b/src/classes/Utils/Network.php @@ -11,7 +11,7 @@ namespace Friendica\Directory\Utils; /** * Description of Network * - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Network { diff --git a/src/classes/Utils/Photo.php b/src/classes/Utils/Photo.php index 82df18e..2d1603f 100644 --- a/src/classes/Utils/Photo.php +++ b/src/classes/Utils/Photo.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Utils; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Photo { diff --git a/src/classes/Utils/Scrape.php b/src/classes/Utils/Scrape.php index 6c8fee5..2859a84 100644 --- a/src/classes/Utils/Scrape.php +++ b/src/classes/Utils/Scrape.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Utils; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Scrape { diff --git a/src/classes/Views/PhpRenderer.php b/src/classes/Views/PhpRenderer.php index eccab06..d47a567 100644 --- a/src/classes/Views/PhpRenderer.php +++ b/src/classes/Views/PhpRenderer.php @@ -5,7 +5,7 @@ namespace Friendica\Directory\Views; /** * Zend-Escaper wrapper for Slim PHP Renderer * - * @author Hypolite Petovan + * @author Hypolite Petovan * * @method string escapeHtml(string $value) * @method string escapeHtmlAttr(string $value) diff --git a/src/classes/Views/Widget/AccountTypeTabs.php b/src/classes/Views/Widget/AccountTypeTabs.php index 3caedd4..faec5de 100644 --- a/src/classes/Views/Widget/AccountTypeTabs.php +++ b/src/classes/Views/Widget/AccountTypeTabs.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Views\Widget; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class AccountTypeTabs { diff --git a/src/classes/Views/Widget/PopularCountries.php b/src/classes/Views/Widget/PopularCountries.php index f5d0a9a..2f2d22f 100644 --- a/src/classes/Views/Widget/PopularCountries.php +++ b/src/classes/Views/Widget/PopularCountries.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Views\Widget; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class PopularCountries { diff --git a/src/classes/Views/Widget/PopularLanguages.php b/src/classes/Views/Widget/PopularLanguages.php index a07cc21..f82e2f4 100644 --- a/src/classes/Views/Widget/PopularLanguages.php +++ b/src/classes/Views/Widget/PopularLanguages.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Views\Widget; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class PopularLanguages { diff --git a/src/classes/Views/Widget/PopularTags.php b/src/classes/Views/Widget/PopularTags.php index d5bb798..a2ecde9 100644 --- a/src/classes/Views/Widget/PopularTags.php +++ b/src/classes/Views/Widget/PopularTags.php @@ -3,7 +3,7 @@ namespace Friendica\Directory\Views\Widget; /** - * @author Hypolite Petovan + * @author Hypolite Petovan */ class PopularTags { From a402fbdf5d53107423287237014ab89eae089d12 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 13 Jun 2020 13:16:25 -0400 Subject: [PATCH 2/8] Add Utils\Url class --- src/classes/Utils/Url.php | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 src/classes/Utils/Url.php diff --git a/src/classes/Utils/Url.php b/src/classes/Utils/Url.php new file mode 100644 index 0000000..a292c6a --- /dev/null +++ b/src/classes/Utils/Url.php @@ -0,0 +1,38 @@ + + * @package Friendica\Directory\Utils + */ +class Url +{ + /** + * Mirror of parse_url function, puts components back together to form a URI. + * + * @param array $parsed + * @return string + */ + public static function unparse(array $parsed) + { + $scheme = $parsed['scheme'] ?? null; + $user = $parsed['user'] ?? null; + $pass = $parsed['pass'] ?? null; + $userinfo = $pass !== null ? "$user:$pass" : $user; + $port = $parsed['port'] ?? null; + $query = $parsed['query'] ?? null; + $fragment = $parsed['fragment'] ?? null; + $authority = ($userinfo !== null ? $userinfo . "@" : '') . + ($parsed['host'] ?? '') . + ($port ? ":$port" : ''); + + return (!empty($scheme) ? $scheme . ":" : '') . + (strlen($authority) ? "//" . $authority : '') . + ($parsed['path'] ?? '') . + (strlen($query) ? "?" . $query : '') . + (strlen($fragment) ? "#" . $fragment : ''); + } +} From f47f263fc3f5ae6747c35b5050f22ab3d2a59581 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 13 Jun 2020 13:16:35 -0400 Subject: [PATCH 3/8] Add ZrlMiddleware class --- src/classes/Middleware/ZrlMiddleware.php | 40 ++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 src/classes/Middleware/ZrlMiddleware.php diff --git a/src/classes/Middleware/ZrlMiddleware.php b/src/classes/Middleware/ZrlMiddleware.php new file mode 100644 index 0000000..e880481 --- /dev/null +++ b/src/classes/Middleware/ZrlMiddleware.php @@ -0,0 +1,40 @@ + + * @package Friendica\Directory\Middleware + */ +class ZrlMiddleware +{ + /** + * @var PhpRenderer + */ + private $phpRenderer; + + public function __construct(PhpRenderer $phpRenderer) + { + $this->phpRenderer = $phpRenderer; + } + + /** + * @param ServerRequestInterface $request PSR7 request + * @param ResponseInterface $response PSR7 response + * @param callable $next Next middleware + * + * @return ResponseInterface + */ + public function __invoke(ServerRequestInterface $request, ResponseInterface $response, callable $next) + { + $this->phpRenderer->addAttribute('zrl', $request->getQueryParams()['zrl'] ?? null); + + return $next($request, $response); + } +} From 230ceeab29eaf4c87a6085edc1355de94b31fc01 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 13 Jun 2020 13:17:19 -0400 Subject: [PATCH 4/8] Add names to routes we need to get URLs for --- src/routes.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes.php b/src/routes.php index b703b5e..a3ed395 100644 --- a/src/routes.php +++ b/src/routes.php @@ -10,7 +10,7 @@ use Slim\Http\Response; */ $app->get('/servers/surprise', \Friendica\Directory\Routes\Http\Surprise::class); -$app->get('/servers', \Friendica\Directory\Routes\Web\Servers::class); +$app->get('/servers', \Friendica\Directory\Routes\Web\Servers::class)->setName('servers'); $app->get('/search[/{account_type}]', function (Request $request, Response $response, $args) { if ($request->getAttribute('negotiation')->getMediaType() == 'application/json') { @@ -24,7 +24,7 @@ $app->get('/search[/{account_type}]', function (Request $request, Response $resp $app->post('/msearch', \Friendica\Directory\Routes\Http\MatchSearch::class); -$app->get('/stats', \Friendica\Directory\Routes\Web\Statistics::class); +$app->get('/stats', \Friendica\Directory\Routes\Web\Statistics::class)->setName('stats'); $app->get('/submit', \Friendica\Directory\Routes\Http\Submit::class); From 0cdbd3af2d16419942075bc73dbcd084d92e00cc Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 13 Jun 2020 13:17:40 -0400 Subject: [PATCH 5/8] Add ZrlMiddleware to the stack --- src/middleware.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/middleware.php b/src/middleware.php index ce41504..f4493b1 100644 --- a/src/middleware.php +++ b/src/middleware.php @@ -51,4 +51,6 @@ $middleware->setLocaleCallback(function (string $locale) use ($container) { }); $middleware->setUriParamName('lang'); -$app->add($middleware); \ No newline at end of file +$app->add($middleware); + +$app->add(new \Friendica\Directory\Middleware\ZrlMiddleware($container->get('renderer'))); From 57dd610e73508ee476da90487d196ce65aedbaae Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 13 Jun 2020 13:20:49 -0400 Subject: [PATCH 6/8] Add u() and r() method to PhpRenderer - Add Router dependency --- src/classes/Views/PhpRenderer.php | 51 ++++++++++++++++++++++++++++++- src/dependencies.php | 7 ++++- 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/src/classes/Views/PhpRenderer.php b/src/classes/Views/PhpRenderer.php index d47a567..d80628e 100644 --- a/src/classes/Views/PhpRenderer.php +++ b/src/classes/Views/PhpRenderer.php @@ -2,6 +2,9 @@ namespace Friendica\Directory\Views; +use Friendica\Directory\Utils\Url; +use Slim\Router; + /** * Zend-Escaper wrapper for Slim PHP Renderer * @@ -32,10 +35,15 @@ class PhpRenderer extends \Slim\Views\PhpRenderer * @var \Gettext\TranslatorInterface */ private $l10n; + /** + * @var Router + */ + private $router; public function __construct( \Zend\Escaper\Escaper $escaper, \Gettext\TranslatorInterface $l10n, + Router $router, string $templatePath = "", array $attributes = array() ) @@ -44,6 +52,7 @@ class PhpRenderer extends \Slim\Views\PhpRenderer $this->escaper = $escaper; $this->l10n = $l10n; + $this->router = $router; } public function e(string $value): string @@ -58,7 +67,7 @@ class PhpRenderer extends \Slim\Views\PhpRenderer } elseif (method_exists($this->l10n, $name)) { return $this->l10n->$name(...$arguments); } else { - throw new \Exception('Unknown PhpRendere magic method: ' . $name); + throw new \Exception('Unknown PhpRenderer magic method: ' . $name); } } @@ -172,5 +181,45 @@ class PhpRenderer extends \Slim\Views\PhpRenderer return !empty($args[1]) && is_array($args[1]) ? strtr($text, $args[1]) : vsprintf($text, $args); } + /** + * Return the URL of the provided route and parameters + * + * @param string $name + * @param array $data + * @param array $queryParams + * @return string + */ + function r(string $name, array $data = [], array $queryParams = []) + { + if ($this->getAttribute('zrl')) { + $queryParams['zrl'] = $this->getAttribute('zrl'); + } + return $this->router->pathFor($name, $data, $queryParams); + } + + /** + * Add sitewide ZRL support for external URLs + * + * @param string $url + */ + function u(string $url) + { + if ($this->getAttribute('zrl')) { + $queryParameters = []; + + $parsed = parse_url($url); + if (!empty($parsed['query'])) { + parse_str($parsed['query'], $queryParameters); + } + + $queryParameters['zrl'] = $this->getAttribute('zrl'); + + $parsed['query'] = http_build_query($queryParameters); + + $url = Url::unparse($parsed); + } + + return $url; + } } diff --git a/src/dependencies.php b/src/dependencies.php index dbd6c6a..3cb2b66 100644 --- a/src/dependencies.php +++ b/src/dependencies.php @@ -25,7 +25,12 @@ $container['escaper'] = function (ContainerInterface $c): Zend\Escaper\Escaper { // view renderer $container['renderer'] = function (ContainerInterface $c): Friendica\Directory\Views\PhpRenderer { $settings = $c->get('settings')['renderer']; - return new Friendica\Directory\Views\PhpRenderer($c->get('escaper'), $c->get('l10n'), $settings['template_path']); + return new Friendica\Directory\Views\PhpRenderer( + $c->get('escaper'), + $c->get('l10n'), + $c->get('router'), + $settings['template_path'] + ); }; // monolog From 476f7ae8320af02f026d664901302bcabd13b8ba Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 13 Jun 2020 13:21:18 -0400 Subject: [PATCH 7/8] Add ZRL parameter support sitewide in templates --- src/templates/layout.phtml | 16 ++++++++-------- src/templates/search.phtml | 2 +- src/templates/statistics.phtml | 10 ++++++---- src/templates/sub/profile.phtml | 16 ++++++++-------- src/templates/sub/server.phtml | 6 +++--- src/templates/widget/accounttypetabs.phtml | 2 +- src/templates/widget/popularcountries.phtml | 2 +- src/templates/widget/popularlanguages.phtml | 2 +- src/templates/widget/populartags.phtml | 2 +- 9 files changed, 30 insertions(+), 28 deletions(-) diff --git a/src/templates/layout.phtml b/src/templates/layout.phtml index 2a2d8d9..5ac846d 100644 --- a/src/templates/layout.phtml +++ b/src/templates/layout.phtml @@ -13,12 +13,12 @@