Merge pull request #167 from ins0/feature/paa

Update PAA Image Conversation
ins0 · May 25, 2018 · 2e958cf · 2e958cf
2 parents bd687d6 + 9b97ea9
commit 2e958cf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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" ))

diff --git 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__);