X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fsurfbar_functions.php;h=354b33b3a44fb0aeac07ed0f7c66ab82198f9c86;hb=80539a22f89c2a5e4e765a886ad5081c5fc33dc2;hp=95705bc254012b231b3772f5a595541696b29da0;hpb=461f500c8603e1f9fd5f4c56ab3df53ef7661e77;p=mailer.git

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 95705bc254..354b33b3a4 100644
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -798,10 +799,10 @@ function SURFBAR_DETERMINE_TEMPLATE_NAME() {
 	$templateName = "surfbar_frameset";
 
 	// Any frame set? ;-)
-	if (isGetRequestElementSet('frame')) {
+	if (isGetRequestParameterSet('frame')) {
 		// Use the frame as a template name part... ;-)
 		$templateName = sprintf("surfbar_frame_%s",
-		getRequestElement('frame')
+		getRequestParameter('frame')
 		);
 	} // END - if
 
@@ -835,7 +836,12 @@ INNER JOIN
 ON
 	u.id=l.url_id
 WHERE
-	l.userid=%s AND (UNIX_TIMESTAMP() - ".SURFBAR_GET_SURF_LOCK().") < UNIX_TIMESTAMP(l.last_surfed) AND (((UNIX_TIMESTAMP(l.last_surfed) - u.fixed_reload) < 0 AND u.fixed_reload > 0) OR u.fixed_reload = '0')
+	l.userid=%s AND
+	(UNIX_TIMESTAMP() - ".SURFBAR_GET_SURF_LOCK().") < UNIX_TIMESTAMP(l.last_surfed) AND
+	(
+		((UNIX_TIMESTAMP(l.last_surfed) - u.fixed_reload) < 0 AND u.fixed_reload > 0) OR
+		u.fixed_reload = '0'
+	)
 LIMIT 1",
 		array(getMemberId()), __FUNCTION__, __LINE__
 	);
@@ -973,7 +979,7 @@ function SURFBAR_GENERATE_VALIDATION_CODE ($urlId, $salt = '') {
 	$hashedCode = generateHash(md5($valCode), SURFBAR_GET_SALT());
 
 	// Finally encrypt it PGP-like and return it
-	$valHashedCode = generatePassString($hashedCode);
+	$valHashedCode = encodeHashForCookie($hashedCode);
 
 	// Return hashed value
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'finalValCode='.$valHashedCode.'', false);