Address Issue #1441

geoffhumphrey · Aug 9, 2023 · 34a70e4 · 34a70e4
1 parent fb578b7
commit 34a70e4
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 30 deletions.
diff --git a/eval/process.eval.php b/eval/process.eval.php
@@ -34,8 +34,8 @@
 	$evalFlavorScore = 0;
 	$evalMouthfeelScore = 0;
 
-	if ($_SESSION['prefsSEF'] == "Y") $sef = "true";
-	else $sef = "false";
+	if ($_SESSION['prefsSEF'] == "Y") $sef = TRUE;
+	else $sef = FALSE;
 
 	if ($view == "admin") $insertGoTo = $base_url."index.php?section=evaluation&go=default&filter=default&view=admin";
 	else $insertGoTo = build_public_url("evaluation","default","default","default",$sef,$base_url);

diff --git a/includes/process.inc.php b/includes/process.inc.php
@@ -76,7 +76,7 @@
 	// echo $referrer['host']."<br>".$_SERVER['SERVER_NAME']; exit;
 }
 
-if ((isset($_SESSION['prefsSEF'])) && ($_SESSION['prefsSEF'] == "Y")) $sef = "true";
+if ((isset($_SESSION['prefsSEF'])) && ($_SESSION['prefsSEF'] == "Y")) $sef = TRUE;
 
 if (((isset($_SERVER['HTTP_REFERER'])) && ($referrer['host'] == $_SERVER['SERVER_NAME'])) && ((isset($_SESSION['prefs'.$prefix_session])) || ($setup_free_access))) {
 

diff --git a/lib/common.lib.php b/lib/common.lib.php
@@ -152,32 +152,26 @@ function build_form_action($base_url,$section,$go,$action,$filter,$id,$dbTable,$
 }
 
 function build_public_url($section="default",$go="default",$action="default",$id="default",$sef,$base_url) {
-
-	include (CONFIG.'config.php');
-	if (NHC) {
-		$url = "index.php?section=".$section;
+
+	if ($_SESSION['prefsSEF'] == 'Y') {
+		$url = $base_url."";
+		if ($section != "default") $url .= $section."/";
+		if ($go != "default") $url .= $go."/";
+		if ($action != "default") $url .= $action."/";
+		if ($id != "default") $url .= $id."/";
+		return rtrim($url,"/");
+	}
+
+	else {
+		$url = $base_url."index.php?section=".$section;
 		if ($go != "default") $url .= "&amp;go=".$go;
 		if ($action != "default") $url .= "&amp;action=".$action;
+		if ($id != "default") $url .= "&amp;id=".$id;
 		return $url;
 	}
-	else {
-		if ($sef == "true") {
-			$url = $base_url."";
-			if ($section != "default") $url .= $section."/";
-			if ($go != "default") $url .= $go."/";
-			if ($action != "default") $url .= $action."/";
-			if ($id != "default") $url .= $id."/";
-			return rtrim($url,"/");
-		}
-		if ($sef == "false") {
-			$url = $base_url."index.php?section=".$section;
-			if ($go != "default") $url .= "&amp;go=".$go;
-			if ($action != "default") $url .= "&amp;action=".$action;
-			if ($id != "default") $url .= "&amp;id=".$id;
-			return $url;
-		}
-	}
+
 }
+
 /*
 function build_admin_url ($section="default",$go="default",$action="default",$id="default",$filter="default",$view="default",$sef="true",$base_url) {
 	if ($sef == "true") {

diff --git a/sections/nav.sec.php b/sections/nav.sec.php
@@ -5,10 +5,6 @@
  *
  */
 
-// Turn off SEF for error pages
-if ($section >= 400) $sef = "false";
-else $sef = $sef;
-
 $add_entry_link_show = FALSE;
 $show_entries = TRUE;
 $nav_register_entrant_show = TRUE;

diff --git a/site/bootstrap.php b/site/bootstrap.php
@@ -139,8 +139,8 @@
 	require_once (LANG.'language.lang.php');
 	require_once (INCLUDES.'headers.inc.php');
 	require_once (INCLUDES.'scrubber.inc.php');
-	if ($_SESSION['prefsSEF'] == "Y") $sef = "true";
-	else $sef = "false";
+	if ($_SESSION['prefsSEF'] == "Y") $sef = TRUE;
+	else $sef = FALSE;
 
 	if ($no_updates_needed) $_SESSION['currentVersion'] = 1;
 	else $_SESSION['currentVersion'] = 0;