From 9cf9f17115fbc2b95c39bb5eb2c3c3ec80263db4 Mon Sep 17 00:00:00 2001 From: Ulrich Block Date: Fri, 22 Jul 2016 16:44:52 +0200 Subject: [PATCH] Code alignment --- js/default/monstaftp_ajax.js | 9 +++++---- languages/default/de/general.xml | 2 ++ languages/default/dk/general.xml | 2 ++ languages/default/it/general.xml | 2 ++ languages/default/uk/general.xml | 2 ++ third_party/monstaftp/monstaftp.php | 4 ++-- 6 files changed, 15 insertions(+), 6 deletions(-) diff --git a/js/default/monstaftp_ajax.js b/js/default/monstaftp_ajax.js index 5e1a1c09..c2f43854 100644 --- a/js/default/monstaftp_ajax.js +++ b/js/default/monstaftp_ajax.js @@ -880,10 +880,11 @@ function checkFileChecked() { function activateActionButtons(active,paste) { // Paste button - if (paste == 1 || globalClipboardAction == 'copy') - document.getElementById('actionButtonPaste').disabled = false; - else - document.getElementById('actionButtonPaste').disabled = true; + var actionButtonPaste = document.getElementById('actionButtonPaste'); + + if (actionButtonPaste) { + actionButtonPaste.disabled = (!(paste == 1 || globalClipboardAction == 'copy')); + } // All other buttons if (active == 1) { diff --git a/languages/default/de/general.xml b/languages/default/de/general.xml index d6875d19..d253692f 100644 --- a/languages/default/de/general.xml +++ b/languages/default/de/general.xml @@ -35,9 +35,11 @@ Sicheres Löschen In jedem Fall Löschen Aus der Datenbank Löschen + Beschreibung Domains Downloads Bearbeiten + Fehler beim Verbinden zum Server Fehler Ausführen Exportieren diff --git a/languages/default/dk/general.xml b/languages/default/dk/general.xml index 2713d27b..ece8130a 100644 --- a/languages/default/dk/general.xml +++ b/languages/default/dk/general.xml @@ -23,8 +23,10 @@ Sikker Slat Slet i hvert fald Fjern fra database + Beskrivelse Domains Feeds + Rediger diff --git a/languages/default/it/general.xml b/languages/default/it/general.xml index 52b68fdd..e04a2cfd 100644 --- a/languages/default/it/general.xml +++ b/languages/default/it/general.xml @@ -35,9 +35,11 @@ Elimina in modo sicuro Elimina in ogni caso Rimuovi dal database + Descrizione Domini Downloads Modifica + Errore/i Esegui Esporta diff --git a/languages/default/uk/general.xml b/languages/default/uk/general.xml index dcb9159a..c72639b1 100644 --- a/languages/default/uk/general.xml +++ b/languages/default/uk/general.xml @@ -35,9 +35,11 @@ Safe delete Delete in any case Remove from database + Description Domains Downloads Edit + Error while connecting to the server Error(s) Execute Export diff --git a/third_party/monstaftp/monstaftp.php b/third_party/monstaftp/monstaftp.php index 45eae165..4980d9a5 100644 --- a/third_party/monstaftp/monstaftp.php +++ b/third_party/monstaftp/monstaftp.php @@ -91,9 +91,9 @@ if ($ui->escaped('ftpAction', 'get') == "templateProcess") { // Check for AJAX post if ($ui->escaped('ftpAction', 'post') != "" || $ui->escaped('ftpAction', 'get') != "") { - $ajaxRequest=1; + $ajaxRequest = 1; } else { - $ajaxRequest=0; + $ajaxRequest = 0; } // Check resetting upload erreor array