From a1ef058ab014b0b88e1d5d03403d7644d78d1b5e Mon Sep 17 00:00:00 2001
From: real_nowhereman <real_nowhereman@aa359531-4221-0410-9edc-b0b45c38dadb>
Date: Fri, 9 Nov 2007 08:09:15 +0000
Subject: [PATCH] prettyurls: some fixes to the htaccess editor

---
 fp-plugins/prettyurls/lang/lang.en-us.php              | 6 +++---
 fp-plugins/prettyurls/plugin.prettyurls.php            | 2 +-
 fp-plugins/prettyurls/tpls/admin.plugin.prettyurls.tpl | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/fp-plugins/prettyurls/lang/lang.en-us.php b/fp-plugins/prettyurls/lang/lang.en-us.php
index 4fab0d0..0a677bb 100644
--- a/fp-plugins/prettyurls/lang/lang.en-us.php
+++ b/fp-plugins/prettyurls/lang/lang.en-us.php
@@ -1,6 +1,6 @@
 <?php
 	$lang['plugin']['prettyurls']['errors'] = array (
-		-2	=> 'I can\' find or create an <code>.htaccess</code> file in your root '.
+		-2	=> 'I can\'t find or create an <code>.htaccess</code> file in your root '.
 				'directory. PrettyURLs might not work properly, see the config panel.'
 	);
 	
@@ -8,8 +8,8 @@
 	$lang['admin']['plugin']['prettyurls'] = array(
 		'head'		=> 'PrettyURLs Configuration',
 		'description'=>'This raw editor let you edit your '.
-						'<code><a class="hint" href="http://wiki.flatpress.org/doc:plugins:prettyurls">.htaccess</a></code>.',
-		'cantsave'	=> 'If file were writable you could edit it',
+						'<code><a class="hint" href="http://wiki.flatpress.org/doc:plugins:prettyurls#htaccess">.htaccess</a></code>.',
+		'cantsave'	=> 'You can\'t edit this file, because it\'s not <strong>writable</strong>. You can give writing permission or copy and paste to a file and then upload as <a class="hint" href="http://wiki.flatpress.org/doc:plugins:prettyurls#manual_upload">described here</a>',
 		'submit'	=> 'Save'
 	);
 	$lang['admin']['plugin']['prettyurls']['msgs'] = array(
diff --git a/fp-plugins/prettyurls/plugin.prettyurls.php b/fp-plugins/prettyurls/plugin.prettyurls.php
index 0ec22a7..048148e 100644
--- a/fp-plugins/prettyurls/plugin.prettyurls.php
+++ b/fp-plugins/prettyurls/plugin.prettyurls.php
@@ -495,7 +495,7 @@ STR;
 			
 			
 			$this->smarty->assign('cantsave', 
-				( (file_exists($f) && !is_writable($f)) && !is_writable(ABS_PATH) )
+				( !is_writable(ABS_PATH) || (file_exists($f) && !is_writable($f)) )
 			);	
 			$this->smarty->assign('htaccess', $txt);		
 		}
diff --git a/fp-plugins/prettyurls/tpls/admin.plugin.prettyurls.tpl b/fp-plugins/prettyurls/tpls/admin.plugin.prettyurls.tpl
index dd75992..16aae11 100644
--- a/fp-plugins/prettyurls/tpls/admin.plugin.prettyurls.tpl
+++ b/fp-plugins/prettyurls/tpls/admin.plugin.prettyurls.tpl
@@ -7,7 +7,8 @@
 {html_form}
 	
 	<p>	
-	<textarea id="htaccess" name="htaccess" cols="70" rows="16">{$htaccess|escape:'html'}</textarea>
+	<textarea id="htaccess" name="htaccess" 
+	{if $cantsave}readonly="readonly" {/if}cols="70" rows="16">{$htaccess|escape:'html'}</textarea>
 	</p>
 	
 	<div class="buttonbar">