Empty commit

This commit is contained in:
Git 2011-12-04 08:00:16 +00:00
parent 177f4c653e
commit c29d0ad1b9
3 changed files with 71 additions and 67 deletions

View File

@ -1358,7 +1358,7 @@ function update_hash($GroupID) {
FROM torrents_artists AS ta
JOIN artists_alias AS aa ON aa.AliasID=ta.AliasID
JOIN torrents_group AS tg ON tg.ID=ta.GroupID
WHERE ta.GroupID=$GroupID AND ta.Importance IN ('1', '4', '5')
WHERE ta.GroupID=$GroupID AND ta.Importance IN ('1', '4', '5', '6')
GROUP BY tg.ID
ON DUPLICATE KEY UPDATE ArtistName=values(ArtistName)");
@ -1742,7 +1742,7 @@ function get_groups($GroupIDs, $Return = true, $GetArtists = true) {
$NotFound = array_flip($GroupIDs);
foreach($GroupIDs as $GroupID) {
$Data = $Cache->get_value('torrent_group_'.$GroupID, true);
$Data = $Cache->get_value('torrent_group_'.$GroupID);
if(!empty($Data) && (@$Data['ver'] >= 4)) {
unset($NotFound[$GroupID]);
$Found[$GroupID] = $Data['d'];

View File

@ -1,65 +1,65 @@
<?
if (!($IsFLS)) {
// Logged in user is not FLS or Staff
error(403);
}
if ($ConvID = (int)$_GET['convid']) {
// FLS, check level of conversation
$DB->query("SELECT Level FROM staff_pm_conversations WHERE ID=$ConvID");
list($Level) = $DB->next_record;
if ($Level == 0) {
// FLS conversation, assign to staff (moderator)
if(!empty($_GET['to'])) {
$Level = 0;
switch($_GET['to']) {
case 'forum' :
$Level = 650;
break;
case 'staff' :
$Level = 700;
break;
default :
error(404);
break;
}
$DB->query("UPDATE staff_pm_conversations SET Level=".$Level." WHERE ID=$ConvID");
header('Location: staffpm.php');
} else {
error(404);
}
} else {
// FLS trying to assign non-FLS conversation
error(403);
}
} elseif ($ConvID = (int)$_POST['convid']) {
// Staff (via ajax), get current assign of conversation
$DB->query("SELECT Level, AssignedToUser FROM staff_pm_conversations WHERE ID=$ConvID");
list($Level, $AssignedToUser) = $DB->next_record;
if ($LoggedUser['Class'] >= $Level || $AssignedToUser == $LoggedUser['ID']) {
// Staff member is allowed to assign conversation, assign
list($LevelType, $NewLevel) = explode("_", db_string($_POST['assign']));
if ($LevelType == 'class') {
// Assign to class
$DB->query("UPDATE staff_pm_conversations SET Status='Unanswered', Level=$NewLevel, AssignedToUser=NULL WHERE ID=$ConvID");
} else {
// Assign to user
$DB->query("UPDATE staff_pm_conversations SET Status='Unanswered', AssignedToUser=$NewLevel WHERE ID=$ConvID");
}
echo '1';
} else {
// Staff member is not allowed to assign conversation
echo '-1';
}
} else {
// No id
header('Location: staffpm.php');
}
?>
<?
if (!($IsFLS)) {
// Logged in user is not FLS or Staff
error(403);
}
if ($ConvID = (int)$_GET['convid']) {
// FLS, check level of conversation
$DB->query("SELECT Level FROM staff_pm_conversations WHERE ID=$ConvID");
list($Level) = $DB->next_record;
if ($Level == 0) {
// FLS conversation, assign to staff (moderator)
if(!empty($_GET['to'])) {
$Level = 0;
switch($_GET['to']) {
case 'forum' :
$Level = 650;
break;
case 'staff' :
$Level = 700;
break;
default :
error(404);
break;
}
$DB->query("UPDATE staff_pm_conversations SET Status='Unanswered', Level=".$Level." WHERE ID=$ConvID");
header('Location: staffpm.php');
} else {
error(404);
}
} else {
// FLS trying to assign non-FLS conversation
error(403);
}
} elseif ($ConvID = (int)$_POST['convid']) {
// Staff (via ajax), get current assign of conversation
$DB->query("SELECT Level, AssignedToUser FROM staff_pm_conversations WHERE ID=$ConvID");
list($Level, $AssignedToUser) = $DB->next_record;
if ($LoggedUser['Class'] >= $Level || $AssignedToUser == $LoggedUser['ID']) {
// Staff member is allowed to assign conversation, assign
list($LevelType, $NewLevel) = explode("_", db_string($_POST['assign']));
if ($LevelType == 'class') {
// Assign to class
$DB->query("UPDATE staff_pm_conversations SET Status='Unanswered', Level=$NewLevel, AssignedToUser=NULL WHERE ID=$ConvID");
} else {
// Assign to user
$DB->query("UPDATE staff_pm_conversations SET Status='Unanswered', AssignedToUser=$NewLevel WHERE ID=$ConvID");
}
echo '1';
} else {
// Staff member is not allowed to assign conversation
echo '-1';
}
} else {
// No id
header('Location: staffpm.php');
}
?>

View File

@ -368,6 +368,10 @@ p.min_padding {
margin: 0px 5px 10px 5px;
}
#AddArtists input {
width: 100px;
}
.head {
padding: 4px;
background: #b78234 url(images/woodnavcenter.png) repeat-x;