bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Simplify the output of api results

Browse source
This commit is contained in:
Michael 2021-11-09 06:42:59 +00:00
parent 83056df565
commit fb6c3e2912
5 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Module/Api/Friendica/Events/Index.php
View file

@ -70,7 +70,6 @@ class Index extends BaseApi
];
}
echo self::format('events', ['events' => $items]);
exit;
self::exit('events', ['events' => $items]);
}
}

3
src/Module/Api/Friendica/GNUSocial/Version.php
View file

@ -30,7 +30,6 @@ class Version extends BaseApi
{
public static function rawContent(array $parameters = [])
{
echo self::format('version', ['version' => '0.9.7']);
exit;
self::exit('version', ['version' => '0.9.7']);
}
}

3
src/Module/Api/Friendica/Help/Test.php
View file

@ -36,7 +36,6 @@ class Test extends BaseApi
$ok = 'ok';
}
echo self::format('ok', ['ok' => $ok]);
exit;
self::exit('ok', ['ok' => $ok]);
}
}

3
src/Module/Api/Friendica/Profile/Show.php
View file

@ -66,8 +66,7 @@ class Show extends BaseApi
'profiles' => $profiles
];
echo self::format('friendica_profiles', ['$result' => $result]);
exit;
self::exit('friendica_profiles', ['$result' => $result]);
}
/**

7
src/Module/BaseApi.php
View file

@ -348,13 +348,13 @@ class BaseApi extends BaseModule
}
/**
* Formats the data according to the data type
* Outputs formatted data according to the data type and then exits the execution.
*
* @param string $root_element
* @param array $data An array with a single element containing the returned result
* @return false|string
*/
protected static function format(string $root_element, array $data)
protected static function exit(string $root_element, array $data)
{
$return = self::formatData($root_element, self::$format, $data);
@ -382,7 +382,8 @@ class BaseApi extends BaseModule
break;
}
return $return;
echo $return;
exit;
}
/**