More variables renamed to , install/admin_WriteData() is now generic (with open TODO)
[mailer.git] / inc / install-inc.php
index eb85791..dad33f5 100644 (file)
@@ -41,74 +41,9 @@ if (!defined('__SECURITY')) {
        require($INC);
 }
 
        require($INC);
 }
 
-//
-function install_WriteData ($file, $comment, $prefix, $suffix, $DATA, $sneak=0) {
-       // Initialize all and count up the "seak" value
-       $done = false;
-       $next = -1;
-       $sneak++;
-
-       if (FILE_READABLE($file)) {
-               $search = "CFG: ".$comment;
-               $tmp = $file.".tmp";
-               $fp = @fopen($file, 'r') or OUTPUT_HTML("<strong>READ:</strong> ".$file."<br />");
-               if (is_resource($fp)) {
-                       $fp_tmp = @fopen($tmp, 'w') or OUTPUT_HTML("<strong>WRITE:</strong> ".$tmp."<br />");
-                       if (is_resource($fp_tmp)) {
-                               while (!feof($fp)) {
-                                       $line = fgets ($fp, 10240);
-                                       //* DEBUG: */ echo $search."/<font color=\"red\">".htmlentities($line)."</font><br />\n";
-                                       $found = strpos($line, $search);
-                                       //* DEBUG: */ echo "FOUND: <font color=\"brown\">";
-                                       //* DEBUG: */ 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++;
-                                               }
-                                       } // END - if
-                                       //* DEBUG: */ echo "WRITE: <font color=\"green\">".htmlentities($line)."</font><br />\n";
-                                       fputs($fp_tmp, $line);
-                               } // END - while
-                               fclose($fp_tmp);
-
-                               // Finished writing tmp file
-                               $done = true;
-                       } // END - if
-
-                       // Close source directory
-                       fclose($fp);
-
-                       if (($done) && (is_writeable($file))) {
-                               // Copy back tmp file and delete tmp :-)
-                               @copy($tmp, $file);
-                               @unlink($tmp);
-                       } else {
-                               OUTPUT_HTML("<strong>TMP:</strong> UNDONE!");
-                       }
-               } // END - if
-       } else {
-               OUTPUT_HTML("<strong>404:</strong> ".$file."<br />");
-       }
-}
-
-//
+// Init variables
 $mysql = "";
 $mysql = "";
-if (isset($_POST['mysql']) && is_array($_POST['mysql'])) $mysql = $_POST['mysql'];
-
-if (URL != "http://your-server.com") {
-       // Already installed???
-       $burl = constant('URL');
-} elseif (empty($burl)) {
-       // Auto-detect URL
-       $burl = "http://".$SERVER_NAME.$_SERVER['PHP_SELF'];
-       $burl = substr($burl, 0, strpos($burl, "install.php"));
-}
+if ((isset($_POST['mysql'])) && (is_array($_POST['mysql']))) $mysql = $_POST['mysql'];
 
 // Check if both passwords from SMTP are matching
 if ((isset($_GET['page']) && ($_GET['page'] == 5))) {
 
 // Check if both passwords from SMTP are matching
 if ((isset($_GET['page']) && ($_GET['page'] == 5))) {
@@ -118,16 +53,19 @@ if ((isset($_GET['page']) && ($_GET['page'] == 5))) {
                OUTPUT_HTML(getMessage('INSTALL_SMTP_HOSTNAME_EMPTY')."<br />");
                $_GET['page'] = 3;
        } // END - if
                OUTPUT_HTML(getMessage('INSTALL_SMTP_HOSTNAME_EMPTY')."<br />");
                $_GET['page'] = 3;
        } // END - if
+
        if ((empty($_POST['smtp_pass1'])) && (!empty($_POST['smtp_pass2']))) {
                // Password is empty
                OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS1_EMPTY')."<br />");
                $_GET['page'] = 3;
        } // END - if
        if ((empty($_POST['smtp_pass1'])) && (!empty($_POST['smtp_pass2']))) {
                // Password is empty
                OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS1_EMPTY')."<br />");
                $_GET['page'] = 3;
        } // END - if
+
        if ((!empty($_POST['smtp_pass1'])) && (empty($_POST['smtp_pass2']))) {
                // Password repeat is empty
                OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS2_EMPTY')."<br />");
                $_GET['page'] = 3;
        } // END - if
        if ((!empty($_POST['smtp_pass1'])) && (empty($_POST['smtp_pass2']))) {
                // Password repeat is empty
                OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS2_EMPTY')."<br />");
                $_GET['page'] = 3;
        } // END - if
+
        if ($_POST['smtp_pass1'] != $_POST['smtp_pass1']) {
                // Passwords are not matching
                OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS_MISMATCH')."<br />");
        if ($_POST['smtp_pass1'] != $_POST['smtp_pass1']) {
                // Passwords are not matching
                OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS_MISMATCH')."<br />");
@@ -139,7 +77,7 @@ if ((isset($_GET['page']) && ($_GET['page'] == 5))) {
 if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndTrue('admin_registered')))
 {
        // Set URL for FORM actions
 if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndTrue('admin_registered')))
 {
        // Set URL for FORM actions
-       define('__BURL_ACTION', $burl);
+       define('__BURL_ACTION', constant('URL'));
 
        // Output page for entered value
        switch ($_GET['page'])
 
        // Output page for entered value
        switch ($_GET['page'])
@@ -341,14 +279,17 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
                                                // Both exists so import them
                                                foreach (array("tables.sql", "menu-".GET_LANGUAGE().".sql") as $dump) {
                                                        // Should be save here because file_exists() is there but we check it again. :)
                                                // Both exists so import them
                                                foreach (array("tables.sql", "menu-".GET_LANGUAGE().".sql") as $dump) {
                                                        // Should be save here because file_exists() is there but we check it again. :)
-                                                       $file = secureString($_POST['spath']) . "install/" . $dump;
-                                                       if (FILE_READABLE($file)) {
+                                                       $FQFN = secureString($_POST['spath']) . "install/" . $dump;
+                                                       if (FILE_READABLE($FQFN)) {
                                                                // Read the file
                                                                // Read the file
-                                                               $SQLs = READ_FILE($file, true);
+                                                               $SQLs = READ_FILE($FQFN, true);
 
                                                                // And split it up against ;\n ...
                                                                $SQLs = merge_array($SQLs, explode(";\n", $sql));
 
                                                                // And split it up against ;\n ...
                                                                $SQLs = merge_array($SQLs, explode(";\n", $sql));
-                                                       } // END - if
+                                                       } else {
+                                                               // Not readable!
+                                                               debug_report_bug(sprintf("SQL dump %s is not readable!", $dump));
+                                                       }
                                                } // END - foreach
 
                                                // Are some SQLs found?
                                                } // END - foreach
 
                                                // Are some SQLs found?
@@ -371,24 +312,24 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
                                                } // END - foreach
 
                                                // Ok, all done. So we can write the config data to the php files
                                                } // END - foreach
 
                                                // Ok, all done. So we can write the config data to the php files
-                                               if ($_POST['spath'] != constant('PATH')) install_WriteData($_POST['spath']."inc/config.php", "SERVER-PATH", "define('PATH', \"", "\");", $_POST['spath'], 0);
-                                               if ($_POST['burl']  != constant('URL'))  install_WriteData($_POST['spath']."inc/config.php", "HOST-URL", "define('URL', \"", "\");", $_POST['burl'], 0);
-                                               install_WriteData($_POST['spath']."inc/config.php", "MAIN_TITLE", "define('MAIN_TITLE', \"", "\");", $_POST['title'], 0);
-                                               install_WriteData($_POST['spath']."inc/config.php", "SLOGAN", "define('SLOGAN', \"", "\");", $_POST['slogan'], 0);
-                                               install_WriteData($_POST['spath']."inc/config.php", "WEBMASTER", "define('WEBMASTER', \"", "\");", $_POST['email'], 0);
-                                               install_WriteData($_POST['spath']."inc/config.php", "NULLPASS-WARNING", "define('warn_no_pass', ", ");", $_POST['warn_no_pass'], 0);
-                                               install_WriteData($_POST['spath']."inc/config.php", "WRITE-FOOTER", "define('WRITE_FOOTER', ", ");", $_POST['wfooter'], 0);
-                                               install_WriteData($_POST['spath']."inc/config.php", "BACKLINK", "define('ENABLE_BACKLINK', ", ");", $_POST['blink'], 0);
-                                               // install_WriteData($_POST['spath']."inc/config.php", "OUTPUT-MODE", "define('OUTPUT_MODE', \"", "\");", $_POST['omode'], 0);
-                                               install_WriteData($_POST['spath']."inc/config.php", "MYSQL-HOST", "     'host'     => \"", "\",", $mysql['host'], 0);
-                                               install_WriteData($_POST['spath']."inc/config.php", "MYSQL-DBASE", "    'dbase'    => \"", "\",", $mysql['dbase'], 0);
-                                               install_WriteData($_POST['spath']."inc/config.php", "MYSQL-LOGIN", "    'login'    => \"", "\",", $mysql['login'], 0);
-                                               install_WriteData($_POST['spath']."inc/config.php", "MYSQL-PASSWORD", " 'password' => \"", "\",", $mysql['pass1'], 0);
-                                               install_WriteData($_POST['spath']."inc/config.php", "MYSQL-PREFIX", "define('_MYSQL_PREFIX', \"", "\");", $mysql['prefix'], 0);
-                                               install_WriteData($_POST['spath']."inc/config.php", "SMTP-HOSTNAME", "define('SMTP_HOSTNAME', \"", "\");", $_POST['smtp_host'], 0);
-                                               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);
+                                               if ($_POST['spath'] != constant('PATH')) changeDataInFile($_POST['spath']."inc/config.php", "SERVER-PATH", "define('PATH', \"", "\");", $_POST['spath'], 0);
+                                               if ($_POST['burl']  != constant('URL'))  changeDataInFile($_POST['spath']."inc/config.php", "HOST-URL", "define('URL', \"", "\");", $_POST['burl'], 0);
+                                               changeDataInFile($_POST['spath']."inc/config.php", "MAIN_TITLE", "define('MAIN_TITLE', \"", "\");", $_POST['title'], 0);
+                                               changeDataInFile($_POST['spath']."inc/config.php", "SLOGAN", "define('SLOGAN', \"", "\");", $_POST['slogan'], 0);
+                                               changeDataInFile($_POST['spath']."inc/config.php", "WEBMASTER", "define('WEBMASTER', \"", "\");", $_POST['email'], 0);
+                                               changeDataInFile($_POST['spath']."inc/config.php", "NULLPASS-WARNING", "define('warn_no_pass', ", ");", $_POST['warn_no_pass'], 0);
+                                               changeDataInFile($_POST['spath']."inc/config.php", "WRITE-FOOTER", "define('WRITE_FOOTER', ", ");", $_POST['wfooter'], 0);
+                                               changeDataInFile($_POST['spath']."inc/config.php", "BACKLINK", "define('ENABLE_BACKLINK', ", ");", $_POST['blink'], 0);
+                                               // changeDataInFile($_POST['spath']."inc/config.php", "OUTPUT-MODE", "define('OUTPUT_MODE', \"", "\");", $_POST['omode'], 0);
+                                               changeDataInFile($_POST['spath']."inc/config.php", "MYSQL-HOST", "      'host'     => \"", "\",", $mysql['host'], 0);
+                                               changeDataInFile($_POST['spath']."inc/config.php", "MYSQL-DBASE", "     'dbase'    => \"", "\",", $mysql['dbase'], 0);
+                                               changeDataInFile($_POST['spath']."inc/config.php", "MYSQL-LOGIN", "     'login'    => \"", "\",", $mysql['login'], 0);
+                                               changeDataInFile($_POST['spath']."inc/config.php", "MYSQL-PASSWORD", "  'password' => \"", "\",", $mysql['pass1'], 0);
+                                               changeDataInFile($_POST['spath']."inc/config.php", "MYSQL-PREFIX", "define('_MYSQL_PREFIX', \"", "\");", $mysql['prefix'], 0);
+                                               changeDataInFile($_POST['spath']."inc/config.php", "SMTP-HOSTNAME", "define('SMTP_HOSTNAME', \"", "\");", $_POST['smtp_host'], 0);
+                                               changeDataInFile($_POST['spath']."inc/config.php", "SMTP-USER", "define('SMTP_USER', \"", "\");", $_POST['smtp_user'], 0);
+                                               changeDataInFile($_POST['spath']."inc/config.php", "SMTP-PASSWORD", "define('SMTP_PASSWORD', \"", "\");", $_POST['smtp_pass'], 0);
+                                               changeDataInFile($_POST['spath']."inc/config.php", "INSTALLED", "define('mxchange_installed', ", ");", "true", 0);
                                        } else {
                                                // Installation area not found!
                                                addFatalMessage(getMessage('INSTALL_MISSING_DUMPS'));
                                        } else {
                                                // Installation area not found!
                                                addFatalMessage(getMessage('INSTALL_MISSING_DUMPS'));
@@ -418,7 +359,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
                                LOAD_TEMPLATE("install_fatal_errors");
                        } else {
                                // Installation is done!
                                LOAD_TEMPLATE("install_fatal_errors");
                        } else {
                                // Installation is done!
-                               LOAD_URL($burl."/install.php?page=finalize");
+                               LOAD_URL("install.php?page=finalize");
                        }
                } elseif (isBooleanConstantAndTrue('mxchange_installed')) {
                        // Redirection after writing data... :-)
                        }
                } elseif (isBooleanConstantAndTrue('mxchange_installed')) {
                        // Redirection after writing data... :-)