task: use collage frame & background depending on layout

Change-Id: I55c8bed0b374d703aea769f95f7bc4614c210202

Author: andi34

api/applyEffects.php

@@ -39,6 +39,26 @@
 
     if (isset($_POST['collageLayout'])) {
         $config['collage']['layout'] = $_POST['collageLayout'];
+        if ($config['collage']['allow_selection']) {
+            if ($config['collage']['take_frame'] !== 'off') {
+                $collageFrame = $config['collage']['frame'];
+                $collageFrameDirectory = dirname($collageFrame);
+                $collageFrameFilename = basename($collageFrame);
+                $collageLayoutFrame = $collageFrameDirectory . '/' . $config['collage']['layout'] . '_' . $collageFrameFilename;
+                if (file_exists($collageLayoutFrame)) {
+                    $config['collage']['frame'] = $collageLayoutFrame;
+                }
+            }
+            if (!empty($config['collage']['background']) && $config['collage']['background'] !== '') {
+                $collageBackground = $config['collage']['background'];
+                $collageBackgroundDirectory = dirname($collageBackground);
+                $collageBackgroundFilename = basename($collageBackground);
+                $collageLayoutBackground = $collageBackgroundDirectory . '/' . $config['collage']['layout'] . '_' . $collageBackgroundFilename;
+                if (file_exists($collageLayoutBackground)) {
+                    $config['collage']['background'] = $collageLayoutBackground;
+                }
+            }
+        }
     }
     if (isset($_POST['collageLimit'])) {
         $config['collage']['limit'] = $_POST['collageLimit'];