Empty commit

classes/permissions_form.php

@@ -20,7 +20,9 @@
 	'site_collages_create' => 'Collage create access.',
 	'site_collages_manage' => 'Collage manage access.',
 	'site_collages_delete' => 'Collage delete access.',
+	'site_collages_subscribe' => 'Collage subscription access.',
 	'site_collages_personal' => 'Can have a personal collage.',
+	'site_collages_renamepersonal' => 'Can rename own personal collages.',
 	'site_make_bookmarks' => 'Bookmarks access.',
 	'site_edit_wiki' => 'Wiki edit access.',
 	'site_can_invite_always' => 'Can invite past user limit.',
@@ -127,7 +129,9 @@ function permissions_form(){ ?>
 					<? display_perm('site_collages_create','Can create collages.'); ?>
 					<? display_perm('site_collages_manage','Can manage collages (add torrents, sorting).'); ?>
 					<? display_perm('site_collages_delete','Can delete collages.'); ?>
+					<? display_perm('site_collages_subscribe','Can access collage subscriptions.'); ?>
 					<? display_perm('site_collages_personal','Can have a personal collage.'); ?>
+					<? display_perm('site_collages_renamepersonal','Can rename own personal collages.'); ?>
 					<? display_perm('site_advanced_top10','Can access advanced top 10.'); ?>
 					<? display_perm('site_make_bookmarks','Can make bookmarks.'); ?>
 					<? display_perm('site_edit_wiki','Can edit wiki pages.'); ?>

sections/tools/index.php

@@ -151,6 +151,9 @@
 	case 'tokens':
 		include('managers/tokens.php');
 		break;
+	case 'ocelot':
+		include('managers/ocelot.php');
+		break;
 
 	case 'permissions':
 		if (!check_perms('admin_manage_permissions')) { error(403); }
@@ -158,6 +161,7 @@
 		if (!empty($_REQUEST['id'])) {
 			$Val->SetFields('name',true,'string','You did not enter a valid name for this permission set.');
 			$Val->SetFields('level',true,'number','You did not enter a valid level for this permission set.');
+			$Val->SetFields('maxcollages',true,'number','You did not enter a valid number of personal collages.');
 			//$Val->SetFields('test',true,'number','You did not enter a valid level for this permission set.');
 
 			$Values=array();
@@ -195,6 +199,7 @@
 				$Name=$_REQUEST['name'];
 				$Level=$_REQUEST['level'];
 				$DisplayStaff=$_REQUEST['displaystaff'];
+				$Values['MaxCollages']=$_REQUEST['maxcollages'];
 
 				if (!$Err) {
 					if (!is_numeric($_REQUEST['id'])) {

sections/tools/managers/permissions_alter.php

@@ -32,6 +32,10 @@ function display_perm($Key,$Title) {
 			<td class="label">Show on Staff page</td>
 			<td><input type="checkbox" name="displaystaff" value="1" <? if (!empty($DisplayStaff)) { ?>checked<? } ?> /></td>
 		</tr>
+		<tr>
+			<td class="label">Maximum number of personal collages</td>
+			<td><input type="text" name="maxcollages" size="5" value="<?=$Values['MaxCollages']?>" /></td>
+		</tr>
 <? if (is_numeric($_REQUEST['id'])) { ?>
 		<tr>
 			<td class="label">Current users in this class</td>

sections/torrents/browse2.php

@@ -899,9 +899,10 @@ function header_link($SortKey,$DefaultWay="desc") {
 		list($TorrentID, $Data) = each($Torrents);
 		
 		$DisplayName = '<a href="torrents.php?id='.$GroupID.'" title="View Torrent">'.$GroupName.'</a>';
-		
+		if($Data['FreeTorrent'] == '1') {
-		if(!empty($Data['FreeTorrent'])) {
+			$DisplayName .= ' <strong>Freeleech!</strong>';
-			$DisplayName .=' <strong>Freeleech!</strong>'; 
+		} elseif($Data['FreeTorrent'] == '2') {
+			$DisplayName .= ' <strong>Neutral Leech!</strong>';
 		}
 ?>
 	<tr class="torrent">

sections/wiki/wiki_browse.php

@@ -1,4 +1,5 @@
 <?
+show_header($Title);
 $Letter = strtoupper(substr($_GET['letter'],0,1));
 
 $sql = "SELECT SQL_CALC_FOUND_ROWS 
@@ -21,7 +22,6 @@
 
 $Title = 'Browse articles';
 if($Letter) { $Title.= ' ('.$Letter.')'; }
-show_header($Title);
 ?>
 <div class="thin">
 <? if($Letter) { ?>