From 9559f1a875dd97c1bcf9b7e603ec27a5245c1479 Mon Sep 17 00:00:00 2001 From: patdenice Date: Sat, 4 Oct 2008 11:33:34 +0000 Subject: Add explicit error message in plugins tab if allow_url_fopen is disabled. git-svn-id: http://piwigo.org/svn/trunk@2652 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/plugins_new.php | 6 +++++- admin/plugins_update.php | 6 +++++- language/en_UK/admin.lang.php | 1 + language/es_ES/admin.lang.php | 1 + language/fr_FR/admin.lang.php | 3 ++- language/it_IT/admin.lang.php | 1 + language/nl_NL/admin.lang.php | 1 + 7 files changed, 16 insertions(+), 3 deletions(-) diff --git a/admin/plugins_new.php b/admin/plugins_new.php index e86dc0a16..d2c2ce52f 100644 --- a/admin/plugins_new.php +++ b/admin/plugins_new.php @@ -89,7 +89,11 @@ $template->assign('order_selected', $link.$order); // +-----------------------------------------------------------------------+ // | start template output | // +-----------------------------------------------------------------------+ -if ($plugins->get_server_plugins(true)) +if (!ini_get('allow_url_fopen')) +{ + array_push($page['errors'], l10n('Unable to retrieve server informations since allow_url_fopen is disabled.')); +} +elseif ($plugins->get_server_plugins(true)) { $plugins->sort_server_plugins($order); diff --git a/admin/plugins_update.php b/admin/plugins_update.php index 944fd3b1a..6040a26a3 100644 --- a/admin/plugins_update.php +++ b/admin/plugins_update.php @@ -97,7 +97,11 @@ set_plugins_tabsheet($page['page']); // +-----------------------------------------------------------------------+ // | start template output | // +-----------------------------------------------------------------------+ -if ($plugins->get_server_plugins()) +if (!ini_get('allow_url_fopen')) +{ + array_push($page['errors'], l10n('Unable to connect to PEM server since allow_url_fopen is disabled.')); +} +elseif ($plugins->get_server_plugins()) { foreach($plugins->fs_plugins as $plugin_id => $fs_plugin) { diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php index fe8bba4a6..3f8222687 100644 --- a/language/en_UK/admin.lang.php +++ b/language/en_UK/admin.lang.php @@ -637,4 +637,5 @@ $lang['No element in this category'] = 'No element in this category'; $lang['Images manual order was saved'] = 'Images manual order was saved'; $lang['ranks'] = 'ranks'; $lang['Drag to re-order'] = 'Drag to re-order'; +$lang['Unable to retrieve server informations since allow_url_fopen is disabled.'] = 'Unable to retrieve server informations since allow_url_fopen is disabled.'; ?> diff --git a/language/es_ES/admin.lang.php b/language/es_ES/admin.lang.php index d189ab573..3870ad078 100644 --- a/language/es_ES/admin.lang.php +++ b/language/es_ES/admin.lang.php @@ -634,4 +634,5 @@ $lang['No element in this category'] = 'Ningún elemento en esta categoría'; $lang['Images manual order was saved'] = 'La orden manual de las imágenes ha sido salvada'; $lang['ranks'] = 'Filas'; /* TODO */ $lang['Drag to re-order'] = 'Drag to re-order'; +/* TODO */ $lang['Unable to retrieve server informations since allow_url_fopen is disabled.'] = 'Unable to retrieve server informations since allow_url_fopen is disabled.'; ?> diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php index 7d659f7aa..a5513f055 100644 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -628,7 +628,7 @@ $lang['delete this comment'] = 'supprimer ce commentaire'; $lang['link_info_image'] = 'Modifier les informations'; $lang['edit category informations'] = 'éditer les informations de cette catégorie'; $lang['nothing'] = 'rien'; -/* TODO */ $lang['overrides existing values with empty ones'] = 'overrides existing values with empty ones'; +$lang['overrides existing values with empty ones'] = 'écraser les données existantes avec des données vides'; $lang['manage image ranks'] = 'gérer l\'ordre des images'; $lang['Manage image ranks'] = 'Gérer l\'ordre des images'; $lang['Edit ranks'] = 'Modifier l\'ordre'; @@ -636,4 +636,5 @@ $lang['No element in this category'] = 'Aucun élément dans cette catégorie'; $lang['Images manual order was saved'] = 'L\'ordre manuel des images a été sauvé'; $lang['ranks'] = 'rangs'; $lang['Drag to re-order'] = 'Cliquer-glisser pour ré-organiser'; +$lang['Unable to retrieve server informations since allow_url_fopen is disabled.'] = 'Impossible de se connecter au server car la fonction allow_url_fopen est désactivée.'; ?> diff --git a/language/it_IT/admin.lang.php b/language/it_IT/admin.lang.php index bb23b5491..f2a44ee04 100644 --- a/language/it_IT/admin.lang.php +++ b/language/it_IT/admin.lang.php @@ -636,4 +636,5 @@ $lang['No element in this category'] = 'Nessun\'elemento in questa categoria'; $lang['Images manual order was saved'] = 'L\'ordinamento manuale delle immagini è stato salvato'; $lang['ranks'] = 'rangs'; /* TODO */ $lang['Drag to re-order'] = 'Drag to re-order'; +/* TODO */ $lang['Unable to retrieve server informations since allow_url_fopen is disabled.'] = 'Unable to retrieve server informations since allow_url_fopen is disabled.'; ?> diff --git a/language/nl_NL/admin.lang.php b/language/nl_NL/admin.lang.php index cd549d2c1..e99605477 100644 --- a/language/nl_NL/admin.lang.php +++ b/language/nl_NL/admin.lang.php @@ -632,4 +632,5 @@ $lang['edit category informations'] = 'bewerk categorie informatie'; /* TODO */ $lang['nothing'] = 'nothing'; /* TODO */ $lang['overrides existing values with empty ones'] = 'overrides existing values with empty ones'; /* TODO */ $lang['Drag to re-order'] = 'Drag to re-order'; +/* TODO */ $lang['Unable to retrieve server informations since allow_url_fopen is disabled.'] = 'Unable to retrieve server informations since allow_url_fopen is disabled.'; ?> -- cgit v1.2.3