diff --git a/src/Application/Controller/Import.php b/src/Application/Controller/Import.php index c66e63d..fa03d16 100644 --- a/src/Application/Controller/Import.php +++ b/src/Application/Controller/Import.php @@ -454,10 +454,16 @@ private static function _getXML(array $import) { (isset($import['auth_password']))? $import['auth_password'] : '' ); break; - case 'header': + case 'header_authentication': $client->addHeader( 'Authentication', - (isset($import['auth_header']))? $import['auth_header'] : '' + (isset($import['auth_header_authentication']))? $import['auth_header_authentication'] : '' + ); + break; + case 'header_authorization': + $client->addHeader( + 'Authorization', + (isset($import['auth_header_authorization']))? $import['auth_header_authorization'] : '' ); break; } @@ -515,4 +521,4 @@ private static function _calculateDate(SimpleXMLElement $event, $dayChange) { } } -?> \ No newline at end of file +?> diff --git a/src/Application/View/import/index.html.php b/src/Application/View/import/index.html.php index 669cf49..322f51b 100644 --- a/src/Application/View/import/index.html.php +++ b/src/Application/View/import/index.html.php @@ -35,7 +35,8 @@ [ '' => 'No Authentication', 'basic' => 'Basic HTTP Authentication', - 'header' => 'Authentication Header' + 'header_authentication' => 'Authentication Header' + 'header_authorization' => 'Authorization Header' ], '', ['data-import-auth-type-value'] @@ -43,7 +44,8 @@
  • input('auth_user', 'Username', '', ['data-import-auth-type' => 'basic']); ?>
  • password('auth_password', 'Password', ['data-import-auth-type' => 'basic']); ?>
  • -
  • input('auth_header', 'Authentication Header', '', ['class' => 'wide', 'data-import-auth-type' => 'header']); ?>
  • +
  • input('auth_header_authentication', 'Authentication Header', '', ['class' => 'wide', 'data-import-auth-type' => 'header_authentication']); ?>
  • +
  • input('auth_header_authorization', 'Authorization Header', '', ['class' => 'wide', 'data-import-auth-type' => 'header_authorization']); ?>
  • submit('Create new import', ['disabled' => $project['read_only']]); ?>