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

log removal fixes

Browse Source 
- update logger's statpic instead of deleting user's (may be cache owner)
- adjusted template layouts
- fixed German translation for deleting own log
This commit is contained in:
following
2013-02-23 02:11:48 +01:00
parent 94781d5af3
commit 0c90672306
5 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8634,7 +8634,7 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1803', 'ES', 'nano', '2013-02-21 00:32:43');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1804', 'ES', 'Licencia de datos', '2013-02-21 00:32:43');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1806', 'ES', '¡Por favor, seleccione sólo una de las opciones de eliminar / desactivar!', '2013-02-21 00:32:43');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1807', 'ES', 'Al enviar Acepto los <a href=\"articles.php?page=impressum#tos\" target=\"_blank\">los terminos de servicio de Opencaching.de</a> y la <a href=\"articles.php?page=impressum#datalicense\" target=\"_blank\">licencia de datos de Opencaching.de</a>', '2013-02-21 00:32:43');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1807', 'ES', 'Al enviar Acepto los <a href=\"articles.php?page=impressum#tos\" target=\"_blank\">los terminos de servicio de Opencaching.de</a> y la <a href=\"articles.php?page=impressum#datalicense\" target=\"_blank\">licencia de datos de Opencaching.de</a>.', '2013-02-21 00:32:43');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1808', 'ES', 'He leído y entendido la <a target=\"_blank\" href=\"articles.php?page=dsb\">declaración de privacidad</a>, los <a target=\"_blank\" href=\"articles.php?page=impressum#tos\">terminos de servicio</a> y la <a href=\"articles.php?page=impressum#datalicense\" target=\"_blank\">Licencia de Datos</a> y aceptarlos.', '2013-02-21 00:32:43');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1809', 'ES', 'Tienes que aceptar la declaración de privacidad, términos de servicio y la licencia de datos para registrarse en opencaching.de', '2013-02-21 00:32:43');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1810', 'ES', 'Al descargar este archivo, aceptas nuestros <a href=\"articles.php?page=impressum#tos\">terminos de uso</a> y <a href=\"articles.php?page=impressum#datalicense\" target=\"_blank\">Licencia de Datos</a>.', '2013-02-21 00:32:43');
@ -10134,7 +10134,7 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1804', 'IT', 'Licenza dati', '2013-02-20 01:27:31');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1805', 'IT', 'Il contenuto di www.opencaching.de è rilasciato sotto <br />Licenza <a rel=\"license\" href=\"http://creativecommons.org/licenses/by-nc-nd/3.0/de/deed.it\" target=\"_blank\">Attribuzione - Non commerciale - Non opere derivate 3.0 Germania</a>.', '2013-02-20 01:27:31');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1806', 'IT', 'Per favore seleziona una sola opzione cancella/disabilita!', '2013-02-20 01:27:31');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1807', 'IT', 'Inviando accetto i <a href=\"articles.php?page=impressum#tos\" target=\"_blank\">Termini del Servizio Opencaching.de</a> e la <a href=\"articles.php?page=impressum#datalicense\" target=\"_blank\">Lecenza dati Opencaching.de</a>', '2013-02-20 01:27:31');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1807', 'IT', 'Inviando accetto i <a href=\"articles.php?page=impressum#tos\" target=\"_blank\">Termini del Servizio Opencaching.de</a> e la <a href=\"articles.php?page=impressum#datalicense\" target=\"_blank\">Lecenza dati Opencaching.de</a>.', '2013-02-20 01:27:31');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1808', 'IT', 'Ho letto e compreso la <a target=\"_blank\" href=\"articles.php?page=dsb\">dichiarazione di privacy</a>, i <a target=\"_blank\" href=\"articles.php?page=impressum#tos\">termini del servizio</a> e la <a href=\"articles.php?page=impressum#datalicense\" target=\"_blank\">licnza Dati</a> e di accerrali.', '2013-02-20 01:27:31');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1809', 'IT', 'Devi accettare la dichiarazione di privacy, i termini del servizio e la licenza dati per registrarti su opencaching.de', '2013-02-20 01:27:31');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1810', 'IT', 'Scaricando questo file accetti i nostri <a href=\"articles.php?page=impressum#tos\">termini di utilizzo</a> e la <a href=\"articles.php?page=impressum#datalicense\" target=\"_blank\">Licenza dati</a>.', '2013-02-20 01:27:31');

16
htdocs/lang/de/ocstyle/removelog_cacheowner.tpl.php
View File

@ -18,37 +18,39 @@
<form action="removelog.php" method="post" enctype="application/x-www-form-urlencoded" name="removelog_form" dir="ltr">
<input type="hidden" name="commit" value="1"/>
<input type="hidden" name="logid" value="{logid}"/>
<table class="content">
<table class="table">
<tr><td class="header" colspan="2"><img src="lang/de/ocstyle/images/description/22x22-logs.png" border="0" width="32" height="32" alt="" title="" align="middle"> <b>{t}remove log entry for <a href="viewcache.php?cacheid={cacheid}">{cachename}</a>{/t}</b></td></tr>
<tr><td class="spacer"></td></tr>
<tr><td>{t}are you sure that this log entry shall be removed?{/t}</td></tr>
<tr><td colspan="2">{t}are you sure that this log entry shall be removed?{/t}</td></tr>
<tr><td class="spacer"></td></tr>
<tr>
<td class="header-small">
<td>&nbsp;&nbsp;&nbsp;</td>
<td>
{logimage} {date} {typetext}
</td>
</tr>
<tr><td class="spacer"></td></tr>
<tr>
<td></td>
<td>
{logtext}
</td>
</tr>
<tr><td class="spacer"></td></tr>
<tr><td class="header-small">{t}do you want to send {log_user_name} a note?{/t}</td></tr>
<tr><td class="header-small" colspan="2">{t}do you want to send {log_user_name} a note?{/t}</td></tr>
<tr>
<td>
<td colspan="2">
<textarea class="logs" name="logowner_message"></textarea>
</td>
</tr>
<tr><td class="spacer"></td></tr>
<tr>
<td class="header-small">
<input type="submit" name="submit" value="{t}Remove log entry{/t}" style="width:120px"/>
<td class="header-small" colspan="2">
<input type="submit" name="submit" value="{t}Remove log entry{/t}" style="width:140px"/>
</td>
</tr>
</table>

14
htdocs/lang/de/ocstyle/removelog_logowner.tpl.php
View File

@ -22,20 +22,22 @@
<form action="removelog.php" method="post" enctype="application/x-www-form-urlencoded" name="removelog_form" dir="ltr">
<input type="hidden" name="commit" value="1"/>
<input type="hidden" name="logid" value="{logid}"/>
<table class="content">
<tr><td class="header" colspan="2"><img src="lang/de/ocstyle/images/description/22x22-logs.png" border="0" width="32" height="32" alt="" title="" align="middle"> <b>{t}Remove log entry for <a href="viewcache.php?cacheid={cacheid}">{cachename}</a>{/t}</b></td></tr>
<table class="table">
<tr><td class="header" colspan="2"><img src="lang/de/ocstyle/images/description/22x22-logs.png" border="0" width="32" height="32" alt="" title="" align="middle"> <b>{t}remove log entry for <a href="viewcache.php?cacheid={cacheid}">{cachename}</a>{/t}</b></td></tr>
<tr><td class="spacer"></td></tr>
<tr><td>{t}Are you sure to remove your log entry?{/t}</td></tr>
<tr><td colspan="2">{t}Are you sure to remove your log entry?{/t}</td></tr>
<tr><td class="spacer"></td></tr>
<tr>
<td class="header-small">
<td>&nbsp;&nbsp;&nbsp;</td>
<td>
{logimage} {date} {typetext}
</td>
</tr>
<tr><td class="spacer"></td></tr>
<tr>
<td></td>
<td>
{logtext}
</td>
@ -43,8 +45,8 @@
<tr><td class="spacer"></td></tr>
<tr>
<td class="header-small">
<input type="submit" name="submit" value="{t}Remove log entry{/t}" style="width:120px"/>
<td class="header-small" colspan="2">
<input type="submit" name="submit" value="{t}Remove log entry{/t}" style="width:140px"/>
</td>
</tr>
</table>

8
htdocs/removelog.php
View File

@ -101,10 +101,12 @@
//get cache owner name
$cache_owner_rs = sql("SELECT `username` FROM `user` WHERE `user_id`='&1'", $log_record['cache_owner_id']);
$cache_owner_record = sql_fetch_array($cache_owner_rs);
mysql_free_result($cache_owner_rs);
//get email address of logowner
$log_user_rs = sql("SELECT `email`, `username` FROM `user` WHERE `user_id`='&1'", $log_record['log_user_id']);
$log_user_record = sql_fetch_array($log_user_rs);
mysql_free_result($log_user_rs);
$email_content = mb_ereg_replace('%log_owner%', $log_user_record['username'], $email_content);
$email_content = mb_ereg_replace('%cache_owner%', $cache_owner_record['username'], $email_content);
@ -121,7 +123,9 @@
// move to archive
sql("INSERT INTO `cache_logs_archived` SELECT * FROM `cache_logs` WHERE `cache_logs`.`id`='&1' LIMIT 1", $log_id);
//log entfernen
// TO DO: remove log pictures
// remove log entry
sql("DELETE FROM `cache_logs` WHERE `cache_logs`.`id`='&1' LIMIT 1", $log_id);
// remove cache from users top caches, if the only found or attended log
@ -135,7 +139,7 @@
//call eventhandler
require_once($opt['rootpath'] . 'lib/eventhandler.inc.php');
event_remove_log($cacheid, $usr['userid']+0);
event_remove_log($log_record['cache_id'], $log_record['log_user_id']);
//cache anzeigen
tpl_redirect('viewcache.php?cacheid=' . urlencode($log_record['cache_id']));

2
htdocs/resource2/ocstyle/css/style_screen.css
View File

@ -477,6 +477,8 @@ ul.linklist-indent {margin: -0.3em 0px 0.5em 0px; padding: 0px 0px 0px 10px; lis
.bg-red09 {background-color: rgb(225,79,55);}
.bg-red10 {background-color: rgb(222,59,33);}
.bg-quote {background-color: #e3ecf3;}
/*---------------------------*/
/* 7.5 Bottom border colors */
/*---------------------------*/