X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Finstall-inc.php;h=f19cf3a718928e19c6b463653dd5bb2c932870b5;hb=6fc12676fe7e6be6151ffed7bac2a2d6efd22086;hp=850d6fae7e6b0390cd862f7983989ce4f7ccd64f;hpb=ca373c1ed0ab946bbf39bda275ed83214d6a3fed;p=mailer.git
diff --git a/inc/install-inc.php b/inc/install-inc.php
index 850d6fae7e..f19cf3a718 100644
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -36,7 +36,7 @@
************************************************************************/
// Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
+if (!defined('__SECURITY')) {
$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
require($INC);
}
@@ -45,10 +45,10 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
function install_WriteData ($file, $comment, $prefix, $suffix, $DATA, $sneak=0) {
// Initialize all and count up the "seak" value
$done = false;
- $next = 0;
+ $next = -1;
$sneak++;
- if ((file_exists($file)) && (is_readable($file))) {
+ if (FILE_READABLE($file)) {
$search = "CFG: ".$comment;
$tmp = $file.".tmp";
$fp = @fopen($file, 'r') or OUTPUT_HTML("READ: ".$file."
");
@@ -60,7 +60,7 @@ function install_WriteData ($file, $comment, $prefix, $suffix, $DATA, $sneak=0)
//* DEBUG: */ echo $search."/".htmlentities($line)."
\n";
$found = strpos($line, $search);
//* DEBUG: */ echo "FOUND: ";
- var_dump($found);
+ //* DEBUG: */ var_dump($found);
//* DEBUG: */ echo "
\n";
if ($found !== false) $next = 0;
if ($next > -1) {
@@ -104,7 +104,7 @@ if (isset($_POST['mysql']) && is_array($_POST['mysql'])) $mysql = $_POST['mysql'
if (URL != "http://your-server.com") {
// Already installed???
$burl = URL;
-} elseif ($burl == "") {
+} elseif (empty($burl)) {
// Auto-detect URL
$burl = "http://".$SERVER_NAME.$_SERVER['PHP_SELF'];
$burl = substr($burl, 0, strpos($burl, "install.php"));
@@ -166,7 +166,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
if (empty($mysql['prefix'])) $mysql['prefix'] = "mxchange_";
if ((sizeof($FATAL) > 0) || (!empty($FATAL[0]))) {
OUTPUT_HTML("");
- foreach ($FATAL as $key=>$err) {
+ foreach ($FATAL as $key => $err) {
OUTPUT_HTML(" · ".FATAL_NO.($key + 1).": ".$err."
");
}
OUTPUT_HTML("
");
@@ -275,7 +275,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
if (isBooleanConstantAndTrue('warn_no_pass')) OUTPUT_HTML(" selected=\"selected\"");
OUTPUT_HTML(">".YES."
@@ -289,7 +289,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
if (isBooleanConstantAndTrue('WRITE_FOOTER')) OUTPUT_HTML(" selected=\"selected\"");
OUTPUT_HTML(">".YES."
@@ -311,7 +311,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT