X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Finstall-inc.php;h=552956e9a6683588bf8b98c332e2bce73c2f8e79;hp=5f9fede1c27f7ed416f8fda48a8aad31897120b3;hb=dc1d66c49b8cb1e4fb8056d46b9c7e3fecd0ffdd;hpb=8eb210b89c951f3278331087d6ad20b0d0833db7

diff --git a/inc/install-inc.php b/inc/install-inc.php
index 5f9fede1c2..552956e9a6 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);
 }
@@ -48,7 +48,7 @@ function install_WriteData ($file, $comment, $prefix, $suffix, $DATA, $sneak=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("<STRONG>READ:</STRONG> ".$file."<br />");
@@ -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("<SPAN class=\"install_fatal\">");
-			foreach ($FATAL as $key=>$err) {
+			foreach ($FATAL as $key => $err) {
 				OUTPUT_HTML("  <STRONG>&middot;</STRONG>&nbsp;".FATAL_NO.($key + 1).":&nbsp;".$err."<br />");
 			}
 			OUTPUT_HTML("</SPAN><br />");
@@ -275,7 +275,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
 		if (isBooleanConstantAndTrue('warn_no_pass')) OUTPUT_HTML(" selected=\"selected\"");
 		OUTPUT_HTML(">".YES."</OPTION>
       <OPTION value=\"false\"");
-		if (!isBooleanConstantAndTrue('warn_no_pass')) OUTPUT_HTML(" selected=\"selected\"");
+		if (!defined('warn_no_pass')) OUTPUT_HTML(" selected=\"selected\"");
 		OUTPUT_HTML(">".NO."</OPTION>
     </SELECT>
   </TD>
@@ -289,7 +289,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
 		if (isBooleanConstantAndTrue('WRITE_FOOTER')) OUTPUT_HTML(" selected=\"selected\"");
 		OUTPUT_HTML(">".YES."</OPTION>
       <OPTION value=\"false\"");
-		if (!isBooleanConstantAndTrue('WRITE_FOOTER')) OUTPUT_HTML(" selected=\"selected\"");
+		if (!defined('WRITE_FOOTER')) OUTPUT_HTML(" selected=\"selected\"");
 		OUTPUT_HTML(">".NO."</OPTION>
     </SELECT>
   </TD>
@@ -311,7 +311,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
 <TR><TD colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</TD></TR>
 <TR>
   <TD colspan=\"2\" align=\"center\">");
-		foreach ($mysql as $key=>$value) {
+		foreach ($mysql as $key => $value) {
 			OUTPUT_HTML("    <INPUT type=\"hidden\" name=\"mysql[".$key."]\" value=\"".$value."\">");
 		}
 		OUTPUT_HTML("    <INPUT type=\"hidden\" name=\"spath\" value=\"".__SPATH_VALUE."\">
@@ -342,12 +342,12 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
 				$db = SQL_SELECT_DB($mysql['dbase'], $link, __FILE__, __LINE__);
 				if ($db) {
 					// Automatically run install.sql
-					if ((file_exists($_POST['spath']."install/tables.sql")) && (file_exists($_POST['spath']."install/menu-".GET_LANGUAGE().".sql"))) {
+					if ((FILE_READABLE($_POST['spath']."install/tables.sql")) && (FILE_READABLE($_POST['spath']."install/menu-".GET_LANGUAGE().".sql"))) {
 						// 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_exists($file)) && (is_readable($file))) {
+							if (FILE_READABLE($file)) {
 								// Load the file
 								$sql = implode("", file($file));
 
@@ -418,7 +418,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
 				}
 				define('__FATAL_ERROR_LI', $OUT);
 				$OUT = "";
-				foreach ($mysql as $key=>$value)
+				foreach ($mysql as $key => $value)
 				{
 					$OUT .= "    <INPUT type=\"hidden\" name=\"mysql[".$key."]\" value=\"".$value."\">\n";
 				}