Merge pull request #94 from mjrider/for-upstream

improvements for esiFetch and ar/connect/soap

Author: mjrider

docs/CHANGES

@@ -2,6 +2,8 @@
 Changes Ariadne 9.4
 ========================
 
+Minimum PHP version raised to 5.4.7
+
 Changes:
 - updated composer libraries
 - php7 support, it passes the unit tests, and is installable. We aren't running
@@ -21,10 +23,13 @@ Bug fixes:
   fatal errors when saving templates.
 - Fixed an escaping bug in htmlcleaner for attributes
 - Fixed mod_tar in pear mode, windows installs should now work again.
-- Performance improvements:
+- Fixed installer for the usecase where the www dir is copied instead of symlinked
+- Fixed esi including schemeless uri's
 
+- Performance improvements:
 +- 10% performce gain by improving performance of performance heavy functions
 
+
 ========================
 Changes Ariadne 9.3
 ========================

lib/modules/mod_esi.php

@@ -107,6 +107,10 @@ function esiFetch($url) {
 		} else {
 			// FIXME: Is it a good idea to do http requests from the server this way?
 			$client = ar('http')->client();
+			$scheme = parse_url($url, PHP_URL_SCHEME);
+			if (!$scheme) {
+				$url = 'http:'.$url;
+			}
 			$replacement = $client->get($url);
 
 			if ($client->statusCode != "200") {
@@ -167,7 +171,7 @@ function esiEvaluate($test) {
 
 		$compiled=$pinp->compile("<pinp>" . $test . "</pinp>");
 
-		$compiled = preg_replace("/^<\?php(.*)\?>$/s", '$1', $compiled);
+		$compiled = preg_replace("/^<\?php(.*)\?".">$/s", '$1', $compiled);
 
 		// FIXME: Is eval after the pinp compiler save enough to run?
 		$result = eval("return (" . $compiled . ");");
@@ -183,7 +187,7 @@ function esiInclude($page) {
 		global $ARCurrent, $AR;
 
 		// parse <esi:include src="view.html">
-		$regExp = '|<esi:include.*?>|i';
+		$regExp = '|<esi:include.*?'.'>|i';
 
 
 		preg_match_all($regExp, $page, $matches);

lib/modules/mod_pinp.phtml

@@ -758,6 +758,7 @@ class pinp {
 		  "dns_get_mx|dns_get_record|getservbyport|getservbyname|ip2long|long2ip|get_headers|http_build_query";
 		$regex_funcs="ereg|ereg_replace|eregi|eregi_replace|split|spliti|preg_match|".
 		  "preg_match_all|preg_split|preg_quote|preg_grep|preg_filter|preg_last_error";
+		$stream_functs="stream_context_create|stream_context_get_options|stream_context_get_params|stream_context_set_option|stream_context_set_params";
 		$string_funcs="addslashes|addcslashes|bin2hex|chop|chr|chunk_split|".
 		  "convert_cyr_string|convert_uudecode|convert_uuencode|count_chars|crc32|crypt|echo|explode|flush|".
 		  "get_html_translation_table|htmlentities|htmlspecialchars|htmlspecialchars_decode|hex2bin|implode|join|".
@@ -808,7 +809,7 @@ class pinp {
 		  "imap_subscribe|imap_thread|imap_timeout|imap_uid|imap_undelete|imap_unsubscribe|imap_utf7_decode|imap_utf7_encode|imap_utf8";
 		$this->allowed_functions=array_flip(explode("|", strtolower("$array_funcs|$object_funcs|$ctype_funcs|$filter_funcs|".
 		  "$control_funcs|$datetime_funcs|$math_funcs|".
-		  "$misc_funcs|$net_funcs|$regex_funcs|$string_funcs|$var_funcs|$xml_funcs|".
+		  "$misc_funcs|$net_funcs|$regex_funcs|$string_funcs|$stream_funcs|$var_funcs|$xml_funcs|".
 		  "$allowed_functions|$debug_funcs|$loader_funcs|$ob_funcs|$iconv_funcs|$mb_funcs|$pspell_funcs|$imap_funcs|$zlib_funcs")));
 
 		/*

lib/stores/store.php

@@ -439,14 +439,15 @@ protected function serialize($value, $path) {
 	}
 
 	protected function unserialize($value, $path) {
-		if (substr($value, 0, 2) == "O:") {
+		if ($value[0] === "O" && $value[1] === ":") {
 			return unserialize($value);
 		} else if ($this->config['crypto'] instanceof \Closure) {
 			$crypto = $this->config['crypto']();
+			list($token,$datavalue) = explode(':', $value, 2);
 			foreach ($crypto as $cryptoConfig) {
 				$cryptoToken = $cryptoConfig['token'];
-				if (substr($value, 0, strlen($cryptoToken)+1) == ($cryptoToken . ":")) {
-					$value = substr($value, strlen($cryptoToken)+1);
+				if ($token === $cryptoToken ) {
+					$value = $datavalue;
 					switch ($cryptoConfig['method']) {
 						case 'ar_crypt':
 							$key = base64_decode($cryptoConfig['key']);
@@ -459,7 +460,7 @@ protected function unserialize($value, $path) {
 				}
 			}
 
-			if (substr($decryptedValue, 0, 2) == "O:") {
+			if ($decryptedValue[0] === "O" && $decryptedValue[1] === ":") {
 				return unserialize($decryptedValue);
 			} else {
 				$dummy = unserialize('O:6:"object":7:{s:5:"value";s:0:"";s:3:"nls";O:6:"object":2:{s:7:"default";s:2:"nl";s:4:"list";a:1:{s:2:"nl";s:10:"Nederlands";}}s:2:"nl";O:6:"object":1:{s:4:"name";s:14:"Crypted object";}s:6:"config";O:6:"object":2:{s:10:"owner_name";s:6:"Nobody";s:5:"owner";s:6:"nobody";}s:5:"mtime";i:0;s:5:"ctime";i:0;s:5:"muser";s:6:"nobody";}');

www/install/nls.en.php

@@ -23,7 +23,7 @@
 	$ARnls['install:recheck']		= 'Re-run checks';
 	$ARnls['install:check_ok']		= 'Passed';
 	$ARnls['install:check_failed']		= 'Failed';
-	$ARnls['install:check_php_version']	= 'PHP >= 5.4';
+	$ARnls['install:check_php_version']	= 'PHP >= 5.4.7';
 	$ARnls['install:check_database_support']= 'Supported database';
 	$ARnls['install:check_webserver']	= 'Supported webserver';
 	$ARnls['install:check_accept_path_info']= 'AcceptPathInfo directive in httpd.conf';

www/install/nls.nl.php

@@ -25,7 +25,7 @@
 	$ARnls['install:recheck']		= 'Opnieuw controleren';
 	$ARnls['install:check_ok']		= 'Geslaagd';
 	$ARnls['install:check_failed']		= 'Mislukt';
-	$ARnls['install:check_php_version']	= 'PHP >= 5.4';
+	$ARnls['install:check_php_version']	= 'PHP >= 5.4.7';
 	$ARnls['install:check_database_support']= 'Ondersteunde database';
 	$ARnls['install:check_webserver']	= 'Ondersteunde webserver';
 	$ARnls['install:check_accept_path_info']= 'AcceptPathInfo regel in httpd.conf';

www/install/system_checks.php

@@ -2,7 +2,7 @@
 	$ariadne = '';
 
 	function check_php_version() {
-		if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
+		if (version_compare(PHP_VERSION, '5.4.7', '>=')) {
 			return true;
 		}
 		return false;