Skip to content

Commit

Permalink
Update (9.4.x) and fix
Browse files Browse the repository at this point in the history
Updated to 9.4.x, fixed issue with error 500 on user_softwarelicense.form.php.
  • Loading branch information
prybak committed May 6, 2019
1 parent 75be4a2 commit 8794aba
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Global view of all licenses lists all users along with their machines, in that c
In general this plugin makes GLPI more user-oriented instead of PC-oriented.

### Requirements
GLPI 0.85.x, 0.90.x, 9.1.x - 9.3.x
GLPI 0.85.x, 0.90.x, 9.1.x - 9.4.x

### Install instructions
Just like all other plugins, just copy to plugins and install/enable from Administration/Plugins section.
Expand Down
10 changes: 9 additions & 1 deletion fpsoftware.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,21 @@
</long>
</description>
<homepage>https://github.com/FutureProcessing/glpi-fpsoftware</homepage>
<download>https://github.com/FutureProcessing/glpi-fpsoftware/archive/v1.2.zip</download>
<download>https://github.com/FutureProcessing/glpi-fpsoftware/archive/v1.4.zip</download>
<issues>https://github.com/FutureProcessing/glpi-fpsoftware/issues</issues>
<readme>https://github.com/FutureProcessing/glpi-fpsoftware/blob/master/README.md</readme>
<authors>
<author>Future Processing</author>
</authors>
<versions>
<version>
<num>1.4</num>
<compatibility>9.4.x</compatibility>
</version>
<version>
<num>1.3</num>
<compatibility>9.3.x</compatibility>
</version>
<version>
<num>1.2</num>
<compatibility>9.1.3</compatibility>
Expand Down
2 changes: 1 addition & 1 deletion front/user_softwarelicense.form.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
if (isset($_POST["add"])) {
if ($_POST['softwarelicenses_id'] > 0 ) {
if ($usl->add($_POST)) {
Event::log($_POST['softwarelicenses_id'], "softwarelicense", 4, "inventory",
Glpi\Event::log($_POST['softwarelicenses_id'], "softwarelicense", 4, "inventory",
//TRANS: %s is the user login
sprintf(__('%s associates an user and a license'), $_SESSION["glpiname"]));
}
Expand Down
6 changes: 3 additions & 3 deletions setup.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function plugin_version_fpsoftware()
{
return array(
'name' => "FP Software",
'version' => '1.3.0',
'version' => '1.4.0',
'author' => 'Future Processing',
'license' => 'GPLv2+',
'homepage' => 'http://www.future-processing.com',
Expand All @@ -64,8 +64,8 @@ function plugin_version_fpsoftware()
*/
function plugin_fpsoftware_check_prerequisites()
{
if (version_compare(GLPI_VERSION, '0.84', 'lt') || version_compare(GLPI_VERSION, '9.3.3', 'gt')) {
echo "This plugin requires GLPI >= 0.84 and GLPI <= 9.3.3";
if (version_compare(GLPI_VERSION, '0.84', 'lt') || version_compare(GLPI_VERSION, '9.5', 'gt')) {
echo "This plugin requires GLPI >= 0.84 and GLPI <= 9.5";

return false;
}
Expand Down

0 comments on commit 8794aba

Please sign in to comment.