X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fuser_functions.php;h=d837789fe8b07b16b95e17c368fd1c8e3056abbc;hp=75d9fe3de1494f7841a8413198543cb2e722032c;hb=d897dae9f3b01f17fb59f2b96ba067b1a0f417b0;hpb=788a9ea4259381bb4216f77c1ab2341ed36c66dd

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 75d9fe3de1..d837789fe8 100644
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -57,9 +57,9 @@ function alpha ($sortby, $colspan, $return=false) {
 			$OUT .= '<strong>' . $ltr . '</strong>';
 		} else {
 			// Output link to letter
-			$OUT .= '<a href="{?URL?}/modules.php?module=admin&amp;what=' . getWhat();
+			$OUT .= '<a href="{%url=modules.php?module=admin&amp;what=' . getWhat();
 			if (isGetRequestElementSet('mode')) $OUT .= '&amp;mode=' . getRequestElement('mode');
-			$OUT .= '&amp;letter=' . $ltr . '&amp;sortby=' . $sortby . $add . '">' . $ltr . '</a>';
+			$OUT .= '&amp;letter=' . $ltr . '&amp;sortby=' . $sortby . $add . '%}">' . $ltr . '</a>';
 		}
 
 		if ((($counter / getConfig('user_alpha')) == round($counter / getConfig('user_alpha'))) && ($counter > 0)) {
@@ -99,8 +99,8 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
 	// Prepare array with all possible sorters
 	$list = array(
 		'userid'      => getMessage('_UID'),
-		'family'      => getMessage('FAMILY_NAME'),
-		'email'       => getMessage('EMAIL_ADDRESS'),
+		'family'      => getMessage('FAMILY'),
+		'email'       => getMessage('EMAIL'),
 		'REMOTE_ADDR' => getMessage('REMOTE_IP')
 	);
 
@@ -113,7 +113,7 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
 		if ($sortby == $sort) {
 			$OUT .= '<strong>' . $title . '</strong>&nbsp;|&nbsp;';
 		} else {
-			$OUT .= '<a href="{?URL?}/modules.php?module=admin&amp;what=list_user&amp;letter=' . $letter . '&amp;sortby=' . $sort.$add . '">' . $title . '</a>&nbsp;|&nbsp;';
+			$OUT .= '<a href="{%url=modules.php?module=admin&amp;what=list_user&amp;letter=' . $letter . '&amp;sortby=' . $sort.$add . '%}">' . $title . '</a>&nbsp;|&nbsp;';
 		}
 	} // END - foreach
 
@@ -154,14 +154,14 @@ function addPageNavigation ($PAGES, $offset, $show_form, $colspan,$return=false)
 			if (!isGetRequestElementSet('sortby')) setRequestGetElement('sortby', 'userid');
 
 			// Base link
-			$OUT .= '<a href="{?URL?}/modules.php?module=admin&amp;what=' . getWhat();
+			$OUT .= '<a href="{%url=modules.php?module=admin&amp;what=' . getWhat();
 
 			// Add status or mode
 			if (isGetRequestElementSet('status'))    $OUT .= '&amp;mode=' . getRequestElement('status');
 			 elseif (isGetRequestElementSet('mode')) $OUT .= '&amp;mode=' . getRequestElement('mode');
 
 			// Letter and so on
-			$OUT .= '&amp;letter=' . getRequestElement('letter') . '&amp;sortby=' . getRequestElement('sortby') . '&amp;page=' . $page . '&amp;offset=' . $offset . '">';
+			$OUT .= '&amp;letter=' . getRequestElement('letter') . '&amp;sortby=' . getRequestElement('sortby') . '&amp;page=' . $page . '&amp;offset=' . $offset . '%}">';
 		}
 
 		$OUT .= $page;
@@ -210,7 +210,7 @@ LIMIT 1",
 		list($userid) = SQL_FETCHROW($result);
 
 		// Rewrite email address to contact link
-		$email = '{?URL?}/modules.php?module=' . $mod . '&amp;what=user_contct&amp;userid=' . bigintval($userid);
+		$email = '{%url=modules.php?module=' . $mod . '&amp;what=user_contct&amp;userid=' . bigintval($userid) . '%}';
 	} // END - if
 
 	// Free memory
@@ -221,6 +221,7 @@ LIMIT 1",
 }
 
 // Selects a random user id as the new referal id if they have at least X confirmed mails in this run
+// @TODO Double-check configuration entry here
 function determineRandomReferalId () {
 	// Default is zero refid
 	$refid = '0';
@@ -367,7 +368,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
 				}
 			} else {
 				// Cookies not setable!
-				$errorCode = getCode('NO_COOKIES');
+				$errorCode = getCode('COOKIES_DISABLED');
 			}
 		} elseif (getExtensionVersion('sql_patches') >= '0.6.1') {
 			// Update failture counter