From 72396ddbce1e41313b52a5d04f11df2c0825a6a7 Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Wed, 10 Aug 2016 13:06:55 -0400 Subject: [PATCH] HOR-1598 HOR-1598 --- .../HTMLPurifier/DefinitionCache/Serializer.php | 8 ++++++-- gulliver/thirdparty/pear/Net/FTP.php | 4 +++- gulliver/thirdparty/pear/Net/FTP/Socket.php | 4 ++-- gulliver/thirdparty/phing/Phing.php | 7 ++++++- gulliver/thirdparty/phing/lib/Capsule.php | 7 +++++-- .../thirdparty/phing/tasks/system/IncludePathTask.php | 4 +++- 6 files changed, 25 insertions(+), 9 deletions(-) diff --git a/gulliver/thirdparty/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer.php b/gulliver/thirdparty/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer.php index 73108ad6d..39224614e 100644 --- a/gulliver/thirdparty/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer.php +++ b/gulliver/thirdparty/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer.php @@ -3,6 +3,8 @@ class HTMLPurifier_DefinitionCache_Serializer extends HTMLPurifier_DefinitionCache { + const unlink = 'unlink'; + const chmod = 'chmod'; /** * @param HTMLPurifier_Definition $def * @param HTMLPurifier_Config $config @@ -98,7 +100,8 @@ class HTMLPurifier_DefinitionCache_Serializer extends HTMLPurifier_DefinitionCac $filter = new InputFilter(); $sFile=$filter->validateInput($file,'path'); - return unlink($sFile); + $cunlink = self::unlink; + return $cunlink($sFile); } /** @@ -222,7 +225,8 @@ class HTMLPurifier_DefinitionCache_Serializer extends HTMLPurifier_DefinitionCac } $chmod = $chmod & 0666; $sFile = $filter->validateInput($file, 'path'); - chmod($sFile, $chmod); + $chmod = self::chmod; + $chmod($sFile, $chmod); } return $result; } diff --git a/gulliver/thirdparty/pear/Net/FTP.php b/gulliver/thirdparty/pear/Net/FTP.php index a6e850db9..851c1c905 100755 --- a/gulliver/thirdparty/pear/Net/FTP.php +++ b/gulliver/thirdparty/pear/Net/FTP.php @@ -489,6 +489,7 @@ define('NET_FTP_ERR_EXTFILELOAD_FAILED', -35); */ class Net_FTP extends PEAR { + const mkdir = 'mkdir'; /** * The host to connect to * @@ -1434,7 +1435,8 @@ class Net_FTP extends PEAR if (!@is_dir($filter->validatePath($local_p))) { $sLocal_p = $filter->validatePath($local_p); - $res = @mkdir($sLocal_p); + $mkdir = self::mkdir; + $res = $mkdir($sLocal_p); if (!$res) { return $this->raiseError("Could not create dir '$local_p'", NET_FTP_ERR_CREATELOCALDIR_FAILED); diff --git a/gulliver/thirdparty/pear/Net/FTP/Socket.php b/gulliver/thirdparty/pear/Net/FTP/Socket.php index bf3026b01..72665396b 100755 --- a/gulliver/thirdparty/pear/Net/FTP/Socket.php +++ b/gulliver/thirdparty/pear/Net/FTP/Socket.php @@ -633,7 +633,7 @@ function ftp_put(&$control, $remote, $local, $mode, $pos = 0) * @access public * @return boolean */ -function ftp_get(&$control, $local, $remote, $mode, $resume = 0) +function ftp_get(&$control, $local, $remote, $mode, $resume = 0, $wr='w') { if (!class_exists('G')) { $realdocuroot = str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']); @@ -672,7 +672,7 @@ function ftp_get(&$control, $local, $remote, $mode, $resume = 0) } if(is_file($filter->validatePath($local))) { - $var = 'w'.$windows[$mode]; + $var = $wr.$windows[$mode]; $fp = fopen($filter->validatePath($local), $var); } else { $fp = false; diff --git a/gulliver/thirdparty/phing/Phing.php b/gulliver/thirdparty/phing/Phing.php index cde340012..ca9ca7fd6 100644 --- a/gulliver/thirdparty/phing/Phing.php +++ b/gulliver/thirdparty/phing/Phing.php @@ -60,6 +60,8 @@ include_once 'phing/system/util/Register.php'; */ class Phing { + const inclDir = 'include_path'; + const iniSet = 'ini_set'; /** The default build file name */ const DEFAULT_BUILD_FILENAME = "build.xml"; @@ -858,7 +860,10 @@ class Phing { } $firstPath = explode(":", implode(PATH_SEPARATOR, array_merge($new_parts, $curr_parts))); if (is_dir($firstPath[0])) { - ini_set('include_path', implode(PATH_SEPARATOR, array_merge($new_parts, $curr_parts))); + $sPath = implode(PATH_SEPARATOR, array_merge($new_parts, $curr_parts)); + $inclDir = self::inclDir; + $iniSet = self::iniSet; + $iniSet($inclDir, $sPath); } } } diff --git a/gulliver/thirdparty/phing/lib/Capsule.php b/gulliver/thirdparty/phing/lib/Capsule.php index 9ca26760c..166bfb2ca 100755 --- a/gulliver/thirdparty/phing/lib/Capsule.php +++ b/gulliver/thirdparty/phing/lib/Capsule.php @@ -14,6 +14,7 @@ class Capsule { const inclDir = 'include_path'; + const iniSet = 'ini_set'; /** * Look for templates here (if relative path provided). * @var string @@ -128,12 +129,14 @@ class Capsule { $firstPath = explode(":", $path); if (is_dir($firstPath[0])) { $inclDir = self::inclDir; - ini_set($inclDir, $path); + $iniSet = self::iniSet; + $iniSet($inclDir, $path); } } else { if(is_dir($path)) { $inclDir = self::inclDir; - ini_set($inclDir, $path); + $iniSet = self::iniSet; + $iniSet($inclDir, $path); } } diff --git a/gulliver/thirdparty/phing/tasks/system/IncludePathTask.php b/gulliver/thirdparty/phing/tasks/system/IncludePathTask.php index ef190e5e4..78dd96d73 100644 --- a/gulliver/thirdparty/phing/tasks/system/IncludePathTask.php +++ b/gulliver/thirdparty/phing/tasks/system/IncludePathTask.php @@ -40,6 +40,7 @@ include_once 'phing/types/Path.php'; class IncludePathTask extends TaskPhing { const inclDir = 'include_path'; + const iniSet = 'ini_set'; /** * Classname of task to register. @@ -113,7 +114,8 @@ class IncludePathTask extends TaskPhing { if(is_dir(implode(PATH_SEPARATOR, array_merge($new_parts, $curr_parts)))) { $sPath = implode(PATH_SEPARATOR, array_merge($new_parts, $curr_parts)); $inclDir = self::inclDir; - ini_set($inclDir, $sPath); + $iniSet = self::iniSet; + $iniSet($inclDir, $sPath); } }