Merge branch 'release/1.1.0'

pluginsGLPI · Sep 21, 2017 · 73eeb6c · 73eeb6c
2 parents e392018 + 2f1c908
commit 73eeb6c
Show file tree

Hide file tree

Showing 8 changed files with 235 additions and 278 deletions.
diff --git a/front/entity.form.php b/front/entity.form.php
@@ -34,19 +34,17 @@
 
 Session::haveRight("entity", UPDATE);
 
-$Entity                    = new Entity();
+$Entity              = new Entity();
 $PluginCreditEntity  = new PluginCreditEntity();
 $PluginCreditType    = new PluginCreditType();
 
 if (isset($_POST["add"])) {
-
    $PluginCreditEntity->check(-1, CREATE, $_POST);
    if ($PluginCreditEntity->add($_POST)) {
       Event::log($_POST["plugin_credit_types_id"], "entity", 4, "setup",
                  sprintf(__('%s adds a vouchers to an entity'), $_SESSION["glpiname"]));
    }
    Html::back();
-
 }
 
 Html::displayErrorAndDie("lost");
diff --git a/front/ticket.php b/front/ticket.php
@@ -37,11 +37,10 @@
 if (!isset($_GET["plugcreditentity"])) {
    throw new \RuntimeException('Invalid params provided!', 'credit');
 } else {
-   $_GET['plugcreditentity'] = intval($_GET['plugcreditentity']);
+   $_GET['plugcreditentity'] = (int) $_GET['plugcreditentity'];
 }
 
 Session::checkLoginUser();
-
 Session::checkRightsOr('ticket', [Ticket::STEAL, Ticket::OWN]);
 
 PluginCreditTicket::displayConsumed($_GET['plugcreditentity']);

diff --git a/hook.php b/hook.php
@@ -78,10 +78,7 @@ function plugin_credit_uninstall() {
  * Define Dropdown tables to be manage in GLPI :
  */
 function plugin_credit_getDropdown() {
-
-   $pluginDropdowns = array('PluginCreditType' => _n('Credit voucher type',
-                                                     'Credit vouchers types',
-                                                     Session::getPluralNumber(),
-                                                     'credit'));
-   return $pluginDropdowns;
+   return ['PluginCreditType' => _n('Credit voucher type', 'Credit vouchers types',
+                                    Session::getPluralNumber(),
+                                    'credit')];
 }