Merge pull request #142 from lbr38/devel

3.7.9-1

docker/Dockerfile

@@ -33,6 +33,12 @@ RUN apt-get update -y
 # Install nginx and PHP 8.1
 RUN apt-get install nginx php8.1-fpm php8.1-cli php8.1-sqlite3 php8.1-xml php8.1-curl sqlite3 -y
 
+# Install syslog-ng
+RUN if [ "$env" = "devel" ]; then \
+       apt-get install syslog-ng -y && \
+       sed -i 's/system()/system(exclude-kmsg(yes))/g' /etc/syslog-ng/syslog-ng.conf; \
+    fi
+
 # Clone project in the container
 RUN git clone https://github.com/lbr38/repomanager.git /tmp/repomanager
 # For tests only

docker/entrypoint.sh

@@ -27,6 +27,9 @@ if [ ! -z "$MAX_UPLOAD_SIZE" ];then
 fi
 
 # Start services
+if [ -f "/etc/init.d/syslog-ng" ];then
+    /usr/sbin/service syslog-ng start
+fi
 /usr/sbin/service php8.1-fpm start
 /usr/sbin/service nginx start
 /usr/sbin/service postfix start

www/controllers/Mail.php

@@ -67,6 +67,12 @@ public function __construct(string $to, string $subject, string $content, string
             $mail->Subject = $subject;
             $mail->Body    = $template;
 
+            /**
+             *  Charset and encoding
+             */
+            $mail->CharSet = 'UTF-8';
+            $mail->Encoding = 'base64';
+
             $mail->send();
         } catch (Exception $e) {
             throw new Exception('Error: mail could not be sent. Mailer Error: ' . $mail->ErrorInfo);

www/models/Repo/Repo.php

@@ -175,7 +175,10 @@ public function getIdByName(string $name, string $dist = null, string $section =
              *  Cas où on a seulement spécifié le nom du repo
              */
             if (empty($dist) or empty($section)) {
-                $stmt = $this->db->prepare("SELECT Id from repos WHERE Name = :name AND Dist IS NULL AND Section IS NULL");
+                $stmt = $this->db->prepare("SELECT Id from repos
+                WHERE Name = :name
+                AND (Dist IS NULL OR Dist = '')
+                AND (Section IS NULL OR Section = '')");
 
             /**
              *  Cas où la distribution et la section ont été spécifié
@@ -217,8 +220,8 @@ public function getEnvIdFromRepoName(string $name, string|null $dist, string|nul
                 INNER JOIN repos
                     ON repos.Id = repos_snap.Id_repo
                 WHERE repos.Name = :name
-                AND repos.Dist IS NULL
-                AND repos.Section IS NULL
+                AND (repos.Dist IS NULL OR repos.Dist = '')
+                AND (repos.Section IS NULL OR repos.Section = '')
                 AND repos_env.Env = :env");
             /**
              *  Case DEB (dist and section are specified)
@@ -717,7 +720,10 @@ public function exists(string $name, string $dist = '', string $section = '')
                 $stmt->bindValue(':dist', $dist);
                 $stmt->bindValue(':section', $section);
             } else {
-                $stmt = $this->db->prepare("SELECT * FROM repos WHERE Name = :name AND Dist IS NULL AND Section IS NULL");
+                $stmt = $this->db->prepare("SELECT * FROM repos WHERE
+                Name = :name
+                AND (Dist IS NULL OR Dist = '')
+                AND (Section IS NULL OR Section = '')");
             }
             $stmt->bindValue(':name', $name);
             $result = $stmt->execute();
@@ -858,8 +864,8 @@ public function isActive(string $name, string $dist = null, string $section = nu
                 INNER JOIN repos_snap
                     ON repos_snap.Id_repo = repos.Id
                 WHERE repos.Name = :name
-                AND repos.Dist IS NULL
-                AND repos.Section IS NULL
+                AND (repos.Dist IS NULL OR repos.Dist = '')
+                AND (repos.Section IS NULL OR repos.Section = '')
                 AND repos_snap.Status = 'active'");
             } else {
                 $stmt = $this->db->prepare("SELECT repos.Id

www/version

@@ -1 +1 @@
-3.7.9
+3.7.9-1