Merge branch 'release/1.5.1'

hook.php

@@ -220,7 +220,7 @@ function plugin_mreporting_uninstall() {
    Toolbox::deleteDir(GLPI_PLUGIN_DOC_DIR."/mreporting/notifications");
    Toolbox::deleteDir(GLPI_PLUGIN_DOC_DIR."/mreporting");
 
-   $objects = ["DisplayPreference", (class_exists('Bookmark') ? "Bookmark" : "SavedSearch")];
+   $objects = ["DisplayPreference", "SavedSearch"];
 
    foreach ($objects as $object) {
       $obj = new $object();

inc/common.class.php

@@ -1642,12 +1642,7 @@ static function showSelector($date1, $date2, $randname) {
       }
       $_SERVER['REQUEST_URI'] .= "&date1".$randname."=".$date1."&date2".$randname."=".$date2;
 
-      if (class_exists('Bookmark')) {
-         Bookmark::showSaveButton(Bookmark::URI, __CLASS__);
-      } else {
-         //@since GLPI 9.2
-         SavedSearch::showSaveButton(SavedSearch::URI, __CLASS__);
-      }
+      SavedSearch::showSaveButton(SavedSearch::URI, __CLASS__);
 
       //If there's no selector for the report, there's no need for a reset button !
       if ($has_selector) {

inc/profile.class.php

@@ -80,8 +80,7 @@ static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $withtem
          if (!$prof->getFromDBByProfile($item->getField('id'))) {
             $prof->createAccess($item->getField('id'));
          }
-         $prof->showForm($item->getField('id'), ['target' =>
-            $CFG_GLPI["root_doc"]."/plugins/mreporting/front/profile.form.php"]);
+         $prof->showForm($item->getField('id'));
       } else if ($item->getType()=='PluginMreportingConfig') {
          $reportProfile = new self();
          $reportProfile->showFormForManageProfile($item);
@@ -204,10 +203,14 @@ function showForm($ID, $options = []) {
          return false;
       }
 
-      $this->getFromDB($ID);
-      $this->showFormHeader($options);
+      echo '<form method="post" action="' . self::getFormURL() . '">';
+      echo '<div class="spaced" id="tabsbody">';
+      echo '<table class="tab_cadre_fixe" id="mainformtable">';
+
+      echo '<tr class="headerRow"><th colspan="3">' . self::getTypeName() . '</th></tr>';
+
+      Plugin::doHook("pre_item_form", ['item' => $this, 'options' => &$options]);
 
-      echo "<table class='tab_cadre_fixe'>\n";
       echo "<tr><th colspan='3'>".__("Rights management", 'mreporting')."</th></tr>\n";
 
       $config = new PluginMreportingConfig();
@@ -260,6 +263,7 @@ function showForm($ID, $options = []) {
 
       echo "</td></tr>";
       echo "</table>";
+      echo "</div>";
       Html::closeForm();
    }
 

locales/cs_CZ.po

@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - MReporting\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-28 08:41+0000\n"
-"PO-Revision-Date: 2018-06-28 08:41+0000\n"
-"Last-Translator: Cédric Anne\n"
+"POT-Creation-Date: 2018-07-06 09:45+0000\n"
+"PO-Revision-Date: 2018-06-28 11:42+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/teclib/glpi-project-plugin-mreporting/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,17 +26,17 @@ msgstr ""
 #: inc/notificationtargetnotification.class.php:8 inc/preference.class.php:182
 #: setup.php:163 test.php:4
 msgid "More Reporting"
-msgstr "Rozšířená hlášení"
+msgstr "Rozšířené výkazy"
 
 #: front/popup.php:38 inc/common.class.php:1139 inc/common.class.php:1146
 #: inc/common.class.php:1154
 msgid "General Report - ODT"
-msgstr "Obecné hlášení – ODT"
+msgstr "Obecný výkaz – ODT"
 
 #: front/central.php:73 front/central.php:80 inc/config.class.php:660
 #: inc/common.class.php:321 inc/common.class.php:388
 msgid "No report is available !"
-msgstr "Není k dispozici žádné hlášení!"
+msgstr "Není k dispozici žádný výkaz!"
 
 #: ajax/dropdownExport.php:41 inc/common.class.php:500
 msgid "With data"
@@ -60,8 +60,8 @@ msgstr "Přehled"
 msgid "No data for this date range !"
 msgstr "Nebyla nalezena žádná data pro toto časové rozmezí!"
 
-#: inc/profile.class.php:66 inc/profile.class.php:211
-#: inc/profile.class.php:282
+#: inc/profile.class.php:66 inc/profile.class.php:214
+#: inc/profile.class.php:286
 msgid "Rights management"
 msgstr "Správa práv"
 
@@ -91,7 +91,7 @@ msgstr "Jednotka"
 
 #: inc/config.class.php:126 inc/config.class.php:752
 msgid "Default delay"
-msgstr "Výchozí zpoždění"
+msgstr "Výchozí prodleva"
 
 #: inc/config.class.php:133 inc/config.class.php:760
 msgid "Additional condition for MySQL"
@@ -107,15 +107,15 @@ msgstr "Třída"
 
 #: inc/config.class.php:157
 msgid "Default chart format"
-msgstr ""
+msgstr "Výchozí formát grafu"
 
 #: inc/config.class.php:166 inc/config.class.php:769
 msgid "Send this report with the notification"
-msgstr "Odeslat s oznámením toto hlášení"
+msgstr "Odeslat tento výkaz s oznámením"
 
 #: inc/config.class.php:252
 msgid "Initialize graphics configuration"
-msgstr "Inicializace nastavení grafiky"
+msgstr "Inicializovat nastavení grafiky"
 
 #: inc/config.class.php:489 inc/config.class.php:504
 msgid "On mouse over"
@@ -128,7 +128,7 @@ msgstr "Objekt už existuje"
 #: inc/notification.class.php:34 inc/notification.class.php:55
 #: inc/notification.class.php:128
 msgid "Notification for \"More Reporting\""
-msgstr "Oznámení pro „Rozšířená hlášení“"
+msgstr "Oznámení pro „Rozšířené výkazy“"
 
 #: inc/notification.class.php:39
 msgid ""
@@ -138,11 +138,11 @@ msgid ""
 "<p>GLPI reports are available.<br />\n"
 "You will find attached in this email.</p>\n"
 "\n"
-msgstr "\n<p>Dobrý den,</p>\n\n<p>Jsou k dispozici hlášení z GLPI.<br />\nNaleznete je v příloze tohoto e-mailu.</p>\n\n"
+msgstr "\n<p>Dobrý den,</p>\n\n<p>Jsou k dispozici výkazy z GLPI.<br />\nNaleznete je v příloze tohoto e-mailu.</p>\n\n"
 
 #: inc/notification.class.php:46 inc/pdf.class.php:15
 msgid "GLPI statistics reports"
-msgstr "Statistická hlášení GLPI"
+msgstr "Statistické výkazy z GLPI"
 
 #: inc/notification.class.php:47
 msgid ""
@@ -151,39 +151,39 @@ msgid ""
 "GLPI reports are available.\n"
 "You will find attached in this email.\n"
 "\n"
-msgstr "Dobrý den,\n\nJsou k dispozici hlášení z GLPI.\nNaleznete je v příloze tohoto e-mailu.\n\n"
+msgstr "Dobrý den,\n\nJsou k dispozici výkazy z GLPI.\nNaleznete je v příloze tohoto e-mailu.\n\n"
 
 #: inc/notification.class.php:153
 msgid "Notification(s) sent !"
-msgstr "Oznámení bylo posláno!"
+msgstr "Oznámení odeslána!"
 
 #: inc/dashboard.class.php:85
 msgid "Select a report to display"
-msgstr "Vyberte hlášení, které chcete zobrazit"
+msgstr "Vyberte výkaz, který chcete zobrazit"
 
 #: inc/dashboard.class.php:96
 msgid "Dashboard is empty. Please add reports by clicking on the icon"
-msgstr "Přehled je prázdný. Přidejte hlášení kliknutím na ikonu"
+msgstr "Přehled je prázdný. Přidejte výkaz kliknutím na ikonu"
 
 #: inc/dashboard.class.php:105
 msgid "Add a report"
-msgstr "Přidat hlášení"
+msgstr "Přidat výkaz"
 
 #: inc/dashboard.class.php:134
 msgid "Select a report to add"
-msgstr "Vyberte hlášení, které chcete přidat"
+msgstr "Vyberte výkaz, který chcete přidat"
 
 #: inc/dashboard.class.php:223
 msgid "Configure report"
-msgstr "Nastavit hlášení"
+msgstr "Nastavit výkaz"
 
 #: inc/helpdesk.class.php:284 inc/helpdesk.class.php:343
 msgid "Undefined"
 msgstr "Neurčeno"
 
 #: inc/common.class.php:63 inc/common.class.php:64 inc/common.class.php:82
 msgid "Reports list"
-msgstr "Seznam hlášení"
+msgstr "Seznam výkazů"
 
 #: inc/common.class.php:921
 msgid "Number"
@@ -196,11 +196,11 @@ msgstr "data"
 
 #: inc/common.class.php:1140 inc/preference.class.php:123
 msgid "Please, select a model in your preferences"
-msgstr "Vyberte model do svých předvoleb"
+msgstr "Ve svých předvolbách vyberte model"
 
 #: inc/common.class.php:1147
 msgid "No model available"
-msgstr "Žádný model není k dispozici"
+msgstr "Není k dispozici žádný model"
 
 #: inc/common.class.php:1155
 msgid "No graphic selected"
@@ -216,7 +216,7 @@ msgstr "Měsíc"
 
 #: inc/common.class.php:1502
 msgid "Max depth entity level"
-msgstr "Maximální hloubka úrovně entity"
+msgstr "Maximální hloubka ve stromu entit"
 
 #: inc/pdf.class.php:16
 msgid "Automaticaly generated by GLPI"
@@ -228,11 +228,11 @@ msgstr "Přidat/odebrat software v počítači"
 
 #: inc/other.class.php:73
 msgid "Add/remove version on a software"
-msgstr "Přidat/odebrat verzi v software"
+msgstr "Přidat/odebrat verzi software"
 
 #: inc/other.class.php:76
 msgid "Add infocom"
-msgstr "Přidat infocom"
+msgstr "Přidat finanční informace"
 
 #: inc/other.class.php:79
 msgid "Add/remove profile on a user"
@@ -244,15 +244,15 @@ msgstr "Přidat/odebrat skupinu uživatele"
 
 #: inc/other.class.php:85
 msgid "User deleted from LDAP"
-msgstr "Uživatel byl smazán z LDAP adresáře"
+msgstr "Uživatel smazán z LDAP adresáře"
 
 #: inc/other.class.php:93
 msgid "Webservice logs"
-msgstr "Záznam (log) z webových služeb"
+msgstr "Záznam událostí (log) z webových služeb"
 
 #: inc/other.class.php:97
 msgid "OCS Infos"
-msgstr "Informace OCS"
+msgstr "Informace z OCS"
 
 #: inc/other.class.php:100
 msgid "Add/update/remove device"

locales/de_DE.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - MReporting\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-28 08:41+0000\n"
+"POT-Creation-Date: 2018-07-06 09:45+0000\n"
 "PO-Revision-Date: 2018-06-28 08:41+0000\n"
 "Last-Translator: Cédric Anne\n"
 "Language-Team: German (Germany) (http://www.transifex.com/teclib/glpi-project-plugin-mreporting/language/de_DE/)\n"
@@ -59,8 +59,8 @@ msgstr "Dashboard"
 msgid "No data for this date range !"
 msgstr "Keine Daten für diesen Bereich verfügbar!"
 
-#: inc/profile.class.php:66 inc/profile.class.php:211
-#: inc/profile.class.php:282
+#: inc/profile.class.php:66 inc/profile.class.php:214
+#: inc/profile.class.php:286
 msgid "Rights management"
 msgstr "Rechteverwaltung"
 

locales/en_GB.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-28 08:41+0000\n"
-"PO-Revision-Date: 2018-06-28 08:41+0000\n"
+"POT-Creation-Date: 2018-07-06 09:45+0000\n"
+"PO-Revision-Date: 2018-07-06 09:45+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en_GB\n"
@@ -58,7 +58,7 @@ msgstr "Dashboard"
 msgid "No data for this date range !"
 msgstr "No data for this date range !"
 
-#: inc/profile.class.php:66 inc/profile.class.php:211 inc/profile.class.php:282
+#: inc/profile.class.php:66 inc/profile.class.php:214 inc/profile.class.php:286
 msgid "Rights management"
 msgstr "Rights management"
 

locales/en_US.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - MReporting\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-28 08:41+0000\n"
+"POT-Creation-Date: 2018-07-06 09:45+0000\n"
 "PO-Revision-Date: 2018-06-28 08:41+0000\n"
 "Last-Translator: Cédric Anne\n"
 "Language-Team: English (United States) (http://www.transifex.com/teclib/glpi-project-plugin-mreporting/language/en_US/)\n"
@@ -59,8 +59,8 @@ msgstr "Dashboard"
 msgid "No data for this date range !"
 msgstr "No data for this date range !"
 
-#: inc/profile.class.php:66 inc/profile.class.php:211
-#: inc/profile.class.php:282
+#: inc/profile.class.php:66 inc/profile.class.php:214
+#: inc/profile.class.php:286
 msgid "Rights management"
 msgstr "Rights management"
 

locales/es_CO.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - MReporting\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-28 08:41+0000\n"
+"POT-Creation-Date: 2018-07-06 09:45+0000\n"
 "PO-Revision-Date: 2018-06-28 08:41+0000\n"
 "Last-Translator: Cédric Anne\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/teclib/glpi-project-plugin-mreporting/language/es_CO/)\n"
@@ -59,8 +59,8 @@ msgstr "Tablero"
 msgid "No data for this date range !"
 msgstr "¡Sin datos para este rango de fechas!"
 
-#: inc/profile.class.php:66 inc/profile.class.php:211
-#: inc/profile.class.php:282
+#: inc/profile.class.php:66 inc/profile.class.php:214
+#: inc/profile.class.php:286
 msgid "Rights management"
 msgstr "Gestión de permisos"
 

locales/es_ES.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - MReporting\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-28 08:41+0000\n"
+"POT-Creation-Date: 2018-07-06 09:45+0000\n"
 "PO-Revision-Date: 2018-06-28 08:41+0000\n"
 "Last-Translator: Cédric Anne\n"
 "Language-Team: Spanish (Spain) (http://www.transifex.com/teclib/glpi-project-plugin-mreporting/language/es_ES/)\n"
@@ -59,8 +59,8 @@ msgstr "Dashboard"
 msgid "No data for this date range !"
 msgstr "No hay data para este rango"
 
-#: inc/profile.class.php:66 inc/profile.class.php:211
-#: inc/profile.class.php:282
+#: inc/profile.class.php:66 inc/profile.class.php:214
+#: inc/profile.class.php:286
 msgid "Rights management"
 msgstr "Gestión de derechos"