glype-1.4.5

Author: vincentclee

INSTALL.txt

@@ -2,6 +2,6 @@
 # INSTALLATION INSTRUCTIONS
 # ------------------------------------------------------------------------------
 
- 1. Upload the contents of the /glype-1.4.1/ folder to the desired directory on your server.
+ 1. Upload the contents of the /glype-1.4.5/ folder to the desired directory on your server.
  2. Visit the URL of your Glype Admin Control Panel (i.e. http://www.domain.com/admin.php).
  3. Set the desired options and save your settings.

admin.php

@@ -42,7 +42,7 @@
 define('ADMIN_URI', $_SERVER['PHP_SELF']);
 
 # Define the current admin version
-define('ADMIN_VERSION', '1.4.4');
+define('ADMIN_VERSION', '1.4.5');
 
 # Start buffering
 ob_start();

edit-browser.php

@@ -30,20 +30,29 @@
 ******************************************************************/
 
 // Return without saving button
-$return		 = empty($_GET['return']) ? '' : '<input type="button" value="Cancel" onclick="window.location=\'' . $_GET['return'] . '\'">';
-$returnField = empty($_GET['return']) ? '' : '<input type="hidden" value="' . $_GET['return'] . '" name="return">';
+$return		 = empty($_GET['return']) ? '' : '<input type="button" value="Cancel" onclick="window.location=\'' . remove_html($_GET['return']) . '\'">';
+$returnField = empty($_GET['return']) ? '' : '<input type="hidden" value="' . remove_html($_GET['return']) . '" name="return">';
+$agent		 = empty($_SERVER['HTTP_USER_AGENT']) ? '' : htmlentities($_SERVER['HTTP_USER_AGENT']);
 
 // Quote strings
-function q($value) {
+function escape_single_quotes($value) {
 	return str_replace("'", "\'", $value);
 }
+function remove_html($x) {
+	$x = preg_replace('#"#', '', $x);
+	$x = preg_replace("#'#", '', $x);
+	$x = preg_replace('#<#', '', $x);
+	$x = preg_replace('#>#', '', $x);
+	$x = preg_replace('#\\\\#', '', $x);
+	return $x;
+}
 
 // Get existing values
 $browser		  = $_SESSION['custom_browser'];
 
-$currentUA		  = q($browser['user_agent']);
+$currentUA		  = escape_single_quotes($browser['user_agent']);
 $realReferrer	  = $browser['referrer'] == 'real' ? 'true' : 'false';
-$customReferrer  = $browser['referrer'] == 'real' ? ''	  : q($browser['referrer']);
+$customReferrer  = $browser['referrer'] == 'real' ? ''	  : escape_single_quotes($browser['referrer']);
 
 echo <<<OUT
 	<script type="text/javascript">
@@ -141,7 +150,7 @@ function clearRealReferrer() {
 						<option value="Mozilla/5.0 (Linux; U; Android 2.3.5; en-us; HTC Vision Build/GRI40) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1">Android 2.3.5</option>
 						<option value="Mozilla/5.0 (BlackBerry; U; BlackBerry 9850; en-US) AppleWebKit/534.11+ (KHTML, like Gecko) Version/7.0.0.115 Mobile Safari/534.11+">Blackberry</option>
 						<option value="Opera/9.80 (J2ME/MIDP; Opera Mini/9.80 (S60; SymbOS; Opera Mobi/23.348; U; en) Presto/2.5.25 Version/10.54">Symbian with Opera Mini</option>
-						<option value="{$_SERVER['HTTP_USER_AGENT']}"> - Current/Real</option>
+						<option value="{$agent}"> - Current/Real</option>
 						<option value=""> - None</option>
 						<option value="custom"> - Custom...</option>			  
 					</select>

includes/init.php

@@ -92,7 +92,7 @@
 ******************************************************************/
 
 # Current version - no need to change this!
-$themeReplace['version'] = 'v1.4.4';
+$themeReplace['version'] = 'v1.4.5';
 
 # Look for a config.php in the /themes/themeName/ folder
 if ( ! defined('MULTIGLYPE') && file_exists($tmp = GLYPE_ROOT . '/themes/' . $CONFIG['theme'] . '/config.php') ) {

includes/parser.php

@@ -52,10 +52,16 @@ function HTMLDocument($input, $insert='', $inject=false, $footer='') {
 			}
 		}
 
+		# Remove empty script comments
+		$input = preg_replace('#/\*\s*\*/#s', '', $input);
+
 		# Remove conditional comments
 		$input = preg_replace('#<\!\-\-\[if \!IE\]>\s*\-\->(.*?)<\!\[endif\]\-\->#s','$1',$input);
 		$input = preg_replace('#<\!\-\-\[if.*?<\!\[endif\]\-\->#s','',$input);
 
+		# Prevent websites from calling disableOverride()
+		$input = preg_replace('#disableOverride#s', 'disabled___disableOverride', $input);
+
 		# Remove titles if option is enabled
 		if ( $this->htmlOptions['stripTitle'] || $this->htmlOptions['encodePage'] ) {
 			$input = preg_replace('#<title.*?</title>#is', '', $input, 1);

includes/settings.php

@@ -1,4 +1,4 @@
-<?php
+<?php
 /*******************************************************************
 * Glype is copyright and trademark 2007-2013 UpsideOut, Inc. d/b/a Glype
 * and/or its licensors, successors and assigners. All rights reserved.
@@ -265,7 +265,7 @@
 
 # Settings file version for determining compatability with admin
 # tool.
-$CONFIG['version'] = '1.4.4';
+$CONFIG['version'] = '1.4.5';
 
 //---PRESERVE ME---
 // Anything below this line will be preserved when the admin control panel rewrites