OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

enabled log-pw for event attendance; logging usability improvements

Browse Source
This commit is contained in:
following
2013-04-08 12:05:58 +02:00
parent e281cfadc1
commit 59129285c9
6 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/doc/sql/static-data/data.sql
View File

@ -2436,6 +2436,8 @@ INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1973', 'General
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1974', 'If you do not see any E-Mail, please check the spam folder of your mailbox.', '2013-02-23 19:00:04');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1975', 'Do not use easy-to-guess number and letter sequences like \'123456\' or \'qwerty\'', '2013-02-23 19:00:04');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1976', 'currently not available', '2013-02-23 19:00:04');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1977', 'password for \'found\' logs', '2013-02-23 19:00:04');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1978', 'only for attended-logs', '2013-02-23 19:00:04');
-- Table sys_trans_ref
SET NAMES 'utf8';
@ -6149,6 +6151,8 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1974', 'DE', 'Falls du keine E-Mail sehen solltest, prüfe bitte ob sie im Spam-Ordner deines Postfachs einsortiert wurde.', '2013-02-19 05:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1975', 'DE', 'Verwende keine einfach erratbaren Ziffern- oder Buchstabenkombinationen wie \„123456\“ oder \„qwertz\“.', '2013-02-19 05:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1976', 'DE', 'zurzeit nicht verfügbar', '2013-02-19 05:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1977', 'DE', 'Passwort für Fund-Logs', '2013-02-19 05:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1978', 'DE', 'nur für Teilgenommen-Logs', '2013-02-19 05:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1', 'EN', 'Reorder IDs \r', '2010-09-02 00:15:30');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2', 'EN', 'The database could not be reconnected.', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('3', 'EN', 'Testing – please do not login', '2010-08-28 11:48:07');
@ -7647,6 +7651,8 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1974', 'EN', 'If you do not see any E-Mail, please check the spam folder of your mailbox.', '2013-02-19 05:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1975', 'EN', 'Do not use easy-to-guess number and letter sequences like \'123456\' or \'qwerty\'.', '2013-02-19 05:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1976', 'EN', 'currently not available', '2013-02-19 05:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1977', 'EN', 'password for \'found\' logs', '2013-02-19 05:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1978', 'EN', 'only for \'attended\' logs', '2013-02-19 05:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1', 'ES', 'Reordenar ID', '2010-12-09 00:17:55');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2', 'ES', 'La base de datos no se pudo conectar.', '2010-12-09 00:17:55');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('3', 'ES', 'En pruebas - por favor, no entre.', '2010-12-09 00:17:55');

7
htdocs/lang/de/ocstyle/editcache.tpl.php
View File

@ -329,6 +329,9 @@ function toggleAttr(id)
<input class="input20" type="text" name="hidden_month" maxlength="2" value="{date_month}"/>.
<input class="input40" type="text" name="hidden_year" maxlength="4" value="{date_year}"/>&nbsp;
{date_message}
&nbsp;
<img src="lang/de/ocstyle/images/misc/hint.gif" border="0" width="15" height="11" alt="{t}Notice{/t}" title="{t}Notice{/t}" />
{t}For Events: The date of event!{/t}
</td>
</tr>
@ -336,8 +339,8 @@ function toggleAttr(id)
<tr><td class="spacer" colspan="2"></td></tr>
<tr>
<td nowrap="nowrap">{t}passwort to log:{/t}</td>
<td><input class="input100" type="text" name="log_pw" value="{log_pw}" maxlength="20"/> {t}(leave blank for no password){/t}</td>
<td nowrap="nowrap">{t}password for 'found' logs{/t}:</td>
<td><input class="input100" type="text" name="log_pw" value="{log_pw}" maxlength="20"/> &nbsp; {t}(leave blank for no password){/t}</td>
</tr>
<tr>
<td class="help" colspan="2">

3
htdocs/lang/de/ocstyle/log_cache.inc.php
View File

@ -21,7 +21,8 @@
$date_message = '<span class="errormsg">' . t('date or time is invalid') . '</span>';
// Ocprop: <td colspan=\"2\">\s*Kennwort zum Loggen:\s*<input
$log_pw_field = '<tr><td colspan="2">' . t('passwort to log:') . ' <input class="input100" type="text" name="log_pw" maxlength="20" value="" /> ' . t('(only for found-logs)') . '</td></tr><tr><td class="spacer" colspan="2"></td></tr>';
$event_log_pw_field = '<tr><td colspan="2">' . t('passwort to log:') . ' <input class="input100" type="text" name="log_pw" maxlength="20" value="" /> (' . t('only for attended-logs') . ')</td></tr><tr><td class="spacer" colspan="2"></td></tr>';
$other_log_pw_field = '<tr><td colspan="2">' . t('passwort to log:') . ' <input class="input100" type="text" name="log_pw" maxlength="20" value="" /> ' . t('(only for found-logs)') . '</td></tr><tr><td class="spacer" colspan="2"></td></tr>';
$log_pw_field_pw_not_ok = '<tr><td colspan="2">' . t('passwort to log:') . ' <input type="text" name="log_pw" maxlength="20" size="20" value=""/><span class="errormsg"> ' . t('Invalid password!') . '</span></td></tr><tr><td class="spacer" colspan="2"></td></tr>';
$listed_only_oc = t('only listed here!');

6
htdocs/lang/de/ocstyle/newcache.tpl.php
View File

@ -368,7 +368,7 @@ function toggleAttr(id)
<input class="input20" type="text" name="activate_day" maxlength="2" value="{activate_day}"/>.
<input class="input20" type="text" name="activate_month" maxlength="2" value="{activate_month}"/>.
<input class="input40" type="text" name="activate_year" maxlength="4" value="{activate_year}"/>&nbsp;
<select name="activate_hour" class="input40">
<select name="activate_hour" class="input60">
{activation_hours}
</select>&nbsp;{t}#time_suffix_label#{/t}&nbsp;{activate_on_message}<br />
<input type="radio" class="radio" name="publish" id="publish_notnow" value="notnow" {publish_notnow_checked}>&nbsp;<label for="publish_notnow">{t}Do not publish now.{/t}</label>
@ -377,8 +377,8 @@ function toggleAttr(id)
<tr><td class="spacer" colspan="2"></td></tr>
<tr>
<td><nobr>{t}passwort to log:{/t}</nobr></td>
<td><input class="input100" type="text" name="log_pw" value="{log_pw}" maxlength="20"/> {t}(leave blank for no password){/t}</td>
<td><nobr>{t}password for 'found' logs{/t}:</nobr></td>
<td><input class="input100" type="text" name="log_pw" value="{log_pw}" maxlength="20"/> &nbsp; {t}(leave blank for no password){/t}</td>
</tr>
<tr>
<td class="help" colspan="2">

8
htdocs/log.php
View File

@ -187,7 +187,7 @@
{
$all_ok = $date_ok && $logtype_ok;
if ($all_ok && $use_log_pw && $log_type == 1)
if ($all_ok && $use_log_pw && ($log_type == 1 || $log_type == 7))
if (!isset($_POST['log_pw']) ||
mb_strtolower($log_pw) != mb_strtolower($_POST['log_pw']))
{
@ -334,10 +334,14 @@
}
if ($use_log_pw == true)
{
if (!$pw_ok == true)
tpl_set_var('log_pw_field', $log_pw_field_pw_not_ok);
else if ($cache_type == 6)
tpl_set_var('log_pw_field', $event_log_pw_field);
else
tpl_set_var('log_pw_field', $log_pw_field);
tpl_set_var('log_pw_field', $other_log_pw_field);
}
else
tpl_set_var('log_pw_field', '');

4
htdocs/newcache.php
View File

@ -49,8 +49,8 @@
tpl_set_var('reset', $reset);
tpl_set_var('submit', $submit);
tpl_set_var('general_message', '');
tpl_set_var('hidden_since_message', $date_time_format_message);
tpl_set_var('activate_on_message', $date_time_format_message);
tpl_set_var('hidden_since_message', '');
tpl_set_var('activate_on_message', '');
tpl_set_var('lon_message', '');
tpl_set_var('lat_message', '');
tpl_set_var('tos_message', '');