From 685e258be8d2c097cdcecce29fdbf25b0220d387 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Tue, 18 Aug 2020 15:34:07 +0300 Subject: [PATCH] fixed messy --- .../src/Adv/Command/appendRequestURL.php | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/Command/appendRequestURL.php b/addons/default/visiosoft/advs-module/src/Adv/Command/appendRequestURL.php index 0c1d7eb93..8b85930e4 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Command/appendRequestURL.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Command/appendRequestURL.php @@ -32,24 +32,21 @@ class appendRequestURL { $request = $this->removeParameters($this->request); + $count_newParameters = count($this->new_parameters); + $count_request = count($this->request); - if (count($this->new_parameters) === 0 && count($request) === 0) { - return $this->url; - } elseif (count($this->new_parameters) > 0 && count($request) > 0) { - return $this->url - . (Str::contains($this->url, '?') ? '&' : '?') - . Arr::query($this->appends(array_merge($request, $this->new_parameters))); - } elseif (count($this->new_parameters) > 0 && count($request) === 0) { - return $this->url - . (Str::contains($this->url, '?') ? '&' : '?') - . Arr::query($this->appends($this->new_parameters)); - } elseif (count($this->new_parameters) === 0 && count($request) > 0) { - return $this->url - . (Str::contains($this->url, '?') ? '&' : '?') - . Arr::query($this->appends($request)); + if ($count_newParameters > 0) { + return ($count_request > 0) ? $this->createURL(array_merge($request, $this->new_parameters)) : $this->createURL($this->new_parameters); + } else { + return ($count_request > 0) ? $this->createURL($request) : $this->url; } } + public function createURL($append) + { + return $this->url . (Str::contains($this->url, '?') ? '&' : '?') . Arr::query($this->appends($append)); + } + /** * @param $key * @param null $value