diff options
author | patdenice <patdenice@piwigo.org> | 2008-11-24 22:35:56 +0000 |
---|---|---|
committer | patdenice <patdenice@piwigo.org> | 2008-11-24 22:35:56 +0000 |
commit | ac56adb8b16514af0b94540ff27d40bb6a9f4146 (patch) | |
tree | 16abba0e0f024746b9b23f0d9c19061c43c65d9b /plugins | |
parent | 8a4f579994af7e563dce7e107cb57b1a41256e83 (diff) |
- Replace all #content by .content in Sylvia theme.css.
- In LocalFiles Editor, show error message when creating new template file with empty filename.
git-svn-id: http://piwigo.org/svn/trunk@2906 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
6 files changed, 13 insertions, 3 deletions
diff --git a/plugins/LocalFilesEditor/admin.php b/plugins/LocalFilesEditor/admin.php index 2cd5e3afa..348fdd0cc 100644 --- a/plugins/LocalFilesEditor/admin.php +++ b/plugins/LocalFilesEditor/admin.php @@ -93,6 +93,10 @@ if ((isset($_POST['edit'])) and !is_numeric($_POST['file_to_edit'])) if (isset($_POST['create_tpl'])) { $filename = $_POST['tpl_name']; + if (empty($filename)) + { + array_push($page['errors'], l10n('locfiledit_empty_filename')); + } if (get_extension($filename) != 'tpl') { $filename .= '.tpl'; @@ -100,19 +104,20 @@ if (isset($_POST['create_tpl'])) if (!preg_match('/^[a-zA-Z0-9-_.]+$/', $filename)) { array_push($page['errors'], l10n('locfiledit_filename_error')); - $newfile_page = true; } if (is_numeric($_POST['tpl_model']) and $_POST['tpl_model'] != '0') { array_push($page['errors'], l10n('locfiledit_model_error')); - $newfile_page = true; } if (file_exists($_POST['tpl_parent'] . '/' . $filename)) { array_push($page['errors'], l10n('locfiledit_file_already_exists')); + } + if (!empty($page['errors'])) + { $newfile_page = true; } - if (!$newfile_page) + else { $edited_file = $_POST['tpl_parent'] . '/' . $filename; $content_file = ($_POST['tpl_model'] == '0') ? $new_file['tpl'] : file_get_contents($_POST['tpl_model']); diff --git a/plugins/LocalFilesEditor/language/de_DE/plugin.lang.php b/plugins/LocalFilesEditor/language/de_DE/plugin.lang.php index 38689f359..224861476 100644 --- a/plugins/LocalFilesEditor/language/de_DE/plugin.lang.php +++ b/plugins/LocalFilesEditor/language/de_DE/plugin.lang.php @@ -51,5 +51,6 @@ $lang['locfiledit_parent_directory'] = 'Eltern-Verzeichnis'; $lang['locfiledit_filename_error'] = 'Verboten Zeichen in Dateinamen.'; $lang['locfiledit_file_already_exists'] = 'Datei ist bereits vorhanden.'; $lang['locfiledit_model_error'] = 'Sie müssen ein Modell wählen.'; +/* TODO */ $lang['locfiledit_empty_filename'] = 'You must fill file name.'; ?>
\ No newline at end of file diff --git a/plugins/LocalFilesEditor/language/en_UK/plugin.lang.php b/plugins/LocalFilesEditor/language/en_UK/plugin.lang.php index 42f53aec4..eaeca2a22 100644 --- a/plugins/LocalFilesEditor/language/en_UK/plugin.lang.php +++ b/plugins/LocalFilesEditor/language/en_UK/plugin.lang.php @@ -51,5 +51,6 @@ $lang['locfiledit_parent_directory'] = 'Parent directory'; $lang['locfiledit_filename_error'] = 'Forbidden caraters in file name.'; $lang['locfiledit_file_already_exists'] = 'File already exists.'; $lang['locfiledit_model_error'] = 'You must choose a model.'; +$lang['locfiledit_empty_filename'] = 'You must fill file name.'; ?>
\ No newline at end of file diff --git a/plugins/LocalFilesEditor/language/es_ES/plugin.lang.php b/plugins/LocalFilesEditor/language/es_ES/plugin.lang.php index 0925fbf24..f9cf68100 100644 --- a/plugins/LocalFilesEditor/language/es_ES/plugin.lang.php +++ b/plugins/LocalFilesEditor/language/es_ES/plugin.lang.php @@ -51,5 +51,6 @@ $lang['locfiledit_parent_directory'] = 'Expediente allegado'; $lang['locfiledit_filename_error'] = 'Carácteres prohibidos en el nombre del fichero.'; $lang['locfiledit_file_already_exists'] = 'El fichero ya existe.'; $lang['locfiledit_model_error'] = 'Por favor, seleccione un modelo.'; +/* TODO */ $lang['locfiledit_empty_filename'] = 'You must fill file name.'; ?>
\ No newline at end of file diff --git a/plugins/LocalFilesEditor/language/fr_FR/plugin.lang.php b/plugins/LocalFilesEditor/language/fr_FR/plugin.lang.php index 40c56492a..cb6d1d1d5 100644 --- a/plugins/LocalFilesEditor/language/fr_FR/plugin.lang.php +++ b/plugins/LocalFilesEditor/language/fr_FR/plugin.lang.php @@ -51,5 +51,6 @@ $lang['locfiledit_parent_directory'] = 'Dossier parent'; $lang['locfiledit_filename_error'] = 'Caractères interdits dans le nom du fichier.'; $lang['locfiledit_file_already_exists'] = 'Le fichier existe déjà.'; $lang['locfiledit_model_error'] = 'Veuillez sélectionner un modèle.'; +$lang['locfiledit_empty_filename'] = 'Veuillez indiquer un nom de fichier.'; ?>
\ No newline at end of file diff --git a/plugins/LocalFilesEditor/language/it_IT/plugin.lang.php b/plugins/LocalFilesEditor/language/it_IT/plugin.lang.php index 5cba9fef6..4926d65e1 100644 --- a/plugins/LocalFilesEditor/language/it_IT/plugin.lang.php +++ b/plugins/LocalFilesEditor/language/it_IT/plugin.lang.php @@ -51,5 +51,6 @@ $lang['locfiledit_parent_directory'] = 'Directory parente'; $lang['locfiledit_filename_error'] = 'Caratteri vietati nel nome del file.'; $lang['locfiledit_file_already_exists'] = 'Il file esiste già.'; $lang['locfiledit_model_error'] = 'Selezionare un modello.'; +/* TODO */ $lang['locfiledit_empty_filename'] = 'You must fill file name.'; ?>
\ No newline at end of file |