From: stronk7 <stronk7>
Date: Mon, 19 Oct 2009 17:22:27 +0000 (+0000)
Subject: MDL-20591 check for min libxml 2.6.30 version on ims-cc import ; merged from 19_STABLE
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=1a193a89163cc0335c84e9ab9030485ceb26ce56;p=moodle.git

MDL-20591 check for min libxml 2.6.30 version on ims-cc import ; merged from 19_STABLE
---

diff --git a/backup/cc/restore_cc.php b/backup/cc/restore_cc.php
index 1a1b2b0ac1..4568280d51 100755
--- a/backup/cc/restore_cc.php
+++ b/backup/cc/restore_cc.php
@@ -53,6 +53,10 @@ function cc_convert ($dir) {
                 return false;
             }
 
+            if (!$detected_requirements["libxmlminversion"]) {
+                notify(get_string('cc_import_req_libxmlminversion', 'imscc'));
+                return false;
+            }
             if (!$detected_requirements["xsl"]) {
                 notify(get_string('cc_import_req_xsl', 'imscc'));
                 return false;
@@ -102,6 +106,7 @@ function detect_requirements () {
     $detected["xsl"] = extension_loaded('xsl');
     $detected['dom'] = extension_loaded('dom');
     $detected['libxml'] = extension_loaded('libxml');
+    $detected['libxmlminversion'] = extension_loaded('libxml') && version_compare(LIBXML_DOTTED_VERSION, '2.6.30', '>=');
 
     return $detected;
 
diff --git a/lang/en_utf8/imscc.php b/lang/en_utf8/imscc.php
index f475b0e604..6cb3b40579 100644
--- a/lang/en_utf8/imscc.php
+++ b/lang/en_utf8/imscc.php
@@ -1,10 +1,11 @@
 <?php
 $string['enable_cc_import'] = 'Enable CC Import';
-$string['enable_cc_import_description'] = 'This setting enables the import of Common Cartridge (IMS-CC) packages using the standard restore functionality. Note it requires PHP5, DOM, XSL and LIBXML extensions to be installed in the server.';
+$string['enable_cc_import_description'] = 'This setting enables the import of Common Cartridge (IMS-CC) packages using the standard restore functionality. Note it requires PHP5, DOM, XSL and LIBXML (2.6.30 or newer) extensions to be installed in the server.';
 $string['cc_import_req_php5'] = 'ERROR: The Common Cartridge import requires PHP 5 or highter.';
 $string['cc_import_req_xsl'] = 'ERROR: The Common Cartridge import requires XSL.';
 $string['cc_import_req_dom'] = 'ERROR: The Common Cartridge import requires DOM extension.';
-$string['cc_import_req_libxml'] = 'ERROR: The Common Cartridge import requires LIBXML extension';
+$string['cc_import_req_libxml'] = 'ERROR: The Common Cartridge import requires LIBXML extension.';
+$string['cc_import_req_libxmlminversion'] = 'ERROR: The Common Cartridge import requires LIBXML version 2.6.30 or newer.';
 $string['cc2moodle_checking_schema'] = 'CC Format! Checking Schema...';
 $string['cc2moodle_valid_schema'] = 'Schema Valid!';
 $string['cc2moodle_req_auth'] = 'ERROR: The Common Cartridge package requires authorization.';