Merge branch 'rel-10_0' into rel-10_1

RotherOSS · May 8, 2023 · 74c4188 · 74c4188
2 parents 89c3df4 + 816fbf2
commit 74c4188
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1491,4 +1491,3 @@
 
 # OTOBO 10.0.0 beta1 2020-01-30
  - First official OTOBO release, yippie!
-
diff --git a/Kernel/Language/es_MX.pm b/Kernel/Language/es_MX.pm
@@ -6394,7 +6394,7 @@ Thanks for your help!
 ' => '
 Estimado cliente,
 
-Lamentablemente no hemos podido detectar un número de ticket válido 
+Lamentablemente no hemos podido detectar un número de ticket válido
 en su asunto, por lo que este correo no puede ser procesado.
 
 Por favor, cree un nuevo ticket a través del panel de cliente.

diff --git a/Kernel/Output/HTML/ArticleCompose/Crypt.pm b/Kernel/Output/HTML/ArticleCompose/Crypt.pm
@@ -407,7 +407,6 @@ sub _CheckRecipient {
                 next ADDRESS;
             }
 
-
             PUBLICKEY:
             for my $PublicKey (@PublicKeys) {
 

diff --git a/Kernel/System/Stats.pm b/Kernel/System/Stats.pm
@@ -992,7 +992,8 @@ sub GetStaticFiles {
     }
     $Directory .= 'Kernel/System/Stats/Static/';
 
-    if ( !opendir( DIR, $Directory ) ) {
+    my $StaticDirH;
+    if ( !opendir $StaticDirH, $Directory ) {
         $Kernel::OM->Get('Kernel::System::Log')->Log(
             Priority => 'error',
             Message  => "Can not open Directory: $Directory",
@@ -1028,16 +1029,17 @@ sub GetStaticFiles {
     my %Filelist;
 
     DIRECTORY:
-    while ( defined( my $Filename = readdir DIR ) ) {
+    while ( defined( my $Filename = readdir $StaticDirH ) ) {
         next DIRECTORY if $Filename eq '.';
         next DIRECTORY if $Filename eq '..';
+
         if ( $Filename =~ m{^(.*)\.pm$}x ) {
             if ( !defined $StaticFiles{$1} ) {
                 $Filelist{$1} = $1;
             }
         }
     }
-    closedir(DIR);
+    closedir $StaticDirH;
 
     return \%Filelist;
 }
@@ -3872,7 +3874,8 @@ sub _AutomaticSampleImport {
     my $Language  = $Kernel::OM->Get('Kernel::Config')->Get('DefaultLanguage');
     my $Directory = $Self->{StatsTempDir};
 
-    if ( !opendir( DIRE, $Directory ) ) {
+    my $TempDirH;
+    if ( !opendir $TempDirH, $Directory ) {
         $Kernel::OM->Get('Kernel::System::Log')->Log(
             Priority => 'error',
             Message  => "Can not open Directory: $Directory",
@@ -3882,18 +3885,19 @@ sub _AutomaticSampleImport {
 
     # check if stats in the default language available, if not use en
     my $Flag = 0;
-    while ( defined( my $Filename = readdir DIRE ) ) {
+    while ( defined( my $Filename = readdir $TempDirH ) ) {
         if ( $Filename =~ m{^.*\.$Language\.xml$}x ) {
             $Flag = 1;
         }
     }
 
-    rewinddir(DIRE);
+    rewinddir $TempDirH;
+
     if ( !$Flag ) {
         $Language = 'en';
     }
 
-    while ( defined( my $Filename = readdir DIRE ) ) {
+    while ( defined( my $Filename = readdir $TempDirH ) ) {
         if ( $Filename =~ m{^.*\.$Language\.xml$}x ) {
 
             my $Filehandle;
@@ -3902,7 +3906,7 @@ sub _AutomaticSampleImport {
                     Priority => 'error',
                     Message  => "Can not open File: " . $Directory . $Filename,
                 );
-                closedir(DIRE);
+                closedir $TempDirH;
 
                 return;
             }
@@ -3919,7 +3923,7 @@ sub _AutomaticSampleImport {
             );
         }
     }
-    closedir(DIRE);
+    closedir $TempDirH;
 
     return 1;
 }

diff --git a/scripts/test/Selenium/Customer/Login.t b/scripts/test/Selenium/Customer/Login.t
@@ -54,7 +54,7 @@ $Selenium->RunTest(
         # This test is a leftover from the old costomer login page,
         # as in the current version there is no check for Secure::DisabledBanner.
         my %SourceChecks = (
-            PoweredBy  => qr{powered by.{5,30}https://otobo\.de}s,
+            PoweredBy => qr{powered by.{5,30}https://otobo\.de}s,
         );
         my $Product = $Kernel::OM->Get('Kernel::Config')->Get('Product');
         my $Version = $Kernel::OM->Get('Kernel::Config')->Get('Version');