Installer now writes config.php correctly

diff --git a/inc/install-inc.php b/inc/install-inc.php
index 9bdd5f39f0393a019483229e2216c65bea1f97e2..850d6fae7e6b0390cd862f7983989ce4f7ccd64f 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -47,6 +47,7 @@ function install_WriteData ($file, $comment, $prefix, $suffix, $DATA, $sneak=0)
        $done = false;
        $next = 0;
        $sneak++;
+
        if ((file_exists($file)) && (is_readable($file))) {
                $search = "CFG: ".$comment;
                $tmp = $file.".tmp";
@@ -56,15 +57,22 @@ function install_WriteData ($file, $comment, $prefix, $suffix, $DATA, $sneak=0)
                        if (is_resource($fp_tmp)) {
                                while (!feof($fp)) {
                                        $line = fgets ($fp, 10240);
-                                       if (strpos($line, $search) > -1) $next = 0;
+                                       //* DEBUG: */ echo $search."/<font color=\"red\">".htmlentities($line)."</font><br />\n";
+                                       $found = strpos($line, $search);
+                                       //* DEBUG: */ echo "FOUND: <font color=\"brown\">";
+                                       var_dump($found);
+                                       //* DEBUG: */ echo "</font><br />\n";
+                                       if ($found !== false) $next = 0;
                                        if ($next > -1) {
                                                if ($next == $sneak) {
                                                        $next = -1;
                                                        $line = $prefix.$DATA.$suffix."\n";
+                                                       //* DEBUG: */ echo "NEW: <font color=\"blue\">".htmlentities($line)."</font><br />\n";
                                                } else {
                                                        $next++;
                                                }
                                        }
+                                       //* DEBUG: */ echo "WRITE: <font color=\"green\">".htmlentities($line)."</font><br />\n";
                                        fputs($fp_tmp, $line);
                                }
                                fclose($fp_tmp);
@@ -390,6 +398,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
                                                install_WriteData($_POST['spath']."inc/config.php", "SMTP-USER", "define('SMTP_USER', \"", "\");", $_POST['smtp_user'], 0);
                                                install_WriteData($_POST['spath']."inc/config.php", "SMTP-PASSWORD", "define('SMTP_PASSWORD', \"", "\");", $_POST['smtp_pass'], 0);
                                                install_WriteData($_POST['spath']."inc/config.php", "INSTALLED", "define('mxchange_installed', ", ");", "true", 0);
+                                               die();
 
                                                // Close the link
                                                SQL_CLOSE($link, __FILE__, __LINE__);