chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use PhpZip\ZipFile

Browse Source
pull/3924/head
Julio Montoya 4 years ago
parent e1ff2f8443
commit cd0b9b0d5b
5 changed files with 42 additions and 247 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 124
      public/main/exercise/export/aiken/aiken_import.inc.php
  2. 146
      public/main/exercise/export/exercise_import.inc.php
  3. 7
      public/main/inc/lib/api.lib.php
  4. 5
      public/main/lp/aicc.class.php
  5. 7
      public/main/lp/scorm.class.php

124
public/main/exercise/export/aiken/aiken_import.inc.php
Unescape View File

@ -43,67 +43,6 @@ function aiken_display_form()
echo $form;
}
/**
* Gets the uploaded file (from $_FILES) and unzip it to the given directory.
*
* @param string The directory where to do the work
* @param string The path of the temporary directory where the exercise was uploaded and unzipped
* @param string $baseWorkDir
* @param string $uploadPath
*
* @return bool True on success, false on failure
*/
function get_and_unzip_uploaded_exercise($baseWorkDir, $uploadPath)
{
$_course = api_get_course_info();
$_user = api_get_user_info();
// Check if the file is valid (not to big and exists)
if (!isset($_FILES['userFile']) || !is_uploaded_file($_FILES['userFile']['tmp_name'])) {
// upload failed
return false;
}
if (preg_match('/.zip$/i', $_FILES['userFile']['name']) &&
handle_uploaded_document(
$_course,
$_FILES['userFile'],
$baseWorkDir,
$uploadPath,
$_user['user_id'],
0,
null,
1,
'overwrite',
false,
true
)
) {
if (!function_exists('gzopen')) {
return false;
}
// upload successful
return true;
} elseif (preg_match('/.txt/i', $_FILES['userFile']['name']) &&
handle_uploaded_document(
$_course,
$_FILES['userFile'],
$baseWorkDir,
$uploadPath,
$_user['user_id'],
0,
null,
0,
'overwrite',
false
)
) {
return true;
}
return false;
}
/**
* Main function to import the Aiken exercise.
*
@ -113,62 +52,19 @@ function get_and_unzip_uploaded_exercise($baseWorkDir, $uploadPath)
*/
function aiken_import_exercise($file)
{
$archive_path = api_get_path(SYS_ARCHIVE_PATH).'aiken/';
$baseWorkDir = $archive_path;
$uploadPath = 'aiken_'.api_get_unique_id();
if (!is_dir($baseWorkDir.$uploadPath)) {
mkdir($baseWorkDir.$uploadPath, api_get_permissions_for_new_directories(), true);
}
// set some default values for the new exercise
$exercise_info = [];
$exercise_info['name'] = preg_replace('/.(zip|txt)$/i', '', $file);
$exercise_info['name'] = preg_replace('/.(txt)$/i', '', $file);
$exercise_info['question'] = [];
// if file is not a .zip, then we cancel all
if (!preg_match('/.(zip|txt)$/i', $file)) {
return 'YouMustUploadAZipOrTxtFile';
if (!preg_match('/.(zip)$/i', $file)) {
return 'You must upload a .txt file';
}
// unzip the uploaded file in a tmp directory
if (preg_match('/.(zip|txt)$/i', $file)) {
if (!get_and_unzip_uploaded_exercise($baseWorkDir.$uploadPath, '/')) {
return 'ThereWasAProblemWithYourFile';
}
}
// find the different manifests for each question and parse them
$exerciseHandle = opendir($baseWorkDir.$uploadPath);
$file_found = false;
$operation = false;
$result = false;
// Parse every subdirectory to search txt question files
while (false !== ($file = readdir($exerciseHandle))) {
if (is_dir($baseWorkDir.'/'.$uploadPath.$file) && '.' != $file && '..' != $file) {
//find each manifest for each question repository found
$questionHandle = opendir($baseWorkDir.'/'.$uploadPath.$file);
while (false !== ($questionFile = readdir($questionHandle))) {
if (preg_match('/.txt$/i', $questionFile)) {
$result = aiken_parse_file(
$exercise_info,
$baseWorkDir,
$file,
$questionFile
);
$file_found = true;
}
}
} elseif (preg_match('/.txt$/i', $file)) {
$result = aiken_parse_file($exercise_info, $baseWorkDir.$uploadPath, '', $file);
$file_found = true;
}
}
if (!$file_found) {
$result = 'NoTxtFileFoundInTheZip';
}
$result = aiken_parse_file($exercise_info, $file);
if (true !== $result) {
return $result;
@ -267,8 +163,6 @@ function aiken_import_exercise($file)
);
}
// Delete the temp dir where the exercise was unzipped
my_delete($baseWorkDir.$uploadPath);
$operation = $last_exercise_id;
}
@ -290,15 +184,13 @@ function aiken_import_exercise($file)
* @return string|bool True on success, error message on error
* @assert ('','','') === false
*/
function aiken_parse_file(&$exercise_info, $exercisePath, $file, $questionFile)
function aiken_parse_file(&$exercise_info, $file)
{
$questionTempDir = $exercisePath.'/'.$file.'/';
$questionFilePath = $questionTempDir.$questionFile;
if (!is_file($questionFilePath)) {
if (!is_file($file)) {
return 'FileNotFound';
}
$text = file_get_contents($questionFilePath);
$text = file_get_contents($file);
$detect = mb_detect_encoding($text, 'ASCII', true);
if ('ASCII' === $detect) {
$data = explode("\n", $text);

146
public/main/exercise/export/exercise_import.inc.php
Unescape View File

@ -3,6 +3,7 @@
/* For licensing terms, see /license.txt */
use Chamilo\CoreBundle\Component\Utils\ChamiloApi;
use PhpZip\ZipFile;
use Symfony\Component\DomCrawler\Crawler;
/**
@ -12,51 +13,10 @@ use Symfony\Component\DomCrawler\Crawler;
* @author Yannick Warnier <yannick.warnier@beeznest.com>
*/
/**
* Unzip the exercise in the temp folder.
*
* @param string $baseWorkDir The path of the temporary directory where the exercise was uploaded and unzipped
* @param string $uploadPath
*
* @return bool
*/
function get_and_unzip_uploaded_exercise($baseWorkDir, $uploadPath)
{
$_course = api_get_course_info();
$_user = api_get_user_info();
//Check if the file is valid (not to big and exists)
if (!isset($_FILES['userFile']) || !is_uploaded_file($_FILES['userFile']['tmp_name'])) {
// upload failed
return false;
}
if (preg_match('/.zip$/i', $_FILES['userFile']['name'])) {
return handle_uploaded_document(
$_course,
$_FILES['userFile'],
$baseWorkDir,
$uploadPath,
$_user['user_id'],
0,
null,
1,
null,
null,
true,
null,
null,
false
);
}
return false;
}
/**
* Imports an exercise in QTI format if the XML structure can be found in it.
*
* @param array $file
* @param string $file
*
* @return string|array as a backlog of what was really imported, and error or debug messages to display
*/
@ -65,17 +25,6 @@ function import_exercise($file)
global $exerciseInfo;
global $resourcesLinks;
$baseWorkDir = api_get_path(SYS_ARCHIVE_PATH).'qti2/';
if (!is_dir($baseWorkDir)) {
mkdir($baseWorkDir, api_get_permissions_for_new_directories(), true);
}
$uploadPath = api_get_unique_id().'/';
if (!is_dir($baseWorkDir.$uploadPath)) {
mkdir($baseWorkDir.$uploadPath, api_get_permissions_for_new_directories(), true);
}
// set some default values for the new exercise
$exerciseInfo = [];
$exerciseInfo['name'] = preg_replace('/.zip$/i', '', $file);
@ -86,15 +35,10 @@ function import_exercise($file)
return 'UplZipCorrupt';
}
// unzip the uploaded file in a tmp directory
if (!get_and_unzip_uploaded_exercise($baseWorkDir, $uploadPath)) {
return 'UplZipCorrupt';
}
$zipFile = new ZipFile();
$zipFile->openFile($file);
$zipContentArray = $zipFile->getEntries();
$baseWorkDir = $baseWorkDir.$uploadPath;
// find the different manifests for each question and parse them.
$exerciseHandle = opendir($baseWorkDir);
$fileFound = false;
$result = false;
$filePath = null;
@ -103,37 +47,23 @@ function import_exercise($file)
// parse every subdirectory to search xml question files and other assets to be imported
// The assets-related code is a bit fragile as it has to deal with files renamed by Chamilo and it only works if
// the imsmanifest.xml file is read.
while (false !== ($file = readdir($exerciseHandle))) {
if (is_dir($baseWorkDir.'/'.$file) && '.' != $file && '..' != $file) {
// Find each manifest for each question repository found
$questionHandle = opendir($baseWorkDir.'/'.$file);
// Only analyse one level of subdirectory - no recursivity here
while (false !== ($questionFile = readdir($questionHandle))) {
if (preg_match('/.xml$/i', $questionFile)) {
$isQti = isQtiQuestionBank($baseWorkDir.'/'.$file.'/'.$questionFile);
if ($isQti) {
$result = qti_parse_file($baseWorkDir, $file, $questionFile);
$filePath = $baseWorkDir.$file;
$fileFound = true;
} else {
$isManifest = isQtiManifest($baseWorkDir.'/'.$file.'/'.$questionFile);
if ($isManifest) {
$resourcesLinks = qtiProcessManifest($baseWorkDir.'/'.$file.'/'.$questionFile);
}
}
}
}
} elseif (preg_match('/.xml$/i', $file)) {
$isQti = isQtiQuestionBank($baseWorkDir.'/'.$file);
if ($isQti) {
$result = qti_parse_file($baseWorkDir, '', $file);
$filePath = $baseWorkDir.'/'.$file;
$fileFound = true;
} else {
$isManifest = isQtiManifest($baseWorkDir.'/'.$file);
if ($isManifest) {
$resourcesLinks = qtiProcessManifest($baseWorkDir.'/'.$file);
}
foreach ($zipContentArray as $item) {
$file = $item->getName();
if ($item->isDirectory()) {
continue;
}
$data = $item->getData();
$isQti = isQtiQuestionBank($data);
if ($isQti) {
$result = qti_parse_file($data);
$fileFound = true;
} else {
$isManifest = isQtiManifest($data);
if ($isManifest) {
$resourcesLinks = qtiProcessManifest($data);
}
}
}
@ -145,13 +75,14 @@ function import_exercise($file)
if (false == $result) {
return false;
}
// 1. Create exercise.
$exercise = new Exercise();
$exercise->exercise = $exerciseInfo['name'];
// Random QTI support
if (isset($exerciseInfo['order_type'])) {
if ('Random' == $exerciseInfo['order_type']) {
if ('Random' === $exerciseInfo['order_type']) {
$exercise->setQuestionSelectionType(2);
$exercise->random = -1;
}
@ -261,9 +192,6 @@ function import_exercise($file)
$answer->save();
}
// delete the temp dir where the exercise was unzipped
my_delete($baseWorkDir.$uploadPath);
return $last_exercise_id;
}
@ -287,25 +215,17 @@ function formatText($text)
*
* @return bool
*/
function qti_parse_file($exercisePath, $file, $questionFile)
function qti_parse_file($data)
{
global $record_item_body;
global $questionTempDir;
$questionTempDir = $exercisePath.'/'.$file.'/';
$questionFilePath = $questionTempDir.$questionFile;
if (!($fp = fopen($questionFilePath, 'r'))) {
if (empty($data)) {
Display::addFlash(Display::return_message(get_lang('Error opening question\'s XML file'), 'error'));
return false;
}
$data = fread($fp, filesize($questionFilePath));
//close file
fclose($fp);
//parse XML question file
//$data = str_replace(array('<p>', '</p>', '<front>', '</front>'), '', $data);
$data = ChamiloApi::stripGivenTags($data, ['p', 'front']);
@ -656,9 +576,8 @@ function parseQti2($xmlData)
*
* @return bool Whether it is an IMS/QTI question bank or not
*/
function isQtiQuestionBank($filePath)
function isQtiQuestionBank($data)
{
$data = file_get_contents($filePath);
if (!empty($data)) {
$match = preg_match('/ims_qtiasiv(\d)p(\d)/', $data);
// @todo allow other types
@ -679,9 +598,8 @@ function isQtiQuestionBank($filePath)
*
* @return bool Whether it is an IMS/QTI manifest file or not
*/
function isQtiManifest($filePath)
function isQtiManifest($data)
{
$data = file_get_contents($filePath);
if (!empty($data)) {
$match = preg_match('/imsccv(\d)p(\d)/', $data);
if ($match) {
@ -700,14 +618,12 @@ function isQtiManifest($filePath)
*
* @return bool
*/
function qtiProcessManifest($filePath)
function qtiProcessManifest($data)
{
$xml = simplexml_load_file($filePath);
$xml = simplexml_load_string($data);
$course = api_get_course_info();
$sessionId = api_get_session_id();
$courseDir = $course['path'];
$sysPath = api_get_path(SYS_COURSE_PATH);
$exercisesSysPath = $sysPath.$courseDir.'/document/';
$exercisesSysPath = '/';
$webPath = api_get_path(WEB_CODE_PATH);
$exercisesWebPath = $webPath.'document/document.php?'.api_get_cidreq().'&action=download&id=';
$links = [

7
public/main/inc/lib/api.lib.php
Unescape View File

@ -7405,12 +7405,7 @@ function api_get_language_list_for_flag()
return $languages;
}
/**
* @param string $name
*
* @return ZipStream
*/
function api_create_zip($name)
function api_create_zip(string $name): ZipStream
{
$zipStreamOptions = new Archive();
$zipStreamOptions->setSendHttpHeaders(true);

5
public/main/lp/aicc.class.php
Unescape View File

@ -616,6 +616,7 @@ class aicc extends learnpath
removeDir($zipfoldername); //make sure the temp dir is cleared
mkdir($zipfoldername, api_get_permissions_for_new_directories());
// @todo use ZipFile
// Create zipfile of given directory.
$zip_folder = new PclZip($zipfilename);
$zip_folder->create($scormfoldername.'/', PCLZIP_OPT_REMOVE_PATH, $scormfoldername.'/');
@ -623,10 +624,6 @@ class aicc extends learnpath
//this file sending implies removing the default mime-type from php.ini
DocumentManager::file_send_for_download($zipfilename, true);
// Delete the temporary zip file and directory in fileManage.lib.php
my_delete($zipfilename);
my_delete($zipfoldername);
return true;
}

7
public/main/lp/scorm.class.php
Unescape View File

@ -792,11 +792,10 @@ class scorm extends learnpath
$zipfilename = $zipfoldername.'/'.$LPnamesafe.'.zip';
// Get a temporary dir for creating the zip file.
//error_log('cleaning dir '.$zipfoldername, 0);
my_delete($zipfoldername); // Make sure the temp dir is cleared.
mkdir($zipfoldername, api_get_permissions_for_new_directories());
// Create zipfile of given directory.
// @todo use ZipFile
$zip_folder = new PclZip($zipfilename);
$zip_folder->create($scormfoldername.'/', PCLZIP_OPT_REMOVE_PATH, $scormfoldername.'/');
@ -804,10 +803,6 @@ class scorm extends learnpath
//DocumentManager::file_send_for_download($zipfilename, true, $LPnamesafe.'.zip');
DocumentManager::file_send_for_download($zipfilename, true);
// Delete the temporary zip file and directory in fileManage.lib.php
my_delete($zipfilename);
my_delete($zipfoldername);
return true;
}

Write Preview
Loading…
Cancel
Save