diff --git a/composer.json b/composer.json index 46bb95c014..a981e970ec 100755 --- a/composer.json +++ b/composer.json @@ -36,7 +36,8 @@ "zendframework/zend-config": "2.3.3", "ezyang/htmlpurifier": "4.6.0", "szymach/c-pchart": "1.*", - "aferrandini/phpqrcode": "1.0.1" + "aferrandini/phpqrcode": "1.0.1", + "mpdf/mpdf": "5.7.4" }, "extra": { "branch-alias": { diff --git a/composer.lock b/composer.lock index 731703604a..98894150b8 100755 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "14f25295cfdba7534deecf11519b2d22", + "hash": "6278d7d871b000bcfc52ed6726bc22e5", "packages": [ { "name": "aferrandini/phpqrcode", @@ -422,6 +422,49 @@ ], "time": "2014-12-29 21:29:35" }, + { + "name": "mpdf/mpdf", + "version": "v5.7.4", + "source": { + "type": "git", + "url": "https://github.com/finwe/mpdf.git", + "reference": "f9a374c7ea975ce8c795cec4dfd17ef55addac9c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/finwe/mpdf/zipball/f9a374c7ea975ce8c795cec4dfd17ef55addac9c", + "reference": "f9a374c7ea975ce8c795cec4dfd17ef55addac9c", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "php": ">=4.3.10" + }, + "type": "library", + "autoload": { + "classmap": [ + "mpdf.php", + "classes" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-1.0+" + ], + "authors": [ + { + "name": "Ian Back" + } + ], + "description": "A PHP class to generate PDF files from HTML with Unicode/UTF-8 and CJK support", + "homepage": "http://www.mpdf1.com/mpdf/index.php", + "keywords": [ + "pdf", + "php", + "utf-8" + ], + "time": "2014-12-14 18:32:11" + }, { "name": "neutron/temporary-filesystem", "version": "2.1.1", @@ -569,6 +612,33 @@ ], "time": "2012-12-21 11:40:51" }, + { + "name": "ros/ezpdf", + "version": "0.12.0-RC17", + "source": { + "type": "git", + "url": "https://github.com/didaxRedux/php-ezPDF.git", + "reference": "62e09bc84985e848645c6ae359cc8be4275cfd32" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/didaxRedux/php-ezPDF/zipball/62e09bc84985e848645c6ae359cc8be4275cfd32", + "reference": "62e09bc84985e848645c6ae359cc8be4275cfd32", + "shasum": "" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Porting of the well-known R&OS PDF class.", + "time": "2014-09-30 15:15:44" + }, { "name": "sabre/vobject", "version": "3.3.5", @@ -1166,7 +1236,8 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "php-ffmpeg/php-ffmpeg": 20 + "php-ffmpeg/php-ffmpeg": 20, + "ros/ezpdf": 5 }, "prefer-stable": false, "prefer-lowest": false, diff --git a/main/attendance/index.php b/main/attendance/index.php index f46c439d17..76bfec0087 100755 --- a/main/attendance/index.php +++ b/main/attendance/index.php @@ -24,7 +24,7 @@ require_once '../inc/global.inc.php'; require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/gradebook_functions.inc.php'; require_once api_get_path(LIBRARY_PATH).'attendance.lib.php'; require_once api_get_path(LIBRARY_PATH).'app_view.php'; -require_once api_get_path(LIBRARY_PATH).'ezpdf/class.ezpdf.php'; + require_once 'attendance_controller.php'; require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/fe/exportgradebook.php'; require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php'; diff --git a/main/gradebook/gradebook.php b/main/gradebook/gradebook.php index 483ddae455..add69a43be 100755 --- a/main/gradebook/gradebook.php +++ b/main/gradebook/gradebook.php @@ -30,8 +30,7 @@ require_once 'lib/gradebook_data_generator.class.php'; require_once 'lib/fe/gradebooktable.class.php'; require_once 'lib/fe/displaygradebook.php'; require_once 'lib/fe/userform.class.php'; -require_once api_get_path(LIBRARY_PATH).'document.lib.php'; -require_once api_get_path(LIBRARY_PATH).'ezpdf/class.ezpdf.php'; + $htmlHeadXtra[] = ' - -
-WARNING: This utility will OVERWRITE mpdf.php file in the current directory.
-Select the functions you wish to INCLUDE in your mpdf.php program. When you click generate, a new mpdf.php file will be written to the current directory.
-