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

Merge branch 'stable'

Browse Source
This commit is contained in:
following
2013-05-13 17:36:17 +02:00
parent 90a0fe479b 09b18ed86c
commit d6241a4f1b
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
htdocs/doc/sql/static-data/data.sql
+2
View File
@@ -2458,6 +2458,7 @@ INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2015', 'Safari
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2016', 'This geocache can be found at different places. The places to look for are explained in the cache description. They must be located \"away from home\" and exist for a considerable period of time, so that they can be re-visited later. There is no container and no logbook; instead the find must be documented by a photo and noting the coordinates.', '2013-04-25 23:00:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2017', 'Only virtual caches can be safari caches.', '2013-04-25 23:00:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2040', 'Deleted text:', '2013-04-25 23:00:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2041', 'total', '2013-04-25 23:00:00');
-- Table sys_trans_ref
SET NAMES 'utf8';
@@ -6246,6 +6247,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 ('2016', 'DE', 'Dieser Geocache kann an verschiedenen Orten gefunden werden. Die gesuchten Orte sind in der Cachebeschreibung erläutert. Sie müssen sich „außer Haus“ befinden und über längere Zeit Bestand haben, sodass man sie nach einiger Zeit wieder besuchen kann. Es gibt keinen Behälter und kein Logbuch, sondern der Fund ist mit einem Foto und den Koordinaten des Ortes zu dokumentieren.', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2017', 'DE', 'Das Safari-Attribut kann nur bei virtuellen Caches gesetzt werden.', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2040', 'DE', 'Gelöschter Text:', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2041', 'DE', 'insgesamt', '2013-04-25 23:00:00');
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');
htdocs/event_attendance.php
+5 -1
View File
@@ -28,7 +28,11 @@
sql_free_result($rs);
$rs = sql("SELECT DISTINCT `user`.`username` FROM `cache_logs` INNER JOIN `caches` ON `cache_logs`.`cache_id`=`caches`.`cache_id` INNER JOIN `cache_status` ON `caches`.`status`=`cache_status`.`id` INNER JOIN `user` ON `user`.`user_id`=`cache_logs`.`user_id` WHERE `cache_status`.`allow_user_view`=1 AND `cache_logs`.`type`=8 AND `cache_logs`.`cache_id`='&1' ORDER BY `user`.`username`", $cache_id);
$tpl->assign_rs('attendants', $rs);
$tpl->assign_rs('willattend', $rs);
sql_free_result($rs);
$rs = sql("SELECT DISTINCT `user`.`username` FROM `cache_logs` INNER JOIN `caches` ON `cache_logs`.`cache_id`=`caches`.`cache_id` INNER JOIN `cache_status` ON `caches`.`status`=`cache_status`.`id` INNER JOIN `user` ON `user`.`user_id`=`cache_logs`.`user_id` WHERE `cache_status`.`allow_user_view`=1 AND `cache_logs`.`type`=7 AND `cache_logs`.`cache_id`='&1' ORDER BY `user`.`username`", $cache_id);
$tpl->assign_rs('attended', $rs);
sql_free_result($rs);
}
htdocs/lang/de/ocstyle/email/removed_log.email
+1 -1
View File
@@ -1,6 +1,6 @@
Hallo %log_owner%,
%cache_owner% hat deinen Logeintrag für seinen Cache "%cache_name%" gelöscht
%cache_owner% hat deinen Logeintrag für den Cache "%cache_name%" gelöscht
(http://opencaching.de/%cache_wp%).
%log_text%
htdocs/templates2/ocstyle/event_attendance.tpl
+10 -3
View File
@@ -11,10 +11,17 @@
{t}by{/t} {$owner|escape}</p>
</div>
<div style="margin-top:16px;">
<p style="color: 5890a8"><b>{t}Attendees{/t}</b></p>
<p style="color: 5890a8">({t}Total{/t}: {count array=$attendants})</p>
<p>{foreach from=$attendants item=attendantsItem}
<p style="color: 5890a8"><b>{t}Will attend{/t}</b></p>
<p style="color: 5890a8">({t}total{/t}: {count array=$willattend})</p>
<p>{foreach from=$willattend item=attendantsItem}
{$attendantsItem.username|escape}<br />
{/foreach}</p>
<div style="margin-top:16px;">
<p style="color: 5890a8"><b>{t}Attended{/t}</b></p>
<p style="color: 5890a8">({t}total{/t}: {count array=$attended})</p>
<p>{foreach from=$attended item=attendantsItem}
{$attendantsItem.username|escape}<br />
{/foreach}</p>
</div>
</div>
</p>