From bdfe575365366690fe6a3934e793c67db1a2d623 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 27 Dec 2019 20:48:47 -0500 Subject: [PATCH 1/6] [various] Remove redundant profile_uid field from profile query --- forumdirectory/forumdirectory.php | 2 +- widgets/widget_friendheader.php | 2 +- widgets/widget_friends.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php index 2d07c829..5baad462 100644 --- a/forumdirectory/forumdirectory.php +++ b/forumdirectory/forumdirectory.php @@ -105,7 +105,7 @@ function forumdirectory_content(App $a) $limit = $pager->getStart()."," . $pager->getItemsPerPage(); - $r = DBA::p("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`, + $r = DBA::p("SELECT `profile`.*, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`, `contact`.`addr`, `contact`.`url` AS `profile_url` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid` diff --git a/widgets/widget_friendheader.php b/widgets/widget_friendheader.php index f47b1b57..c4031290 100644 --- a/widgets/widget_friendheader.php +++ b/widgets/widget_friendheader.php @@ -25,7 +25,7 @@ function friendheader_widget_size() function friendheader_widget_content(&$a, $conf) { - $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.* FROM `profile` + $r = q("SELECT `profile`.* , `user`.* FROM `profile` LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid` WHERE `user`.`uid` = %s LIMIT 1", intval($conf['uid']) diff --git a/widgets/widget_friends.php b/widgets/widget_friends.php index a3951cdc..08b7415c 100644 --- a/widgets/widget_friends.php +++ b/widgets/widget_friends.php @@ -27,7 +27,7 @@ function friends_widget_size() function friends_widget_content(&$a, $conf) { - $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.* FROM `profile` + $r = q("SELECT `profile`.* , `user`.* FROM `profile` LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid` WHERE `user`.`uid` = %s LIMIT 1", intval($conf['uid']) -- 2.43.5 From 4dff5e717509f7d1ea9268acfd70c702d4deb120 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 16 Feb 2020 13:06:06 -0500 Subject: [PATCH 2/6] [forumdirectory] Replace profile.pdesc by profile.about --- forumdirectory/forumdirectory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php index 2d07c829..aa760cf0 100644 --- a/forumdirectory/forumdirectory.php +++ b/forumdirectory/forumdirectory.php @@ -81,7 +81,7 @@ function forumdirectory_content(App $a) $sql_extra = " AND ((`profile`.`name` LIKE '%$search%') OR (`user`.`nickname` LIKE '%$search%') OR - (`profile`.`pdesc` LIKE '%$search%') OR + (`profile`.`about` LIKE '%$search%') OR (`profile`.`locality` LIKE '%$search%') OR (`profile`.`region` LIKE '%$search%') OR (`profile`.`country-name` LIKE '%$search%') OR -- 2.43.5 From 9c092d5c404872e4f7b9366f38a94a5ca51d76af Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 16 Feb 2020 13:06:30 -0500 Subject: [PATCH 3/6] [forumdirectory] Add L10n parameter to Pager constructor call --- forumdirectory/forumdirectory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php index aa760cf0..93c57564 100644 --- a/forumdirectory/forumdirectory.php +++ b/forumdirectory/forumdirectory.php @@ -99,7 +99,7 @@ function forumdirectory_content(App $a) $total = $cnt['total']; } - $pager = new Pager(DI::args()->getQueryString(), 60); + $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), 60); $order = " ORDER BY `name` ASC "; -- 2.43.5 From 7509ce88b934a321369f5eeb5eb2b371b222878d Mon Sep 17 00:00:00 2001 From: Andy Date: Sun, 23 Feb 2020 05:06:03 +0000 Subject: [PATCH 4/6] modified: public_server/public_server.php --- public_server/public_server.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public_server/public_server.php b/public_server/public_server.php index a02c8672..f908b9fd 100644 --- a/public_server/public_server.php +++ b/public_server/public_server.php @@ -1,7 +1,7 @@ */ -- 2.43.5 From 47571328407c59b78c1b2af95524da45c2603ec3 Mon Sep 17 00:00:00 2001 From: Andy Date: Sun, 23 Feb 2020 05:13:30 +0000 Subject: [PATCH 5/6] Changes to be committed: --- public_server/public_server.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public_server/public_server.php b/public_server/public_server.php index f908b9fd..41c62832 100644 --- a/public_server/public_server.php +++ b/public_server/public_server.php @@ -1,7 +1,7 @@ */ -- 2.43.5 From 7eb7706a2420f5ee2c2d8d84d1693b101fd80c1e Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 24 Feb 2020 20:08:43 -0500 Subject: [PATCH 6/6] [various] Add rel="noopener noreferrer" to all target="_blank" links See https://mathiasbynens.github.io/rel-noopener/ --- .../doc/advancedcontentfilter.md | 34 +++++++++---------- buglink/buglink.php | 2 +- irc/irc.php | 2 +- openstreetmap/openstreetmap.php | 4 +-- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/advancedcontentfilter/doc/advancedcontentfilter.md b/advancedcontentfilter/doc/advancedcontentfilter.md index 41320fa3..55e52ef4 100644 --- a/advancedcontentfilter/doc/advancedcontentfilter.md +++ b/advancedcontentfilter/doc/advancedcontentfilter.md @@ -322,7 +322,7 @@ You can also retrieve the variables of a specific post by pasting its URL below rendered_html string - Over-compensation #<a href="https://friendica.mrpetovan.com/search?tag=Street" class="tag" title="Street">Street</a> #<a href="https://friendica.mrpetovan.com/search?tag=Night" class="tag" title="Night">Night</a> #<a href="https://friendica.mrpetovan.com/search?tag=CarLights" class="tag" title="CarLights">CarLights</a> #<a href="https://friendica.mrpetovan.com/search?tag=Jeep" class="tag" title="Jeep">Jeep</a> #<a href="https://friendica.mrpetovan.com/search?tag=NoPeople" class="tag" title="NoPeople">NoPeople</a> #<a href="https://friendica.mrpetovan.com/search?tag=Close" class="tag" title="Close">Close</a>-up <div class="type-link"><a href="https://www.eyeem.com/p/120800309" target="_blank"><img src="https://friendica.mrpetovan.com/proxy/bb/aHR0cHM6Ly9jZG4uZXllZW0uY29tL3RodW1iL2IyZjAxOTczOGNiZWVmMDZlMmY4Yzk1MTdjNjI4NmE4YWRjZDNhMDAtMTUyMjE4NDgyMDY0MS82NDAvNDgw" alt="" title="Over-compensation Street Night Car Lights Jeep No | EyeEm" class="attachment-image"></a><br><h4><a href="https://www.eyeem.com/p/120800309">Over-compensation Street Night Car Lights Jeep No | EyeEm</a></h4><blockquote>Photo by @<a href="https://twitter.com/MrPetovan" class="userinfo mention" title="MrPetovan">MrPetovan</a></blockquote><sup><a href="https://www.eyeem.com/p/120800309">www.eyeem.com</a></sup></div> + Over-compensation #<a href="https://friendica.mrpetovan.com/search?tag=Street" class="tag" title="Street">Street</a> #<a href="https://friendica.mrpetovan.com/search?tag=Night" class="tag" title="Night">Night</a> #<a href="https://friendica.mrpetovan.com/search?tag=CarLights" class="tag" title="CarLights">CarLights</a> #<a href="https://friendica.mrpetovan.com/search?tag=Jeep" class="tag" title="Jeep">Jeep</a> #<a href="https://friendica.mrpetovan.com/search?tag=NoPeople" class="tag" title="NoPeople">NoPeople</a> #<a href="https://friendica.mrpetovan.com/search?tag=Close" class="tag" title="Close">Close</a>-up <div class="type-link"><a href="https://www.eyeem.com/p/120800309" target="_blank" rel="noopener noreferrer"><img src="https://friendica.mrpetovan.com/proxy/bb/aHR0cHM6Ly9jZG4uZXllZW0uY29tL3RodW1iL2IyZjAxOTczOGNiZWVmMDZlMmY4Yzk1MTdjNjI4NmE4YWRjZDNhMDAtMTUyMjE4NDgyMDY0MS82NDAvNDgw" alt="" title="Over-compensation Street Night Car Lights Jeep No | EyeEm" class="attachment-image"></a><br><h4><a href="https://www.eyeem.com/p/120800309">Over-compensation Street Night Car Lights Jeep No | EyeEm</a></h4><blockquote>Photo by @<a href="https://twitter.com/MrPetovan" class="userinfo mention" title="MrPetovan">MrPetovan</a></blockquote><sup><a href="https://www.eyeem.com/p/120800309">www.eyeem.com</a></sup></div> @@ -470,14 +470,14 @@ You can also retrieve the variables of a specific post by pasting its URL below list
    -
  1. #<a href="https://friendica.mrpetovan.com/search?tag=Street" target="_blank">street</a>
    2. -
  2. #<a href="https://friendica.mrpetovan.com/search?tag=Night" target="_blank">night</a>
    3. -
  3. #<a href="https://friendica.mrpetovan.com/search?tag=CarLights" target="_blank">carlights</a>
    4. -
  4. #<a href="https://friendica.mrpetovan.com/search?tag=Jeep" target="_blank">jeep</a>
    5. -
  5. #<a href="https://friendica.mrpetovan.com/search?tag=NoPeople" target="_blank">nopeople</a>
    6. -
  6. #<a href="https://friendica.mrpetovan.com/search?tag=Close" target="_blank">close</a>
    7. -
  7. @<a href="https://twitter.com/MrPetovan" target="_blank">mrpetovan</a>
    8. -
  8. #<a href="https://friendica.mrpetovan.com/search?tag=Close-up" target="_blank">close-up</a>
    9. +
  9. #<a href="https://friendica.mrpetovan.com/search?tag=Street" target="_blank" rel="noopener noreferrer">street</a>
    10. +
  10. #<a href="https://friendica.mrpetovan.com/search?tag=Night" target="_blank" rel="noopener noreferrer">night</a>
    11. +
  11. #<a href="https://friendica.mrpetovan.com/search?tag=CarLights" target="_blank" rel="noopener noreferrer">carlights</a>
    12. +
  12. #<a href="https://friendica.mrpetovan.com/search?tag=Jeep" target="_blank" rel="noopener noreferrer">jeep</a>
    13. +
  13. #<a href="https://friendica.mrpetovan.com/search?tag=NoPeople" target="_blank" rel="noopener noreferrer">nopeople</a>
    14. +
  14. #<a href="https://friendica.mrpetovan.com/search?tag=Close" target="_blank" rel="noopener noreferrer">close</a>
    15. +
  15. @<a href="https://twitter.com/MrPetovan" target="_blank" rel="noopener noreferrer">mrpetovan</a>
    16. +
  16. #<a href="https://friendica.mrpetovan.com/search?tag=Close-up" target="_blank" rel="noopener noreferrer">close-up</a>
@@ -486,13 +486,13 @@ You can also retrieve the variables of a specific post by pasting its URL below list
    -
  1. #<a href="https://friendica.mrpetovan.com/search?tag=Street" target="_blank">street</a>
    2. -
  2. #<a href="https://friendica.mrpetovan.com/search?tag=Night" target="_blank">night</a>
    3. -
  3. #<a href="https://friendica.mrpetovan.com/search?tag=CarLights" target="_blank">carlights</a>
    4. -
  4. #<a href="https://friendica.mrpetovan.com/search?tag=Jeep" target="_blank">jeep</a>
    5. -
  5. #<a href="https://friendica.mrpetovan.com/search?tag=NoPeople" target="_blank">nopeople</a>
    6. -
  6. #<a href="https://friendica.mrpetovan.com/search?tag=Close" target="_blank">close</a>
    7. -
  7. #<a href="https://friendica.mrpetovan.com/search?tag=Close-up" target="_blank">close-up</a>
    8. +
  8. #<a href="https://friendica.mrpetovan.com/search?tag=Street" target="_blank" rel="noopener noreferrer">street</a>
    9. +
  9. #<a href="https://friendica.mrpetovan.com/search?tag=Night" target="_blank" rel="noopener noreferrer">night</a>
    10. +
  10. #<a href="https://friendica.mrpetovan.com/search?tag=CarLights" target="_blank" rel="noopener noreferrer">carlights</a>
    11. +
  11. #<a href="https://friendica.mrpetovan.com/search?tag=Jeep" target="_blank" rel="noopener noreferrer">jeep</a>
    12. +
  12. #<a href="https://friendica.mrpetovan.com/search?tag=NoPeople" target="_blank" rel="noopener noreferrer">nopeople</a>
    13. +
  13. #<a href="https://friendica.mrpetovan.com/search?tag=Close" target="_blank" rel="noopener noreferrer">close</a>
    14. +
  14. #<a href="https://friendica.mrpetovan.com/search?tag=Close-up" target="_blank" rel="noopener noreferrer">close-up</a>
@@ -501,7 +501,7 @@ You can also retrieve the variables of a specific post by pasting its URL below string
    -
  1. @<a href="https://twitter.com/MrPetovan" target="_blank">mrpetovan</a>
    2. +
  2. @<a href="https://twitter.com/MrPetovan" target="_blank" rel="noopener noreferrer">mrpetovan</a>
diff --git a/buglink/buglink.php b/buglink/buglink.php index 5d354109..2414a3a3 100644 --- a/buglink/buglink.php +++ b/buglink/buglink.php @@ -22,5 +22,5 @@ function buglink_uninstall() function buglink_active(App $a, &$b) { - $b .= ''; + $b .= ''; } diff --git a/irc/irc.php b/irc/irc.php index 52778e55..2c969d4b 100644 --- a/irc/irc.php +++ b/irc/irc.php @@ -117,7 +117,7 @@ function irc_content(&$a) { /* add the chatroom frame and some html */ $o .= <<< EOT

IRC chat

-

A beginner's guide to using IRC. [en]

+

A beginner's guide to using IRC. [en]

EOT; diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php index 61fe1efd..5df1c7d7 100644 --- a/openstreetmap/openstreetmap.php +++ b/openstreetmap/openstreetmap.php @@ -205,8 +205,8 @@ function openstreetmap_addon_admin(&$a, &$o) $o = Renderer::replaceMacros($t, [ '$submit' => DI::l10n()->t('Submit'), - '$tmsserver' => ['tmsserver', DI::l10n()->t('Tile Server URL'), $tmsserver, DI::l10n()->t('A list of public tile servers')], - '$nomserver' => ['nomserver', DI::l10n()->t('Nominatim (reverse geocoding) Server URL'), $nomserver, DI::l10n()->t('A list of Nominatim servers')], + '$tmsserver' => ['tmsserver', DI::l10n()->t('Tile Server URL'), $tmsserver, DI::l10n()->t('A list of public tile servers')], + '$nomserver' => ['nomserver', DI::l10n()->t('Nominatim (reverse geocoding) Server URL'), $nomserver, DI::l10n()->t('A list of Nominatim servers')], '$zoom' => ['zoom', DI::l10n()->t('Default zoom'), $zoom, DI::l10n()->t('The default zoom level. (1:world, 18:highest, also depends on tile server)')], '$marker' => ['marker', DI::l10n()->t('Include marker on map'), $marker, DI::l10n()->t('Include a marker on the map.')], ]); -- 2.43.5