Move from X-Cart 4.1.9 to 4.1.12 with CDSEO

[jkomar]

I am running a version of CDSEO from prior to the release of CDSEO Pro. I'm currently upgrading my cart from X-Cart Gold 4.1.9 to 4.1.12.

In merging the auth.php file, I'm having a bit of trouble with one spot of CDSEO code as I think there has been a bit of a change in the original X-Cart code.

Here is the 4.1.9 snippet (CDSEO code already in) from the auth.php file:

if ($js_enabled == "Y") {
	$qry_string = ereg_replace("(&*)js=y", "", $QUERY_STRING);
     if ($cat != "" || $productid != "") {
	$js_update_link = $PHP_SELF."?".($qry_string?"$qry_string&":"")."js=n";
     } else {
          // WebsiteCM - CDSEO Compatible
          $wcm_qs = "?" . $QUERY_STRING;
          $wcm_url = str_replace($wcm_qs,"",$_SERVER['REQUEST_URI']);
          $js_update_link = $wcm_url."?".($qry_string?"$qry_string&":"")."js=n";
     }
}
else {
	$qry_string = ereg_replace("(&*)js=n", "", $QUERY_STRING);
     if ($cat != "" || $productid != "") {
	$js_update_link = $PHP_SELF."?".($qry_string?"$qry_string&":"")."js=y";
     } else {
          // WebsiteCM - CDSEO Compatible
          $wcm_qs = "?" . $QUERY_STRING;
          $wcm_url = str_replace($wcm_qs,"",$_SERVER['REQUEST_URI']);
          $js_update_link = $wcm_url."?".($qry_string?"$qry_string&":"")."js=y";
     }
}

Here is the snippet of stock code from the 4.1.12 auth.php file:

$qry_string = func_qs_remove($QUERY_STRING, "js");
if ($qry_string)
	$qry_string .= "&";

$js_update_link = basename($PHP_SELF) . "?" . $qry_string . "js=" . ($js_enabled == "Y" ? "n" : "y");
unset($qry_string);

Can anyone give me some guidance or post the snippet from their modified 4.1.12 auth.php file?

Thanks,
Jason