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

merged stable

Browse Source
This commit is contained in:
following
2013-06-10 14:19:33 +02:00
parent daa08853e5 5873cb46d9
commit 405c215d52
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
htdocs/editlog.php
+2 -3
View File
@@ -222,7 +222,7 @@
} }
// ignore unauthorized team comments // ignore unauthorized team comments
if (!teamcomment_allowed($log_record['cache_id'], $log_type)) if (!teamcomment_allowed($log_record['cache_id'], $log_type, $log_record['oc_team_comment']))
$oc_team_comment = 0; $oc_team_comment = 0;
//store? //store?
@@ -289,8 +289,7 @@
$selected = ($log_record['logtype'] == $logtype ? ' selected="selected"' : ''); $selected = ($log_record['logtype'] == $logtype ? ' selected="selected"' : '');
$logtypeoptions .= '<option value="' . $logtype . '"' . $selected . '>' . htmlspecialchars($logtype_names[$logtype], ENT_COMPAT, 'UTF-8') . '</option>' . "\n"; $logtypeoptions .= '<option value="' . $logtype . '"' . $selected . '>' . htmlspecialchars($logtype_names[$logtype], ENT_COMPAT, 'UTF-8') . '</option>' . "\n";
} }
if (teamcomment_allowed($log_record['cache_id'], 3, $log_record['oc_team_comment']))
if (teamcomment_allowed($log_record['cache_id'],3))
tpl_set_var('teamcommentoption', tpl_set_var('teamcommentoption',
mb_ereg_replace('{chk_sel}', ($oc_team_comment ? 'checked' : ''), $teamcomment_field)); mb_ereg_replace('{chk_sel}', ($oc_team_comment ? 'checked' : ''), $teamcomment_field));
else else
htdocs/lib/logtypes.inc.php
+8 -1
View File
@@ -109,6 +109,11 @@
$allowed_logtypes[] = 3; // note $allowed_logtypes[] = 3; // note
} }
// always allow to keep the existing logtype when the log is edited by an admin
if ($login->hasAdminPriv(ADMIN_USER) &&
$old_logtype > 0 && !in_array($old_logtype+0,$allowed_logtypes))
$allowed_logtypes[] = $old_logtype;
return $allowed_logtypes; return $allowed_logtypes;
} }
@@ -119,7 +124,7 @@
} }
function teamcomment_allowed($cache_id, $logtype_id) function teamcomment_allowed($cache_id, $logtype_id, $old_teamcomment=false)
{ {
global $login, $opt; global $login, $opt;
@@ -127,6 +132,8 @@
return false; return false;
elseif ($logtype_id != 3 && ($logtype_id < 9 || $logtype_id > 14)) elseif ($logtype_id != 3 && ($logtype_id < 9 || $logtype_id > 14))
return false; return false;
elseif ($old_teamcomment)
return true;
else else
{ {
$rs = sql("SELECT `user_id`,`status` FROM `caches` WHERE `cache_id`='&1'", $cache_id); $rs = sql("SELECT `user_id`,`status` FROM `caches` WHERE `cache_id`='&1'", $cache_id);