Mirror/Gazelle
1
0
Fork 0
mirror of https://github.com/WhatCD/Gazelle.git synced 2024-12-12 18:36:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Empty commit

Browse Source
This commit is contained in:
Git 2016-02-18 08:00:30 +00:00
parent 76fed97814
commit 69f5523111
4 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/CHANGES.txt
View File

@ -1,5 +1,8 @@
CHANGE LOG
2016-02-18 by newman
Fix staff seeing FLS-assigned staff PMs. Add checkbox to allow adding a linked account or editing a linked account without updating staff notes
2016-02-13 by lawnmower
minor usability improvement to artist alias editing

8
sections/staffpm/staff_inbox.php
View File

@ -45,6 +45,14 @@
WHERE (LEAST($LevelCap, spc.Level) <= $UserLevel OR spc.AssignedToUser = '".$LoggedUser['ID']."')
AND spc.Status IN ('$Status')";
if ($ViewString == 'Your Unanswered') {
if ($UserLevel >= $Classes[MOD]['Level']) {
$WhereCondition .= " AND spc.Level >= " . $Classes[MOD]['Level'];
} else if ($UserLevel == $Classes[FORUM_MOD]['Level']) {
$WhereCondition .= " AND spc.Level >= " . $Classes[FORUM_MOD]['Level'];
}
}
list($Page, $Limit) = Format::page_limit(MESSAGES_PER_PAGE);
// Get messages
$StaffPMs = $DB->query("

39
sections/user/linkedfunctions.php
View File

@ -1,5 +1,6 @@
<?
function link_users($UserID, $TargetID) {
function link_users($UserID, $TargetID, $IgnoreComments) {
global $DB, $LoggedUser;
authorize();
@ -69,12 +70,14 @@ function link_users($UserID, $TargetID) {
$DB->query("INSERT INTO users_dupes (UserID, GroupID) VALUES ($UserID, $GroupID)");
}
$AdminComment = sqltime()." - Linked accounts updated: [user]".$UserInfo['Username']."[/user] and [user]".$TargetInfo['Username']."[/user] linked by ".$LoggedUser['Username'];
$DB->query("
UPDATE users_info AS i
JOIN users_dupes AS d ON d.UserID = i.UserID
SET i.AdminComment = CONCAT('".db_string($AdminComment)."\n\n', i.AdminComment)
WHERE d.GroupID = $GroupID");
if (!$IgnoreComments) {
$AdminComment = sqltime()." - Linked accounts updated: [user]".$UserInfo['Username']."[/user] and [user]".$TargetInfo['Username']."[/user] linked by ".$LoggedUser['Username'];
$DB->query("
UPDATE users_info AS i
JOIN users_dupes AS d ON d.UserID = i.UserID
SET i.AdminComment = CONCAT('".db_string($AdminComment)."\n\n', i.AdminComment)
WHERE d.GroupID = $GroupID");
}
}
function unlink_user($UserID) {
@ -122,7 +125,7 @@ function delete_dupegroup($GroupID) {
$DB->query("DELETE FROM dupe_groups WHERE ID = '$GroupID'");
}
function dupe_comments($GroupID, $Comments) {
function dupe_comments($GroupID, $Comments, $IgnoreComments) {
global $DB, $LoggedUser;
authorize();
@ -140,7 +143,9 @@ function dupe_comments($GroupID, $Comments) {
WHERE ID = $GroupID");
list($OldCommentHash) = $DB->next_record();
if ($OldCommentHash != sha1($Comments)) {
$AdminComment = sqltime()." - Linked accounts updated: Comments updated by ".$LoggedUser['Username'];
if (!$IgnoreComments) {
$AdminComment = sqltime()." - Linked accounts updated: Comments updated by ".$LoggedUser['Username'];
}
if ($_POST['form_comment_hash'] == $OldCommentHash) {
$DB->query("
UPDATE dupe_groups
@ -153,11 +158,13 @@ function dupe_comments($GroupID, $Comments) {
WHERE ID = '$GroupID'");
}
$DB->query("
UPDATE users_info AS i
JOIN users_dupes AS d ON d.UserID = i.UserID
SET i.AdminComment = CONCAT('".db_string($AdminComment)."\n\n', i.AdminComment)
WHERE d.GroupID = $GroupID");
if (!$IgnoreComments) {
$DB->query("
UPDATE users_info AS i
JOIN users_dupes AS d ON d.UserID = i.UserID
SET i.AdminComment = CONCAT('".db_string($AdminComment)."\n\n', i.AdminComment)
WHERE d.GroupID = $GroupID");
}
}
}
@ -241,7 +248,9 @@ function user_dupes_table($UserID) {
</table>
<div class="pad hidden linkedaccounts">
<label for="target">Link this user with: </label>
<input type="text" name="target" id="target" />
<input type="text" name="target" id="target" /><br />
<label for="ignore_comments">Do not update staff notes</label>
<input type="checkbox" name="ignore_comments" id="ignore_comments" /><br />
<input type="submit" value="Update" id="submitlink" />
</div>
</div>

4
sections/user/manage_linked.php
View File

@ -21,7 +21,7 @@
FROM users_main
WHERE Username LIKE '".db_string($Target)."'");
if (list($TargetID) = $DB->next_record()) {
link_users($UserID, $TargetID);
link_users($UserID, $TargetID, (isset($_REQUEST['ignore_comments'])) ? true : false);
} else {
error("User '$Target' not found.");
}
@ -34,7 +34,7 @@
list($GroupID) = $DB->next_record();
if ($_REQUEST['dupecomments'] && $GroupID) {
dupe_comments($GroupID, $_REQUEST['dupecomments']);
dupe_comments($GroupID, $_REQUEST['dupecomments'], (isset($_REQUEST['ignore_comments'])) ? true : false);
}
break;