Changeset 742 for trunk/lib

Timestamp:

Feb 21, 2021 4:20:55 AM (3 years ago)

Author:

anonymous

Message:

Add urlMergeQuery() function

Location:

trunk/lib

Files:

• App.inc.php (modified) (1 diff)
• Utilities.inc.php (modified) (2 diffs)

trunk/lib/App.inc.php

@@ -1140 +1140 @@
      * @param  mixed  $carry_args       Additional url arguments to carry in the query,
      *                                  or FALSE to prevent carrying queries. Can be any of the following formats:
-     *                                      array('key1', key2', key3')  <-- to save these keys if in the form data.
-     *                                      array('key1'=>'value', key2'='value')  <-- to set keys to default values if not present in form data.
+     *                                      array('key1', key2', key3')  <-- to save these keys, if they exist in the request data.
+     *                                      array('key1'=>'value', key2'='value')  <-- to set keys to default values if not present in request data.
      *                                      false  <-- To not carry any queries. If URL already has queries those will be retained.
      *

trunk/lib/Utilities.inc.php

@@ -899 +899 @@
 function urlEncodeArrayToString($data, $prefix='')
 {
-
     $array_args = urlEncodeArray($data, $prefix);
     $url_args = '';
@@ -1465 +1464 @@
 
     return preg_replace('/[?#].*$/' . $app->getParam('preg_u'), '', $url);
+}
+
+/*
+* Merge query arguments into a URL.
+* Usage:
+* Add ?lang=it or replace an existing ?lang= argument:
+* $url = urlMerge('https://example.com/?lang=en', ['lang' => 'it']).
+*
+* @access   public
+* @param    string  $url        Original URL.
+* @param    array   $new_args   New/modified query arguments.
+* @return   string              Modified URL.
+* @author   Quinn Comendant <quinn@strangecode.com>
+* @since    20 Feb 2021 21:21:53
+*/
+function urlMergeQuery($url, Array $new_args)
+{
+    $u = parse_url($url);
+    if (isset($u['query']) && '' != $u['query']) {
+        parse_str($u['query'], $args);
+    } else {
+        $args = [];
+    }
+    $u['query'] = http_build_query(array_merge($args, $new_args));
+    return sprintf('%s%s%s%s%s',
+        (isset($u['scheme'])    && '' != $u['scheme']   ? $u['scheme'] . '://' : ''),
+        (isset($u['host'])      && '' != $u['host']     ? $u['host']           : ''),
+        (isset($u['path'])      && '' != $u['path']     ? $u['path']           : '/'),
+        (isset($u['query'])     && '' != $u['query']    ? '?' . $u['query']    : ''),
+        (isset($u['fragment'])  && '' != $u['fragment'] ? '#' . $u['fragment'] : '')
+    );
 }