A lot more naming conventions applied

[mailer.git] / inc / install-inc.php

diff --git a/inc/install-inc.php b/inc/install-inc.php
index f4146a707e5dee5e7a5b9b72aee5ac0b35fce1d0..94dfbb38a5bf592b30de5a515216b4d1792494f2 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -43,32 +43,25 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 }
 
 //
-function install_WriteData ($file, $COMMENT, $PREFIX, $SUFFIX, $DATA, $SNEAK=0)
+function install_WriteData ($file, $comment, $prefix, $suffix, $DATA, $SNEAK=0)
 {
-       $DONE = false;  $SNEAK++;
+       $done = false;  $SNEAK++;
        if (file_exists($file))
        {
-               $search = "CFG: ".$COMMENT;
+               $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))
-                               {
+               $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);
                                        if (strpos($line, $search) > -1) $next = 0;
-                                       if ($next > -1)
-                                       {
-                                               if ($next == $SNEAK)
-                                               {
+                                       if ($next > -1) {
+                                               if ($next == $SNEAK) {
                                                        $next = -1;
-                                                       $line = $PREFIX.$DATA.$SUFFIX."\n";
-                                               }
-                                                else
-                                               {
+                                                       $line = $prefix.$DATA.$suffix."\n";
+                                               } else {
                                                        $next++;
                                                }
                                        }
@@ -76,27 +69,22 @@ function install_WriteData ($file, $COMMENT, $PREFIX, $SUFFIX, $DATA, $SNEAK=0)
                                }
                                fclose($fp_tmp);
                                // Finished writing tmp file
-                               $DONE = true;
+                               $done = true;
                        }
 
                        // Close source directory
                        fclose($fp);
 
-                       if (($DONE) && (is_writeable($file)))
-                       {
+                       if (($done) && (is_writeable($file))) {
                                // Copy back tmp file and delete tmp :-)
                                @copy($tmp, $file);
                                @unlink($tmp);
-                       }
-                        else
-                       {
-                               OUTPUT_HTML ("<STRONG>TMP:</STRONG> UNDONE!");
+                       } else {
+                               OUTPUT_HTML("<STRONG>TMP:</STRONG> UNDONE!");
                        }
                }
-       }
-        else
-       {
-               OUTPUT_HTML ("<STRONG>404:</STRONG> ".$file."<BR>");
+       } else {
+               OUTPUT_HTML("<STRONG>404:</STRONG> ".$file."<BR>");
        }
 }
 
@@ -146,12 +134,12 @@ if ((!mxchange_installed) || (!admin_registered))
                if (empty($mysql['prefix'])) $mysql['prefix'] = "mxchange_";
                if ((sizeof($FATAL) > 0) || (!empty($FATAL[0])))
                {
-                       OUTPUT_HTML ("<SPAN class=\"install_fatal\">");
+                       OUTPUT_HTML("<SPAN class=\"install_fatal\">");
                        foreach ($FATAL as $key=>$err)
                        {
-                               OUTPUT_HTML ("  <STRONG>&middot;</STRONG>&nbsp;".FATAL_NO.($key + 1).":&nbsp;".$err."<BR>\n");
+                               OUTPUT_HTML("  <STRONG>&middot;</STRONG>&nbsp;".FATAL_NO.($key + 1).":&nbsp;".$err."<BR>\n");
                        }
-                       OUTPUT_HTML ("</SPAN><BR>");
+                       OUTPUT_HTML("</SPAN><BR>");
                }
                define('__MYSQL_HOST'  , $mysql['host']);
                define('__MYSQL_DBASE' , $mysql['dbase']);
@@ -173,7 +161,7 @@ if ((!mxchange_installed) || (!admin_registered))
                define('__TITLE_VALUE' , $_POST['title']);
                define('__SLOGAN_VALUE', $_POST['slogan']);
                define('__EMAIL_VALUE' , $_POST['email']);
-               OUTPUT_HTML ("<FORM action=\"".__BURL_ACTION."/install.php?page=finalize\" method=\"POST\" target=\"_self\">
+               OUTPUT_HTML("<FORM action=\"".__BURL_ACTION."/install.php?page=finalize\" method=\"POST\" target=\"_self\">
 <TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"install_content\">
 <TR>
   <TD colspan=\"2\" align=\"center\">
@@ -192,11 +180,11 @@ if ((!mxchange_installed) || (!admin_registered))
   <TD>
     <SELECT name=\"omode\" size=\"1\" class=\"install_select\">
       <OPTION value=\"render\"");
-               if (OUTPUT_MODE == "render") OUTPUT_HTML (" selected=\"selected\"");
-               OUTPUT_HTML (">".MODE_RENDER."</OPTION>
+               if (OUTPUT_MODE == "render") OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">".MODE_RENDER."</OPTION>
       <OPTION value=\"direct\"");
-               if (OUTPUT_MODE == "direct") OUTPUT_HTML (" selected=\"selected\"");
-               OUTPUT_HTML (">".MODE_DIRECT."</OPTION>
+               if (OUTPUT_MODE == "direct") OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">".MODE_DIRECT."</OPTION>
     </SELECT>
   </TD>
 </TR>
@@ -206,11 +194,11 @@ if ((!mxchange_installed) || (!admin_registered))
   <TD>
     <SELECT name=\"warn_no_pass\" size=\"1\" class=\"install_select\">
       <OPTION value=\"true\"");
-               if (warn_no_pass) OUTPUT_HTML (" selected=\"selected\"");
-               OUTPUT_HTML (">".YES."</OPTION>
+               if (warn_no_pass) OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">".YES."</OPTION>
       <OPTION value=\"false\"");
-               if (!warn_no_pass) OUTPUT_HTML (" selected=\"selected\"");
-               OUTPUT_HTML (">".NO."</OPTION>
+               if (!warn_no_pass) OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">".NO."</OPTION>
     </SELECT>
   </TD>
 </TR>
@@ -220,11 +208,11 @@ if ((!mxchange_installed) || (!admin_registered))
   <TD>
     <SELECT name=\"wfooter\" size=\"1\" class=\"install_select\">
       <OPTION value=\"true\"");
-               if (WRITE_FOOTER) OUTPUT_HTML (" selected=\"selected\"");
-               OUTPUT_HTML (">".YES."</OPTION>
+               if (WRITE_FOOTER) OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">".YES."</OPTION>
       <OPTION value=\"false\"");
-               if (!WRITE_FOOTER) OUTPUT_HTML (" selected=\"selected\"");
-               OUTPUT_HTML (">".NO."</OPTION>
+               if (!WRITE_FOOTER) OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">".NO."</OPTION>
     </SELECT>
   </TD>
 </TR>
@@ -234,11 +222,11 @@ if ((!mxchange_installed) || (!admin_registered))
   <TD>
     <SELECT name=\"frameset\" size=\"1\" class=\"install_select\">
       <OPTION value=\"true\"");
-               if (frameset_active) OUTPUT_HTML (" selected=\"selected\"");
-               OUTPUT_HTML (">".YES."</OPTION>
+               if (frameset_active) OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">".YES."</OPTION>
       <OPTION value=\"false\"");
-               if (!frameset_active) OUTPUT_HTML (" selected=\"selected\"");
-               OUTPUT_HTML (">".NO."</OPTION>
+               if (!frameset_active) OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">".NO."</OPTION>
     </SELECT>
   </TD>
 </TR>
@@ -248,11 +236,11 @@ if ((!mxchange_installed) || (!admin_registered))
   <TD>
     <SELECT name=\"blink\" size=\"1\" class=\"install_select\">
       <OPTION value=\"true\"");
-               if (ENABLE_BACKLINK) OUTPUT_HTML (" selected=\"selected\"");
-               OUTPUT_HTML (">".YES."</OPTION>
+               if (ENABLE_BACKLINK) OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">".YES."</OPTION>
       <OPTION value=\"false\"");
-               if (!ENABLE_BACKLINK) OUTPUT_HTML (" selected=\"selected\"");
-               OUTPUT_HTML (">".NO."</OPTION>
+               if (!ENABLE_BACKLINK) OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">".NO."</OPTION>
     </SELECT>
   </TD>
 </TR>
@@ -261,9 +249,9 @@ if ((!mxchange_installed) || (!admin_registered))
   <TD colspan=\"2\" align=\"center\">");
                foreach ($mysql as $key=>$value)
                {
-                       OUTPUT_HTML ("    <INPUT type=\"hidden\" name=\"mysql[".$key."]\" value=\"".$value."\">");
+                       OUTPUT_HTML("    <INPUT type=\"hidden\" name=\"mysql[".$key."]\" value=\"".$value."\">");
                }
-               OUTPUT_HTML ("    <INPUT type=\"hidden\" name=\"spath\" value=\"".__SPATH_VALUE."\">
+               OUTPUT_HTML("    <INPUT type=\"hidden\" name=\"spath\" value=\"".__SPATH_VALUE."\">
     <INPUT type=\"hidden\" name=\"burl\" value=\"".__BURL_VALUE."\">
     <INPUT type=\"hidden\" name=\"title\" value=\"".__TITLE_VALUE."\">
     <INPUT type=\"hidden\" name=\"slogan\" value=\"".__SLOGAN_VALUE."\">
@@ -365,7 +353,7 @@ if ((!mxchange_installed) || (!admin_registered))
                                define('__BURL_VALUE' , $_POST['burl']);
                                define('__TITLE_VALUE', $_POST['title']);
 
-                               OUTPUT_HTML ("<FORM action=\"".__BURL_ACTION."/install.php?page=2\" method=\"POST\">
+                               OUTPUT_HTML("<FORM action=\"".__BURL_ACTION."/install.php?page=2\" method=\"POST\">
 <TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"install_content\">
 <TR>
   <TD align=\"center\">
@@ -403,7 +391,7 @@ if ((!mxchange_installed) || (!admin_registered))
                 elseif (mxchange_installed)
                {
                        // Redirection after writing data... :-)
-                       OUTPUT_HTML ("<SPAN class=\"install_finished\">".INSTALL_FINISHED."</SPAN><BR>
+                       OUTPUT_HTML("<SPAN class=\"install_finished\">".INSTALL_FINISHED."</SPAN><BR>
 <BR>
 <SPAN class=\"install_security\">".INSTALL_FIN_SECU."</SPAN><BR>
 <BR>
@@ -421,7 +409,7 @@ if ((!mxchange_installed) || (!admin_registered))
                break;
 
        default:
-               OUTPUT_HTML ("    <STRONG class=\"install_error\">".WRONG_PAGE."</STRONG>");
+               OUTPUT_HTML("    <STRONG class=\"install_error\">".WRONG_PAGE."</STRONG>");
                break;
        }
 }