Merge pull request #15 from Open-Wide/lolautruche/fix_variables

Fix usage of unknown variables
lolautruche · Jan 22, 2014 · 778c965 · 778c965
2 parents eb249d4 + 581e801
commit 778c965
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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 ) );
         }
     }