From: Roland Häder Date: Tue, 31 May 2016 08:27:58 +0000 (+0200) Subject: Continued a bit: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c4be539d249046d6d64d2181c3a1e898fe9a64f5;p=mailer.git Continued a bit: - renamed templates as shortening is not wanted here - renamed variable (was all upper-case) - fixed tpzo ... --- diff --git a/inc/language/de.php b/inc/language/de.php index 47bc860585..4a0ad9c8ce 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -1017,7 +1017,7 @@ addMessages(array( 'ADMIN_CONFIG_SECURE_TITLE' => "Sicherheitseinstellungen:", 'ADMIN_CONFIG_MINIMUM_PASSWORD_LENGTH_LEGEND' => "Minimale Passwort/Saltlängen:", 'ADMIN_CONFIG_MINIMUM_PASSWORD_LENGTH' => "Minimale Passwortlänge:", - 'ADMIN_CONFIG_SALT_LENGTH' => "Länge des "Salz-Hhashes" für alle Passwörter:", + 'ADMIN_CONFIG_SALT_LENGTH' => "Länge des "Salz-Hashes" für alle Passwörter:", 'ADMIN_CONFIG_MINIMUM_PASSWORD_SCORE' => "Minimale Sicherheitsstufe aller Passwörter:", 'ADMIN_CONFIG_SECURE_NOTICE' => "Um für alle Accounts (Mitglieder/Admins derzeit) neue Passwörter zu generieren, lassen Sie das Eingabefeld {--ADMIN_CONFIG_SALT_LENGTH--} leer oder geben Sie eine 0 ein! Vorsicht! Sie müssen sich dann anschliessend erneut einloggen. Sie sollten die minimale Passwortstärke nie unter {--PASSWORD_SCORE_3--} stellen, da diese dann zu schach und somit leicht "erratbar" sind (Brute-Force-Attacke).", diff --git a/inc/modules/admin/what-list_cats.php b/inc/modules/admin/what-list_cats.php index de20d59bf1..9c170d0f5c 100644 --- a/inc/modules/admin/what-list_cats.php +++ b/inc/modules/admin/what-list_cats.php @@ -44,9 +44,6 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -// Init variable to avoid a notice -$CATS = ''; - if (isFormSent('add')) { // Default message $content = '{--CATEGORY_ALREADY_EXISTS--}'; @@ -117,11 +114,11 @@ if (isFormSent('add')) { $OUT = ''; foreach (postRequestElement('sel') as $id => $value) { // Load row template and switch colors - $OUT .= loadTemplate('admin_delete_cats_row', TRUE, $id); + $OUT .= loadTemplate('admin_delete_categories_row', TRUE, $id); } // END - foreach // Load main template - loadTemplate('admin_delete_cats', FALSE, $OUT); + loadTemplate('admin_delete_categories', FALSE, $OUT); } elseif ((isFormSent('edit')) && (ifPostContainsSelections())) { // Edit categories $OUT = ''; @@ -138,14 +135,14 @@ if (isFormSent('add')) { $content['visible_selection'] = addSelectionBox('yn', $content['visible'], 'visible', $content['id']); // Load row template and switch colors - $OUT .= loadTemplate('admin_edit_cats_row', TRUE, $content); + $OUT .= loadTemplate('admin_edit_categories_row', TRUE, $content); } // END - foreach // Load main template - loadTemplate('admin_edit_cats', FALSE, $OUT); + loadTemplate('admin_edit_categories', FALSE, $OUT); } else { // Init variable here - $CATS = ''; + $categoryOptions = ''; // Load all categories $result = sqlQuery("SELECT @@ -164,26 +161,30 @@ ORDER BY // List already existing categories for editing while ($content = sqlFetchArray($result)) { - // Put cat descriptions into variable for the selection box - if (strlen($content['cat']) > 40) $content['cat'] = substr($content['cat'], 0, 37) . '...'; - $CATS .= ''; + // Is the category's name to long? + if (strlen($content['cat']) > 40) { + // Put cat descriptions into variable for the selection box + $content['cat'] = substr($content['cat'], 0, 37) . '...'; + } // END - if + + $categoryOptions .= ''; // Load row template and switch color - $OUT .= loadTemplate('admin_list_cats_row', TRUE, $content); + $OUT .= loadTemplate('admin_list_categories_row', TRUE, $content); } // END - while // Free memory sqlFreeResult($result); // Load main template - loadTemplate('admin_list_cats', FALSE, $OUT); + loadTemplate('admin_list_categories', FALSE, $OUT); } // END - if // Remember in array - $content['cats'] = $CATS; + $content['cats'] = $categoryOptions; // Form to add a new category - loadTemplate('admin_add_cat', FALSE, $content); + loadTemplate('admin_add_category', FALSE, $content); } // [EOF] diff --git a/templates/de/html/admin/admin_add_cat.tpl b/templates/de/html/admin/admin_add_cat.tpl deleted file mode 100644 index 3851f93ef9..0000000000 --- a/templates/de/html/admin/admin_add_cat.tpl +++ /dev/null @@ -1,49 +0,0 @@ -
-{%form,formMethodPost=modules.php?module=admin&what=list_cats%} - - - - - - - - - - - - - - - - - - - - - - - -
- {--ADMIN_ADD_NEW_CATEGORY_TITLE--} -
- {--ADMIN_ENTER_CATEGORY_NAME--}: - - -
- {--ADMIN_SELECT_PARENT_CATEGORY--} - - -
- {--ADMIN_CATEGORY_IS_VISIBLE--} - - {--YES--}
- {--NO--} -
- - -
-{%form_close%} -
diff --git a/templates/de/html/admin/admin_add_category.tpl b/templates/de/html/admin/admin_add_category.tpl new file mode 100644 index 0000000000..3851f93ef9 --- /dev/null +++ b/templates/de/html/admin/admin_add_category.tpl @@ -0,0 +1,49 @@ +
+{%form,formMethodPost=modules.php?module=admin&what=list_cats%} + + + + + + + + + + + + + + + + + + + + + + + +
+ {--ADMIN_ADD_NEW_CATEGORY_TITLE--} +
+ {--ADMIN_ENTER_CATEGORY_NAME--}: + + +
+ {--ADMIN_SELECT_PARENT_CATEGORY--} + + +
+ {--ADMIN_CATEGORY_IS_VISIBLE--} + + {--YES--}
+ {--NO--} +
+ + +
+{%form_close%} +
diff --git a/templates/de/html/admin/admin_delete_categories.tpl b/templates/de/html/admin/admin_delete_categories.tpl new file mode 100644 index 0000000000..6dbe0f19b4 --- /dev/null +++ b/templates/de/html/admin/admin_delete_categories.tpl @@ -0,0 +1,17 @@ +
+{%form,formMethodPost=modules.php?module=admin&what=list_cats&do=del%} + + + + + $content + + + +
+ {--ADMIN_DELETE_CATEGORIES_TITLE--}: +
+ +
+{%form_close%} +
diff --git a/templates/de/html/admin/admin_delete_categories_row.tpl b/templates/de/html/admin/admin_delete_categories_row.tpl new file mode 100644 index 0000000000..a34fe8f48e --- /dev/null +++ b/templates/de/html/admin/admin_delete_categories_row.tpl @@ -0,0 +1,11 @@ + + + {--ADMIN_CATEGORY_ID--} $content: + + + + + {%pipe,getCategory=$content%} + + + diff --git a/templates/de/html/admin/admin_delete_cats.tpl b/templates/de/html/admin/admin_delete_cats.tpl deleted file mode 100644 index 6dbe0f19b4..0000000000 --- a/templates/de/html/admin/admin_delete_cats.tpl +++ /dev/null @@ -1,17 +0,0 @@ -
-{%form,formMethodPost=modules.php?module=admin&what=list_cats&do=del%} - - - - - $content - - - -
- {--ADMIN_DELETE_CATEGORIES_TITLE--}: -
- -
-{%form_close%} -
diff --git a/templates/de/html/admin/admin_delete_cats_row.tpl b/templates/de/html/admin/admin_delete_cats_row.tpl deleted file mode 100644 index a34fe8f48e..0000000000 --- a/templates/de/html/admin/admin_delete_cats_row.tpl +++ /dev/null @@ -1,11 +0,0 @@ - - - {--ADMIN_CATEGORY_ID--} $content: - - - - - {%pipe,getCategory=$content%} - - - diff --git a/templates/de/html/admin/admin_edit_categories.tpl b/templates/de/html/admin/admin_edit_categories.tpl new file mode 100644 index 0000000000..1ec7f76e19 --- /dev/null +++ b/templates/de/html/admin/admin_edit_categories.tpl @@ -0,0 +1,18 @@ +
+{%form,formMethodPost=modules.php?module=admin&what=list_cats&do=edit%} + + + + +$content + + + +
+ {--ADMIN_EDIT_CATEGORIES_TITLE--}: +
+ + +
+{%form_close%} +
diff --git a/templates/de/html/admin/admin_edit_categories_row.tpl b/templates/de/html/admin/admin_edit_categories_row.tpl new file mode 100644 index 0000000000..f813ecd690 --- /dev/null +++ b/templates/de/html/admin/admin_edit_categories_row.tpl @@ -0,0 +1,21 @@ + + + {--ADMIN_CATEGORY_ID--} $content[id]: + + + + {--ADMIN_CATEGORY_DESCRIPTION--}:  + + + + + + {--ADMIN_CATEGORY_IS_VISIBLE--}  + $content[visible_selection] + + + {--ADMIN_ENTER_SORT_KEY--}:  + + + + diff --git a/templates/de/html/admin/admin_edit_cats.tpl b/templates/de/html/admin/admin_edit_cats.tpl deleted file mode 100644 index 1ec7f76e19..0000000000 --- a/templates/de/html/admin/admin_edit_cats.tpl +++ /dev/null @@ -1,18 +0,0 @@ -
-{%form,formMethodPost=modules.php?module=admin&what=list_cats&do=edit%} - - - - -$content - - - -
- {--ADMIN_EDIT_CATEGORIES_TITLE--}: -
- - -
-{%form_close%} -
diff --git a/templates/de/html/admin/admin_edit_cats_row.tpl b/templates/de/html/admin/admin_edit_cats_row.tpl deleted file mode 100644 index f813ecd690..0000000000 --- a/templates/de/html/admin/admin_edit_cats_row.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - - {--ADMIN_CATEGORY_ID--} $content[id]: - - - - {--ADMIN_CATEGORY_DESCRIPTION--}:  - - - - - - {--ADMIN_CATEGORY_IS_VISIBLE--}  - $content[visible_selection] - - - {--ADMIN_ENTER_SORT_KEY--}:  - - - - diff --git a/templates/de/html/admin/admin_list_categories.tpl b/templates/de/html/admin/admin_list_categories.tpl new file mode 100644 index 0000000000..37b1a4910a --- /dev/null +++ b/templates/de/html/admin/admin_list_categories.tpl @@ -0,0 +1,28 @@ +
+{%form,formMethodPost=modules.php?module=admin&what=list_cats%} + + + + + + + + + + + + +$content + + + + +
+ {--ADMIN_CONFIG_CATEGORIES_TITLE--} +
{--ID_SELECT--}{--CATEGORY_NAME--}{--ADMIN_IS_VISIBLE--}{--SORTING_KEY--}
+ + + +
+{%form_close%} +
diff --git a/templates/de/html/admin/admin_list_categories_row.tpl b/templates/de/html/admin/admin_list_categories_row.tpl new file mode 100644 index 0000000000..8f17ff13ef --- /dev/null +++ b/templates/de/html/admin/admin_list_categories_row.tpl @@ -0,0 +1,14 @@ + + + + + + {%pipe,getCategory=$content[id]%} + + + {%pipe,translateYesNo=$content[visible]%} + + + $content[sort] + + diff --git a/templates/de/html/admin/admin_list_cats.tpl b/templates/de/html/admin/admin_list_cats.tpl deleted file mode 100644 index 37b1a4910a..0000000000 --- a/templates/de/html/admin/admin_list_cats.tpl +++ /dev/null @@ -1,28 +0,0 @@ -
-{%form,formMethodPost=modules.php?module=admin&what=list_cats%} - - - - - - - - - - - - -$content - - - - -
- {--ADMIN_CONFIG_CATEGORIES_TITLE--} -
{--ID_SELECT--}{--CATEGORY_NAME--}{--ADMIN_IS_VISIBLE--}{--SORTING_KEY--}
- - - -
-{%form_close%} -
diff --git a/templates/de/html/admin/admin_list_cats_row.tpl b/templates/de/html/admin/admin_list_cats_row.tpl deleted file mode 100644 index 8f17ff13ef..0000000000 --- a/templates/de/html/admin/admin_list_cats_row.tpl +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - {%pipe,getCategory=$content[id]%} - - - {%pipe,translateYesNo=$content[visible]%} - - - $content[sort] - -