loginlink() and lilink()

[cmb]

Hello Community,

does anybody know why function loginlink() is defined as:

Code: Select all

function loginlink()
{
    if (function_exists('lilink')) {
        return lilink();
    }
}

Apparently function lilink() has been introduced with CMSimple 2.8 (placed in cmsimple/login.php), but I don't see the reason why. Has it been to allow lilink() to be removed, so there's no loginlink in the template? Wouldn't that have been more easily accomplished by modifiying the template?

I have not been able to find further information, neither in this forum nor on http://forum.cmsimple-xh.dk/.

Unless there is a good reason to have this split, I suggest to merge lilink() into loginlink() back again.

[cmb]

The respective patch (a feature branch appears to be overkill):

Code: Select all

Index: cmsimple/functions.php
===================================================================
--- cmsimple/functions.php	(revision 1580)
+++ cmsimple/functions.php	(working copy)
@@ -1562,23 +1562,6 @@
 }
 
 /**
- * Returns the login link.
- *
- * @global int    The index of the requested page.
- * @global array  The localization of the core.
- *
- * @return string HTML
- */
-function lilink()
-{
-    global $s, $tx;
-
-    if (!XH_ADM) {
-        return a($s > -1 ? $s : 0, '&login') . $tx['menu']['login'] . '</a>';
-    }
-}
-
-/**
  * Returns the login form.
  *
  * @global array  The configuration of the core.
Index: cmsimple/tplfuncs.php
===================================================================
--- cmsimple/tplfuncs.php	(revision 1580)
+++ cmsimple/tplfuncs.php	(working copy)
@@ -355,12 +355,17 @@
 /**
  * Returns the link to the login form.
  *
+ * @global int    The index of the requested page.
+ * @global array  The localization of the core.
+ *
  * @return string HTML
  */
 function loginlink()
 {
-    if (function_exists('lilink')) {
-        return lilink();
+    global $s, $tx;
+
+    if (!XH_ADM) {
+        return a($s > -1 ? $s : 0, '&login') . $tx['menu']['login'] . '</a>';
     }
 }

[cmb]

Done (r1615).