diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6fcf43c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+# IDE files
+.idea/
diff --git a/README.md b/README.md
index ffb0ff4..201c539 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
# glpi-fpsoftware
GLPI plugin that allows to assign software to users.
+
## General Information
-By default GLPI doesn’t allow to assign software to a user. As we all know a lot of software is currently licensed in per user model. FP Software plugin allows you to assign software to a user and view all his/hers licenses.
+By default GLPI does not allow to assign software to a user. As we all know a lot of software is currently licensed in per user model. FP Software plugin allows you to assign software to a user and view all his/hers licenses.
It changes how software/license asset looks like by providing new tab to license where you can assign users to software and another tab to software so you can see all users using the software (no matter which licenses they are using).
@@ -22,10 +23,10 @@ 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
+### Requirements
+GLPI 0.85.x, 0.90.x, 9.1.x
-###Install instructions
+### Install instructions
Just like all other plugins, just copy to plugins and install/enable from Administration/Plugins section.
If you want to display a sum of assigned computers and users in "Affected Computers" column you need to:
@@ -43,5 +44,5 @@ to
$nb_assoc = Computer_SoftwareLicense::countForLicense($data['id']) + PluginFpsoftwareCommon::countForLicense($data['id']);
```
-###What can be improved?
-* plugin doesn’t validate total number of licenses with number of assigned licenses to users;
+### What can be improved?
+* plugin does not validate total number of licenses with number of assigned licenses to users;
diff --git a/fpsoftware.xml b/fpsoftware.xml
index b05af2e..1e4ef14 100644
--- a/fpsoftware.xml
+++ b/fpsoftware.xml
@@ -8,11 +8,11 @@
- It changes how software/license asset looks like by providing new tab to license where you can assign users to software and another tab to software so you can see all users using the software (no matter which licenses they are using).
In general this plugin makes GLPI more user-oriented instead of PC-oriented.
Changelog:
2015.12:
- Licenses - Users tab now shows proper per user license usage and groups PCs owned by a user;
- "Affected Computers" can show how many licenses are assigned to both users and computers (please read manual on our GitHub)
- plugin is now compatibile with GLPI 0.90
Company website]]>
+ It changes how software/license asset looks like by providing new tab to license where you can assign users to software and another tab to software so you can see all users using the software (no matter which licenses they are using).
In general this plugin makes GLPI more user-oriented instead of PC-oriented.
Changelog:
2015.12:
- Licenses - Users tab now shows proper per user license usage and groups PCs owned by a user;
- "Affected Computers" can show how many licenses are assigned to both users and computers (please read manual on our GitHub)
- plugin is now compatible with GLPI 0.90
2017.04:
- plugin is now compatible with GLPI 9.1.2
Company website]]>
https://github.com/FutureProcessing/glpi-fpsoftware
- https://github.com/FutureProcessing/glpi-fpsoftware/archive/master.zip
+ https://github.com/FutureProcessing/glpi-fpsoftware/archive/v1.1.zip
https://github.com/FutureProcessing/glpi-fpsoftware/issues
https://github.com/FutureProcessing/glpi-fpsoftware/blob/master/README.md
@@ -20,22 +20,28 @@
- 1.0
- 0.90
- 0.85
-
+ 1.1
+ 9.1.2
+ 9.1.1
+ 9.1
+
+
+ 1.0
+ 0.90
+ 0.85
+
en_GB
-
- Inventory
-
-
- Inventory
-
+
+ Inventory
+
+
+ Inventory
+
https://cloud.githubusercontent.com/assets/3634020/8588884/ca0d363a-260f-11e5-9a7c-8be8b4600eb2.png
diff --git a/setup.php b/setup.php
index 7f23703..ad62755 100755
--- a/setup.php
+++ b/setup.php
@@ -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, '0.91', 'gt')) {
- echo "This plugin requires GLPI >= 0.84 and GLPI <= 0.91";
+ if (version_compare(GLPI_VERSION, '0.84', 'lt') || version_compare(GLPI_VERSION, '9.1.2', 'gt')) {
+ echo "This plugin requires GLPI >= 0.84 and GLPI <= 9.1.2";
return false;
}
@@ -76,7 +76,7 @@ function plugin_fpsoftware_check_prerequisites()
/**
* Control of the configuration
*
- * @param type $verbose
+ * @param boolean $verbose
* @return boolean
*/
function plugin_fpsoftware_check_config($verbose = false)