From: Roland Häder <roland@mxchange.org>
Date: Sun, 21 Oct 2012 18:35:10 +0000 (+0000)
Subject: Templates renamed, missing language id added (still no email template for surfbar... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=62220d980d8f0d189e7ebe8d1a1335af590133d3;p=mailer.git

Templates renamed, missing language id added (still no email template for surfbar actions)
---

diff --git a/.gitattributes b/.gitattributes
index 2f1d4fc965..5a852719eb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2167,6 +2167,12 @@ templates/de/html/removeip_level.tpl svneol=native#text/plain
 templates/de/html/runtime_fatal_row.tpl svneol=native#text/plain
 templates/de/html/runtime_fatal_table.tpl svneol=native#text/plain
 templates/de/html/select/.htaccess svneol=native#text/plain
+templates/de/html/select/select_actions_action_surfbar_box.tpl svneol=native#text/plain
+templates/de/html/select/select_actions_action_surfbar_option.tpl svneol=native#text/plain
+templates/de/html/select/select_actions_new_status_surfbar_box.tpl svneol=native#text/plain
+templates/de/html/select/select_actions_new_status_surfbar_option.tpl svneol=native#text/plain
+templates/de/html/select/select_actions_status_surfbar_box.tpl svneol=native#text/plain
+templates/de/html/select/select_actions_status_surfbar_option.tpl svneol=native#text/plain
 templates/de/html/select/select_admins_box.tpl svneol=native#text/plain
 templates/de/html/select/select_admins_option.tpl svneol=native#text/plain
 templates/de/html/select/select_forced_ads_id_popup_box.tpl svneol=native#text/plain
diff --git a/inc/language/surfbar_de.php b/inc/language/surfbar_de.php
index fed5628dec..480875f754 100644
--- a/inc/language/surfbar_de.php
+++ b/inc/language/surfbar_de.php
@@ -191,6 +191,7 @@ addMessages(array(
 	'ADMIN_EDIT_SURFBAR_URLS_SUBJECT' => "[Surfbar:] URL ge&auml;ndert",
 	'ADMIN_ACTIVE_SURFBAR_URLS_SUBJECT' => "[Surfbar:] Freigabe einer URL",
 	'ADMIN_LOCKED_SURFBAR_URLS_SUBJECT' => "[Surfbar:] Sperrung einer URL",
+	'ADMIN_EDIT_SURFBAR_ACTIONS_SUBJECT' => "[Surfbar:] Mitgliederaktion ge&auml;ndert",
 
 	// Subject lines for members
 	'MEMBER_SURFBAR_NOTIFY_URL_UNLOCK_SUBJECT' => "[Surfbar:] Ihre URL wurde aufgenommen",
diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index 4752ac40c1..2a52309768 100644
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -1970,7 +1970,7 @@ function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = TRUE) {
 	} // END - foreach
 
 	// Convert time selections in POST data
-	convertSelectionsToEpocheTimeInPostArray('network_max_reload_time_ye');
+	convertSelectionsToEpocheTimeInPostData('network_max_reload_time_ye');
 
 	// Is there already an entry?
 	if (!isNetworkTypeHandlerConfigured(getRequestElement('network_id'), getRequestElement('network_type_id'))) {
diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index bcb6e6ca07..e0911aee6d 100644
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -1936,7 +1936,7 @@ function doTemplateSurfbarActionsActionSelectionBox ($templateName, $clear = FAL
 	);
 
 	// Handle it over to generateSelectionBoxFromArray()
-	$content = generateSelectionBoxFromArray($actionsAction, 'surfbar_actions_action', 'actions_action', '', '', '', $default, '', FALSE, TRUE);
+	$content = generateSelectionBoxFromArray($actionsAction, 'actions_action', 'actions_action', '', '_surfbar', '', $default, '', FALSE, TRUE);
 
 	// Return prepared content
 	return $content;
@@ -1957,7 +1957,7 @@ function doTemplateSurfbarActionsStatusSelectionBox ($templateName, $clear = FAL
 	);
 
 	// Handle it over to generateSelectionBoxFromArray()
-	$content = generateSelectionBoxFromArray($status, 'surfbar_actions_status', 'actions_status', '', '', '', $default, '', FALSE, TRUE);
+	$content = generateSelectionBoxFromArray($status, 'actions_status', 'actions_status', '', '_surfbar', '', $default, '', FALSE, TRUE);
 
 	// Return prepared content
 	return $content;
@@ -1978,7 +1978,7 @@ function doTemplateSurfbarActionsNewStatusSelectionBox ($templateName, $clear =
 	);
 
 	// Handle it over to generateSelectionBoxFromArray()
-	$content = generateSelectionBoxFromArray($status, 'surfbar_actions_new_status', 'actions_new_status', '', '', '', $default, '', TRUE, TRUE);
+	$content = generateSelectionBoxFromArray($status, 'actions_new_status', 'actions_new_status', '', '_surfbar', '', $default, '', TRUE, TRUE);
 
 	// Return prepared content
 	return $content;
diff --git a/inc/modules/admin/what-add_surfbar_url.php b/inc/modules/admin/what-add_surfbar_url.php
index 969aed280f..a8ad93716f 100644
--- a/inc/modules/admin/what-add_surfbar_url.php
+++ b/inc/modules/admin/what-add_surfbar_url.php
@@ -46,7 +46,7 @@ addYouAreHereLink('admin', __FILE__);
 // Was an URL added?
 if ((isFormSent('add')) && (isPostRequestElementSet('url'))) {
 	// Convert the "reload selections"
-	convertSelectionsToEpocheTimeInPostArray('reload_ye');
+	convertSelectionsToEpocheTimeInPostData('reload_ye');
 
 	// Then add this URL
 	if (doSurfbaradminAddUrl(postRequestElement('url'), postRequestElement('limit'), postRequestElement('reload'))) {
diff --git a/templates/de/html/admin/admin_edit_surfbar_actions_row.tpl b/templates/de/html/admin/admin_edit_surfbar_actions_row.tpl
index 9dac53adb3..c3b0490366 100644
--- a/templates/de/html/admin/admin_edit_surfbar_actions_row.tpl
+++ b/templates/de/html/admin/admin_edit_surfbar_actions_row.tpl
@@ -5,18 +5,18 @@
 		<strong>$content[actions_id]</strong>
 	</td>
 	<td align="center" class="{%template,ColorSwitch%}">
-		<legend for="">{--ADMIN_CHANGE_SURFBAR_ACTIONS_STATUS</legend>
+		<legend for="">{--ADMIN_CHANGE_SURFBAR_ACTIONS_STATUS--}</legend>
 		{%template,SurfbarActionsStatusSelectionBox=$content[actions_id]%}
 	</td>
 </tr>
 
 <tr>
 	<td align="center" class="bottom {%template,ColorSwitch%}">
-		<legend for="">{--ADMIN_CHANGE_SURFBAR_ACTIONS_ACTION</legend>
+		<legend for="">{--ADMIN_CHANGE_SURFBAR_ACTIONS_ACTION--}</legend>
 		{%template,SurfbarActionsActionSelectionBox=$content[actions_id]%}
 	</td>
 	<td align="center" class="bottom {%template,ColorSwitch%}">
-		<legend for="">{--ADMIN_CHANGE_SURFBAR_ACTIONS_NEW_STATUS</legend>
+		<legend for="">{--ADMIN_CHANGE_SURFBAR_ACTIONS_NEW_STATUS--}</legend>
 		{%template,SurfbarActionsNewStatusSelectionBox=$content[actions_id]%}
 	</td>
 </tr>
diff --git a/templates/de/html/select/select_actions_action_surfbar_box.tpl b/templates/de/html/select/select_actions_action_surfbar_box.tpl
new file mode 100644
index 0000000000..8bc5eb9120
--- /dev/null
+++ b/templates/de/html/select/select_actions_action_surfbar_box.tpl
@@ -0,0 +1,3 @@
+<div align="center">
+	$content[selection_box]
+</div>
diff --git a/templates/de/html/select/select_actions_action_surfbar_option.tpl b/templates/de/html/select/select_actions_action_surfbar_option.tpl
new file mode 100644
index 0000000000..775e87e22c
--- /dev/null
+++ b/templates/de/html/select/select_actions_action_surfbar_option.tpl
@@ -0,0 +1,3 @@
+<option value="$content[actions_action]"$content[default]>
+	{%pipe,translateMemberSurfbarActionToSubmit=$content[actions_action]%}
+</option>
diff --git a/templates/de/html/select/select_actions_new_status_surfbar_box.tpl b/templates/de/html/select/select_actions_new_status_surfbar_box.tpl
new file mode 100644
index 0000000000..8bc5eb9120
--- /dev/null
+++ b/templates/de/html/select/select_actions_new_status_surfbar_box.tpl
@@ -0,0 +1,3 @@
+<div align="center">
+	$content[selection_box]
+</div>
diff --git a/templates/de/html/select/select_actions_new_status_surfbar_option.tpl b/templates/de/html/select/select_actions_new_status_surfbar_option.tpl
new file mode 100644
index 0000000000..10a96488c0
--- /dev/null
+++ b/templates/de/html/select/select_actions_new_status_surfbar_option.tpl
@@ -0,0 +1,3 @@
+<option value="$content[actions_new_status]"$content[default]>
+	{%pipe,translateSurfbarUrlStatus=$content[actions_new_status]%}
+</option>
diff --git a/templates/de/html/select/select_actions_status_surfbar_box.tpl b/templates/de/html/select/select_actions_status_surfbar_box.tpl
new file mode 100644
index 0000000000..8bc5eb9120
--- /dev/null
+++ b/templates/de/html/select/select_actions_status_surfbar_box.tpl
@@ -0,0 +1,3 @@
+<div align="center">
+	$content[selection_box]
+</div>
diff --git a/templates/de/html/select/select_actions_status_surfbar_option.tpl b/templates/de/html/select/select_actions_status_surfbar_option.tpl
new file mode 100644
index 0000000000..1e436ddf4a
--- /dev/null
+++ b/templates/de/html/select/select_actions_status_surfbar_option.tpl
@@ -0,0 +1,3 @@
+<option value="$content[actions_status]"$content[default]>
+	{%pipe,translateSurfbarUrlStatus=$content[actions_status]%}
+</option>
diff --git a/templates/de/html/select/select_surfbar_actions_action_box.tpl b/templates/de/html/select/select_surfbar_actions_action_box.tpl
index 8bc5eb9120..11f5d85d80 100644
--- a/templates/de/html/select/select_surfbar_actions_action_box.tpl
+++ b/templates/de/html/select/select_surfbar_actions_action_box.tpl
@@ -1,3 +1 @@
-<div align="center">
-	$content[selection_box]
-</div>
+<!-- @DEPRECATED //-->
diff --git a/templates/de/html/select/select_surfbar_actions_action_option.tpl b/templates/de/html/select/select_surfbar_actions_action_option.tpl
index 775e87e22c..11f5d85d80 100644
--- a/templates/de/html/select/select_surfbar_actions_action_option.tpl
+++ b/templates/de/html/select/select_surfbar_actions_action_option.tpl
@@ -1,3 +1 @@
-<option value="$content[actions_action]"$content[default]>
-	{%pipe,translateMemberSurfbarActionToSubmit=$content[actions_action]%}
-</option>
+<!-- @DEPRECATED //-->
diff --git a/templates/de/html/select/select_surfbar_actions_new_status_box.tpl b/templates/de/html/select/select_surfbar_actions_new_status_box.tpl
index 8bc5eb9120..11f5d85d80 100644
--- a/templates/de/html/select/select_surfbar_actions_new_status_box.tpl
+++ b/templates/de/html/select/select_surfbar_actions_new_status_box.tpl
@@ -1,3 +1 @@
-<div align="center">
-	$content[selection_box]
-</div>
+<!-- @DEPRECATED //-->
diff --git a/templates/de/html/select/select_surfbar_actions_new_status_option.tpl b/templates/de/html/select/select_surfbar_actions_new_status_option.tpl
index 10a96488c0..11f5d85d80 100644
--- a/templates/de/html/select/select_surfbar_actions_new_status_option.tpl
+++ b/templates/de/html/select/select_surfbar_actions_new_status_option.tpl
@@ -1,3 +1 @@
-<option value="$content[actions_new_status]"$content[default]>
-	{%pipe,translateSurfbarUrlStatus=$content[actions_new_status]%}
-</option>
+<!-- @DEPRECATED //-->
diff --git a/templates/de/html/select/select_surfbar_actions_status_box.tpl b/templates/de/html/select/select_surfbar_actions_status_box.tpl
index 8bc5eb9120..11f5d85d80 100644
--- a/templates/de/html/select/select_surfbar_actions_status_box.tpl
+++ b/templates/de/html/select/select_surfbar_actions_status_box.tpl
@@ -1,3 +1 @@
-<div align="center">
-	$content[selection_box]
-</div>
+<!-- @DEPRECATED //-->
diff --git a/templates/de/html/select/select_surfbar_actions_status_option.tpl b/templates/de/html/select/select_surfbar_actions_status_option.tpl
index 1e436ddf4a..11f5d85d80 100644
--- a/templates/de/html/select/select_surfbar_actions_status_option.tpl
+++ b/templates/de/html/select/select_surfbar_actions_status_option.tpl
@@ -1,3 +1 @@
-<option value="$content[actions_status]"$content[default]>
-	{%pipe,translateSurfbarUrlStatus=$content[actions_status]%}
-</option>
+<!-- @DEPRECATED //-->
diff --git a/templates/xml/admin/admin_edit_do_surfbar_actions.xml b/templates/xml/admin/admin_edit_do_surfbar_actions.xml
new file mode 100644
index 0000000000..08ca40abf1
--- /dev/null
+++ b/templates/xml/admin/admin_edit_do_surfbar_actions.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+This template provides meta data for doing edits on URLs of the surfbar in the admin
+area.
+
+@author		Roland Haeder <webmaster@mxchange.org>
+@version	0.2.1-FINAL
+@copyright	(c) 2003 - 2009 by Roland Haeder
+@copyright	(c) 2009 - 2012 by Mailer Developer Team
+@license	GNU GPL 2.0 or any newer version
+@link		http://mxchange.org
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+MA  02110-1301  USA
+//-->
+<admin-entry-meta-data>
+	<!--
+	Call-back function which should all following parameter handled over
+	to. This will always be type of string but we like homogene XMLs.
+	//-->
+	<callback-function type="string" value="adminEditEntriesConfirm" />
+	<!--
+	Name of the database table where the entries should be read/write from/to.
+	//-->
+	<database-table name="" type="string" value="surfbar_actions" />
+	<!--
+	The following three lists must have the same count of list entries, else an
+	error may occur.
+	//-->
+	<!--
+	And all column names to read/write, leave this list tag empty for all (*).
+	//-->
+	<database-column-list>
+	</database-column-list>
+	<!--
+	"Filter" call-back functions to call back for piping the fetched data
+	through (can be left empty, no call-back function will be called)
+	//-->
+	<callback-function-list>
+	</callback-function-list>
+	<!--
+	Extra parameters (2nd, 3rd, ...) for above call-back functions. If an array
+	is provided, we have more than two parameters to handle over to the
+	call-back function. See function handleExtraValues() for details.
+	//-->
+	<extra-parameter-list>
+	</extra-parameter-list>
+	<!--
+	Columns for converting single time selections into a timestamp
+	//-->
+	<time-columns-list>
+	</time-columns-list>
+	<!--
+	Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+	//-->
+	<enable-modify-entries name="" type="bool" value="true" />
+	<!--
+	The table column which should be taken for the ids (see first parameter).
+	This' type can again only be 'string' (remember why?).
+	//-->
+	<table-id-column name="" type="string" value="actions_id" />
+	<!--
+	The table column which should be taken for user ids
+	This' type can again only be 'string' (remember why?).
+	//-->
+	<table-userid-column name="" type="string" value="" />
+	<!--
+	Raw userid column ($key) to skip which is always an invalid (?) entry
+	This' type can again only be 'string' (remember why?).
+	//-->
+	<raw-userid-column-key name="" type="string" value="" />
+	<!--
+	Cache file to delete
+	//-->
+	<cache-file name="" type="string" value="" />
+</admin-entry-meta-data>