Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

jmontoyaa · jmontoyaa · commit 81317309cf6b · 2019-05-09T08:44:46.000+02:00
diff --git a/documentation/changelog.html b/documentation/changelog.html
@@ -109,7 +109,7 @@ <h1>Chamilo&nbsp;Changelog</h1>
     <div class="version" aria-label="1.11.10">
         <a name="1.11.10"></a>
 
-        <h1>Chamilo 1.11.10 - Winchester,  07/05/2019</h1>
+        <h1>Chamilo 1.11.10 - Winchester,  08/05/2019</h1>
         <h3>Release notes - summary</h3>
         <p>Chamilo 1.11.10 is a minor bugfix release on top of 1.11.8. Contrary to previous releases, this one has a large number of security fixes. We strongly recommend you update to this version as soon as you can. Most notable in this version are 2 new features in the survey tool.</p>
         <p>Starting from this release, changes are registered by reversed date of addition (the latest changes first), which dramatically improves the changelog edition time. Because yes, it is reviewed manually.</p>
@@ -160,6 +160,7 @@ <h3>Possibly breaking changes</h3>
         <h3>Notable new Features</h3>
         <h4>For end-users, teachers and Chamilo admins</h4>
         <ul aria-live="off">
+            <li>[2019-05-07] (<a href="https://github.com/chamilo/chamilo-lms/commit/94b7ca55b6648fdb01136c13d0d0334ef9b344d7">94b7ca55</a> - <a href="https://task.beeznest.com/issues/15579">BT#15579</a>) Quiz: Add "Unanswered" status for unique questions, showing on the quiz results page</li>
             <li>[2019-04-30] The IMS/LTI plugin now fully supports LTI 1, 1.1, 1.1.1, Outcomes and Deep Linking</li>
             <li>[2019-04-16] (<a href="https://github.com/chamilo/chamilo-lms/commit/f8d91f9c2dc5502b90088a706a50cb2f8b6a066d">f8d91f9c</a> - <a href="https://task.beeznest.com/issues/15534">BT#15534</a>) Quiz: Allow editing questions that are not inside an exercise</li>
             <li>[2019-04-11] (<a href="https://github.com/chamilo/chamilo-lms/commit/c68ccd9f7a637b992d7269d15c62cf1a574d8c1b">c68ccd9f</a> - <a href="https://support.chamilo.org/issues/7683">CT#7683</a>) Display: Improvement in user summary (tracking)</li>
@@ -256,6 +257,29 @@ <h4>For developers and sysadmins</h4>
         </ul>
         <h3>Improvements (minor features) and debug</h3>
         <ul aria-live="off">
+            <li>[2019-05-08] (<a href="https://github.com/chamilo/chamilo-lms/commit/bca6e5887ef508559b0432025b87d9b0ff9f9e0a">bca6e588</a>) Plugin: CustomCertificate: Fix camel caps format</li>
+            <li>[2019-05-08] (<a href="https://github.com/chamilo/chamilo-lms/commit/db498a914d320f6c1f9e7c92f4fd3cb9b762c37d">db498a91</a>) Plugin: CustomCertificate: Add certificate generation date</li>
+            <li>[2019-05-08] (<a href="https://github.com/chamilo/chamilo-lms/commit/cf030732c5d8ed4cd2b0f0bb5a4b8bd05a275168">cf030732</a> - <a href="https://task.beeznest.com/issues/15609">BT#15609</a>) Gradebook: Create "/certificates" folder when creating course In order to avoid issues when creating a course and different sessions BT#15609</li>
+            <li>[2019-05-08] (<a href="https://github.com/chamilo/chamilo-lms/commit/daab628e82c0c06f888ccacec8b7fd840d8ae60e">daab628e</a> - <a href="https://task.beeznest.com/issues/15534">BT#15534</a>) Quiz: Add delete option in question list</li>
+            <li>[2019-05-08] (<a href="https://github.com/chamilo/chamilo-lms/commit/961c380ac71c56bffd7c1fcbd88f062b312d5a6d">961c380a</a> - <a href="https://task.beeznest.com/issues/15631">BT#15631</a>) Quiz: Fix page access when setting "exercises_hidden_when_no_start_date" is "on" in configuration.php $_custom['exercises_hidden_when_no_start_date']</li>
+            <li>[2019-05-08] (<a href="https://github.com/chamilo/chamilo-lms/commit/f7bfb84fc6dc1d2cbc795be85cb74d330e77be63">f7bfb84f</a> - <a href="https://task.beeznest.com/issues/15534">BT#15534</a>) Admin: Improve question search</li>
+            <li>[2019-05-08] (<a href="https://github.com/chamilo/chamilo-lms/commit/6ce8d9e8bd5d396d7a8dad9cfc3c70c0da9ddb0f">6ce8d9e8</a> - <a href="https://task.beeznest.com/issues/15607">BT#15607</a>) Learnpath: Don't add time to a LP with an exercise</li>
+            <li>[2019-05-07] (<a href="https://github.com/chamilo/chamilo-lms/commit/4989cffdce828f2fb17ec9df0eac7c1740e42a33">4989cffd</a>) UI: Restore Open Sans as default font</li>
+            <li>[2019-05-07] (<a href="https://github.com/chamilo/chamilo-lms/commit/70710b512026acaaf0e07f1548b7f847ff4e854e">70710b51</a> - <a href="https://github.com/chamilo/chamilo-lms/issues/2890">GH#2890</a>) Quiz: Allow export/import unique answer, multiple choice, free question in QTI #2890</li>
+            <li>[2019-05-07] (<a href="https://github.com/chamilo/chamilo-lms/commit/a4e9dbbb5d7d657603939ead488bcc6b651794bf">a4e9dbbb</a> - <a href="https://github.com/chamilo/chamilo-lms/issues/2890">GH#2890</a>) Quiz: Fix export/import QTI questions #2890</li>
+            <li>[2019-05-07] (<a href="https://github.com/chamilo/chamilo-lms/commit/5cb0dc94b75dbf0062342ee99d406f7ca3e63ede">5cb0dc94</a> - <a href="https://task.beeznest.com/issues/15629">BT#15629</a>) Session: Fix session catalog pagination</li>
+            <li>[2019-05-07] (<a href="https://github.com/chamilo/chamilo-lms/commit/ee8f82ed0631b35d5be513c363da145e7bcd2127">ee8f82ed</a> - <a href="https://task.beeznest.com/issues/15607">BT#15607</a>) Internal: Fix correct session id</li>
+            <li>[2019-05-07] (<a href="https://github.com/chamilo/chamilo-lms/commit/59e4230c7f7a8dec4cedae6b0fa998bc19cda465">59e4230c</a>) Internal: Use parameter instead of global course/session value</li>
+            <li>[2019-05-07] (<a href="https://github.com/chamilo/chamilo-lms/commit/0d4c6a8d42b3cf840d3efd98d405e44f9e12f2fc">0d4c6a8d</a> - <a href="https://support.chamilo.org/issues/15629">CT#15629</a>) Session: Fix session catalog pagination</li>
+            <li>[2019-05-07] (<a href="https://github.com/chamilo/chamilo-lms/commit/d0dc37daa99ff289a00431e734ec22a09f0c71ee">d0dc37da</a>) Learnpath: Fix frameReady when loading css files</li>
+            <li>[2019-05-07] (<a href="https://github.com/chamilo/chamilo-lms/commit/5ae54427ab8ef9ebc38a19f39688ec00cd3c6762">5ae54427</a>) Learnpath: Fix frameReady when loading css files</li>
+            <li>[2019-05-06] (<a href="https://github.com/chamilo/chamilo-lms/commit/33601ce60e18f193af08099ae1ea4882c55f6560">33601ce6</a> - <a href="https://task.beeznest.com/issues/15389">BT#15389</a>) Learnpath: Fix frameReady when change item</li>
+            <li>[2019-05-06] (<a href="https://github.com/chamilo/chamilo-lms/commit/3ed37d202e340f9507b121e8c73b5171e0c60f43">3ed37d20</a> - <a href="https://task.beeznest.com/issues/15389">BT#15389</a>) Internal: Replace jquery frameReady to load dependencies properly</li>
+            <li>[2019-05-06] (<a href="https://github.com/chamilo/chamilo-lms/commit/8ec637d50fece7a1a0dff374ad6617ca949efa36">8ec637d5</a> - <a href="https://task.beeznest.com/issues/15612">BT#15612</a>) Quiz: Add session info in email notification</li>
+            <li>[2019-05-06] (<a href="https://github.com/chamilo/chamilo-lms/commit/643ea18809079d93e4cf795f19d4d04a7fd30528">643ea188</a> - <a href="https://task.beeznest.com/issues/15612">BT#15612</a>) Quiz: Add session info in email notification</li>
+            <li>[2019-05-06] (<a href="https://github.com/chamilo/chamilo-lms/commit/0ca45d559ab7bb72f20921463b1ae2f1530749ea">0ca45d55</a> - <a href="https://task.beeznest.com/issues/12552">BT#12552</a>) Glossary: Render glossary in the glossary list</li>
+            <li>[2019-05-06] (<a href="https://github.com/chamilo/chamilo-lms/commit/366dfb4a6776cc4d13d353b6191dc5ff9975f39d">366dfb4a</a>) Learnpath: Fix lp js errors</li>
+            <li>[2019-05-03] (<a href="https://github.com/chamilo/chamilo-lms/commit/5db21799eb4eb3c1dd7bd74400304e1154b4912e">5db21799</a> - <a href="https://task.beeznest.com/issues/15617">BT#15617</a>) Reporting: Don't show legal block when allow_terms_conditions is disabled</li>
             <li>[2019-05-03] (<a href="https://github.com/chamilo/chamilo-lms/commit/5db21799eb4eb3c1dd7bd74400304e1154b4912e">5db21799</a> - <a href="https://task.beeznest.com/issues/15617">BT#15617</a>) Tracking: Don't show legal block on user details page when allow_terms_conditions is disabled</li>
             <li>[2019-05-03] (<a href="https://github.com/chamilo/chamilo-lms/commit/2437c45c972bf0f04d478b10b6cee3a6f478fba1">2437c45c</a> - <a href="https://task.beeznest.com/issues/15617">BT#15617</a>) Template: Avoid double function call in user details page</li>
             <li>[2019-05-03] (<a href="https://github.com/chamilo/chamilo-lms/commit/4e74c84af89f7cd2c8ed04209c9f8517e302994f">4e74c84a</a> - <a href="https://task.beeznest.com/issues/15617">BT#15617</a>) Template: Create macro for user details in reporting</li>
diff --git a/documentation/dependencies.html b/documentation/dependencies.html
@@ -71,7 +71,7 @@ <h2>Dependencies - client-side</h2>
 <h2>Dependencies - server-side</h2>
 <ul>
   <li>Apache 2+</li>
-  <li>PHP 5.6 or higher with MySQL bindings. Now also supports PHP up to 7.3.</li>
+  <li>PHP 5.6 with MySQL bindings or PHP 7.1, 7.2 or 7.3. PHP 7.0 is not supported for this version of Chamilo.</li>
   <li>MySQL 5.6+ or any version of MariaDB database server</li>
   <li>php-curl</li>
   <li>php-dom (usually available by default)</li>
diff --git a/documentation/installation_guide.html b/documentation/installation_guide.html
@@ -78,7 +78,7 @@ <h2><a name="1._Pre-requisites"></a>1. Pre-requisites</h2>
 <ul>
 <li><span style="font-weight: bold;">Apache 2.2+</span></li>
 <li><span style="font-weight: bold;">MySQL 5.6+ or MariaDB 5+</span></li>
-<li><span style="font-weight: bold;">PHP 5.6+ (7.2+ recommended for greater efficiency)</span></li>
+<li><span style="font-weight: bold;">PHP 5.6, 7.1, 7.2 or 7.3</span></li>
 </ul>
 <br />
 All these pieces of software are free software and freely available. <br /><br />
diff --git a/documentation/installation_guide_es_ES.html b/documentation/installation_guide_es_ES.html
@@ -88,8 +88,7 @@ <h2><a id="1._Pre-requisites"></a>1. Prerrequisitos</h2>
 <ul>
   <li><span style="font-weight: bold;">Apache 2.2+</span></li>
   <li><span style="font-weight: bold;">MySQL 5.6+ o MariaDB 5+</span></li>
-  <li><span style="font-weight: bold;">PHP 5.6+ (7.2+ recomendado para mayor eficiencia)</span></li>
-</ul>
+  <li><span style="font-weight: bold;">PHP 5.6, 7.1, 7.2 o 7.3</span></li></ul>
 <p>
   Todo este software es software de código abierto y está disponible libremente.
 </p>
diff --git a/documentation/installation_guide_fr_FR.html b/documentation/installation_guide_fr_FR.html
@@ -80,7 +80,7 @@ <h2><a name="1._Pre-requisites"></a>1. Prérequis</h2>
 
             Chamilo est un système de gestion de l'apprentissage (LMS) qui fonctionne
             principallement sur base d'un <span style="font-weight: bold;">serveur web (Apache 2.2+)</span>, de <span style="font-weight: bold;">MySQL 5.6+ ou de MariaDB 5+
-                (5 ou 10)</span> et de <span style="font-weight: bold;">PHP 5.6+</span> (7.2+ recommandé). <br />
+            (5 ou 10)</span> et de <span style="font-weight: bold;">PHP 5.6, 7.1, 7.2 ou 7.3</span>. <br />
 
 
             <br />
diff --git a/documentation/installation_guide_it_IT.html b/documentation/installation_guide_it_IT.html
@@ -73,7 +73,7 @@ <h1>Guida di installazione di Chamilo LMS 1.9</h1>
 <p class="p8"><span class="s1"></span><br></p>
 <p class="p2"><span class="s1"><b>Chamilo</b> può essere installato indifferentemente su server Windows, Linux, Mac OS X e Unix. Tuttavia raccomandiamo l’utilizzo di server Linux per sfruttarne al meglio le caratteristiche di flessibilità, controllo remoto e scalabilità.</span></p>
 <p class="p3"><span class="s1"></span><br></p>
-<p class="p2"><span class="s1"><b>Chamilo</b> è principalmente un <b>LMS (Learning Management System)</b> che gira sulla piattaforma composta da <b>Apache (1.3,2.0 or 2.2)</b>, <b>MySQL 5.6+ (o MariaDB</b>) e <b>PHP 5.6 (7.2+ consigliato)</b>, meglio nota come piattaforma <b>AMP</b>.</span></p>
+<p class="p2"><span class="s1"><b>Chamilo</b> è principalmente un <b>LMS (Learning Management System)</b> che gira sulla piattaforma composta da <b>Apache (1.3,2.0 or 2.2)</b>, <b>MySQL 5.6+ (o MariaDB</b>) e <b>PHP 5.6, 7.1, 7.2 o 7.3</b>, meglio nota come piattaforma <b>AMP</b>.</span></p>
 <p class="p3"><span class="s1"></span><br></p>
 <p class="p2"><span class="s1">Tutti questi software sono gratuiti e liberamente scaricabili.</span></p>
 <p class="p3"><span class="s1"></span><br></p>
diff --git a/main/lang/arabic/trad4all.inc.php b/main/lang/arabic/trad4all.inc.php
@@ -8425,4 +8425,5 @@
 $LegalTermsAgreementStatus = "حالة الموافقة على احكام الاستخدام";
 $HideSurveyInvitationLink = "اخفاء رابط الدعوة الخاص بالاستبيان";
 $LeaveAMessage = "اترك رسالة";
+$OrphanQuestion = "سؤال غير متصل";
 ?>
diff --git a/main/lang/french/trad4all.inc.php b/main/lang/french/trad4all.inc.php
@@ -8326,4 +8326,5 @@
 $LegalTermsAgreementStatus = "État d'acceptation des conditions d'utilisation";
 $HideSurveyInvitationLink = "Cacher le lien d'invitation à l'enquête";
 $LeaveAMessage = "Laisser un message";
+$OrphanQuestion = "Question orpheline";
 ?>
diff --git a/plugin/customcertificate/lang/english.php b/plugin/customcertificate/lang/english.php
@@ -31,6 +31,7 @@
 $strings['DateExpediction'] = "Expediction date";
 $strings['UseDateEndAccessSession'] = "Use end date of session access";
 $strings['UseDateDownloadCertificate'] = "Use certificate download date";
+$strings['UseDateGenerationCertificate'] = "Use certificate generation date";
 $strings['UseCustomDate'] = "Use custom date";
 $strings['LogosSeal'] = "Logos / Seals";
 $strings['LogoLeft'] = "Logo left";
diff --git a/plugin/customcertificate/lang/spanish.php b/plugin/customcertificate/lang/spanish.php
@@ -31,6 +31,7 @@
 $strings['DateExpediction'] = "Fecha expedición";
 $strings['UseDateEndAccessSession'] = "Usar fecha fin de acceso de la sesión";
 $strings['UseDateDownloadCertificate'] = "Usar fecha de descarga del certificado";
+$strings['UseDateGenerationCertificate'] = "Usar fecha de generación del certificado";
 $strings['UseCustomDate'] = "Usar fechas personalizadas";
 $strings['LogosSeal'] = "Logos / Sellos";
 $strings['LogoLeft'] = "Logo izquierda";
diff --git a/plugin/customcertificate/src/index.php b/plugin/customcertificate/src/index.php
@@ -454,7 +454,7 @@ class="form-control-cert text-center datepicker"
 );
 
 $group = [];
-$option1 = &$form->createElement(
+$option = &$form->createElement(
     'radio',
     'type_date_expediction',
     '',
@@ -466,9 +466,9 @@ class="form-control-cert text-center datepicker"
         (($sessionId == 0) ? 'disabled' : ''),
     ]
 );
-$group[] = $option1;
+$group[] = $option;
 
-$option2 = &$form->createElement(
+$option = &$form->createElement(
     'radio',
     'type_date_expediction',
     '',
@@ -479,9 +479,22 @@ class="form-control-cert text-center datepicker"
         'onclick' => 'javascript: typeDateExpedictionSwitchRadioButton();',
     ]
 );
-$group[] = $option2;
+$group[] = $option;
+
+$option = &$form->createElement(
+    'radio',
+    'type_date_expediction',
+    '',
+    get_lang('UseDateGenerationCertificate'),
+    4,
+    [
+        'id' => 'type_date_expediction_4',
+        'onclick' => 'javascript: typeDateExpedictionSwitchRadioButton();',
+    ]
+);
+$group[] = $option;
 
-$option4 = &$form->createElement(
+$option = &$form->createElement(
     'radio',
     'type_date_expediction',
     '',
@@ -492,9 +505,9 @@ class="form-control-cert text-center datepicker"
         'onclick' => 'javascript: typeDateExpedictionSwitchRadioButton();',
     ]
 );
-$group[] = $option4;
+$group[] = $option;
 
-$option3 = &$form->createElement(
+$option = &$form->createElement(
     'radio',
     'type_date_expediction',
     '',
@@ -505,7 +518,7 @@ class="form-control-cert text-center datepicker"
         'onclick' => 'javascript: typeDateExpedictionSwitchRadioButton();',
     ]
 );
-$group[] = $option3;
+$group[] = $option;
 
 $form->addGroup(
     $group,
diff --git a/plugin/customcertificate/src/print_certificate.php b/plugin/customcertificate/src/print_certificate.php
@@ -183,19 +183,19 @@ class = "caraA"
     $htmlText .= '</tr>';
     $htmlText .= '</table>';
 
-    $all_user_info = DocumentManager::get_all_info_to_certificate(
+    $allUserInfo = DocumentManager::get_all_info_to_certificate(
         $studentId,
         $courseCode,
-        true
+        false
     );
 
     $myContentHtml = $infoCertificate['content_course'];
     $myContentHtml = str_replace(chr(13).chr(10).chr(13).chr(10), chr(13).chr(10), $myContentHtml);
-    $info_to_be_replaced_in_content_html = $all_user_info[0];
-    $info_to_replace_in_content_html = $all_user_info[1];
+    $infoToBeReplacedInContentHtml = $allUserInfo[0];
+    $infoToReplaceInContentHtml = $allUserInfo[1];
     $myContentHtml = str_replace(
-        $info_to_be_replaced_in_content_html,
-        $info_to_replace_in_content_html,
+        $infoToBeReplacedInContentHtml,
+        $infoToReplaceInContentHtml,
         $myContentHtml
     );
 
@@ -253,6 +253,8 @@ class = "caraA"
                     '............'
                 );
             }
+        } elseif ($infoCertificate['type_date_expediction'] == 4) {
+            $dateExpediction .= $plugin->get_lang('to').$infoToReplaceInContentHtml[9]; //date_certificate_no_time
         } else {
             if (!empty($sessionInfo)) {
                 $dateInfo = api_get_local_time($sessionInfo['access_end_date']);
