fixed session crap with https and charset mojo with htmlentites

4 files changed, 27 insertions, 2 deletions

diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index badac60a..b774c36c 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,8 @@
 
 --------------------------------------------------------------------------
   v.3.3.2-Beta2 
+  	- Fixed some Charset problems with htmlentities (Thx Nikk)
+	- Fixed some issues with IE and session caching (Thx wishbone)
   	- Improved Upload Error Messages and blanked up upload and 
 		quarantine directories for non-admin users
   	- Added horrible hack to make Artist sorting work in the Album 
diff --git a/lib/general.lib.php b/lib/general.lib.php
index e485337f..fde2f01c 100644
--- a/lib/general.lib.php
+++ b/lib/general.lib.php
@@ -801,7 +801,7 @@ function scrub_out($str) {
 		$str = stripslashes($str);
 	}
 
-        $str = htmlentities($str);
+        $str = htmlentities($str,ENT_QUOTES,conf('site_charset'));
 
         return $str;
 
diff --git a/modules/init.php b/modules/init.php
index 75d6abb6..eff482c2 100644
--- a/modules/init.php
+++ b/modules/init.php
@@ -80,7 +80,7 @@ if (!$results['allow_stream_playback']) {
 
 
 /** This is the version.... fluf nothing more... **/
-$results['version']		= '3.3.2-Beta2 (Build 009)';
+$results['version']		= '3.3.2-Beta2 (Build 010)';
 
 
 
diff --git a/modules/vauth/session.lib.php b/modules/vauth/session.lib.php
index e27060a9..18006dc1 100644
--- a/modules/vauth/session.lib.php
+++ b/modules/vauth/session.lib.php
@@ -184,6 +184,7 @@ function vauth_session_cookie() {
         session_name(vauth_conf('session_name'));
 
         /* Start the Session */
+	vauth_ungimp_ie();
         session_start(); 	
 
 } // vauth_session_cookie
@@ -258,10 +259,32 @@ function vauth_check_session() {
 	/* Set Session name so it knows what cookie to get */
 	session_name($session_name);
 
+	vauth_ungimp_ie();
 	session_start();
 
 	return true;
 
 } // vauth_check_session
 
+/**
+ * vauth_ungimp_ie
+ * This function sets the cache limiting to public if you are running 
+ * some flavor of IE. The detection used here is very conservative so feel free
+ * to fix it. This only has to be done if we're rolling HTTPS
+ */
+function vauth_ungimp_ie() { 
+
+	if ($_SERVER['HTTPS'] != 'on') { return true; } 
+
+	/* Now try to detect IE */
+	$agent = trim($_SERVER['HTTP_USER_AGENT']);
+	
+	if ((preg_match('|MSIE ([0-9.]+)|', $agent)) || (preg_match('|Internet Explorer/([0-9.]+)|', $agent))) {
+		session_cache_limiter('public');
+	}
+		      
+	return true;
+
+} // vauth_ungimp_ie
+
 ?>