[php-blog-cvs] serendipity serendipity_admin_installer.inc.php,1.71,1.72 serendipity_functions_installer.inc.php,1.22,1.23

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12641

Modified Files:
	serendipity_admin_installer.inc.php 
	serendipity_functions_installer.inc.php 
Log Message:
fix bug reported by justin - shared installation blogs where attempting to write wrong .htaccess. So now instead of './.htaccess' we use $serendipity['serendipityPath'] which is either set via configuration or as fallback within compat.php.


Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- serendipity_admin_installer.inc.php	19 Jul 2004 08:50:54 -0000	1.71
+++ serendipity_admin_installer.inc.php	26 Jul 2004 14:11:22 -0000	1.72
@@ -41,7 +41,7 @@
             }
 
             /* Next are the files, .htaccess */
-            printf(ATTEMPT_WRITE_FILE, '.htaccess');
+            printf(ATTEMPT_WRITE_FILE, $serendipity['serendipityPath'] . '.htaccess');
             $res = serendipity_installFiles();
             if (is_array($res)) {
                 echo '<span class="serendipity_msg_important">- ' . implode('<br />', $res) . '</span><br /><br />';
@@ -90,7 +90,7 @@
         } else {
             /* If we have new rewrite rules, then install them */
             if (isset($_POST['rewrite']) && $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN && $oldRewrite != $_POST['rewrite']) {
-                printf(ATTEMPT_WRITE_FILE, '.htaccess');
+                printf(ATTEMPT_WRITE_FILE, $serendipity['serendipityPath'] . '.htaccess');
                 $res = serendipity_installFiles();
                 if (is_array($res)) {
                     echo implode('<br />'. $res);

Index: serendipity_functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_installer.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- serendipity_functions_installer.inc.php	23 Jul 2004 10:06:39 -0000	1.22
+++ serendipity_functions_installer.inc.php	26 Jul 2004 14:11:22 -0000	1.23
@@ -266,8 +266,8 @@
     // If not yet installed, do some magic:
     $abort = false;
     if (IS_installed !== true && $_abort !== true) {
-        $old_htaccess = @file_get_contents('./.htaccess');
-        $fp = @fopen('./.htaccess', 'w');
+        $old_htaccess = @file_get_contents($serendipity['serendipityPath'] . '.htaccess');
+        $fp = @fopen($serendipity['serendipityPath'] . '.htaccess', 'w');
         $serendipity_root = str_replace(basename($_SERVER['PHP_SELF']), '', $_SERVER['PHP_SELF']);
         $serendipity_host = preg_replace('@^([^:]+):?.*$@', '\1', $_SERVER['HTTP_HOST']);
 
@@ -302,11 +302,11 @@
             }
 
             if (!empty($old_htacces)) {
-                $fp = @fopen('./.htaccess', 'w');
+                $fp = @fopen($serendipity['serendipityPath'] . '.htaccess', 'w');
                 fwrite($fp, $old_htaccess);
                 fclose($fp);
             } else {
-                @unlink('./.htaccess');
+                @unlink($serendipity['serendipityPath'] . '.htaccess');
             }
         }
     }
@@ -581,7 +581,7 @@
 function serendipity_installFiles() {
     global $serendipity;
 
-    $htaccess = @file_get_contents('./.htaccess');
+    $htaccess = @file_get_contents($serendipity['serendipityPath'] . '.htaccess');
 
     // Let this function be callable outside installation and let it use existing settings.
     $import = array('rewrite', 'serendipityHTTPPath', 'indexFile');
@@ -605,7 +605,7 @@
         $err[] = ERROR_TEMPLATE_FILE;
     }
 
-    $fp = @fopen('./.htaccess', 'w');
+    $fp = @fopen($serendipity['serendipityPath'] . '.htaccess', 'w');
 
     $content = str_replace(
                  array(
@@ -646,8 +646,8 @@
               );
 
     if (!$fp) {
-        $errs[] = sprintf(FILE_WRITE_ERROR, '.htaccess') . ' ' . FILE_CREATE_YOURSELF;
-        $errs[] = sprintf(COPY_CODE_BELOW , '.htaccess', 'serendipity', htmlspecialchars($content));
+        $errs[] = sprintf(FILE_WRITE_ERROR, $serendipity['serendipityPath'] . '.htaccess') . ' ' . FILE_CREATE_YOURSELF;
+        $errs[] = sprintf(COPY_CODE_BELOW , $serendipity['serendipityPath'] . '.htaccess', 'serendipity', htmlspecialchars($content));
         return $errs;
     } else {
         // Check if an old htaccess file existed and try to preserve its contents. Otherwise completely wipe the file.