Empty commit

This commit is contained in:
Git 2012-05-30 08:00:20 +00:00
parent d0f12e8e85
commit 6a2b5cb774
4 changed files with 14 additions and 8 deletions

View File

@ -23,15 +23,15 @@
<td><input type="text" name="name" size="60" value="<?=$Name?>" /></td> <td><input type="text" name="name" size="60" value="<?=$Name?>" /></td>
</tr> </tr>
<? } ?> <? } ?>
<? if($CategoryID>0) { ?> <? if($CategoryID>0 || check_perms('site_collages_delete')) { ?>
<tr> <tr>
<td class="label"><strong>Category</strong></td> <td class="label"><strong>Category</strong></td>
<td> <td>
<select name="category"> <select name="category">
<? <?
array_shift($CollageCats); if (!check_perms('site_collages_delete')) { array_shift($CollageCats); }
foreach($CollageCats as $CatID=>$CatName) { ?> foreach($CollageCats as $CatID=>$CatName) { ?>
<option value="<?=$CatID+1?>" <? if($CatID+1 == $CategoryID) { echo ' selected="selected"'; }?>><?=$CatName?></option> <option value="<?=$CatID?>" <? if($CatID == $CategoryID) { echo ' selected="selected"'; }?>><?=$CatName?></option>
<? } ?> <? } ?>
</select> </select>
</td> </td>

View File

@ -41,7 +41,7 @@
$DB->query("UPDATE collages SET Name='".db_string($_POST['name'])."' WHERE ID='$CollageID'"); $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'"); $DB->query("UPDATE collages SET CategoryID='".db_string($_POST['category'])."' WHERE ID='$CollageID'");
} }

View File

@ -409,8 +409,8 @@
), ),
'resolve_options' => array( 'resolve_options' => array(
'upload' => '0', 'upload' => '0',
'warn' => '1', 'warn' => '0',
'delete' => '1', '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. '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.' Your torrent was reported because the bitrates of one or more audio files had been misrepresented.'
) )

View File

@ -526,22 +526,28 @@ function next_hour() {
sleep(5); sleep(5);
// Send email // Send email
$DB->query("SELECT um.Username, um.Email FROM users_info AS ui JOIN users_main AS um ON um.ID=ui.UserID $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 ."') WHERE um.PermissionID IN ('".USER."', '".MEMBER ."')
AND um.LastAccess<'".time_minus(3600*24*110, true)."' AND um.LastAccess<'".time_minus(3600*24*110, true)."'
AND um.LastAccess>'".time_minus(3600*24*111, true)."' AND um.LastAccess>'".time_minus(3600*24*111, true)."'
AND um.LastAccess!='0000-00-00 00:00:00' AND um.LastAccess!='0000-00-00 00:00:00'
AND ui.Donor='0' 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()) { 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. "; $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); 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 $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 ."') WHERE um.PermissionID IN ('".USER."', '".MEMBER ."')
AND um.LastAccess<'".time_minus(3600*24*30*4)."' AND um.LastAccess<'".time_minus(3600*24*30*4)."'
AND um.LastAccess!='0000-00-00 00:00:00' AND um.LastAccess!='0000-00-00 00:00:00'
AND ui.Donor='0' 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) { if($DB->record_count() > 0) {
disable_users($DB->collect('ID'), "Disabled for inactivity.", 3); disable_users($DB->collect('ID'), "Disabled for inactivity.", 3);