From 581e801f3a120502625469e2bac08947ba745622 Mon Sep 17 00:00:00 2001 From: Madeline VEYRENC Date: Wed, 22 Jan 2014 10:35:13 +0100 Subject: [PATCH] Fix usage of unknown variables --- classes/content/sqlicontentutils.php | 2 +- classes/sqliimportfactory.php | 2 +- classes/sqliimportitem.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/classes/content/sqlicontentutils.php b/classes/content/sqlicontentutils.php index 01bc7ba..03208f9 100644 --- a/classes/content/sqlicontentutils.php +++ b/classes/content/sqlicontentutils.php @@ -58,7 +58,7 @@ public static function getRemoteFile( $url, array $httpAuth = null, $debug = fal $password = $ini->variable( 'ProxySettings', 'Password' ); if ( $userName ) { - curl_setopt( $ch, CURLOPT_PROXYUSERPWD, "$username:$password" ); + curl_setopt( $ch, CURLOPT_PROXYUSERPWD, "$userName:$password" ); } } diff --git a/classes/sqliimportfactory.php b/classes/sqliimportfactory.php index f31b8e6..1dbe0b9 100644 --- a/classes/sqliimportfactory.php +++ b/classes/sqliimportfactory.php @@ -193,7 +193,7 @@ public function runImport( array $aImportItems ) if( $this->importINI->hasVariable( $handlerSection, 'DefaultParentNodeID' ) ) { $localParentNodeID = $this->importINI->variable( $handlerSection, 'DefaultParentNodeID' ); - $defaultParentNodeID = is_int( $localParentNodeID ) ? (int)$localParentNode : $defaultParentNodeID; + $defaultParentNodeID = is_int( $localParentNodeID ) ? (int)$localParentNodeID : $defaultParentNodeID; } if( $this->importINI->hasVariable( $handlerSection, 'StreamTimeout' ) ) diff --git a/classes/sqliimportitem.php b/classes/sqliimportitem.php index 059e6ff..c18464f 100644 --- a/classes/sqliimportitem.php +++ b/classes/sqliimportitem.php @@ -132,12 +132,12 @@ public function fromArray( array $attributes ) foreach( $attributes as $attrName => $attrValue ) { if( isset( $this->attributesHolder[$attrName] ) ) - $this->attributesHolder[$name] = $value; + $this->attributesHolder[$attrName] = $attrValue; else throw new SQLIImportRuntimeException( SQLIImportUtils::translate( 'extension/sqliimport/error', 'SQLIPendingImport : Unknown attribute "%attribute"', null, - $name ) ); + $attrName ) ); } }