diff --git a/sections/collages/edit.php b/sections/collages/edit.php index 76275316..e7a54f03 100644 --- a/sections/collages/edit.php +++ b/sections/collages/edit.php @@ -23,15 +23,15 @@ -0) { ?> +0 || check_perms('site_collages_delete')) { ?> Category diff --git a/sections/collages/edit_handle.php b/sections/collages/edit_handle.php index 648b4cf0..d899c43d 100644 --- a/sections/collages/edit_handle.php +++ b/sections/collages/edit_handle.php @@ -41,7 +41,7 @@ $DB->query("UPDATE collages SET Name='".db_string($_POST['name'])."' WHERE ID='$CollageID'"); } -if(!empty($_POST['category']) && !empty($CollageCats[$_POST['category']]) && $_POST['category']!=$CategoryID && $_POST['category']!=0) { +if(isset($_POST['category']) && !empty($CollageCats[$_POST['category']]) && $_POST['category']!=$CategoryID && ($_POST['category']!=0 || check_perms('site_collages_delete'))) { $DB->query("UPDATE collages SET CategoryID='".db_string($_POST['category'])."' WHERE ID='$CollageID'"); } diff --git a/sections/reportsv2/array.php b/sections/reportsv2/array.php index 7369b919..d148a613 100644 --- a/sections/reportsv2/array.php +++ b/sections/reportsv2/array.php @@ -409,8 +409,8 @@ ), 'resolve_options' => array( 'upload' => '0', - 'warn' => '1', - 'delete' => '1', + 'warn' => '0', + 'delete' => '0', 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.1.4]2.1.4[/url]. Bitrates must accurately reflect encoder presets or the average bitrate of the audio files. You are responsible for supplying correct format and bitrate information on the upload page. Your torrent was reported because the bitrates of one or more audio files had been misrepresented.' ) diff --git a/sections/schedule/index.php b/sections/schedule/index.php index 57030a73..8b6ec210 100644 --- a/sections/schedule/index.php +++ b/sections/schedule/index.php @@ -526,22 +526,28 @@ function next_hour() { sleep(5); // Send email $DB->query("SELECT um.Username, um.Email FROM users_info AS ui JOIN users_main AS um ON um.ID=ui.UserID + LEFT JOIN users_levels AS ul ON ul.UserID = um.ID AND ul.PermissionID = '".TC."' WHERE um.PermissionID IN ('".USER."', '".MEMBER ."') AND um.LastAccess<'".time_minus(3600*24*110, true)."' AND um.LastAccess>'".time_minus(3600*24*111, true)."' AND um.LastAccess!='0000-00-00 00:00:00' AND ui.Donor='0' - AND um.Enabled!='2'"); + AND um.Enabled!='2' + AND ul.UserID IS NULL + GROUP BY um.ID"); while(list($Username, $Email) = $DB->next_record()) { $Body = "Hi $Username, \n\nIt has been almost 4 months since you used your account at http://".NONSSL_SITE_URL.". This is an automated email to inform you that your account will be disabled in 10 days if you do not sign in. "; send_email($Email, 'Your '.SITE_NAME.' account is about to be disabled', $Body); } $DB->query("SELECT um.ID FROM users_info AS ui JOIN users_main AS um ON um.ID=ui.UserID + LEFT JOIN users_levels AS ul ON ul.UserID = um.ID AND ul.PermissionID = '".TC."' WHERE um.PermissionID IN ('".USER."', '".MEMBER ."') AND um.LastAccess<'".time_minus(3600*24*30*4)."' AND um.LastAccess!='0000-00-00 00:00:00' AND ui.Donor='0' - AND um.Enabled!='2'"); + AND um.Enabled!='2' + AND ul.UserID IS NULL + GROUP BY um.ID"); if($DB->record_count() > 0) { disable_users($DB->collect('ID'), "Disabled for inactivity.", 3);