merge from 1.5.2.5 ( ~ r10673)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10674 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-05-14 08:04:10 +00:00
parent f0c12f5756
commit ea84468e7d
19 changed files with 173 additions and 49 deletions

View file

@ -146,6 +146,10 @@
$buff = '<?php if(!defined("__ZBXE__")) exit();'."\n";
foreach($ftp_info as $key => $val) {
if(!$val) continue;
if(preg_match('/(<\?|<\?php|\?>)/xsm', preg_replace('/\s/', '', $val)))
{
continue;
}
$buff .= sprintf("\$ftp_info->%s = '%s';\n", $key, str_replace("'","\\'",$val));
}
$buff .= "?>";