[Formatted file and added url generation
Tijmen de Mes <tijmen@ag-projects.com>**20240212164122
 Ignore-this: 29cf2da65fa484f74b6f9ae5c6e5fda89fcfea6928fee41028b819025d609aedea3ae9feddca2d03
] hunk ./library/NGNPro/Records/Carriers.php 5
-    var $carriers=array();
-
-    var $Fields=array(
-                              'id'         => array('type'=>'integer',
-                                                   'readonly' => true),
-                              'name'       => array('type'=>'string')
-                              );
-
-    var $sortElements=array(
-                            'changeDate' => 'Change date',
-                            'name'       => 'Carrier'
-                            );
+    var $carriers = array();
+
+    var $Fields = array(
+        'id'         => array(
+            'type'=>'integer',
+            'readonly' => true
+        ),
+        'name'       => array('type'=>'string')
+    );
+
+    var $sortElements = array(
+        'changeDate' => 'Change date',
+        'name'       => 'Carrier'
+    );
hunk ./library/NGNPro/Records/Carriers.php 29
-    function showCustomerTextBox () {
+    function showCustomerTextBox()
+    {
hunk ./library/NGNPro/Records/Carriers.php 37
-    function listRecords() {
-
+    function listRecords()
+    {
hunk ./library/NGNPro/Records/Carriers.php 45
-        $filter=array(
-                      'id'       => intval($this->filters['id']),
-                      'name'     => $this->filters['name'],
-                      'reseller' => intval($this->filters['reseller'])
-                      );
+        $filter = array(
+            'id'       => intval($this->filters['id']),
+            'name'     => $this->filters['name'],
+            'reseller' => intval($this->filters['reseller'])
+        );
hunk ./library/NGNPro/Records/Carriers.php 52
-        $range=array('start' => intval($this->next),
-                     'count' => intval($this->maxrowsperpage)
-                     );
+        $range = array(
+            'start' => intval($this->next),
+            'count' => intval($this->maxrowsperpage)
+        );
hunk ./library/NGNPro/Records/Carriers.php 61
-        $orderBy = array('attribute' => $this->sorting['sortBy'],
-                         'direction' => $this->sorting['sortOrder']
-                         );
+        $orderBy = array(
+            'attribute' => $this->sorting['sortBy'],
+            'direction' => $this->sorting['sortOrder']
+        );
hunk ./library/NGNPro/Records/Carriers.php 67
-        $Query=array('filter'  => $filter,
-                     'orderBy' => $orderBy,
-                     'range'   => $range
-                     );
+        $Query = array(
+            'filter'  => $filter,
+            'orderBy' => $orderBy,
+            'range'   => $range
+        );
hunk ./library/NGNPro/Records/Carriers.php 75
-        $result  = $this->SoapEngine->soapclient->getCarriers($Query);
+        $result = $this->SoapEngine->soapclient->getCarriers($Query);
hunk ./library/NGNPro/Records/Carriers.php 80
-
hunk ./library/NGNPro/Records/Carriers.php 82
-            print "
-            <div class=\"alert alert-success\"><center>$this->rows records found</center></div>
-            <p>
-            <table class='table table-condensed table-striped' width=100%>
-            ";
-
-            print "
-            <thead>
-            <tr>
-                <th>Id</th>
-                <th>Owner</th>
-                <th>Carrier</th>
-                <th>Name</th>
-                <th>Gateways</th>
-                <th>Change date</th>
-                <th>Actions</th>
-            </tr>
-            </thead>
-            ";
+            print <<< END
+<div class=\"alert alert-success\"><center>$this->rows records found</center></div>
+    <p>
+    <table class='table table-condensed table-striped' width=100%>
+        <thead>
+        <tr>
+            <th>Id</th>
+            <th>Owner</th>
+            <th>Carrier</th>
+            <th>Name</th>
+            <th>Gateways</th>
+            <th>Change date</th>
+            <th>Actions</th>
+        </tr>
+        </thead>
+END;
hunk ./library/NGNPro/Records/Carriers.php 101
-            if ($this->rows > $this->maxrowsperpage)  {
+            if ($this->rows > $this->maxrowsperpage) {
hunk ./library/NGNPro/Records/Carriers.php 105
-                $maxrows=$this->rows;
+                $maxrows = $this->rows;
hunk ./library/NGNPro/Records/Carriers.php 111
-                while ($i < $maxrows)  {
+                while ($i < $maxrows) {
hunk ./library/NGNPro/Records/Carriers.php 116
-                    $index=$this->next+$i+1;
-
-                    $_delete_url = $this->url.sprintf("&service=%s&action=Delete&id_filter=%s",
-                    urlencode($this->SoapEngine->service),
-                    urlencode($carrier->id)
+                    $base_url_data = array(
+                        'service' => $this->SoapEngine->service,
+                        'id_filter' => $carrier->id
hunk ./library/NGNPro/Records/Carriers.php 121
+                    $delete_url_data = array_merge(
+                        $base_url_data,
+                        array(
+                            'action' => 'Delete'
+                        )
+                    );
+
+                    $_url_data = array_merge(
+                        $base_url_data,
+                        array(
+                            'reseller_filter' => $carrier->reseller
+                        )
+                    );
+
+                    $customer_url_data = array(
+                        'service' => sprintf('customers@%s', $this->SoapEngine->service),
+                        'customer_filter' => $carrier->reseller
+                    );
+
+                    $gateway_url_data = array(
+                        'service' => sprintf('pstn_gateways@%s', $this->SoapEngine->service),
+                        'carrier_id_filter' => $carrier->id,
+                        'reseller_filter' => $carrier->reseller
+                    );
+
+                    $index = $this->next + $i + 1;
+
hunk ./library/NGNPro/Records/Carriers.php 150
-                        $_delete_url .= "&confirm=1";
+                        $delete_url_data['confirm'] = 1;
hunk ./library/NGNPro/Records/Carriers.php 156
-                    $_url = $this->url.sprintf("&service=%s&id_filter=%s&reseller_filter=%s",
-                    urlencode($this->SoapEngine->service),
-                    urlencode($carrier->id),
-                    urlencode($carrier->reseller)
+                    $_delete_url = sprintf(
+                        "%s&%s",
+                        $this->url,
+                        http_build_query($delete_url_data)
hunk ./library/NGNPro/Records/Carriers.php 162
-                    $_customer_url = $this->url.sprintf("&service=customers@%s&customer_filter=%s",
-                    urlencode($this->SoapEngine->customer_engine),
-                    urlencode($carrier->reseller)
+                    $_url = sprintf(
+                        "%s&%s",
+                        $this->url,
+                        http_build_query($_url_data)
hunk ./library/NGNPro/Records/Carriers.php 168
-                    $_gateway_url = $this->url.sprintf("&service=pstn_gateways@%s&carrier_id_filter=%d&reseller_filter=%s",
-                    urlencode($this->SoapEngine->soapEngine),
-                    urlencode($carrier->id),
-                    urlencode($carrier->reseller)
+                    $_customer_url = sprintf(
+                        "%s&%s",
+                        $this->url,
+                        http_build_query($customer_url_data)
hunk ./library/NGNPro/Records/Carriers.php 174
-                    printf("
-                    <tr>
-                    <td>%s</td>
-                    <td><a href=%s>%s</a></td>
-                    <td><a href=%s>%s</a></td>
-                    <td>%s</td>
-                    <td><a href=%s>Gateways</a></td>
-                    <td>%s</td>
-                    <td><a class='btn-small btn-danger' href=%s>%s</a></td>
-                    </tr>",
-                    $index,
-                    $_customer_url,
-                    $carrier->reseller,
-                    $_url,
-                    $carrier->id,
-                    $carrier->name,
-                    $_gateway_url,
-                    $carrier->changeDate,
-                    $_delete_url,
-                    $actionText
+                    $_gateway_url = sprintf(
+                        "%s&%s",
+                        $this->url,
+                        http_build_query($gateway_url_data)
hunk ./library/NGNPro/Records/Carriers.php 180
-                    printf("
-                    </tr>
-                    ");
+                    printf(
+                        "
+                        <tr>
+                        <td>%s</td>
+                        <td><a href=%s>%s</a></td>
+                        <td><a href=%s>%s</a></td>
+                        <td>%s</td>
+                        <td><a href=%s>Gateways</a></td>
+                        <td>%s</td>
+                        <td><a class='btn-small btn-danger' href=%s>%s</a></td>
+                        </tr>
+                        ",
+                        $index,
+                        $_customer_url,
+                        $carrier->reseller,
+                        $_url,
+                        $carrier->id,
+                        $carrier->name,
+                        $_gateway_url,
+                        $carrier->changeDate,
+                        $_delete_url,
+                        $actionText
+                    );
+
+                    print "</tr>";
hunk ./library/NGNPro/Records/Carriers.php 206
-
hunk ./library/NGNPro/Records/Carriers.php 207
-
hunk ./library/NGNPro/Records/Carriers.php 221
-    function showAddForm() {
+    function showAddForm()
+    {
hunk ./library/NGNPro/Records/Carriers.php 224
-        printf ("<form class=form-inline method=post name=addform action=%s>",$_SERVER['PHP_SELF']);
-        print "
-        <div class='well well-small'>
-        ";
-
-        print "
-        <input class='btn btn-warning' type=submit name=action value=Add>
-        ";
-        print "<div class='input-prepend'><span class='add-on'>";
+        printf("<form class=form-inline method=post name=addform action=%s>", $_SERVER['PHP_SELF']);
+        print <<< END
+<div class="well well-small">
+    <input class='btn btn-warning' type=submit name=action value=Add>
+    <div class='input-prepend'>
+        <span class='add-on'>
+END;
hunk ./library/NGNPro/Records/Carriers.php 233
-        printf (" <div class='input-prepend'><span class='add-on'>Name</span><input type=text size=20 name=name></div>");
+        print "<div class='input-prepend'><span class='add-on'>Name</span><input type=text size=20 name=name></div>";
hunk ./library/NGNPro/Records/Carriers.php 242
-    function addRecord($dictionary=array()) {
+    function addRecord($dictionary = array())
+    {
hunk ./library/NGNPro/Records/Carriers.php 246
-            $name=$dictionary['name'];
+            $name = $dictionary['name'];
hunk ./library/NGNPro/Records/Carriers.php 251
-        list($customer,$reseller)=$this->customerFromLogin($dictionary);
-
-        $structure=array('name'     => $name,
+        list($customer, $reseller)=$this->customerFromLogin($dictionary);
+
+        $structure = array('name'     => $name,
hunk ./library/NGNPro/Records/Carriers.php 259
-            printf ("<p><font color=red>Error: Missing name. </font>");
+            printf("<p><font color=red>Error: Missing name. </font>");
hunk ./library/NGNPro/Records/Carriers.php 263
-        $function=array('commit'   => array('name'       => 'addCarrier',
-                                            'parameters' => array($structure),
-                                            'logs'       => array('success' => sprintf('Carrier %s has been added',$name)))
-                        );
-
-        return $this->SoapEngine->execute($function,$this->html);
+        $function = array(
+            'commit'   => array(
+                'name'       => 'addCarrier',
+                'parameters' => array($structure),
+                'logs'       => array(
+                    'success' => sprintf('Carrier %s has been added', $name)
+                )
+            )
+        );
+
+        return $this->SoapEngine->execute($function, $this->html);
hunk ./library/NGNPro/Records/Carriers.php 276
-    function deleteRecord($dictionary=array()) {
+    function deleteRecord($dictionary = array())
+    {
hunk ./library/NGNPro/Records/Carriers.php 284
-            $id   = $dictionary['id'];
+            $id = $dictionary['id'];
hunk ./library/NGNPro/Records/Carriers.php 286
-            $id   = trim($this->filters['id']);
+            $id = trim($this->filters['id']);
hunk ./library/NGNPro/Records/Carriers.php 294
-        $function=array('commit'   => array('name'       => 'deleteCarrier',
-                                            'parameters' => array(intval($id)),
-                                            'logs'       => array('success' => sprintf('Carrier %d has been deleted',$id)))
-                        );
+        $function = array(
+            'commit'   => array(
+                'name'       => 'deleteCarrier',
+                'parameters' => array(intval($id)),
+                'logs'       => array(
+                    'success' => sprintf('Carrier %d has been deleted', $id)
+                )
+            )
+        );
hunk ./library/NGNPro/Records/Carriers.php 305
-        return $this->SoapEngine->execute($function,$this->html);
+        return $this->SoapEngine->execute($function, $this->html);
hunk ./library/NGNPro/Records/Carriers.php 308
-    function showSeachFormCustom() {
-        printf (" <div class='input-prepend'><span class='add-on'>Carrier</span><input type=text size=10 name=id_filter value='%s'></div>",$this->filters['id']);
-        printf (" <div class='input-prepend'><span class='add-on'>Name</span><input type=text size=20 name=name_filter value='%s'></div>",$this->filters['name']);
+    function showSeachFormCustom()
+    {
+        printf(
+            "
+            <div class='input-prepend'>
+            <span class='add-on'>Carrier</span>
+            <input type=text size=10 name=id_filter value='%s'>
+            </div>
+            ",
+            $this->filters['id']
+        );
+        printf(
+            "
+            <div class='input-prepend'>
+            <span class='add-on'>Name</span>
+            <input type=text size=20 name=name_filter value='%s'>
+            </div>
+            ",
+            $this->filters['name']
+        );
hunk ./library/NGNPro/Records/Carriers.php 330
-    function showCustomerForm($name='customer_filter') {
+    function showCustomerForm($name = 'customer_filter')
+    {
hunk ./library/NGNPro/Records/Carriers.php 334
-    function showTextBeforeCustomerSelection() {
+    function showTextBeforeCustomerSelection()
+    {
hunk ./library/NGNPro/Records/Carriers.php 339
-    function getRecord($id) {
+    function getRecord($id)
+    {
hunk ./library/NGNPro/Records/Carriers.php 345
-        $filter=array('id'  => intval($id));
+        $filter = array('id'  => intval($id));
hunk ./library/NGNPro/Records/Carriers.php 348
-        $range=array('start' => 0,
-                     'count' => 1
-                     );
+        $range = array(
+            'start' => 0,
+            'count' => 1
+        );
hunk ./library/NGNPro/Records/Carriers.php 357
-        $orderBy = array('attribute' => $this->sorting['sortBy'],
-                         'direction' => $this->sorting['sortOrder']
-                         );
+        $orderBy = array(
+            'attribute' => $this->sorting['sortBy'],
+            'direction' => $this->sorting['sortOrder']
+        );
hunk ./library/NGNPro/Records/Carriers.php 363
-        $Query=array('filter'  => $filter,
-                        'orderBy' => $orderBy,
-                        'range'   => $range
-                        );
+        $Query = array(
+            'filter'  => $filter,
+            'orderBy' => $orderBy,
+            'range'   => $range
+        );
hunk ./library/NGNPro/Records/Carriers.php 376
-            if ($result->carriers[0]){
+            if ($result->carriers[0]) {
hunk ./library/NGNPro/Records/Carriers.php 384
-    function showRecord($carrier) {
-
+    function showRecord($carrier)
+    {
hunk ./library/NGNPro/Records/Carriers.php 388
-
-        printf ("<form class=form-horizontal method=post name=addform action=%s>",$_SERVER['PHP_SELF']);
+        printf("<form class=form-horizontal method=post name=addform action=%s>", $_SERVER['PHP_SELF']);
hunk ./library/NGNPro/Records/Carriers.php 393
-                $item_name=$this->Fields[$item]['name'];
+                $item_name = $this->Fields[$item]['name'];
hunk ./library/NGNPro/Records/Carriers.php 395
-                $item_name=ucfirst($item);
+                $item_name = ucfirst($item);
hunk ./library/NGNPro/Records/Carriers.php 398
-            printf ("<div class=control-group><label class=control-label>%s</label>
-            <td class=border>",
-            $item_name
+            printf(
+                "
+                <div class=control-group><label class=control-label>%s</label>
+                <td class=border>
+                ",
+                $item_name
hunk ./library/NGNPro/Records/Carriers.php 407
-                printf ("<div class=controls style='padding-top:5px'><input name=%s_form type=hidden value='%s'>%s</div>",
-                $item,
-                $carrier->$item,
-                $carrier->$item
+                printf(
+                    "<div class=controls style='padding-top:5px'><input name=%s_form type=hidden value='%s'>%s</div>",
+                    $item,
+                    $carrier->$item,
+                    $carrier->$item
hunk ./library/NGNPro/Records/Carriers.php 414
-                printf ("<div class=controls><input class=span2 name=%s_form type=text value='%s'></div>",
-                $item,
-                $carrier->$item
+                printf(
+                    "<div class=controls><input class=span2 name=%s_form type=text value='%s'></div>",
+                    $item,
+                    $carrier->$item
hunk ./library/NGNPro/Records/Carriers.php 424
-        printf ("<input type=hidden name=id_filter value='%s'>",$carier->id);
+        printf("<input type=hidden name=id_filter value='%s'>", $carrier->id);
hunk ./library/NGNPro/Records/Carriers.php 429
-        print "
-        <div class='from-actions'>
+        print <<< END
+    <div class='from-actions'>
hunk ./library/NGNPro/Records/Carriers.php 432
-        </div>
-        ";
-        print "</form>";
-
+    </div>
+</form>
+END;
hunk ./library/NGNPro/Records/Carriers.php 437
-    function updateRecord () {
+    function updateRecord()
+    {
hunk ./library/NGNPro/Records/Carriers.php 448
-            $var_name=$item.'_form';
+            $var_name = $item.'_form';
hunk ./library/NGNPro/Records/Carriers.php 456
-        $function=array('commit'   => array('name'       => 'updateCarrier',
-                                            'parameters' => array($carrier),
-                                            'logs'       => array('success' => sprintf('Carrier %d has been updated',$_REQUEST['id_filter'])))
-                        );
-
-        $result = $this->SoapEngine->execute($function,$this->html);
+        $function = array(
+            'commit'   => array(
+                'name'       => 'updateCarrier',
+                'parameters' => array($carrier),
+                'logs'       => array(
+                    'success' => sprintf('Carrier %d has been updated', $_REQUEST['id_filter'])
+                )
+            )
+        );
+
+        $result = $this->SoapEngine->execute($function, $this->html);
hunk ./library/NGNPro/Records/Carriers.php 472
-
hunk ./library/NGNPro/Records/DnsZones.php 177
-                        'service' => sprintf('dns_records@%s', $this->SoapEngine->service),
+                        'service' => sprintf('customers@%s', $this->SoapEngine->service),