diff --git a/.gitignore b/.gitignore index 4e5866a115..0fb0b2ba99 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ vendor/tsugi/lib/.gitignore vendor/tsugi/lib/phpdoc.dist.xml vendor/tsugi/lib/phpunit.xml.dist vendor/tsugi/lib/tests/ +vendor/tsugi/lib/scripts/ diff --git a/composer.json b/composer.json index e81e7441ac..0bb0997b51 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "symfony/error-handler" : "v5.3.11", "symfony/http-kernel" : "v5.3.12", - "tsugi/lib": "dev-master#b276926b2db0ed3f7db7236a74cbf4bd6d6da3e2", + "tsugi/lib": "dev-master#b65fed4aaa1cc3a660be981295dd6987158ff3c9", "koseu/lib": "dev-master#5c5bcb32469977bea262b1900461c3f205adb899" }, "config": { diff --git a/composer.lock b/composer.lock index 6be18fe19b..baa816b210 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f288e402a56aadc8014843dedfe179c3", + "content-hash": "ca37cd494b59bbea26d8aa0ff200fee2", "packages": [ { "name": "brick/math", @@ -5866,12 +5866,12 @@ "source": { "type": "git", "url": "https://github.com/tsugiproject/tsugi-php.git", - "reference": "b276926b2db0ed3f7db7236a74cbf4bd6d6da3e2" + "reference": "b65fed4aaa1cc3a660be981295dd6987158ff3c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tsugiproject/tsugi-php/zipball/b276926b2db0ed3f7db7236a74cbf4bd6d6da3e2", - "reference": "b276926b2db0ed3f7db7236a74cbf4bd6d6da3e2", + "url": "https://api.github.com/repos/tsugiproject/tsugi-php/zipball/b65fed4aaa1cc3a660be981295dd6987158ff3c9", + "reference": "b65fed4aaa1cc3a660be981295dd6987158ff3c9", "shasum": "" }, "require": { @@ -5914,7 +5914,7 @@ "issues": "https://github.com/tsugiproject/tsugi-php/issues", "source": "https://github.com/tsugiproject/tsugi-php/tree/master" }, - "time": "2022-11-01T02:01:23+00:00" + "time": "2022-11-03T19:22:13+00:00" }, { "name": "vlucas/phpdotenv", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index d5dcb8ff1e..3a163fb3ac 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -6060,12 +6060,12 @@ "source": { "type": "git", "url": "https://github.com/tsugiproject/tsugi-php.git", - "reference": "b276926b2db0ed3f7db7236a74cbf4bd6d6da3e2" + "reference": "b65fed4aaa1cc3a660be981295dd6987158ff3c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tsugiproject/tsugi-php/zipball/b276926b2db0ed3f7db7236a74cbf4bd6d6da3e2", - "reference": "b276926b2db0ed3f7db7236a74cbf4bd6d6da3e2", + "url": "https://api.github.com/repos/tsugiproject/tsugi-php/zipball/b65fed4aaa1cc3a660be981295dd6987158ff3c9", + "reference": "b65fed4aaa1cc3a660be981295dd6987158ff3c9", "shasum": "" }, "require": { @@ -6078,7 +6078,7 @@ "phpunit/php-timer": "v5.0.3", "phpunit/phpunit": "9.*" }, - "time": "2022-11-01T02:01:23+00:00", + "time": "2022-11-03T19:22:13+00:00", "default-branch": true, "type": "library", "installation-source": "source", diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 5e09a2e260..6d5aa79bbf 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -3,7 +3,7 @@ 'name' => '__root__', 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => '8b8e5e43c538af0d7932f1d42a57953af24ec110', + 'reference' => '81bed6d80ba1e19cd460da1d9e9396ad45470b26', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -13,7 +13,7 @@ '__root__' => array( 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => '8b8e5e43c538af0d7932f1d42a57953af24ec110', + 'reference' => '81bed6d80ba1e19cd460da1d9e9396ad45470b26', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -847,7 +847,7 @@ 'tsugi/lib' => array( 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => 'b276926b2db0ed3f7db7236a74cbf4bd6d6da3e2', + 'reference' => 'b65fed4aaa1cc3a660be981295dd6987158ff3c9', 'type' => 'library', 'install_path' => __DIR__ . '/../tsugi/lib', 'aliases' => array( diff --git a/vendor/tsugi/lib/README.md b/vendor/tsugi/lib/README.md index 899ce7c489..2177d86dca 100644 --- a/vendor/tsugi/lib/README.md +++ b/vendor/tsugi/lib/README.md @@ -4,8 +4,8 @@ Tsugi PHP Library [![Apereo Incubating badge](https://img.shields.io/badge/apereo-incubating-blue.svg?logo=data%3Aimage%2Fpng%3Bbase64%2CiVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABmJLR0QA%2FwD%2FAP%2BgvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH4QUTEi0ybN9p9wAAAiVJREFUKM9lkstLlGEUxn%2Fv%2B31joou0GTFKyswkKrrYdaEQ4cZAy4VQUS2iqH%2BrdUSNYmK0EM3IkjaChnmZKR0dHS0vpN%2FMe97TIqfMDpzN4XkeDg8%2Fw45R1XNAu%2Fe%2BGTgAqLX2KzAQRVGytLR0jN2jqo9FZFRVvfded66KehH5oKr3dpueiMiK915FRBeXcjo9k9K5zLz%2B3Nz8EyAqX51zdwGMqp738NSonlxf36Cn7zX9b4eYX8gSBAE1Bw9wpLaW%2BL5KWluukYjH31tr71vv%2FU0LJ5xzdL3q5dmLJK7gON5wjEQizsTkFMmeXkbHxtHfD14WkbYQaFZVMzk1zfDHERrPnqGz4wZ1tYfJ5%2FPMLOYYW16ltrqKRDyOMcYATXa7PRayixSc4%2FKFRhrqjxKGIWVlZVQkqpg1pYyvR%2BTFF2s5FFprVVXBAAqq%2F7a9uPKd1NomeTX4HXfrvZ8D2F9dTSwWMjwywueJLxQKBdLfZunue0Mqt8qPyMHf0HRorR0ArtbX1Zkrly7yPNnN1EyafZUVZLJZxjNLlHc%2BIlOxly0RyktC770fDIGX3vuOMAxOt19vJQxD%2BgeHmE6liMVKuNPawlZ9DWu2hG8bW1Tuib0LgqCrCMBDEckWAVjKLetMOq2ZhQV1zulGVFAnohv5wrSq3tpNzwMR%2BSQi%2FyEnIl5Ehpxzt4t6s9McRdGpIChpM8Y3ATXbkKdEZDAIgqQxZrKo%2FQUk5F9Xr20TrQAAAABJRU5ErkJggg%3D%3D)](https://www.apereo.org/content/projects-currently-incubation) [![Build Status](https://travis-ci.org/tsugiproject/tsugi-php.svg?branch=master)](https://travis-ci.org/tsugiproject/tsugi-php) -This is part of the Tsugi PHP Project and contains the run-time objects and scripts that support PHP -Tsugi applications and modules. +This is part of the Tsugi PHP Project and contains the run-time objects and scripts that support PHP +Tsugi applications and modules. * [PHP Tsugi](https://github.com/tsugiproject/tsugi) @@ -15,11 +15,11 @@ Here is some documentation for the APIs that are provided by this library: In addition to being used as part of the base Tsugi installs, Tsugi standalone -application or modules will generally pull this in as a +application or modules will generally pull this in as a [Packagist](https://packagist.org/packages/tsugi/lib) dependency -using [Composer](http://getcomposer.org/). +using [Composer](http://getcomposer.org/). -For samples of how to use this code in a standalone library or an application, +For samples of how to use this code in a standalone library or an application, please see the following repositories: * [Sample Tsugi Module](https://github.com/tsugiproject/tsugi-php-module) - Copy @@ -49,6 +49,13 @@ To run one test: vendor/bin/phpunit --filter {EntryTest} +Pulling in to Tsugi +------------------- + +Edit `composer.json` and + + composer update --prefer-dist tsugi/lib + Releasing --------- diff --git a/vendor/tsugi/lib/src/UI/Lessons.php b/vendor/tsugi/lib/src/UI/Lessons.php index b59b3e177c..c926f30d0f 100644 --- a/vendor/tsugi/lib/src/UI/Lessons.php +++ b/vendor/tsugi/lib/src/UI/Lessons.php @@ -787,6 +787,18 @@ public function renderAssignments($allgrades, $buffer=false) { ob_start(); echo('

'.$this->lessons->title."

\n"); + $displayname = U::get($_SESSION, 'displayname'); + $email = U::get($_SESSION, 'email'); + if ( is_string($displayname) || is_string($email) ) { + $output = ""; + if ( is_string($displayname) ) $output .= $displayname; + if ( is_string($displayname) && is_string($email) ) $output .= ' '; + if ( is_string($email) ) $output .= $email; + echo("

Grades for: "); + echo(htmlentities($output)); + $sig = md5("42 ".$output); + echo(" | ".substr($sig,0,5)."

\n"); + } echo(''."\n"); $count = 0; foreach($this->lessons->modules as $module) {