fix: details in email form routine

app/controller/email.php

@@ -61,7 +61,8 @@ class Email {
 
         $c = $this->data['private']['emailconfig'];
         
-        $template = substr($this->path . $this->data['private']['template'],10);
+        $template = substr($this->path,strlen($f3->get('CONTENT_BASE'))+2) . $this->data['private']['template'];
+        
         
         $f3->set('fields', $this->data['fields']);
 
@@ -95,7 +96,7 @@ class Email {
         }
 
         if ($success) {
-            $f3->reroute("/email/success?email=".urlsafe_b64encode($email));
+            $f3->reroute("/email/success?email=".urlsafe_b64encode($email)."&lang="$f3->get('LANG'));
         } else {
             #$f3->reroute("/email/error");
             echo \Template::instance()->render($template,'text/html');

app/modules/filesinfolders.php

@@ -469,7 +469,7 @@ class FilesInFolders {
                     if ($v['type'] == 'custom') {
                         $fields[$k]['template'] = sprintf(
                             "%s%s",
-                            substr($this->folder,strlen($f3->get('CONTENT_BASE'))), //assumens content folder is content
+                            substr($this->folder,strlen($f3->get('CONTENT_BASE'))), 
                             $v['template']
                         );
                     }