Don't include the page URL for the first published page

The first published page of a CMSimple_XH installation can be requested with or without its page URL (unless we're in admin mode). To avoid DC we omit the page URL if possible. We're doing some trickery in loginlink(), so that the page URL is always passed there – otherwise we'd get the unpleasant "No page selected" notice.
cmb69 · Jan 18, 2018 · 8864e33 · 8864e33 · olape-git · Jan 20, 2018
1 parent 6521ae4
commit 8864e33
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/cmsimple/functions.php b/cmsimple/functions.php
@@ -873,9 +873,9 @@ function XH_findNextPage()
  */
 function a($i, $x)
 {
-    global $sn, $u;
+    global $sn, $u, $xh_publisher;
 
-    return isset($u[$i])
+    return isset($u[$i]) && (XH_ADM || $i !== $xh_publisher->getFirstPublishedPage())
         ? '<a href="' . $sn . '?' . $u[$i] . $x . '">'
         : '<a href="' . $sn . ($x ? '?' . $x : '') . '">';
 }
@@ -2684,9 +2684,13 @@ function XH_getLocatorModel()
  */
 function XH_getPageURL($index)
 {
-    global $sn, $u;
+    global $sn, $u, $xh_publisher;
 
-    return $sn . '?' . $u[$index];
+    if ($index === $xh_publisher->getFirstPublishedPage()) {
+        return $sn;
+    } else {
+        return $sn . '?' . $u[$index];
+    }
 }
 
 /**

diff --git a/cmsimple/tplfuncs.php b/cmsimple/tplfuncs.php
@@ -319,10 +319,12 @@ function mailformlink()
  */
 function loginlink()
 {
-    global $s, $tx;
+    global $s, $tx, $xh_publisher, $u;
 
     if (!XH_ADM) {
-        return a($s > -1 ? $s : 0, '&amp;login" rel="nofollow')
+        $index = $s > -1 ? $s : 0;
+        $extra = ($index === $xh_publisher->getFirstPublishedPage() ? $u[$index] : '');
+        return a($index, $extra . '&amp;login" rel="nofollow')
             . $tx['menu']['login'] . '</a>';
     }
 }