From c37b3046f7ac90e31ffc9e5e48a19c9e98e8fbc9 Mon Sep 17 00:00:00 2001
From: Claude <longneck@scratchbook.ch>
Date: Fri, 25 May 2012 19:42:42 +0200
Subject: [PATCH] config option for disabling recent pastes

---
 htdocs/application/config/stikked.php         |  8 ++++++
 htdocs/application/controllers/main.php       | 28 ++++++++++++-------
 htdocs/application/errors/error_404.php       |  1 +
 htdocs/application/errors/error_db.php        |  1 +
 htdocs/application/errors/error_general.php   |  1 +
 htdocs/application/views/defaults/header.php  |  2 ++
 .../application/views/defaults/paste_form.php |  4 ++-
 7 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/htdocs/application/config/stikked.php b/htdocs/application/config/stikked.php
index f4d99f1..455eb3f 100755
--- a/htdocs/application/config/stikked.php
+++ b/htdocs/application/config/stikked.php
@@ -63,6 +63,14 @@ $config['backup_pass'] = '';
 **/
 $config['per_page'] = 10;
 
+/**
+ * Disable public pastes
+ *
+ * No recent pastes will be displayed.
+ *
+**/
+$config['private_only'] = false;
+
 /**
  * Default language
  *
diff --git a/htdocs/application/controllers/main.php b/htdocs/application/controllers/main.php
index 3ec6775..c3e1b3a 100755
--- a/htdocs/application/controllers/main.php
+++ b/htdocs/application/controllers/main.php
@@ -312,21 +312,29 @@ class Main extends CI_Controller
 	
 	function lists() 
 	{
-		$this->load->model('pastes');
-		$data = $this->pastes->getLists();
 		
-		if ($this->uri->segment(2) == 'rss') 
+		if ($this->config->item('private_only')) 
 		{
-			$this->load->helper('text');
-			$data['page_title'] = $this->config->item('site_name');
-			$data['feed_url'] = site_url('lists/rss');
-			$data['replies'] = $data['pastes'];
-			unset($data['pastes']);
-			$this->load->view('view/rss', $data);
+			show_404();
 		}
 		else
 		{
-			$this->load->view('list', $data);
+			$this->load->model('pastes');
+			$data = $this->pastes->getLists();
+			
+			if ($this->uri->segment(2) == 'rss') 
+			{
+				$this->load->helper('text');
+				$data['page_title'] = $this->config->item('site_name');
+				$data['feed_url'] = site_url('lists/rss');
+				$data['replies'] = $data['pastes'];
+				unset($data['pastes']);
+				$this->load->view('view/rss', $data);
+			}
+			else
+			{
+				$this->load->view('list', $data);
+			}
 		}
 	}
 	
diff --git a/htdocs/application/errors/error_404.php b/htdocs/application/errors/error_404.php
index 88ebede..0b2aef9 100755
--- a/htdocs/application/errors/error_404.php
+++ b/htdocs/application/errors/error_404.php
@@ -23,6 +23,7 @@ header("HTTP/1.1 404 Not Found");
 						<ul>
 							<li><a href="<?php echo site_url(''); ?>">Paste</a></li>
 							<li><a href="<?php echo site_url('lists'); ?>">Recent</a></li>
+							<li><a href="<?php echo site_url('api'); ?>">API</a></li>
 							<li><a href="<?php echo site_url('about'); ?>">About</a></li>
 						</ul>
 					</div>
diff --git a/htdocs/application/errors/error_db.php b/htdocs/application/errors/error_db.php
index b60afdc..45225c7 100755
--- a/htdocs/application/errors/error_db.php
+++ b/htdocs/application/errors/error_db.php
@@ -23,6 +23,7 @@ header("HTTP/1.1 404 Not Found");
 						<ul>
 							<li><a href="<?php echo site_url(''); ?>">Paste</a></li>
 							<li><a href="<?php echo site_url('lists'); ?>">Recent</a></li>
+							<li><a href="<?php echo site_url('api'); ?>">API</a></li>
 							<li><a href="<?php echo site_url('about'); ?>">About</a></li>
 						</ul>
 					</div>
diff --git a/htdocs/application/errors/error_general.php b/htdocs/application/errors/error_general.php
index b60afdc..45225c7 100755
--- a/htdocs/application/errors/error_general.php
+++ b/htdocs/application/errors/error_general.php
@@ -23,6 +23,7 @@ header("HTTP/1.1 404 Not Found");
 						<ul>
 							<li><a href="<?php echo site_url(''); ?>">Paste</a></li>
 							<li><a href="<?php echo site_url('lists'); ?>">Recent</a></li>
+							<li><a href="<?php echo site_url('api'); ?>">API</a></li>
 							<li><a href="<?php echo site_url('about'); ?>">About</a></li>
 						</ul>
 					</div>
diff --git a/htdocs/application/views/defaults/header.php b/htdocs/application/views/defaults/header.php
index 8594d3d..25085de 100755
--- a/htdocs/application/views/defaults/header.php
+++ b/htdocs/application/views/defaults/header.php
@@ -48,7 +48,9 @@ $this->carabiner->display('css');
 					<ul class="tabs">
 						<?php $l = $this->uri->segment(1)?>
 						<li><a <?php if($l == ""){ echo 'class="active"'; }?> href="<?php echo base_url()?>" title="Create A New Paste">Create</a></li>
+<?php if(!$this->config->item('private_only')){ ?>
 						<li><a <?php if($l == "lists" || $l == "view" and $this->uri->segment(2) != "options"){ echo 'class="active"'; }?> href="<?php echo site_url('lists'); ?>" title="Recent Pastes">Recent</a></li>
+<?php } ?>
 						<li><a  <?php if($l == "api"){ echo 'class="active"'; }?> href="<?php echo site_url('api'); ?>" title="API">API</a></li>
 						<li><a  <?php if($l == "about"){ echo 'class="active"'; }?> href="<?php echo site_url('about'); ?>" title="About">About</a></li>
 					</ul>
diff --git a/htdocs/application/views/defaults/paste_form.php b/htdocs/application/views/defaults/paste_form.php
index 79b6feb..ccea17f 100644
--- a/htdocs/application/views/defaults/paste_form.php
+++ b/htdocs/application/views/defaults/paste_form.php
@@ -65,6 +65,7 @@
 			</div>
 		
 			<div class="item">
+<?php if (!$this->config->item('private_only')){ ?>
 				<label for="private">Private
 					<span class="instruction">Private paste aren't shown in recent listings.</span>
 				</label>
@@ -74,7 +75,8 @@
 						echo form_checkbox($set);
 					?>
 				</div>
-			</div>						
+<?php } ?>
+			</div>
 		
 			<div class="item">
 				<label for="expire">Delete After