[wp-cvs] wordpress/wp-admin options-permalink.php, 1.39, 1.40 templates.php, 1.23, 1.24

[Ryan Boren]

Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14758/wp-admin

Modified Files:
	options-permalink.php templates.php 
Log Message:
Eliminate use of DOCUMENT_ROOT.  Look for .htaccess in 'home'.

Index: options-permalink.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/options-permalink.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** options-permalink.php	14 Aug 2004 17:36:32 -0000	1.39
--- options-permalink.php	27 Aug 2004 05:20:59 -0000	1.40
***************
*** 21,24 ****
--- 21,34 ----
  }
  
+ $home = get_settings('home');
+ if ($home != '' && $home != get_settings('siteurl')) {
+   $home_path = parse_url($home);
+   $home_path = $home_root['path'];
+   $root = str_replace($_SERVER["PHP_SELF"], '', $_SERVER["PATH_TRANSLATED"]);
+   $home_path = $root . $home_path . "/";
+ } else {
+   $home_path = ABSPATH;
+ }
+ 
  require_once('./optionhandler.php');
  
***************
*** 48,52 ****
  <?php if(isset($_POST['rules'])) {
  		$rules = explode("\n", $_POST['rules']);
! 		if(insert_with_markers(ABSPATH.'.htaccess', 'WordPress', $rules)) {
  ?>
  <div class="updated" id="htupdate"><p><?php _e('mod_rewrite rules written to .htaccess.'); ?></p></div>
--- 58,62 ----
  <?php if(isset($_POST['rules'])) {
  		$rules = explode("\n", $_POST['rules']);
! 		if(insert_with_markers($home_path.'.htaccess', 'WordPress', $rules)) {
  ?>
  <div class="updated" id="htupdate"><p><?php _e('mod_rewrite rules written to .htaccess.'); ?></p></div>
***************
*** 137,141 ****
      </p>
  <?php
! if ((! file_exists(ABSPATH.'.htaccess') && is_writable(ABSPATH)) || is_writable(ABSPATH.'.htaccess')) {
  ?>
      <p class="submit"> 
--- 147,152 ----
      </p>
  <?php
! 
! if ((! file_exists($home_path.'.htaccess') && is_writable($home_path)) || is_writable($home_path.'.htaccess')) {
  ?>
      <p class="submit"> 

Index: templates.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/templates.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** templates.php	1 Aug 2004 08:04:39 -0000	1.23
--- templates.php	27 Aug 2004 05:20:59 -0000	1.24
***************
*** 98,105 ****
  
      $home = get_settings('home');
!     if ($home != '' && ('index.php' == $file || get_settings('blogfilename') == $file)) {
!         $home_root = str_replace('http://', '', $home);
!         $home_root = preg_replace('|([^/]*)(.*)|i', '$2', $home_root);
!         $real_file = $_SERVER['DOCUMENT_ROOT'] . $home_root . '/' . $file;
      } else {
          $file = validate_file($file);
--- 98,109 ----
  
      $home = get_settings('home');
!     if (($home != '' && $home != get_settings('siteurl')) &&
!       ('index.php' == $file || get_settings('blogfilename') == $file ||
!        '.htaccess' == $file)) {
!         $home_root = parse_url($home);
! 	$home_root = $home_root['path'];
! 	$root = str_replace($_SERVER["PHP_SELF"], '', $_SERVER["PATH_TRANSLATED"]);
! 	$home_root = $root . $home_root;
!         $real_file = $home_root . '/' . $file;
      } else {
          $file = validate_file($file);