diff --git a/core/module/addon/addon.php b/core/module/addon/addon.php index 75b8460e..b88539ea 100644 --- a/core/module/addon/addon.php +++ b/core/module/addon/addon.php @@ -192,7 +192,7 @@ class addon extends common { // Nouvelle installation ou mise à jour du module if( ! $moduleInstal || $validMaj ){ // Copie récursive des dossiers - $this -> custom_copy( self::TEMP_DIR . $tempFolder, './' ); + $this->copyDir( self::TEMP_DIR . $tempFolder, './' ); $success = true; if( ! $moduleInstal ){ $notification = 'Module '.$moduleName.' installé'; @@ -304,7 +304,7 @@ class addon extends common { // Export des données localisées dans le dossier de données du module if ($infoModules[$this->getUrl(2)]['dataDirectory'] && is_dir($infoModules[$this->getUrl(2)]['dataDirectory'])) { - $this->custom_copy ($infoModules[$this->getUrl(2)]['dataDirectory'], $tmpFolder . '/' . $moduleDir); + $this->copyDir ($infoModules[$this->getUrl(2)]['dataDirectory'], $tmpFolder . '/' . $moduleDir); } } // Enregistrement des pages dans le dossier de langue identique à module @@ -396,7 +396,7 @@ class addon extends common { } // Import des fichiers placés ailleurs que dans les dossiers localisés. - $this->custom_copy (self::TEMP_DIR . $tempFolder,self::DATA_DIR ); + $this->copyDir (self::TEMP_DIR . $tempFolder,self::DATA_DIR ); // Supprimer le dossier temporaire $this->removeDir(self::TEMP_DIR . $tempFolder); @@ -423,32 +423,4 @@ class addon extends common { ]); } } - - /* - * Copie récursive de dossiers - * - */ - private function custom_copy($src, $dst) { - // open the source directory - $dir = opendir($src); - // Make the destination directory if not exist - if (!is_dir($dst)) { - mkdir($dst); - } - // Loop through the files in source directory - while( $file = readdir($dir) ) { - if (( $file != '.' ) && ( $file != '..' )) { - if ( is_dir($src . '/' . $file) ){ - // Recursively calling custom copy function - // for sub directory - $this -> custom_copy($src . '/' . $file, $dst . '/' . $file); - } - else { - copy($src . '/' . $file, $dst . '/' . $file); - } - } - } - closedir($dir); - } - } diff --git a/core/module/config/config.php b/core/module/config/config.php index a0299776..ad98ce40 100644 --- a/core/module/config/config.php +++ b/core/module/config/config.php @@ -746,7 +746,7 @@ class config extends common { if (!is_dir(self::FILE_DIR.'source/backup')) { mkdir(self::FILE_DIR.'source/backup'); } - $this->custom_copy(self::BACKUP_DIR, self::FILE_DIR . 'source/backup' ); + $this->copyDir(self::BACKUP_DIR, self::FILE_DIR . 'source/backup' ); // Valeurs en sortie $this->addOutput([ 'redirect' => helper::baseUrl() . 'config/advanced', @@ -776,31 +776,4 @@ class config extends common { } return $newArray; } - - /* - * Copie récursive de dossiers - * - */ - private function custom_copy($src, $dst) { - // open the source directory - $dir = opendir($src); - // Make the destination directory if not exist - if (!is_dir($dst)) { - mkdir($dst); - } - // Loop through the files in source directory - while( $file = readdir($dir) ) { - if (( $file != '.' ) && ( $file != '..' )) { - if ( is_dir($src . '/' . $file) ){ - // Recursively calling custom copy function - // for sub directory - $this -> custom_copy($src . '/' . $file, $dst . '/' . $file); - } - else { - copy($src . '/' . $file, $dst . '/' . $file); - } - } - } - closedir($dir); - } }