From 90d582e88c1db47963bcd38cf6e7b46336f9f8cc Mon Sep 17 00:00:00 2001 From: Fraenkiman Date: Sun, 4 Feb 2024 02:25:54 +0100 Subject: [PATCH] Use test file for result - The chmod octal value from the defaults.php file is used for the hint. This has the advantage that you do not have to adjust the 13 language files every time you make a change. - When restoring the file access rights, a test file in the fp-content directory is used to check whether it is writable. If failed, then -1 --- admin/panels/maintain/admin.maintain.php | 12 +++++++++++- fp-interface/lang/cs-cz/lang.admin.maintain.php | 5 +++-- fp-interface/lang/da-dk/lang.admin.maintain.php | 5 +++-- fp-interface/lang/de-de/lang.admin.maintain.php | 5 +++-- fp-interface/lang/el-gr/lang.admin.maintain.php | 5 +++-- fp-interface/lang/en-us/lang.admin.maintain.php | 7 ++++--- fp-interface/lang/es-es/lang.admin.maintain.php | 5 +++-- fp-interface/lang/fr-fr/lang.admin.maintain.php | 5 +++-- fp-interface/lang/it-it/lang.admin.maintain.php | 5 +++-- fp-interface/lang/ja-jp/lang.admin.maintain.php | 5 +++-- fp-interface/lang/nl-nl/lang.admin.maintain.php | 5 +++-- fp-interface/lang/pt-br/lang.admin.maintain.php | 5 +++-- fp-interface/lang/ru-ru/lang.admin.maintain.php | 5 +++-- fp-interface/lang/sl-si/lang.admin.maintain.php | 5 +++-- 14 files changed, 51 insertions(+), 28 deletions(-) diff --git a/admin/panels/maintain/admin.maintain.php b/admin/panels/maintain/admin.maintain.php index 44dd953..498c7d6 100755 --- a/admin/panels/maintain/admin.maintain.php +++ b/admin/panels/maintain/admin.maintain.php @@ -159,7 +159,17 @@ class admin_maintain_default extends AdminPanelAction { case 'restorechmods': { $this->smarty->assign('files', fs_chmod_recursive()); - $this->smarty->assign('success', 1); + + // Test whether writing is possible in the fp-content directory + $test_file = @fopen(CONTENT_DIR . 'chmod-test-file', "a+"); + if ($test_file) { + $this->smarty->assign('success', 1); + } else { + $this->smarty->assign('success', -1); + } + @fclose($test_file); + @unlink(CONTENT_DIR . 'chmod-test-file'); + return PANEL_NOREDIRECT; } case 'purgetplcache': diff --git a/fp-interface/lang/cs-cz/lang.admin.maintain.php b/fp-interface/lang/cs-cz/lang.admin.maintain.php index e838125..4ecab4e 100644 --- a/fp-interface/lang/cs-cz/lang.admin.maintain.php +++ b/fp-interface/lang/cs-cz/lang.admin.maintain.php @@ -11,12 +11,13 @@ $lang ['admin'] ['maintain'] ['default'] = array( 'opt4' => 'Ukázat informace o PHP', 'opt5' => 'Zjistit aktualizace', - 'chmod_info' => 'Následující oprávnění nemůžou být resetované na 0776; pravděpodobně vlastník souborů není stejná osoba jako vlastník webu. ' . // + 'chmod_info' => 'Pokud se oprávnění souboru nepodařilo obnovit na ' . decoct(FILE_PERMISSIONS) . ', vlastník souboru pravděpodobně není stejný jako vlastník webového serveru.
' . // 'Případně můžete ignorovat toto oznámení.' ); $lang ['admin'] ['maintain'] ['default'] ['msgs'] = array( - 1 => 'Operace kompletní' + 1 => 'Operace kompletní', + -1 => 'Operace se nezdařila' ); $lang ['admin'] ['maintain'] ['updates'] = array( diff --git a/fp-interface/lang/da-dk/lang.admin.maintain.php b/fp-interface/lang/da-dk/lang.admin.maintain.php index 53cb1d4..f9768da 100644 --- a/fp-interface/lang/da-dk/lang.admin.maintain.php +++ b/fp-interface/lang/da-dk/lang.admin.maintain.php @@ -11,12 +11,13 @@ $lang ['admin'] ['maintain'] ['default'] = array( 'opt4' => 'Vis PHP-information om webserveren', 'opt5' => 'Tjek for nye versioner', - 'chmod_info' => 'Filadgangsrettighederne kunne ikke være nulstilles til standardværdierne på 0776.' . // + 'chmod_info' => 'Hvis filrettighederne ikke kunne nulstilles til ' . decoct(FILE_PERMISSIONS) . ', er ejeren af filen sandsynligvis ikke den samme som ejeren af webserveren.
' . // 'Normalt kan du ignorere dette tip.' ); $lang ['admin'] ['maintain'] ['default'] ['msgs'] = array( - 1 => 'Handling udført.' + 1 => 'Handling udført.', + -1 => 'Handling mislukt.' ); $lang ['admin'] ['maintain'] ['updates'] = array( diff --git a/fp-interface/lang/de-de/lang.admin.maintain.php b/fp-interface/lang/de-de/lang.admin.maintain.php index c3c7b4f..f25844e 100644 --- a/fp-interface/lang/de-de/lang.admin.maintain.php +++ b/fp-interface/lang/de-de/lang.admin.maintain.php @@ -11,12 +11,13 @@ $lang ['admin'] ['maintain'] ['default'] = array( 'opt4' => 'Zeige PHP-Informationen des Webservers', 'opt5' => 'Prüfe auf neue Versionen', - 'chmod_info' => 'Die Dateizugriffsrechte konnten nicht auf die Default Werte von 0776 zurückgesetzt werden. ' . // + 'chmod_info' => 'Wenn die Dateiberechtigungen nicht auf ' . decoct(FILE_PERMISSIONS) . ' zurückgesetzt werden konnten, ist wahrscheinlich der Eigentümer der Datei nicht derselbe wie der des Webservers.
' . // 'Normalerweise kann man diesen Hinweis ignorieren.' ); $lang ['admin'] ['maintain'] ['default'] ['msgs'] = array( - 1 => 'Aktion ausgeführt.' + 1 => 'Aktion ausgeführt.', + -1 => 'Aktion fehlgeschlagen.' ); $lang ['admin'] ['maintain'] ['updates'] = array( diff --git a/fp-interface/lang/el-gr/lang.admin.maintain.php b/fp-interface/lang/el-gr/lang.admin.maintain.php index 7f931b2..f92d4df 100644 --- a/fp-interface/lang/el-gr/lang.admin.maintain.php +++ b/fp-interface/lang/el-gr/lang.admin.maintain.php @@ -11,12 +11,13 @@ $lang ['admin'] ['maintain'] ['default'] = array( 'opt4' => 'Εμφάνιση πληροφοριών σχετικά με την PHP', 'opt5' => 'Έλεγχος για αναβαθμίσεις', - 'chmod_info' => 'Τα ακόλουθα δικαιώματα αρχείων δεν μπόρεσαν να επανέλθουν σε 0776; πιθανότατα ο ιδιοκτήτης των αρχείων δεν είναι ο ίδιος με τον ιδιοκτήτη του διακομιστή. ' . // + 'chmod_info' => 'Αν τα δικαιώματα του αρχείου δεν μπόρεσαν να επανέλθουν σε ' . decoct(FILE_PERMISSIONS) . ', ο ιδιοκτήτης του αρχείου δεν είναι πιθανότατα ο ίδιος με τον ιδιοκτήτη του διακομιστή ιστού.
' . // 'Συνήθως αυτή η ειδοποίηση μπορεί να αγνοηθεί.' ); $lang ['admin'] ['maintain'] ['default'] ['msgs'] = array( - 1 => 'Η διαδικασία ολοκληρώθηκε' + 1 => 'Η διαδικασία ολοκληρώθηκε', + -1 => 'Η διαδικασία απέτυχε' ); $lang ['admin'] ['maintain'] ['updates'] = array( diff --git a/fp-interface/lang/en-us/lang.admin.maintain.php b/fp-interface/lang/en-us/lang.admin.maintain.php index 4209d2d..f0ef681 100755 --- a/fp-interface/lang/en-us/lang.admin.maintain.php +++ b/fp-interface/lang/en-us/lang.admin.maintain.php @@ -11,12 +11,13 @@ $lang ['admin'] ['maintain'] ['default'] = array( 'opt4' => 'Show info about PHP', 'opt5' => 'Check for updates', - 'chmod_info' => 'The following file permissions could not be reset to 0776; probably file owner is not the same as the webserver\'s. ' . // - 'Usually you can ignore this notice.' + 'chmod_info' => 'If the file permissions could not be reset to ' . decoct(FILE_PERMISSIONS) . ', the owner of the file is probably not the same as the owner of the web server.
' . // + 'Normalement, tu peux ignorer cette remarque.' ); $lang ['admin'] ['maintain'] ['default'] ['msgs'] = array( - 1 => 'Operation completed' + 1 => 'Operation completed', + -1 => 'Operation failed' ); $lang ['admin'] ['maintain'] ['updates'] = array( diff --git a/fp-interface/lang/es-es/lang.admin.maintain.php b/fp-interface/lang/es-es/lang.admin.maintain.php index e720ca9..33b67fd 100644 --- a/fp-interface/lang/es-es/lang.admin.maintain.php +++ b/fp-interface/lang/es-es/lang.admin.maintain.php @@ -11,12 +11,13 @@ $lang ['admin'] ['maintain'] ['default'] = array( 'opt4' => 'Mostrar información sobre PHP', 'opt5' => 'Buscar actualizaciones', - 'chmod_info' => 'Los siguientes permisos de archivo no pudieron ser reiniciados a 0776; probablemente el propietario del archivo no sea el mismo que el del servidor web. ' . // + 'chmod_info' => 'Si los permisos del archivo no se pudieron restablecer a ' . decoct(FILE_PERMISSIONS) . ', es probable que el propietario del archivo no sea el mismo que el del servidor web.
' . // 'Por lo general, puede ignorar este aviso.' ); $lang ['admin'] ['maintain'] ['default'] ['msgs'] = array( - 1 => 'Operación completada' + 1 => 'Operación completada', + -1 => 'Operación fallida' ); $lang ['admin'] ['maintain'] ['updates'] = array( diff --git a/fp-interface/lang/fr-fr/lang.admin.maintain.php b/fp-interface/lang/fr-fr/lang.admin.maintain.php index dbae116..441054f 100644 --- a/fp-interface/lang/fr-fr/lang.admin.maintain.php +++ b/fp-interface/lang/fr-fr/lang.admin.maintain.php @@ -11,12 +11,13 @@ $lang ['admin'] ['maintain'] ['default'] = array( 'opt4' => 'Afficher info.php', 'opt5' => 'Vérifier les mises à jour', - 'chmod_info' => 'Les permissions de fichiers (chmod) ne sont peut-être pas à 0776; propriétaire du fichier peut-ê' . // + 'chmod_info' => 'Si les permissions du fichier n\'ont pas pu être remises à ' . decoct(FILE_PERMISSIONS) . ', il est probable que le propriétaire du fichier ne soit pas le même que celui du serveur web.
' . // 'tre différent du serveur web.' ); $lang ['admin'] ['maintain'] ['default'] ['msgs'] = array( - 1 => 'Opération effectuée' + 1 => 'Opération effectuée', + -1 => 'Échec de l\'opération' ); $lang ['admin'] ['maintain'] ['updates'] = array( diff --git a/fp-interface/lang/it-it/lang.admin.maintain.php b/fp-interface/lang/it-it/lang.admin.maintain.php index bacdba7..a84baf8 100644 --- a/fp-interface/lang/it-it/lang.admin.maintain.php +++ b/fp-interface/lang/it-it/lang.admin.maintain.php @@ -11,12 +11,13 @@ $lang ['admin'] ['maintain'] ['default'] = array( 'opt4' => 'Visualizza informazioni su PHP', 'opt5' => 'Controllo aggiornamenti', - 'chmod_info' => 'I seguenti permessi dei file non possono essere ripristinati a 0776; probabilmente il proprietario non è lo stesso del server web. ' . // + 'chmod_info' => 'Se non è stato possibile reimpostare i permessi del file a ' . decoct(FILE_PERMISSIONS) . ', probabilmente il proprietario del file non è lo stesso del server web.
' . // 'Di solito puoi ignorare questo avviso.' ); $lang ['admin'] ['maintain'] ['default'] ['msgs'] = array( - 1 => 'Operazione completata con successo' + 1 => 'Operazione completata con successo', + -1 => 'Operazione non completata con successo' ); $lang ['admin'] ['maintain'] ['updates'] = array( diff --git a/fp-interface/lang/ja-jp/lang.admin.maintain.php b/fp-interface/lang/ja-jp/lang.admin.maintain.php index 825f208..cd02334 100644 --- a/fp-interface/lang/ja-jp/lang.admin.maintain.php +++ b/fp-interface/lang/ja-jp/lang.admin.maintain.php @@ -11,12 +11,13 @@ $lang ['admin'] ['maintain'] ['default'] = array( 'opt4' => 'PHP情報を表示します', 'opt5' => 'アップデートをチェックします', - 'chmod_info' => '次のファイルのパーミッションを 0776 にリセットできません; おそらく、ファイルの所有権者とウェブサーバの権限が異なるのでしょう。' . // + 'chmod_info' => 'ファイルのパーミッションを' . decoct(FILE_PERMISSIONS) . 'にリセットできなかった場合、ファイルの所有者がウェブサーバーの所有者と同じでない可能性があります。
' . // 'でも通常、この通知を無視することができます。' ); $lang ['admin'] ['maintain'] ['default'] ['msgs'] = array( - 1 => '作業を完了しました。' + 1 => '作業を完了しました。', + -1 => '操作が正常に完了しなかった。' ); $lang ['admin'] ['maintain'] ['updates'] = array( diff --git a/fp-interface/lang/nl-nl/lang.admin.maintain.php b/fp-interface/lang/nl-nl/lang.admin.maintain.php index 09d5d4a..cb157b0 100644 --- a/fp-interface/lang/nl-nl/lang.admin.maintain.php +++ b/fp-interface/lang/nl-nl/lang.admin.maintain.php @@ -11,12 +11,13 @@ $lang ['admin'] ['maintain'] ['default'] = array( 'opt4' => 'Toon info over PHP', 'opt5' => 'Controleren op updates', - 'chmod_info' => 'De volgende bestandsmachtigingen kan niet worden teruggezet naar 0776; waarschijnlijk is de bestandseigenaar niet hetzelfde als de webserver\'s. ' . // + 'chmod_info' => 'Als de bestandsrechten niet konden worden teruggezet naar ' . decoct(FILE_PERMISSIONS) . ', is de eigenaar van het bestand waarschijnlijk niet dezelfde als de eigenaar van de webserver.
' . // 'Meestal kunt u deze kennisgeving negeren.' ); $lang ['admin'] ['maintain'] ['default'] ['msgs'] = array( - 1 => 'Operation completed' + 1 => 'Operation completed', + -1 => 'Operatie mislukt' ); $lang ['admin'] ['maintain'] ['updates'] = array( diff --git a/fp-interface/lang/pt-br/lang.admin.maintain.php b/fp-interface/lang/pt-br/lang.admin.maintain.php index 8109353..7a37806 100644 --- a/fp-interface/lang/pt-br/lang.admin.maintain.php +++ b/fp-interface/lang/pt-br/lang.admin.maintain.php @@ -11,12 +11,13 @@ $lang ['admin'] ['maintain'] ['default'] = array( 'opt4' => 'Mostre as informações sobre o PHP', 'opt5' => 'Procure atualizações', - 'chmod_info' => 'As seguintes permissões de arquivo não puderam ser redefinidas para 0776; provavelmente o proprietário do arquivo não é o mesmo do servidor da web. ' . // + 'chmod_info' => 'Se não for possível redefinir as permissões do arquivo para ' . decoct(FILE_PERMISSIONS) . ', o proprietário do arquivo provavelmente não é o mesmo que o proprietário do servidor Web.
' . // 'Geralmente você pode ignorar este aviso.' ); $lang ['admin'] ['maintain'] ['default'] ['msgs'] = array( - 1 => 'Operação concluída' + 1 => 'Operação concluída', + -1 => 'Falha na operação' ); $lang ['admin'] ['maintain'] ['updates'] = array( diff --git a/fp-interface/lang/ru-ru/lang.admin.maintain.php b/fp-interface/lang/ru-ru/lang.admin.maintain.php index d1e308c..3663f78 100644 --- a/fp-interface/lang/ru-ru/lang.admin.maintain.php +++ b/fp-interface/lang/ru-ru/lang.admin.maintain.php @@ -11,12 +11,13 @@ $lang ['admin'] ['maintain'] ['default'] = array( 'opt4' => 'Показать информацию о PHP', 'opt5' => 'Проверить наличие обновлений', - 'chmod_info' => 'Не удалось сбросить следующие права доступа к файлам на 0776; вероятно, владелец файла не совпадает с владельцем веб-сервера. ' . // + 'chmod_info' => 'Если права доступа к файлу не удалось сбросить на ' . decoct(FILE_PERMISSIONS) . ', владелец файла, вероятно, не совпадает с владельцем веб-сервера.
' . // 'Обычно это уведомление можно проигнорировать.' ); $lang ['admin'] ['maintain'] ['default'] ['msgs'] = array( - 1 => 'Операция выполнена' + 1 => 'Операция выполнена', + -1 => 'Операция не удалась' ); $lang ['admin'] ['maintain'] ['updates'] = array( diff --git a/fp-interface/lang/sl-si/lang.admin.maintain.php b/fp-interface/lang/sl-si/lang.admin.maintain.php index b37ddf7..996ef2a 100644 --- a/fp-interface/lang/sl-si/lang.admin.maintain.php +++ b/fp-interface/lang/sl-si/lang.admin.maintain.php @@ -11,12 +11,13 @@ $lang ['admin'] ['maintain'] ['default'] = array( 'opt4' => 'Prikaži informacije o PHP', 'opt5' => 'Preveri posodobitve', - 'chmod_info' => 'Naslednja dovoljenja za datoteke ni mogoče povrniti na 0776; verjetno lastnik datoteke ni isti kot spletne strežnik. ' . // + 'chmod_info' => 'Če pravic datoteke ni bilo mogoče ponastaviti na ' . decoct(FILE_PERMISSIONS) . ', lastnik datoteke verjetno ni isti kot lastnik spletnega strežnika.
' . // 'Običajno lahko to obvestilo prezrete.' ); $lang ['admin'] ['maintain'] ['default'] ['msgs'] = array( - 1 => 'Operacija je končana' + 1 => 'Operacija je končana', + -1 => 'Operacija ni uspela' ); $lang ['admin'] ['maintain'] ['updates'] = array(