Fix #1611: Duplicate path links

Cotonti · Apr 10, 2019 · a8d4c38 · a8d4c38
1 parent d01bd71
commit a8d4c38
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/modules/page/inc/page.list.php b/modules/page/inc/page.list.php
@@ -208,9 +208,6 @@
 }
 // Building the canonical URL
 $out['canonical_uri'] = cot_url('page', $pageurl_params);
-if ($out['uri'] != $out['canonical_uri']) {
-    cot_die_message(404, true);
-}
 
 $_SESSION['cat'] = $c;
 

diff --git a/modules/page/inc/page.main.php b/modules/page/inc/page.main.php
@@ -131,9 +131,6 @@
 	$pageurl_params['pg'] = $pg;
 }
 $out['canonical_uri'] = cot_url('page', $pageurl_params);
-if ($out['uri'] != $out['canonical_uri']) {
-    cot_die_message(404, true);
-}
 
 $mskin = cot_tplfile(array('page', $cat['tpl']));
 

diff --git a/plugins/urleditor/inc/urleditor.functions.php b/plugins/urleditor/inc/urleditor.functions.php
@@ -140,6 +140,9 @@ function cot_apply_rwr()
 			{
 				// Is a category
 				$_GET['c'] = $path[$last];
+				if ($rwr !== cot_url($ext, array('c' => $_GET['c']))) {
+					cot_die_message(404, true);
+				}
 			}
 			else
 			{
@@ -159,6 +162,11 @@ function cot_apply_rwr()
 						$_GET['c'] = $path[$last];
 					$_GET['al'] = $path[$last];
 				}
+				if (!empty($_GET['id'] || $_GET['al']) && $_GET['c']) {
+					if ($rwr !== cot_url($ext, array('c' => $_GET['c'], !empty($_GET['al']) ? 'al' : 'id' => $path[$last]))) {
+						cot_die_message(404, true);
+					}
+				}
 			}
 		}
 	}