extern/2FAuth
1
0
Fork 0
mirror of https://github.com/Bubka/2FAuth.git synced 2025-06-24 05:51:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Handle comma-separated ids correctly

Browse Source
This commit is contained in:
Bubka 2021-10-08 23:21:07 +02:00
parent 194eb54335
commit a58a4a3def
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/Services/TwoFAccountService.php
View File

@ -167,14 +167,19 @@ class TwoFAccountService
/** /**
* Withdraw one or more twofaccounts from their group * Withdraw one or more twofaccounts from their group
* *
* @param int|array $ids twofaccount ids to free * @param int|array|string $ids twofaccount ids to free
*/ */
public function withdraw($ids) : void public function withdraw($ids) : void
{ {
$arIds = explode(',', $ids); // $ids as string could be a comma-separated list of ids
// so in this case we explode the string to an array
$ids = $this->commaSeparatedToArray($ids);
if ($arIds) { // whereIn() expects an array
TwoFAccount::whereIn('id', $arIds) $ids = is_array($ids) ? $ids : func_get_args();
if ($ids) {
TwoFAccount::whereIn('id', $ids)
->update( ->update(
['group_id' => NULL] ['group_id' => NULL]
); );
@ -185,12 +190,15 @@ class TwoFAccountService
/** /**
* Delete one or more twofaccounts * Delete one or more twofaccounts
* *
* @param int|array $ids twofaccount ids to delete * @param int|array|string $ids twofaccount ids to delete
* *
* @return int The number of deleted * @return int The number of deleted
*/ */
public function delete($ids) : int public function delete($ids) : int
{ {
// $ids as string could be a comma-separated list of ids
// so in this case we explode the string to an array
$ids = $this->commaSeparatedToArray($ids);
$deleted = TwoFAccount::destroy($ids); $deleted = TwoFAccount::destroy($ids);
return $deleted; return $deleted;
@ -202,6 +210,17 @@ class TwoFAccountService
// ######################################################################################################################## // ########################################################################################################################
// ######################################################################################################################## // ########################################################################################################################
/**
*
*/
private function commaSeparatedToArray($ids)
{
$regex = "/^\d+(,{1}\d+)*$/";
if (preg_match($regex, $ids)) {
$ids = explode(',', $ids);
}
return $ids;
}
/** /**
* Inits the Token * Inits the Token