Merge branch 'release/2.6.0'

pluginsGLPI · Jul 22, 2021 · b7e5e7f · b7e5e7f
2 parents 79e985c + 6d83a8f
commit b7e5e7f
Show file tree

Hide file tree

Showing 32 changed files with 905 additions and 691 deletions.
diff --git a/barcode.xml b/barcode.xml
@@ -22,6 +22,11 @@
       <author>David DURIEUX</author>
    </authors>
    <versions>
+      <version>
+         <num>2.6.0</num>
+         <compatibility>~9.5.0</compatibility>
+         <download_url>https://github.com/pluginsGLPI/barcode/releases/download/2.6.0/glpi-barcode-2.6.0.tar.bz2</download_url>
+      </version>
       <version>
          <num>2.5.2</num>
          <compatibility>~9.5.0</compatibility>

diff --git a/composer.lock b/composer.lock
diff --git a/front/config.form.php b/front/config.form.php
@@ -54,6 +54,11 @@
       }
    }
    Session::addMessageAfterRedirect(__('The cache has been emptied.', 'barcode'));
+} else if (isset($_POST['dropLogo'])) {
+   if (is_file(GLPI_PLUGIN_DOC_DIR.'/barcode/logo.png')) {
+      unlink(GLPI_PLUGIN_DOC_DIR.'/barcode/logo.png');
+   }
+   Session::addMessageAfterRedirect(__('The logo has been removed.', 'barcode'));
 } else if (!empty($_FILES['logo']['name'])) {
    if (is_file(GLPI_PLUGIN_DOC_DIR.'/barcode/logo.png')) {
       @unlink(GLPI_PLUGIN_DOC_DIR.'/barcode/logo.png');

diff --git a/inc/config.class.php b/inc/config.class.php
@@ -95,6 +95,10 @@ function showForm($p_type = null) {
                width='300'/>";
          echo "</td>";
          echo "</tr>";
+
+         echo "<tr class='tab_bg_1'>";
+         echo "<td class='tab_bg_1' colspan='4' align='center'><input type='submit' value='".__('Delete the logo', 'barcode')."' class='submit' name='dropLogo'></td>";
+         echo "</tr>";
       }
 
       echo "<tr class='tab_bg_1'>";