[Changed url generation
Tijmen de Mes <tijmen@ag-projects.com>**20240207175534
 Ignore-this: 323ba77a8956d551037cdccab3da7a1
] hunk ./library/NGNPro/Records/SipAccounts.php 264
-			        $_url = $this->url.'&'.$this->addFiltersToURL().sprintf("&service=%s&action=Delete",
-                    urlencode($this->SoapEngine->service)
+                    $deleteUrl = array(
+                        'service' => $this->SoapEngine->service,
+                        'action' => 'Delete',
+                        'key' => $account->id->username
hunk ./library/NGNPro/Records/SipAccounts.php 271
-			        	$_url .= sprintf("&domain_filter=%s",urlencode($account->id->domain));
+                        $deleteUrl['domain_filter'] = $account->id->domain;
hunk ./library/NGNPro/Records/SipAccounts.php 275
-                    	$_url .= sprintf("&username_filter=%s",urlencode($account->id->username));
+                        $deleteUrl['username_filter'] = $account->id->username;
hunk ./library/NGNPro/Records/SipAccounts.php 278
-                    $_url.= sprintf("&key=%s",urlencode($account->id->username));
-
hunk ./library/NGNPro/Records/SipAccounts.php 281
-                        $_url .= "&confirm=1";
+                        $deleteUrl['confirm'] = 1;
hunk ./library/NGNPro/Records/SipAccounts.php 298
-                        $url=sprintf('%s?account=%s@%s&sip_engine=%s',
-                        $this->sip_settings_page,urlencode($account->id->username),$account->id->domain, $this->SoapEngine->sip_engine);
+                        $settingsUrl = array(
+                            'account' => sprintf('%s@%s', $account->id->username, $account->id->domain),
+                            'sip_engine' => $this->SoapEngine->sip_engine
+                        );
hunk ./library/NGNPro/Records/SipAccounts.php 304
-                        	$url  .= sprintf('&reseller=%s',$reseller_sip_settings_page);
-                        	$url  .= sprintf('&adminonly=%s',$this->adminonly);
+                            $settingsUrl['reseller'] = $reseller_sip_settings_page;
+                            $settingsUrl['adminonly'] = $this->adminonly;
hunk ./library/NGNPro/Records/SipAccounts.php 307
-                        	if ($account->reseller == $this->reseller) $url .= sprintf('&reseller=%s',$reseller_sip_settings_page);
+                        	if ($account->reseller == $this->reseller) $settingsUrl['reseller'] = $reseller_sip_settings_page;
hunk ./library/NGNPro/Records/SipAccounts.php 312
-                            $url  .= sprintf('&%s=%s',$element,urlencode($this->SoapEngine->extraFormElements[$element]));
+                            $settingsUrl[$element] = $this->SoapEngine->extraFormElements[$elememt];
hunk ./library/NGNPro/Records/SipAccounts.php 315
-                        $sip_account=sprintf("
-                        <a href=\"javascript:void(null);\" onClick=\"return window.open('%s', 'SIP_Settings',
-                        'toolbar=1,status=1,menubar=1,scrollbars=1,resizable=1,width=800,height=720')\">
-                        %s@%s</a>",$url, $account->id->username, $account->id->domain);
+                        $sip_account = sprintf(
+                            "<a href=\"javascript:void(null);\" onClick=\"return window.open('%s%s', 'SIP_Settings',
+                            'toolbar=1,status=1,menubar=1,scrollbars=1,resizable=1,width=800,height=720')\">
+                            %s@%s</a>",
+                            $this->sip_settings_page,
+                            http_build_query($settingsUrl),
+                            $account->id->username,
+                            $account->id->domain
+                        );
hunk ./library/NGNPro/Records/SipAccounts.php 325
-                        $sip_account=sprintf("%s@%s",$account->id->username, $account->id->domain);
+                        $sip_account = sprintf("%s@%s",$account->id->username, $account->id->domain);
hunk ./library/NGNPro/Records/SipAccounts.php 335
-                        $_owner_url = sprintf
-                        ("<a href=%s&service=customers@%s&customer_filter=%s>%s</a>",
-                        $this->url,
-                        urlencode($this->SoapEngine->soapEngine),
-                        urlencode($account->owner),
-                        $account->owner
+                        $ownersUrlData = array(
+                            'service' => sprintf('customers@%s', $this->SoapEngine->soapEngine),
+                            'customer_filter' => $account->owner
hunk ./library/NGNPro/Records/SipAccounts.php 339
+                        $_owner_url = sprintf(
+                            '<a href="%s&%s">%s</a>',
+                            $this->url,
+                            http_build_query($ownersUrlData),
+                            $account->owner
+                        );
hunk ./library/NGNPro/Records/SipAccounts.php 348
-                    $prepaid_account=sprintf("%s@%s",$account->id->username, $account->id->domain);
+                    $prepaid_account = sprintf("%s@%s", $account->id->username, $account->id->domain);
hunk ./library/NGNPro/Records/SipAccounts.php 358
-                    printf("
-                    <tr>
-                    <td>%s</td>
-                    <td>%s</td>
-                    <td>%s %s</td>
-                    <td><a href=mailto:%s>%s</a></td>
-                    <td align=right>%s</td>
-                    <td align=right>%s</td>
-                    <td align=right>%s</td>
-                    <td align=right>%s</td>
-                    <td>%s</td>
-                    <td>%s</td>
-                    <td><a class='btn-small btn-danger' href=%s>%s</a></td>
-                    </tr>
-                    ",
-                    $index,
-                    $sip_account,
-                    $account->firstName,
-                    $account->lastName,
-                    $account->email,
-                    $account->email,
-                    $account->timezone,
-                    $callLimit,
-                    $account->quota,
-                    $_prepaid_balance[$prepaid_account],
-                    $_owner_url,
-                    $account->changeDate,
-                    $_url,
-                    $actionText
+                    printf(
+                        '
+                        <tr>
+                        <td>%s</td>
+                        <td>%s</td>
+                        <td>%s %s</td>
+                        <td><a href=mailto:%s>%s</a></td>
+                        <td align=right>%s</td>
+                        <td align=right>%s</td>
+                        <td align=right>%s</td>
+                        <td align=right>%s</td>
+                        <td>%s</td>
+                        <td>%s</td>
+                        <td><a class="btn-small btn-danger" href="%s">%s</a></td>
+                        </tr>
+                        ',
+                        $index,
+                        $sip_account,
+                        $account->firstName,
+                        $account->lastName,
+                        $account->email,
+                        $account->email,
+                        $account->timezone,
+                        $callLimit,
+                        $account->quota,
+                        $_prepaid_balance[$prepaid_account],
+                        $_owner_url,
+                        $account->changeDate,
+                        $this->url.'&'.$this->addFiltersToURL().'&'.http_build_query($deleteUrl),
+                        $actionText