dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update ESI search endpoint & auth (#133)

Browse Source
This commit is contained in:
turbofeedorglory
2022-08-27 23:27:46 +01:00
committed by GitHub
parent 441f1fd808
commit 6ffc10b362
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Controller/Api/Universe.php
View File

@@ -25,13 +25,14 @@ class Universe extends Controller\AccessController {
$postData = (array)$f3->get('POST');
$categories = (array)$postData['categories'];
$universeNameData = [];
$activeCharacter = $this->getCharacter();
if(
array_key_exists('arg1', $params) &&
!empty($search = strtolower($params['arg1'])) &&
!empty($categories)
){
$universeNameData = Ccp\Universe::searchUniverseNameData($categories, $search);
$universeNameData = Ccp\Universe::searchUniverseNameData($categories, $search, $activeCharacter->_id, $activeCharacter->getAccessToken());
}
echo json_encode($universeNameData);

6
app/Controller/Ccp/Universe.php
View File

@@ -299,14 +299,16 @@ class Universe extends Controller\Controller {
* search universeName data by search term
* @param array $categories
* @param string $search
* @param int $characterId
* @param string $accessToken
* @param bool $strict
* @return array
*/
public static function searchUniverseNameData(array $categories, string $search, bool $strict = false) : array {
public static function searchUniverseNameData(array $categories, string $search, int $characterId, string $accessToken, bool $strict = false) : array {
$f3 = \Base::instance();
$universeNameData = [];
if( !empty($categories) && !empty($search)){
$universeIds = $f3->ccpClient()->send('search', $categories, $search, $strict);
$universeIds = $f3->ccpClient()->send('search', $categories, $search, $characterId, $accessToken, $strict);
if(isset($universeIds['error'])){
// ESI error
$universeNameData = $universeIds;