Compare commits

...

5 commits

Author SHA1 Message Date
David Prevot d76d3e7596 Update changelog for 1.0.10-1 release
All checks were successful
gitea/evoadmin-mail/pipeline/head This commit looks good
gitea/evoadmin-mail/pipeline/tag This commit looks good
2024-02-13 11:20:35 +01:00
David Prevot 3e3ca1cd40 Update upstream source from tag 'upstream/1.0.10'
Update to upstream version '1.0.10'
with Debian dir e5b7e7fed1
2024-02-13 11:19:38 +01:00
David Prevot f22c255a0b New upstream version 1.0.10
All checks were successful
gitea/evoadmin-mail/pipeline/head This commit looks good
gitea/evoadmin-mail/pipeline/tag This commit looks good
2024-02-13 11:19:38 +01:00
David Prevot 0257f25e92 php-twig is psr-4 only since Bullseye
All checks were successful
gitea/evoadmin-mail/pipeline/head This commit looks good
gitea/evoadmin-mail/pipeline/tag This commit looks good
2024-02-13 10:09:16 +01:00
David Prevot 2d312b605a Force system dependencies loading 2024-02-13 10:00:14 +01:00
3 changed files with 13 additions and 16 deletions

7
debian/changelog vendored
View file

@ -1,3 +1,10 @@
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 ]

View file

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

View file

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