Browse Source

Move tmp to datas

stany.ferer 1 year ago
parent
commit
d4518e1523
2 changed files with 5 additions and 5 deletions
  1. 2 2
      conf.inc.php
  2. 3 3
      core/class/backup.class.php

+ 2 - 2
conf.inc.php

@@ -15,10 +15,10 @@ define("DIR_DATAS", DOCUMENT_DATAS . "datas/");
 define("DIR_DATAS_JSON", DOCUMENT_DATAS . "datas/json/");
 define("DIR_DATAS_JSON", DOCUMENT_DATAS . "datas/json/");
 define("DIR_DATAS_FILES", DOCUMENT_DATAS . "datas/files/");
 define("DIR_DATAS_FILES", DOCUMENT_DATAS . "datas/files/");
 define("DIR_DATAS_DOCS", DOCUMENT_DATAS . "datas/documents/");
 define("DIR_DATAS_DOCS", DOCUMENT_DATAS . "datas/documents/");
-define("DIR_TEMPLATE_EMAILS", DOCUMENT_DATAS . "datas/emails/");
+define("DIR_TEMPLATE_EMAILS", DOCUMENT_DATAS . "core/views/templates/emails/");
 define("SFTP_LOCAL", DOCUMENT_DATAS . "datas/sftp/");
 define("SFTP_LOCAL", DOCUMENT_DATAS . "datas/sftp/");
 define("DIR_PRINT", DOCUMENT_ROOT . "core/print/");
 define("DIR_PRINT", DOCUMENT_ROOT . "core/print/");
-define("DIR_TEMP", DOCUMENT_ROOT . "tmp/");
+define("DIR_TEMP", DOCUMENT_DATAS . "tmp/");
 define("DIR_MAJ", DOCUMENT_ROOT . "maj/");
 define("DIR_MAJ", DOCUMENT_ROOT . "maj/");
 
 
 define("DIR_BACKUP", DOCUMENT_DATAS . "backups/");
 define("DIR_BACKUP", DOCUMENT_DATAS . "backups/");

+ 3 - 3
core/class/backup.class.php

@@ -6,10 +6,10 @@ class backup
     {
     {
         try {
         try {
             $nameNewFolder = date("Ymd-His");
             $nameNewFolder = date("Ymd-His");
-            $newFolder = "/" . DIR_TEMP . $nameNewFolder;
+            $newFolder = DIR_TEMP . $nameNewFolder;
             mkdir($newFolder, 0777);
             mkdir($newFolder, 0777);
             self::dumpMysql($newFolder);
             self::dumpMysql($newFolder);
-            file::copyFolder("/" . DIR_DATAS, $newFolder . "/datas");
+            file::copyFolder(DIR_DATAS, $newFolder . "/datas");
             $localZip = file::zip($newFolder, DIR_TEMP . $nameNewFolder);
             $localZip = file::zip($newFolder, DIR_TEMP . $nameNewFolder);
             file::deleteFolder($newFolder);
             file::deleteFolder($newFolder);
             rename($localZip, DIR_BACKUP . $nameNewFolder . ".zip");
             rename($localZip, DIR_BACKUP . $nameNewFolder . ".zip");
@@ -25,7 +25,7 @@ class backup
     {
     {
         $tmpZip = str_replace(DIR_BACKUP, DIR_TEMP, $_zip);
         $tmpZip = str_replace(DIR_BACKUP, DIR_TEMP, $_zip);
         $tmpDatas = date("Ymd-His") . "-datas";
         $tmpDatas = date("Ymd-His") . "-datas";
-        copy($_zip, $tmpZip);
+        copy($_zip, $tmpZip); 
         $folder = file::unzip($tmpZip, DIR_TEMP); 
         $folder = file::unzip($tmpZip, DIR_TEMP); 
         if(self::dumpMysqlRestore(DIR_TEMP . $folder . "/" . DB_NAME . ".Mysql")){
         if(self::dumpMysqlRestore(DIR_TEMP . $folder . "/" . DB_NAME . ".Mysql")){
             rename(DIR_DATAS, DIR_TEMP . $tmpDatas);
             rename(DIR_DATAS, DIR_TEMP . $tmpDatas);