Merge branch '3061' into 1.11.x

Author: ywarnier

composer.json

@@ -33,7 +33,7 @@
         ]
     },
     "require": {
-        "aferrandini/phpqrcode": "1.0.1",
+        "angelfqc/vimeo-api": "2.0.6",
         "apereo/phpcas": "^1.3",
         "brumann/polyfill-unserialize": "^1.0",
         "chamilo/chash": "0.1.1",
@@ -46,6 +46,7 @@
         "doctrine/migrations": "~1.0@dev",
         "doctrine/orm": "~2.4",
         "emojione/emojione": "1.3.0",
+        "endroid/qr-code": "2.5.*",
         "essence/essence": "2.6.1",
         "ext-curl": "*",
         "ext-dom": "*",
@@ -117,8 +118,7 @@
         "zendframework/zend-config": "~2.6|^3.0",
         "zendframework/zend-feed": "~2.6|^3.0",
         "zendframework/zend-http": "~2.6|^3.0",
-        "zendframework/zend-soap": "~2.6|^3.0",
-        "angelfqc/vimeo-api": "2.0.6"
+        "zendframework/zend-soap": "~2.6|^3.0"
     },
     "require-dev": {
         "behat/behat": "3.5.0",

main/gradebook/gradebook_display_summary.php

@@ -177,7 +177,7 @@
 if (count($userList) == 0) {
     echo Display::return_message(get_lang('NoResultsAvailable'), 'warning');
 } else {
-    echo '<br /><br /><table class="data_table">';
+    echo '<br /><br /><div class="table-responsive"><table class=" table table-bordered data_table">';
     echo '<tr><th>';
     echo get_lang('Student');
     echo '</th>';
@@ -208,7 +208,7 @@
         echo $link;
         echo '</td></tr>';
     }
-    echo '</table>';
+    echo '</table></div>';
 }
 
 Display::display_footer();

main/gradebook/lib/fe/evalform.class.php

@@ -163,8 +163,9 @@ protected function build_all_results_edit_form()
         $renderer = &$this->defaultRenderer();
         // set new form template
         $form_template = '<form{attributes}>
-                    <table class="data_table" border="0" cellpadding="5" cellspacing="5">{content}
-                    </table>
+                <div class="table-responsive">
+                    <table class="data_table" border="0" cellpadding="5" cellspacing="5">{content}</table>
+                </div>
                 </form>';
         $renderer->setFormTemplate($form_template);
 
@@ -224,7 +225,7 @@ protected function build_all_results_edit_form()
 		      <td align="left" >'.$user['official_code'].'</td>
 		      <td align="left" >'.$user['username'].'</td>
 		      '.$user_info.'
-		       <td align="left">{element} / '.$this->evaluation_object->get_max().'
+		      <td align="left">{element} / '.$this->evaluation_object->get_max().'
 		         <!-- BEGIN error --><br /><span style="color: #ff0000;font-size:10px">{error}</span><!-- END error -->
 		      </td>
 		   </tr>';
@@ -309,10 +310,12 @@ protected function build_result_add_form()
         $renderer = &$this->defaultRenderer();
         $renderer->setFormTemplate(
             '<form{attributes}>
-		      <table class="data_table">
-              {content}
-		      </table>
-		   </form>'
+            <div class="table-responsive">
+                <table class="data_table">
+                {content}
+                </table>
+            </div>
+		    </form>'
         );
 
         $users = GradebookUtils::get_users_in_course($this->evaluation_object->get_course_code());
@@ -330,7 +333,7 @@ protected function build_result_add_form()
                   <th>'.get_lang('FirstName').'</th>
                   <th>'.get_lang('LastName').'</th>
                   <th>'.get_lang('Qualify').'</th>
-               </tr>'
+                </tr>'
             );
         } else {
             $renderer->setHeaderTemplate(
@@ -340,7 +343,7 @@ protected function build_result_add_form()
                   <th>'.get_lang('LastName').'</th>
                   <th>'.get_lang('FirstName').'</th>
                   <th>'.get_lang('Qualify').'</th>
-               </tr>'
+                </tr>'
             );
         }
 

main/inc/lib/certificate.lib.php

@@ -1,6 +1,7 @@
 <?php
 /* For licensing terms, see /license.txt */
-
+use Endroid\QrCode\ErrorCorrectionLevel;
+use Endroid\QrCode\QrCode;
 /**
  * Certificate Class
  * Generate certificates based in the gradebook tool.
@@ -510,12 +511,19 @@ public function isHtmlFileGenerated()
      */
     public function generateQRImage($text, $path)
     {
-        // Make sure HTML certificate is generated
         if (!empty($text) && !empty($path)) {
-            //L low, M - Medium, L large error correction
-            return PHPQRCode\QRcode::png($text, $path, 'M', 2, 2);
+            $qrCode = new QrCode($text);
+            //$qrCode->setEncoding('UTF-8');
+            $qrCode->setSize(120);
+            $qrCode->setMargin(5);
+            $qrCode->setWriterByName('png');
+            $qrCode->setErrorCorrectionLevel(ErrorCorrectionLevel::MEDIUM());
+            $qrCode->setForegroundColor(['r' => 0, 'g' => 0, 'b' => 0, 'a' => 0]);
+            $qrCode->setBackgroundColor(['r' => 255, 'g' => 255, 'b' => 255, 'a' => 0]);
+            $qrCode->setValidateResult(false);
+            $qrCode->writeFile($path);
+            return true;
         }
-
         return false;
     }