FIX #7045 modified content in new session variable

apps/maarch_entreprise/actions/index_mlb.php

@@ -1100,12 +1100,11 @@ function check_docserver($collId)
     if ($core->is_module_loaded('templates')
         && $_SESSION['upfile']['format'] == 'maarch'
     ) {
-        if (!isset($_SESSION['template_content'])
+        if (!isset($_SESSION['template_modified_content'])
             || $_SESSION['template_content_same']
         ) {
             $_SESSION['action_error'] = _TEMPLATE.' '._IS_EMPTY;
             unset($_SESSION['template_content_same']);
-
             return false;
         }
         if (
@@ -1122,9 +1121,10 @@ function check_docserver($collId)
 
                 return false;
             }
-            fwrite($myfile, $_SESSION['template_content']);
+            fwrite($myfile, $_SESSION['template_modified_content']);
             fclose($myfile);
             $_SESSION['upfile']['size'] = filesize($tmpPath);
+            $_SESSION['template_modified_content'] = '';
         }
     }
     if ($_SESSION['origin'] == 'scan') {

apps/maarch_entreprise/getIframeTemplateContent.php

@@ -19,21 +19,20 @@
 *    along with Maarch Framework.  If not, see <http://www.gnu.org/licenses/>.
 */
 //Remove html tags to avoid empty space 
-$_SESSION['template_content'] = trim(str_replace(
+$sessionTemplateContent = trim(str_replace(
     array('&nbsp;','<p>','</p>'),
     '',
     $_SESSION['template_content']
 ));
-$_SESSION['template_content'] = strip_tags($_SESSION['template_content']);
-$_SESSION['template_content'] = trim(preg_replace(
+$sessionTemplateContent = strip_tags($sessionTemplateContent);
+$sessionTemplateContent = trim(preg_replace(
     '/\s*/m', 
     '', 
-    $_SESSION['template_content']));
+    $sessionTemplateContent));
 
-$sessionTemplateContent = utf8_encode(html_entity_decode($_SESSION['template_content']));
+$sessionTemplateContent = utf8_encode(html_entity_decode($sessionTemplateContent));
 
 $requestTemplateContent = utf8_encode(html_entity_decode(strip_tags($_REQUEST['template_content'])));
-//var_dump($sessionTemplateContent);var_dump($requestTemplateContent);
 $sessionTemplateContent = trim(str_replace(
     "Â",
     "",
@@ -84,9 +83,9 @@ if ($sessionTemplateContent == $requestTemplateContent || empty($sessionTemplate
     $_SESSION['template_content_same'] = true;
     echo "{status : '1, responseText : same content ! '}";
 } else {
-    $_SESSION['template_content'] = $_REQUEST['template_content'];
-    $_SESSION['template_content'] = str_replace('[dates]', date('d-m-Y'), $_SESSION['template_content']);
-    $_SESSION['template_content'] = str_replace('[time]', date('G:i:s'), $_SESSION['template_content']);
+    $_SESSION['template_modified_content'] = $_REQUEST['template_content'];
+    $_SESSION['template_modified_content'] = str_replace('[dates]', date('d-m-Y'), $_SESSION['template_modified_content']);
+    $_SESSION['template_modified_content'] = str_replace('[time]', date('G:i:s'), $_SESSION['template_modified_content']);
     echo "{status : '0, responseText : " . addslashes(functions::xssafe($_REQUEST['template_content'])) . "'}";
 }