debian/changelog

@@ -1,10 +1,3 @@
-evoadmin-mail (1.0.10-1) unstable; urgency=medium
-
-  * Force system dependencies loading
-  * php-twig is psr-4 only since Bookworm
-
- -- David Prévot <dprevot@evolix.fr>  Tue, 13 Feb 2024 11:20:16 +0100
-
 evoadmin-mail (1.0.9-2) unstable; urgency=medium
 
   [ William Hirigoyen ]

htdocs/lib/MailNotify.php

@@ -1,13 +1,18 @@
 <?php
 
-require_once '/usr/share/php/Twig/autoload.php';
+if (file_exists(stream_resolve_include_path('Twig/autoload.php'))) {
+    require_once 'Twig/autoload.php';
+} elseif (stream_resolve_include_path(file_exists('Twig/Autoloader.php'))) {
+    require_once 'Twig/Autoloader.php';
+    Twig_Autoloader::register();
+}
 
 class MailNotify {
     private static $twig, $adminmail;
 
     public static function init() {
-        $loader = new Twig\Loader\FilesystemLoader('tpl/mail');
-        self::$twig = new Twig\Environment($loader, array(
+        $loader = new Twig_Loader_Filesystem('tpl/mail');
+        self::$twig = new Twig_Environment($loader, array(
             'cache' => false
         ));
 

htdocs/lib/PageController.php

@@ -1,6 +1,11 @@
 <?php
 
-require_once '/usr/share/php/Twig/autoload.php';
+if (file_exists(stream_resolve_include_path('Twig/autoload.php'))) {
+    require_once 'Twig/autoload.php';
+} elseif (stream_resolve_include_path(file_exists('Twig/Autoloader.php'))) {
+    require_once 'Twig/Autoloader.php';
+    Twig_Autoloader::register();
+}
 
 class PageController {
     public static $alerts=array();
@@ -9,8 +14,8 @@ class PageController {
     public static function init(LdapServer $server=NULL) {
         self::$server = $server;
 
-        $loader = new Twig\Loader\FilesystemLoader('tpl/page');
-        self::$twig = new Twig\Environment($loader, array(
+        $loader = new Twig_Loader_Filesystem('tpl/page');
+        self::$twig = new Twig_Environment($loader, array(
             'cache' => false
         ));