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

restructured cache-history code

Browse Source
This commit is contained in:
following
2013-06-09 12:31:16 +02:00
parent 81692e6676
commit cef230b661
6 changed files with 93 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/adminreports.php
View File

@ -144,7 +144,7 @@
$tpl->assign('adminid', $record['adminid']);
$tpl->assign('adminnick', $record['adminnick']);
$tpl->assign('reason', $record['reason']);
$tpl->assign('note', $record['note']);
$tpl->assign('note', trim($record['note']));
$tpl->assign('status', $record['status']);
$tpl->assign('created', $record['date_created']);
$tpl->assign('lastmodified', $record['lastmodified']);

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

@ -2487,7 +2487,7 @@ INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2065', 'Guest',
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2066', 'Open chat in a new tab/window', '2013-04-25 23:00:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2067', 'Status', '2013-05-28 16:51:40');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2068', 'since June 2013', '2013-05-28 16:51:40');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2069', 'since February 2012', '2013-05-28 16:51:40');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2069', 'since deletion date February 2012', '2013-05-28 16:51:40');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2070', 'One ore more emails to this user could not be delivered. It might be a good idea to additionally log comments on the user\'s geocaches, and/or trying to contact him/her through other channels like a message board account or another geocaching platform.', '2013-05-28 16:51:40');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2071', 'This cache has been \"temporarily unavailable\" for more than one year now; therefore it is being archived automatically. The owner may decide to maintain the cache and re-enable the listing.', '2013-05-28 16:51:40');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2072', 'This event took place more than five weeks ago; therefore it is being archived automatically. The owner may re-enable the listing if it should stay active for some exceptional reason.', '2013-05-28 16:51:40');
@ -6431,7 +6431,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 ('2066', 'DE', 'Chat in neuem Tab/Fenster öffnen', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2067', 'DE', 'Status', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2068', 'DE', 'seit Juni 2013', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2069', 'DE', 'seit Februar 2012', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2069', 'DE', 'seit Löschdatum Februar 2012', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2070', 'DE', 'Eine oder mehrere Emails an diesen Benutzer konnten nicht zugestellt werden. Es könnte ratsam sein, Hinweise zu seinen Caches zusätzlich zu loggen, und ihn ggf. über weitere Adressen wie z.B. Forenaccounts oder andere Geocaching-Plattformen zu kontaktieren.', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2071', 'DE', 'Dieser Cache ist seit mehr als einem Jahr „momentan nicht verfügbar“; daher wird er automatisch archiviert. Er kann vom Besitzer jederzeit instand gesetzt und reaktiviert werden.', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2072', 'DE', 'Dieses Event fand vor über fünf Wochen statt; daher wird es automatisch archiviert. Das Listing kann vom Owner selbst reaktiviert werden, falls es aus besonderen Gründen weiter aktiv bleiben soll.', '2013-04-25 23:00:00');
@ -7995,7 +7995,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 ('2066', 'EN', 'Open chat in a new tab/window', '2013-02-19 05:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2067', 'EN', 'Status', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2068', 'EN', 'since June 2013', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2069', 'EN', 'since February 2012', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2069', 'EN', 'since deletion date February 2012', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2070', 'EN', 'One ore more emails to this user could not be delivered. It might be a good idea to additionally log comments on the user\'s geocaches, and/or trying to contact him/her through other channels like a message board account or another geocaching platform.', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2071', 'EN', 'This cache has been \"temporarily unavailable\" for more than one year now; therefore it is being archived automatically. The owner may decide to maintain the cache and re-enable the listing.', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2072', 'EN', 'This event took place more than five weeks ago; therefore it is being archived automatically. The owner may re-enable the listing if it should stay active for some exceptional reason.', '2013-04-25 23:00:00');

111
htdocs/templates2/ocstyle/adminhistory.tpl
View File

@ -4,6 +4,7 @@
* Unicode Reminder メモ
***************************************************************************}
{* OCSTYLE *}
{if !$reportdisplay}
<div class="content2-pagetitle">
<img src="resource2/{$opt.template.style}/images/misc/32x32-tools.png" style="align: left; margin-right: 10px;" width="32" height="32" alt="World" />
{t}Cache history{/t}
@ -16,36 +17,96 @@
<input type="submit" name="submitform" value="{t}Show{/t}" class="formbutton" onclick="submitbutton('submitform')" />
</p>
</form>
{/if}
{if $showhistory}
<p>
<a href="viewcache.php?cacheid={$cache.cache_id}">{$cache.name}</a>
{t}by{/t}
<a href="viewprofile.php?userid={$cache.user_id}">{$ownername}</a>
</p>
<br />
<div class="content2-container bg-blue02">
<p class="content-title-noshade-size2">
<img src="resource2/{$opt.template.style}/images/misc/32x32-tools.png" style="align: left; margin-right: 10px;" width="22" height="22" alt="" />
{t}Cache reports{/t}
{if !$reportdisplay}
<p>
<a href="viewcache.php?cacheid={$cache.cache_id}">{$cache.name}</a>
{t}by{/t}
<a href="viewprofile.php?userid={$cache.user_id}">{$ownername}</a>
</p>
</div>
{include file="adminreport_history.tpl"}
<br />
<br />
{/if}
<div class="content2-container bg-blue02">
<p class="content-title-noshade-size2">
<img src="resource2/{$opt.template.style}/images/description/22x22-logs.png" style="align: left; margin-right: 10px;" width="22" height="22" alt="" />
{t}Deleted logs{/t} <small>{t}since February 2012{/t}</small>
</p>
</div>
<div class="content2-container">
{include file="res_logentry.tpl" header=false footer=false footbacklink=false cache=$cache logs=$deleted_logs}
</div>
<p>&nbsp;</p>
{if !$reportdisplay || $reports|@count}
<div class="content2-container bg-blue02">
<p class="content-title-noshade-size2">
<img src="resource2/{$opt.template.style}/images/misc/32x32-tools.png" style="align: left; margin-right: 10px;" width="22" height="22" alt="" />
{if $reportdisplay} {t}Other reports for this cache{/t}{else}{t}Cache reports{/t}{/if}
</p>
</div>
{include file="res_status_changes.tpl"}
<table class="table" width="98%">
{if $reports|@count}
<tr>
<th>{t}ID{/t}</th>
<th>{t}Report date{/t}</th>
<th>{t}Reporter{/t}</th>
<th>{t}Reason{/t}</th>
<th>{t}Admin{/t}</th>
<th>{t}Last modified{/t}</th>
<th>{t}Status{/t}</th>
</tr>
{foreach from=$reports item=report}
<tr>
<td><a href="adminreports.php?id={$report.id}">{$report.id}</a></td>
<td>{$report.date_created|date_format:$opt.format.date}</td>
<td><a href="viewprofile.php?userid={$report.userid}">{$report.usernick}</a></td>
<td>{$report.reason}</td>
<td><a href="viewprofile.php?userid={$report.adminid}">{$report.adminnick}</a></td>
<td>{$report.lastmodified|date_format:$opt.format.date}</td>
<td>{$report.status}</td>
</tr>
{/foreach}
{else}
<tr><td></td></tr>
{/if}
</table>
<br />
{/if}
{if !$reportdisplay || $deleted_logs|@count}
<div class="content2-container bg-blue02">
<p class="content-title-noshade-size2">
<img src="resource2/{$opt.template.style}/images/description/22x22-logs.png" style="align: left; margin-right: 10px;" width="22" height="22" alt="" />
{t}Deleted logs{/t} <small>{t}since deletion date February 2012{/t}</small>
</p>
</div>
<div class="content2-container">
{include file="res_logentry.tpl" header=false footer=false footbacklink=false cache=$cache logs=$deleted_logs}
</div>
<p>&nbsp;</p>
{/if}
{if !$reportdisplay || $status_changes|@count}
<div class="content2-container bg-blue02">
<p class="content-title-noshade-size2">
<img src="resource2/{$opt.template.style}/images/description/22x22-logs.png" style="align: left; margin-right: 10px;" width="22" height="22" alt="" />
{t}Status changes{/t} <small>{t}since June 2013{/t}</small>
</p>
</div>
<table class="table" width="80%">
{if $status_changes|@count}
<tr>
<th>{t}Date{/t}</th>
<th>{t}Status{/t}</th>
<th>{t}Changed by{/t}</th>
</tr>
{foreach from=$status_changes item=change}
<tr>
<td>{$change.date_modified|date_format:$opt.format.date}</td>
<td>{$change.old_status} &rarr; {$change.new_status} {include file="res_cachestatus.tpl" status=$change.new_status_id}</td>
<td><a href="viewprofile.php?userid={$change.user_id}">{$change.username}</a></td>
</tr>
{/foreach}
{else}
<tr><td></td></tr>
{/if}
</table>
{/if}
{else}
<p class="errormsg">{$error}</p>

36
htdocs/templates2/ocstyle/adminreport_history.tpl
View File

@ -1,36 +0,0 @@
{***************************************************************************
* You can find the license in the docs directory
*
* Unicode Reminder メモ
***************************************************************************}
{* OCSTYLE *}
<table class="table" width="98%">
{if $reports|@count}
<tr>
<th>{t}ID{/t}</th>
<th>{t}Report date{/t}</th>
<th>{t}Reporter{/t}</th>
<th>{t}Reason{/t}</th>
<th>{t}Admin{/t}</th>
<th>{t}Last modified{/t}</th>
<th>{t}Status{/t}</th>
</tr>
{foreach from=$reports item=report}
<tr>
<td><a href="adminreports.php?id={$report.id}">{$report.id}</a></td>
<td>{$report.date_created|date_format:$opt.format.date}</td>
<td><a href="viewprofile.php?userid={$report.userid}">{$report.usernick}</a></td>
<td>{$report.reason}</td>
<td><a href="viewprofile.php?userid={$report.adminid}">{$report.adminnick}</a></td>
<td>{$report.lastmodified|date_format:$opt.format.date}</td>
<td>{$report.status}</td>
</tr>
{/foreach}
{else}
<tr><td></td></tr>
{/if}
</table>

31
htdocs/templates2/ocstyle/adminreports.tpl
View File

@ -67,7 +67,7 @@
{/if}
<p style="line-height: 1.6em;"><b>{t}State:{/t}</b>&nbsp;{$status}&nbsp;&nbsp;<b>Admin:</b>&nbsp;{if $adminnick==''}{t}not assigned{/t}{else}{if $otheradmin}<font color="red"><b>{/if}{$adminnick|escape}{if $otheradmin}</b></font>{/if}{/if}</p>
<p style="line-height: 1.6em;"><b>{t}Reason:{/t}</b>&nbsp;{$reason|escape|nl2br}</p>
<p style="line-height: 1.6em;"><b>{t}Comment:{/t}</b>&nbsp;{$note|escape|nl2br}</p>
<p style="line-height: 1.6em; margin-bottom:16px"><b>{t}Comment:{/t}</b>&nbsp;{$note|escape|nl2br}</p>
<div class="content2-container bg-blue02">
<p class="content-title-noshade-size2">
@ -76,7 +76,7 @@
</p>
</div>
<p style="line-height: 1.6em; margin-bottom:16px">
<p style="line-height: 1.6em; margin-bottom:24px">
{if !$ownreport}
<input type="submit" name="assign" value="{t}Assign to me{/t}" class="formbutton" onclick="submitbutton('assign')" />
{else}
@ -107,32 +107,7 @@
{/if}
<br />
{if $reports|@count}
<div class="content2-container bg-blue02">
<p class="content-title-noshade-size2">
<img src="resource2/{$opt.template.style}/images/misc/32x32-tools.png" style="align: left; margin-right: 10px;" width="22" height="22" alt="" />
{t}Other reports for this cache{/t}
</p>
</div>
{include file="adminreport_history.tpl"}
{/if}
{if $deleted_logs|@count}
<div class="content2-container bg-blue02">
<p class="content-title-noshade-size2">
<img src="resource2/{$opt.template.style}/images/description/22x22-logs.png" style="align: left; margin-right: 10px;" width="22" height="22" alt="" />
{t}Deleted logs{/t} <small>{t}since February 2012{/t}</small>
</p>
</div>
<div class="content2-container">
{include file="res_logentry.tpl" header=false footer=false footbacklink=false cache=$cache logs=$deleted_logs}
</div>
{/if}
{if $status_changes|@count}
{include file="res_status_changes.tpl"}
{/if}
{include file=adminhistory.tpl reportdisplay=true showhistory=true}
{/if}
</form>

32
htdocs/templates2/ocstyle/res_status_changes.tpl
View File

@ -1,32 +0,0 @@
{***************************************************************************
* You can find the license in the docs directory
*
* Unicode Reminder メモ
***************************************************************************}
{* OCSTYLE *}
<div class="content2-container bg-blue02">
<p class="content-title-noshade-size2">
<img src="resource2/{$opt.template.style}/images/description/22x22-logs.png" style="align: left; margin-right: 10px;" width="22" height="22" alt="" />
{t}Status changes{/t} <small>{t}since June 2013{/t}</small>
</p>
</div>
<table class="table" width="80%">
{if $status_changes|@count}
<tr>
<th>{t}Date{/t}</th>
<th>{t}Status{/t}</th>
<th>{t}Changed by{/t}</th>
</tr>
{foreach from=$status_changes item=change}
<tr>
<td>{$change.date_modified|date_format:$opt.format.date}</td>
<td>{$change.old_status} &rarr; {$change.new_status} {include file="res_cachestatus.tpl" status=$change.new_status_id}</td>
<td><a href="viewprofile.php?userid={$change.user_id}">{$change.username}</a></td>
</tr>
{/foreach}
{else}
<tr><td></td></tr>
{/if}
</table>