--- old/modules/base/xarblocks/menu.php 2005-10-02 11:25:22.000000000 -0700
+++ new/modules/base/xarblocks/menu.php 2005-11-16 19:11:58.000000000 -0800
@@ -130,22 +130,63 @@
                 {
                     case '[': // module link
                     {
-                        // Credit to Elek Márton for further expansion
-                        $sections = explode(']',substr($url,1));
-                        $url = explode(':', $sections[0]);
-                        // if the current module is active, then we are here
-                        if ($url[0] == $thismodname &&
-                            (!isset($url[1]) || $url[1] == $thismodtype) &&
-                            (!isset($url[2]) || $url[2] == $thisfuncname)) {
-                            $here = 'true';
+                        // one gigantic regexp!
+                        preg_match_all("/\[((\w+)(=(\w*))?)(:((\w+)(=(\w*))?)(:((\w+)(=(\w*))?))?)?\]+/",
+                            $url, $matches, PREG_SET_ORDER);
+
+                        // preserve whatever remains after [...] sections
+                        // (we do this because $url gets overwritten, and I can't seem to make the
+                        // above regexp match a string at the end of the line)
+                        $endglob = preg_replace("/^(.*)\]/", '', $url);
+
+                        // set default url we will build upon
+                        $newurl = $GLOBALS['xarRequest_defaultRequestInfo'];
+
+                        // get mod:type:func
+                        if (!empty($matches[0][2])) $newurl[0] = $matches[0][2];
+                        if (!empty($matches[0][7])) $newurl[1] = $matches[0][7];
+                        if (!empty($matches[0][12])) $newurl[2] = $matches[0][12];
+
+                        // see if we're "here" so far
+                        $here = false;
+                        if ($newurl[0] == $thismodname &&
+                            $newurl[1] == $thismodtype &&
+                            $newurl[2] == $thisfuncname) {
+                            $here = true;
+                        }
+
+                        // initialize argument array
+                        $args = array();
+
+                        // now work on required args (required, meaning, for us to be considered "here")
+                        if (!empty($matches[1])) {
+                            for ($i=2; $i<count($matches[1]); $i+=5) {
+                                $args[$matches[1][$i]] = isset($matches[1][$i+2]) ? $matches[1][$i+2] : null;
+
+                                // make sure all args in this section are also in the current URL
+                                xarVarFetch($matches[1][$i], 'str:1:', $test, NULL, XARVAR_DONT_SET);
+                                if (!isset($test)) {
+                                    $here = false;
+                                }
+                            }
+                        }
+
+                        // work on remaining args
+                        if (!empty($matches[2])) {
+                            for ($i=2; $i<count($matches[1]); $i+=5) {
+                                $args[$matches[2][$i]] = isset($matches[2][$i+2]) ? $matches[2][$i+2] : null;
+                            }
                         }
-                        if (empty($url[1])) $url[1]="user";
-                        if (empty($url[2])) $url[2]="main";
-                        $url = xarModUrl($url[0],$url[1],$url[2]);
-                        if(isset($sections[1])) {
-                            $url .= xarVarPrepForDisplay($sections[1]);
+
+                        // now generate URL
+                        $url = xarModURL($newurl[0], $newurl[1], $newurl[2], $args);
+
+                        if (!empty($endglob)) {
+                            $url .= xarVarPrepForDisplay($endglob);
                         }
+
                         break;
+
                     }
                     case '{': // article link
                     {
@@ -162,7 +203,13 @@
                         if ($url[0] == $ptid) {
                             $here = 'true';
                         }
-                        $url = xarModUrl('articles', 'user', 'view', array('ptid' => $url[0]));
+                        $urlargs = array();
+                        $urlargs['ptid'] = $url[0];
+
+                        if (isset($url[1])) {
+                            $urlargs['catid'] = $url[1];
+                        }
+                        $url = xarModUrl('articles', 'user', 'view', $urlargs);
                         break;
                     }
                     case '(': // category link