Browse Source

Merge pull request #7077 from nupplaphil/task/mod_nogroup

Move mod/nogroup to src/Module/Group
tags/2019.06^2
Hypolite Petovan 1 year ago
committed by GitHub
parent
commit
41401bb18d
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 24 deletions
  1. +0
    -23
      mod/nogroup.php
  2. +1
    -0
      src/App/Router.php
  3. +3
    -1
      src/Module/Group.php

+ 0
- 23
mod/nogroup.php View File

@@ -1,23 +0,0 @@
<?php
/**
* @file mod/nogroup.php
*/
use Friendica\App;
use Friendica\Core\L10n;

function nogroup_init(App $a)
{
if (! local_user()) {
return;
}
}

function nogroup_content(App $a)
{
if (! local_user()) {
notice(L10n::t('Permission denied.') . EOL);
return '';
}

$a->internalRedirect('group/none');
}

+ 1
- 0
src/App/Router.php View File

@@ -129,6 +129,7 @@ class Router
$this->routeCollector->addRoute(['GET'], '/magic', Module\Magic::class);
$this->routeCollector->addRoute(['GET'], '/manifest', Module\Manifest::class);
$this->routeCollector->addRoute(['GET'], '/nodeinfo/1.0', Module\NodeInfo::class);
$this->routeCollector->addRoute(['GET'], '/nogroup', Module\Group::class);
$this->routeCollector->addRoute(['GET'], '/objects/{guid}', Module\Objects::class);
$this->routeCollector->addGroup('/oembed', function (RouteCollector $collector) {
$collector->addRoute(['GET'], '/[b2h|h2b]', Module\Oembed::class);


+ 3
- 1
src/Module/Group.php View File

@@ -176,7 +176,9 @@ class Group extends BaseModule

$nogroup = false;

if (($a->argc == 2) && ($a->argv[1] === 'none')) {
// @TODO: Replace with parameter from router
if (($a->argc == 2) && ($a->argv[1] === 'none') ||
($a->argc == 1) && ($a->argv[0] === 'nogroup')) {
$id = -1;
$nogroup = true;
$group = [


Loading…
Cancel
Save