From d42b1713036df0259f66c5f058b8349dc28f028b Mon Sep 17 00:00:00 2001
From: Claude <longneck@scratchbook.ch>
Date: Sat, 14 Apr 2012 15:08:52 +0200
Subject: [PATCH] options fix

---
 htdocs/application/controllers/main.php       | 20 ++++++++++++++-----
 .../application/views/view/view_options.php   |  4 +++-
 htdocs/static/js/stikked.js                   |  3 +++
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/htdocs/application/controllers/main.php b/htdocs/application/controllers/main.php
index 3157718..f368d99 100755
--- a/htdocs/application/controllers/main.php
+++ b/htdocs/application/controllers/main.php
@@ -93,12 +93,12 @@ class Main extends CI_Controller
 				array(
 					'field' => 'code',
 					'label' => 'Main Paste',
-					'rules' => 'required'
+					'rules' => 'required',
 				) ,
 				array(
 					'field' => 'lang',
 					'label' => 'Language',
-					'rules' => 'min_length[1]|required|callback__valid_lang'
+					'rules' => 'min_length[1]|required|callback__valid_lang',
 				) ,
 			);
 
@@ -243,7 +243,7 @@ class Main extends CI_Controller
 	function view_options() 
 	{
 		
-		if ($this->input->post('submit')) 
+		if (!$this->input->post('submit')) 
 		{
 			$data = $this->_view_options_prep();
 			$this->load->view('view/view_options', $data);
@@ -251,8 +251,18 @@ class Main extends CI_Controller
 		else
 		{
 			$this->load->library('form_validation');
-			$rules['full_width'] = 'max_length[1]';
-			$rules['view_raw'] = 'max_length[1]';
+			$rules = array(
+				array(
+					'field' => 'full_width',
+					'label' => 'full_width',
+					'rules' => 'max_length[1]',
+				) ,
+				array(
+					'field' => 'view_raw',
+					'label' => 'view_raw',
+					'rules' => 'max_length[1]',
+				) ,
+			);
 			$this->form_validation->set_rules($rules);
 			
 			if ($this->form_validation->run() == false) 
diff --git a/htdocs/application/views/view/view_options.php b/htdocs/application/views/view/view_options.php
index 879c298..67f3c79 100755
--- a/htdocs/application/views/view/view_options.php
+++ b/htdocs/application/views/view/view_options.php
@@ -19,6 +19,7 @@
 			</div>
 		</div>
 		
+<!-- the 'new' raw mode is like the pastebin.com raw mode. makes no sense to enable that by default…
 		<div class="item">
 			<label for="view_raw">View Raw
 				<span class="instruction">This changes the default paste view to the raw view. Useful for dialup + low bandwith users.</span>
@@ -28,7 +29,8 @@
 			echo form_checkbox($set);
 			?><p>Use the raw view by default</p>
 			</div>
-		</div>			
+		</div>
+-->
 			
 		<div><button type="submit" value="submit" name="submit">Save</button></div>
 		<div class="spacer"></div>
diff --git a/htdocs/static/js/stikked.js b/htdocs/static/js/stikked.js
index 6b75e7f..82b9235 100644
--- a/htdocs/static/js/stikked.js
+++ b/htdocs/static/js/stikked.js
@@ -23,6 +23,9 @@ ST.show = function() {
 
 ST.expand = function() {
 	$('.expand').click(function() {
+        if($('.paste').hasClass('full')) {
+            return false;
+        }
 		var window_width = $(window).width();
 		var spacer = 20;
 		if (window_width < 900) {