From 21b9dfc2d278dbb164e8333dadae2fcedf300687 Mon Sep 17 00:00:00 2001
From: Marco Rieger <m.rieger@mittwald.de>
Date: Fri, 25 May 2018 11:59:37 +0200
Subject: [PATCH 1/2] update paa image conversation

---
 .../Squads/src/Frontend/Squads/Service/SquadImageService.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/Frontend/Squads/src/Frontend/Squads/Service/SquadImageService.php b/module/Frontend/Squads/src/Frontend/Squads/Service/SquadImageService.php
index d7007f2..d6842b2 100644
--- a/module/Frontend/Squads/src/Frontend/Squads/Service/SquadImageService.php
+++ b/module/Frontend/Squads/src/Frontend/Squads/Service/SquadImageService.php
@@ -37,7 +37,7 @@ public function convertFromTGA($sourceImage)
             $imageTGA->destroy();
             $imageTGA->clear();
 
-            $command = 'cd '.escapeshellcmd(escapeshellarg(dirname($sourceImage))).' && wine /var/www/racecore/library/TexView2/Pal2PacE.exe ' . escapeshellcmd(escapeshellarg(basename($tgaPath))) . ' ' . escapeshellcmd(escapeshellarg(basename($tgaPath, '.tga') . '.paa'));
+            $command = 'cd '.escapeshellcmd(escapeshellarg(dirname($sourceImage))).' && wine /var/www/armasquads/tool/ImageToPAA/ImageToPAA.exe ' . escapeshellcmd(escapeshellarg(basename($tgaPath))) . ' ' . escapeshellcmd(escapeshellarg(basename($tgaPath, '.tga') . '.paa'));
             exec($command, $response);
 
             @unlink($tgaPath);
@@ -59,7 +59,7 @@ public function convert($sourceImage)
     {
         Try {
             // convert to paa
-            $command = 'cd '.escapeshellcmd(escapeshellarg(dirname($sourceImage))).' && wine /var/www/racecore/library/TexView2/Pal2PacE.exe ' . escapeshellcmd(escapeshellarg(basename($sourceImage))) . ' ' . escapeshellcmd(escapeshellarg(basename($sourceImage, '.png') . '.paa'));
+            $command = 'cd '.escapeshellcmd(escapeshellarg(dirname($sourceImage))).' && wine /var/www/armasquads/tool/ImageToPAA/ImageToPAA.exe ' . escapeshellcmd(escapeshellarg(basename($sourceImage))) . ' ' . escapeshellcmd(escapeshellarg(basename($sourceImage, '.png') . '.paa'));
             exec($command, $response);
 
             if( isset($response[1]) && strstr(strtolower($response[1]), "error" ))

From 9b97ea9ea45e92170ce31a17c0983c25d002b2c8 Mon Sep 17 00:00:00 2001
From: Marco Rieger <m.rieger@mittwald.de>
Date: Fri, 25 May 2018 12:03:55 +0200
Subject: [PATCH 2/2] adjust error reporting level

---
 public/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/index.php b/public/index.php
index 6c80410..f9ca5e7 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,5 +1,5 @@
 <?php
-error_reporting(E_ALL);
+error_reporting(E_ALL & ~E_DEPRECATED & ~E_NOTICE);
 define('REQUEST_MICROTIME', microtime(true));
 define('ROOT_PATH', __DIR__);