Fix typos and upgrade URI:ESCAPE

aamt_auth.pm

@@ -341,7 +341,7 @@ sub auth_createSessionDirectory
 	
 	$migrationStatus='';
 	$returnCreateSuccess=0;
-	$sessionFilename= "./sessions/$sessionName/$sessionFilename";           #appended with the full path 
+	$sessionFilename= "./$sessionName/$sessionFilename";           #appended with the full path 
 	$DIRHANDLE= new IO::Dir ".";
     if(opendir (DIRHANDLE,$sessionName))
     {

aamt_constants.pm

@@ -46,7 +46,7 @@ More Information:  Visit http://www.movemetothecloud.net/LinuxMigration
 
 Remember to periodically update the tool from the above site.
 
-For support please open a ticket at :  https://github.com/Azure/Azure-Apache-Migration-Tool/issues
+For support please open a ticket at:  https://github.com/Azure/Azure-Apache-Migration-Tool/issues
 
 Important Notes:
     Super User rights are required to use the Apache to Azure App Service Migration Tool.\n";	  
@@ -67,7 +67,7 @@ For more information:  Visit http://www.movemetothecloud.net/LinuxMigration\n
 
 Remember to periodically update the tool from the above site.\n
 
-For support please open a ticket at :  https://github.com/Azure/Azure-Apache-Migration-Tool/issues\n
+For support please open a ticket at:  https://github.com/Azure/Azure-Apache-Migration-Tool/issues\n
 Thank You for using Apache to Azure App Service Migration Tool\n
 ---------------------------------------------------------------------------\n\n";
 use constant SUCCESS						=>						"1000";

aamt_parse2.pm

@@ -409,8 +409,11 @@ sub pars_UploadPublishSettingsAllSites
         ilog_setLogInformation('INT_INFO',$recoveryFile,MSG_FILE_CLOSE,'');
     }
 
-    ilog_print(1, dTITLE_EXIT);
-    return 0; 
+    ilog_print(1, TITLE_EXIT);
+    return 0;
+
+
+
 }
 
 sub pars_UploadPublishSettings

lib/URI/Escape.pm

@@ -1,5 +1,7 @@
 package URI::Escape;
+
 use strict;
+use warnings;
 
 =head1 NAME
 
@@ -135,8 +137,7 @@ it under the same terms as Perl itself.
 
 =cut
 
-require Exporter;
-our @ISA = qw(Exporter);
+use Exporter 5.57 'import';
 our %escapes;
 our @EXPORT = qw(uri_escape uri_unescape uri_escape_utf8);
 our @EXPORT_OK = qw(%escapes);
@@ -180,6 +181,7 @@ sub _fail_hi {
 
 sub uri_escape_utf8 {
     my $text = shift;
+    return undef unless defined $text;
     utf8::encode($text);
     return uri_escape($text, @_);
 }
@@ -201,8 +203,19 @@ sub uri_unescape {
     $str;
 }
 
+# XXX FIXME escape_char is buggy as it assigns meaning to the string's storage format.
 sub escape_char {
-    return join '', @URI::Escape::escapes{$_[0] =~ /(\C)/g};
+    # Old versions of utf8::is_utf8() didn't properly handle magical vars (e.g. $1).
+    # The following forces a fetch to occur beforehand.
+    my $dummy = substr($_[0], 0, 0);
+
+    if (utf8::is_utf8($_[0])) {
+        my $s = shift;
+        utf8::encode($s);
+        unshift(@_, $s);
+    }
+
+    return join '', @URI::Escape::escapes{split //, $_[0]};
 }
 
-1;
+1;