fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HOR-838

Browse Source
This commit is contained in:
Paula V. Quispe
2016-04-22 15:01:21 -04:00
parent 43f9dcc7cd
commit 6b3ee8f471
3 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gulliver/thirdparty/phing/Phing.php vendored
View File

@@ -858,7 +858,17 @@ class Phing {
} }
$firstPath = explode(":", implode(PATH_SEPARATOR, array_merge($new_parts, $curr_parts))); $firstPath = explode(":", implode(PATH_SEPARATOR, array_merge($new_parts, $curr_parts)));
if (is_dir($firstPath[0])) { if (is_dir($firstPath[0])) {
ini_set('include_path', implode(PATH_SEPARATOR, array_merge($new_parts, $curr_parts))); $realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.inputfilter.php');
$filter = new InputFilter();
$incPath = implode(PATH_SEPARATOR, array_merge($new_parts, $curr_parts));
$incPath = $filter->validateInput($incPath, 'path');
ini_set('include_path', $incPath);
} }
} }
} }

16
gulliver/thirdparty/phing/lib/Capsule.php vendored
View File

@@ -118,6 +118,14 @@ class Capsule {
// extract variables into local namespace // extract variables into local namespace
extract($this->vars); extract($this->vars);
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.inputfilter.php');
$filter = new InputFilter();
// prepend template path to include path, // prepend template path to include path,
// so that include "path/relative/to/templates"; can be used within templates // so that include "path/relative/to/templates"; can be used within templates
$__old_inc_path = ini_get('include_path'); $__old_inc_path = ini_get('include_path');
@@ -126,11 +134,15 @@ class Capsule {
if(strpos($path,":")>0){ if(strpos($path,":")>0){
$firstPath = explode(":", $this->templatePath . PATH_SEPARATOR . $__old_inc_path); $firstPath = explode(":", $this->templatePath . PATH_SEPARATOR . $__old_inc_path);
if (is_dir($firstPath[0])) { if (is_dir($firstPath[0])) {
ini_set('include_path', $this->templatePath . PATH_SEPARATOR . $__old_inc_path); $incPath = $this->templatePath . PATH_SEPARATOR . $__old_inc_path;
$incPath = $filter->validateInput($incPath, 'path');
ini_set('include_path', $incPath);
} }
} else { } else {
if(is_dir($this->templatePath . PATH_SEPARATOR . $__old_inc_path)) { if(is_dir($this->templatePath . PATH_SEPARATOR . $__old_inc_path)) {
ini_set('include_path', $this->templatePath . PATH_SEPARATOR . $__old_inc_path); $incPath = $this->templatePath . PATH_SEPARATOR . $__old_inc_path;
$incPath = $filter->validateInput($incPath, 'path');
ini_set('include_path', $incPath);
} }
} }

14
gulliver/thirdparty/phing/tasks/system/IncludePathTask.php vendored
View File

@@ -106,10 +106,20 @@ class IncludePathTask extends TaskPhing {
$add_parts = explode(PATH_SEPARATOR, $this->classpath); $add_parts = explode(PATH_SEPARATOR, $this->classpath);
$new_parts = array_diff($add_parts, $curr_parts); $new_parts = array_diff($add_parts, $curr_parts);
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.inputfilter.php');
$filter = new InputFilter();
if ($new_parts) { if ($new_parts) {
$this->log("Prepending new include_path components: " . implode(PATH_SEPARATOR, $new_parts), PROJECT_MSG_VERBOSE); $this->log("Prepending new include_path components: " . implode(PATH_SEPARATOR, $new_parts), PROJECT_MSG_VERBOSE);
if(is_dir(implode(PATH_SEPARATOR, array_merge($new_parts, $curr_parts)))) { $dir = implode(PATH_SEPARATOR, array_merge($new_parts, $curr_parts));
set_include_path(implode(PATH_SEPARATOR, array_merge($new_parts, $curr_parts))); $dir = $filter->validateInput($dir, 'path');
if(is_dir($dir)) {
set_include_path($dir);
} }
} }